lilei 1 éve
szülő
commit
c8d7ec68b0

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -218,7 +218,7 @@
             this.colspanNums = this.colspanNums + 3
             arr = arr.concat([
                 { title: '待下推数', field: 'unpushedQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-                { title: '已下推数', field: 'pushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+                { title: '已下推数', field: 'epushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
                 { title: '已取消数', field: 'cancelQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} }
             ])
           return arr
@@ -347,6 +347,7 @@
               item.productName = productName || '--'
               item.productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
               item.productOrigUnit = productOrigUnit || '--'
+              item.epushedQty = Number(item.pushedQty) - Number(item.pushQty)
               if (item.unpushedQty && (Number(item.stockQty) < Number(item.unpushedQty))) {
                   str += item.productCode + '、'
               }

+ 5 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -443,6 +443,7 @@ export default {
     // 启用规则
     enabledActive(e,item){
       const _this = this
+      this.spinning = true
       salesEnablePromoPromo({
         salesBillSn: _this.salesBillSn,
         salesPromoSn: item.salesPromoSn
@@ -452,6 +453,7 @@ export default {
           item.disabled = false
           item.isActive = true
           _this.activeList.splice()
+          _this.spinning = false
           // 刷新正常活动
           _this.$refs.productNormalList.resetSearchForm()
           _this.insterActiveOk('normal')
@@ -462,6 +464,7 @@ export default {
     // 禁用规则
     disabledActive(e,item){
       const _this = this
+      _this.spinning = true
       salesDisablePromo({
         salesBillSn: _this.salesBillSn,
         salesPromoSn: item.salesPromoSn,
@@ -473,7 +476,7 @@ export default {
           // 刷新所有表格
           _this.$refs.productNormalList.resetSearchForm()
           _this.insterActiveOk('normal')
-          
+          _this.spinning = false
           _this.disabledActiveOption = null
           item.disabled = true
           item.isActive = false
@@ -486,6 +489,7 @@ export default {
     disenablePromp(e,item){
       const _this = this
       const table = _this.$refs['productList-'+item.promoRuleSn][0]
+
       // 是否启用规则
       if(item.disabled){
         this.enabledActive(e,item)

+ 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.111/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: {