Procházet zdrojové kódy

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui před 1 rokem
rodič
revize
5bc883845c

+ 9 - 2
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -155,7 +155,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :row-selection="{ columnWidth: 40 }"
+      :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.promotionFlag == 'GIFT'&&!!record.salesPromoDetailParentSn } }) }"
       @rowSelection="rowSelectionFun"
       :pageSize="10"
       bordered>
@@ -197,6 +197,7 @@
       <template slot="salesNums" slot-scope="text, record">
         <a-input-number
           id="salesEdit-qty"
+          v-if="!(record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn)"
           size="small"
           v-model="record.qty"
           :precision="0"
@@ -205,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">
@@ -218,6 +220,7 @@
       <template slot="warehouseBox" slot-scope="text, record">
         <a-select
           size="small"
+          :disabled="record.promotionFlag == 'GIFT'&&!!record.salesPromoDetailParentSn"
           style="width:100%;" 
           placeholder="请选择仓库"
           v-model="record.warehouseSn"
@@ -230,11 +233,13 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button
+        <div>
+          <a-button
           size="small"
           type="link"
           :loading="delLoading"
           class="button-error"
+          v-if="!(record.promotionFlag == 'GIFT'&&record.salesPromoDetailParentSn)"
           @click="handleDel(record)"
         >删除</a-button>
 
@@ -243,8 +248,10 @@
           type="link"
           :loading="delLoading"
           class="button-primary"
+          v-if="record.promotionFlag != 'GIFT'"
           @click="handleUpdateActive(record)"
         >换促销</a-button>
+        </div>
       </template>
       <template slot="footer" slot-scope="currentPageData">
         <!-- 总计 -->

+ 2 - 0
src/views/salesManagement/salesQueryNew/edit.vue

@@ -323,6 +323,8 @@ export default {
           this.$refs.productNormalList.resetSearchForm()
           // 刷新当前活动
           this.$refs['productList-'+oldPromo.promoRuleSn][0].upAcitveSuccess()
+          // 刷新详情统计
+          this.getOrderDetail()
         }
       })
     },

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ 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', //  预发布
         ws: false,