lilei 1 年之前
父节点
当前提交
05d9f953bf
共有 2 个文件被更改,包括 9 次插入6 次删除
  1. 7 4
      src/views/salesManagement/salesQueryNew/comps/productList.vue
  2. 2 2
      vue.config.js

+ 7 - 4
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -155,7 +155,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn } }) }"
+      :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.promotionFlag == 'GIFT'&&!!record.salesPromoDetailParentSn } }) }"
       @rowSelection="rowSelectionFun"
       :pageSize="10"
       bordered>
@@ -197,7 +197,7 @@
       <template slot="salesNums" slot-scope="text, record">
         <a-input-number
           id="salesEdit-qty"
-          :disabled="record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn"
+          v-if="!(record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn)"
           size="small"
           v-model="record.qty"
           :precision="0"
@@ -206,6 +206,7 @@
           placeholder="请输入"
           @blur="e => onCellBlur(e.target.value, record)"
           style="width: 100%;" />
+          <span v-else>{{ record.qty }}</span>
       </template>
       <!-- 当前库存 -->
       <template slot="stockQty" slot-scope="text, record">
@@ -219,7 +220,7 @@
       <template slot="warehouseBox" slot-scope="text, record">
         <a-select
           size="small"
-          :disabled="record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn"
+          :disabled="record.promotionFlag == 'GIFT'&&!!record.salesPromoDetailParentSn"
           style="width:100%;" 
           placeholder="请选择仓库"
           v-model="record.warehouseSn"
@@ -232,7 +233,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button
+        <div>
+          <a-button
           size="small"
           type="link"
           :loading="delLoading"
@@ -249,6 +251,7 @@
           v-if="record.promotionFlag != 'GIFT'"
           @click="handleUpdateActive(record)"
         >换促销</a-button>
+        </div>
       </template>
       <template slot="footer" slot-scope="currentPageData">
         <!-- 总计 -->

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.113:8660/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {