Jelajahi Sumber

修改地址

lilei 4 tahun lalu
induk
melakukan
2b46eada5e

+ 1 - 1
.env.preview

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://it.test.zyucgj.com/zyit
+VUE_APP_API_BASE_URL=http://ocs-admin.360arrow.com.cn/ocs
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠运营中心系统-pre
 VUE_APP_LOGO=@/assets/logo.png

+ 1 - 1
src/views/salesManagement/waitDispatch/edit.vue

@@ -132,7 +132,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 300, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', width: 300, customRender: function (text) { return text || '--' } },
         { title: '剩余待下推', dataIndex: 'surplusQty', width: 150, align: 'center' },
         { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 23 - 20
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -165,28 +165,31 @@ export default {
         this.queryParam.salesBillSn = this.salesBillSn
         return salesDetailAllList(Object.assign(parameter, this.queryParam)).then(res => {
           let data = res.data
-          // 根据类型过滤数据
-          data = data.filter(item => {
-            if (this.queryParam.ptype == '1') {
-              return item != null && item.surplusQty > 0
+          if (data) {
+            // 根据类型过滤数据
+            data = data.filter(item => {
+              if (this.queryParam.ptype == '1') {
+                return item != null && item.surplusQty > 0
+              }
+              if (this.queryParam.ptype == '2') {
+                return item != null && item.surplusQty > 0 && item.surplusQty <= item.stockQty
+              }
+              if (this.queryParam.ptype == '3') {
+                return item != null && item.surplusQty > item.stockQty
+              }
+              if (this.queryParam.ptype == '0') {
+                return item != null
+              }
+            })
+            // 增加编号
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              data[i].cancelNums = data[i].surplusQty
             }
-            if (this.queryParam.ptype == '2') {
-              return item != null && item.surplusQty > 0 && item.surplusQty <= item.stockQty
-            }
-            if (this.queryParam.ptype == '3') {
-              return item != null && item.surplusQty > item.stockQty
-            }
-            if (this.queryParam.ptype == '0') {
-              return item != null
-            }
-          })
-          // 增加编号
-          const no = 0
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
-            data[i].cancelNums = data[i].surplusQty
+            this.disabled = false
           }
-          this.disabled = false
+
           return data
         })
       }

+ 1 - 2
vue.config.js

@@ -109,8 +109,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         target: 'http://192.168.16.104:8602/ocs',
-        // target: 'http://qpls-md.360arrow.com.cn/qpls-md',
-        // target: 'https://it.test.qiubcar.com/zyit',
+        // target: 'http://ocs-admin.360arrow.com.cn/ocs',
         ws: false,
         changeOrigin: true,
         pathRewrite: {