瀏覽代碼

提交箱管、达沃特

caojunjie 2 年之前
父節點
當前提交
bb0749e78a

+ 16 - 0
src/views/basicData/container/archives.vue

@@ -165,6 +165,22 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
+          label: '应收',
+          prop: 'collect',
+          overHidden: true
+        }, {
+          label: '应付',
+          prop: 'pay',
+          overHidden: true
+        }, {
+          label: '业务类型',
+          prop: 'billType',
+          overHidden: true
+        }, {
+          label: '状态',
+          prop: 'status',
+          overHidden: true
         }]
       },
       excelBox: false,

+ 1 - 2
src/views/boxManagement/exportShipment/detailsPage.vue

@@ -993,11 +993,10 @@ export default {
               type: "DCF",
               source: "CKZY",
               ...this.formState,
-              purchaseCompanyId: this.formState.corpId,
-              purchaseCompanyName: this.formState.corpName,
               // tradingBoxItemsList: this.dataList,
               tradingBoxItemsList: this.selectionList,
             }
+            console.log(this.formState)
             // data.tradingBoxItemsList.forEach(item=> delete item.id)
             delete data.id
             const loading = this.$loading({

+ 0 - 2
src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -998,8 +998,6 @@ export default {
               type: "DCF",
               source: "JKFC",
               ...this.formState,
-              purchaseCompanyId: this.formState.corpId,
-              purchaseCompanyName: this.formState.corpName,
               // tradingBoxItemsList: this.dataList,
               tradingBoxItemsList: this.selectionList,
             }

+ 14 - 0
src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -274,6 +274,20 @@
       "valueFormat": "yyyy-MM-dd",
       "overHidden": true,
       "pickerOptions": {}
+    },{
+      "label": "采购状态",
+      "prop": "purchaseStatus",
+      "search": false,
+      "index": 22.1,
+      "width": 100,
+      "overHidden": true
+    },{
+      "label": "收货状态",
+      "prop": "receivingStatus",
+      "search": false,
+      "index": 22.2,
+      "width": 100,
+      "overHidden": true
     },
     {
       "type": "select",

+ 1 - 1
vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.103:1080',
+        // target: 'http://192.168.0.104:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
         target: 'http://121.37.83.47:10004',//服务器ip