修改国内贸易

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -198,34 +198,24 @@
       "pickerOptions": {}
     },
     {
-      "type": "select",
-      "dicData": [{
-          "name": "已收款",
-          "id": "0"
-        },
-        {
-          "name": "未收款",
-          "id": "1"
-        }
-      ],
-      "props": {
-        "label": "name",
-        "value": "id"
-      },
-      "label": "收款状态",
-      "prop": "gathering",
-      "search": true,
+      "label": "应付金额",
+      "prop": "debitAmount",
       "index": 17,
       "width": 100,
-      "showColumn": false,
-      "hide": true,
+      "overHidden": true
+    },
+    {
+      "label": "已付金额",
+      "prop": "settlmentAmount",
+      "index": 18,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "更改人",
       "prop": "updateUserName",
       "search": false,
-      "index": 18,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
@@ -233,7 +223,7 @@
       "label": "更改时间",
       "prop": "updateTime",
       "search": false,
-      "index": 19,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
@@ -241,7 +231,7 @@
       "label": "是否生成发货",
       "prop": "createFreight",
       "search": false,
-      "index": 20,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
@@ -249,7 +239,7 @@
       "label": "生成发货时间",
       "prop": "createFreightTime",
       "search": false,
-      "index": 21,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
@@ -257,7 +247,7 @@
       "label": "发货人",
       "prop": "createFreightUser",
       "search": false,
-      "index": 22,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
@@ -271,8 +261,32 @@
       "label": "单据状态",
       "prop": "orderStatus",
       "search": false,
-      "index": 23,
+      "index": 24,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "type": "select",
+      "dicData": [{
+        "name": "已付款",
+        "id": "0"
+      },
+        {
+          "name": "未付款",
+          "id": "1"
+        }
+      ],
+      "props": {
+        "label": "name",
+        "value": "id"
+      },
+      "label": "付款状态",
+      "prop": "gathering",
+      "search": true,
+      "index": 999,
       "width": 100,
+      "showColumn": false,
+      "hide": true,
       "overHidden": true
     }
   ]

src/views/businessManagement/purchaseOrder/index.vue

@@ -148,7 +148,7 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(17), option);
     this.getWorkDicts("payment_term").then(res => {
       this.findObject(this.option.column, "paymentType").dicData =
-        res.data.data;
+          res.data.data;
     });
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
@@ -196,6 +196,7 @@ export default {
         }
       }
     })
+    console.log(this.option.column.length)
   },
   activated() {
     if (this.$route.query.check) {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -676,6 +676,17 @@ export default {
                 trigger: 'blur'
               }
             ]
+          },{
+            label: '来源单号',
+            prop: 'srcOrderNo',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: "入库单备注",

src/views/financialManagement/paymentRequest/configuration/detailsPage.json

@@ -51,6 +51,13 @@
       "overHidden": true
     },
     {
+      "label": "销售单号",
+      "prop": "srcOrderno",
+      "index": 2,
+      "width":150,
+      "overHidden": true
+    },
+    {
       "label": "费用名称",
       "prop": "costType",
       "index": 3,

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -441,6 +441,13 @@
     },
     async created() {
       this.itemOption = await this.getColumnData(this.getColumnName(62), itemOption);
+      if (JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id === '681169'){
+        for (let item in this.itemOption.column){
+          if (this.itemOption.column[item].prop === 'billNo'){
+            this.itemOption.column.splice(item, 1)
+          }
+        }
+      }
       //是否需要根据 登录人所属公司  区分不用option
 
       //币别
@@ -746,6 +753,13 @@
         if (inSave) {
           this.$message.success("重置成功");
           this.itemOption = itemOption;
+          if (JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id === '681169'){
+            for (let item in this.itemOption.column){
+              if (this.itemOption.column[item].prop === 'billNo'){
+                this.itemOption.column.splice(item, 1)
+              }
+            }
+          }
           //关闭窗口
           this.$refs.crud.$refs.dialogColumn.columnBox = false;
         }