修改bug

src/views/basicData/customerInformation/configuration/customerContact.json

@@ -18,14 +18,7 @@
       "label": "编号",
       "prop": "code",
       "index": 1,
-      "width":120,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入编号",
-          "trigger": "blur"
-        }
-      ]
+      "width":120
     },{
       "label": "姓名",
       "prop": "cname",

src/views/businessManagement/proxyOrder/configuration/commodity.json

@@ -117,24 +117,7 @@
       "slot": true,
       "overHidden": true
     },
-    {
-      "label": "供应商",
-      "prop": "corpName",
-      "slot": true,
-      "overHidden": true
-    },
-    {
-      "label": "体积",
-      "prop": "cntrVolumn",
-      "slot": true,
-      "overHidden": true
-    },
-    {
-      "label": "重量",
-      "prop": "cartonWeight",
-      "slot": true,
-      "overHidden": true
-    },
+
     {
       "label": "商品图片",
       "prop": "url",

src/views/businessManagement/proxyOrder/detailsPageEdit.vue

@@ -1429,7 +1429,7 @@ export default {
       if (!this.detailData.id) {
         getCorp().then(res => {
           this.form.corpId = res.data.data.id;
-          this.form.corpName = res.data.data.cname;
+          // this.form.corpName = res.data.data.cname;
           this.getCorpRow(res.data.data)
         })
       }
@@ -1531,17 +1531,17 @@ export default {
         this.goodsActives = 'goods';
         this.handleClick({ name: this.goodsActives })
         // this.contactsData = this.form.orderItemsList
-        this.advantageProjectData = this.form.orderFeesList
+        // this.advantageProjectData = this.form.orderFeesList
         this.bankOfDepositData = this.form.orderFilesList
         this.configuration.dicData = this.form.corpName
         let feesData = []
-        this.form.orderFeesList.forEach(item => {
-          let a = {
-            cname: item.corpName,
-            id: item.corpId
-          }
-          feesData.push(a)
-        })
+        // this.form.orderFeesList.forEach(item => {
+        //   let a = {
+        //     cname: item.corpName,
+        //     id: item.corpId
+        //   }
+        //   feesData.push(a)
+        // })
         this.configuration.dicData = this.configuration.dicData.concat(feesData)
         // 去重
         this.removeRepeat()
@@ -1555,7 +1555,7 @@ export default {
         this.goodsConfiguration.dicData = [].concat(goodsData)
         this.removeGoodsRepeat()
         delete this.form.orderItemsList
-        delete this.form.orderFeesList
+        // delete this.form.orderFeesList
         delete this.form.orderFilesList
         // delete this.form.corpName
         delete this.form.belongToCorpList
@@ -2791,10 +2791,12 @@ export default {
           }
           // this.form.orderFeesList = this.$refs.feeInfo.submitData()
           let packFee;
-          if (this.form.packageRemarks && this.form.packageRemarks !== '无包装' && this.form.packageRemarks !== '不包装') {
-            let arr = this.form.orderFeesList.filter(item => item.feesType == 1)
-            packFee = arr.findIndex(item => item.feeName == '包装费')
-          }
+          // if (this.form.packageRemarks && this.form.packageRemarks !== '无包装' && this.form.packageRemarks !== '不包装') {
+          //   if(this.form.orderFeesList){
+          //     let arr = this.form.orderFeesList.filter(item => item.feesType == 1)
+          //     packFee = arr.findIndex(item => item.feeName == '包装费')
+          //   }
+          // }
           if (packFee == -1) {
             return this.$message.error('费用明细未有包装费')
           }

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -239,81 +239,81 @@ export default {
         showSummary: true,
         sumColumnList: [
           {
-          name: 'goodsTotalNum',
-          type: 'sum',
-          decimals: 0
-        }, 
-        {
-          name: 'totalMoney',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'fundingAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'useAdvanceChargeAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'produceAdvanceChargeAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'bondAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'interest',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'goodsTotalShipNum',
-          type: 'sum',
-          decimals: 0
-        }, 
-        {
-          name: 'goodsTotalShipAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'outGoodsTotalShipNum',
-          type: 'sum',
-          decimals: 0
-        }, 
-        {
-          name: 'outGoodsTotalShipAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'surplusShipNum',
-          type: 'sum',
-          decimals: 0
-        }, 
-        {
-          name: 'surplusShipAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'primaryFundingAmount',
-          type: 'sum',
-          decimals: 2
-        }, 
-        {
-          name: 'primaryGoodsTotalNum',
-          type: 'sum',
-          decimals: 0
-        }
-      ],
+            name: 'goodsTotalNum',
+            type: 'sum',
+            decimals: 0
+          },
+          {
+            name: 'totalMoney',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'fundingAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'useAdvanceChargeAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'produceAdvanceChargeAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'bondAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'interest',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'goodsTotalShipNum',
+            type: 'sum',
+            decimals: 0
+          },
+          {
+            name: 'goodsTotalShipAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'outGoodsTotalShipNum',
+            type: 'sum',
+            decimals: 0
+          },
+          {
+            name: 'outGoodsTotalShipAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'surplusShipNum',
+            type: 'sum',
+            decimals: 0
+          },
+          {
+            name: 'surplusShipAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'primaryFundingAmount',
+            type: 'sum',
+            decimals: 2
+          },
+          {
+            name: 'primaryGoodsTotalNum',
+            type: 'sum',
+            decimals: 0
+          }
+        ],
         column: [
           {
             label: '供应商',
@@ -379,6 +379,12 @@ export default {
               value: 'cname'
             },
             dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
+          },
+          {
+            label: '订单保证金',
+            prop: "primaryBondAmount",
+            width:100,
+            disabled: true,
           }, {
             label: '订单数量',
             prop: "primaryGoodsTotalNum",
@@ -660,7 +666,7 @@ export default {
     },
     confirm(row, index, type) {
       if (type == 1) {
-        if(row.goodsTotalShipNum==0) return   this.$message.error("入库数量为0，请先入库");
+        if (row.goodsTotalShipNum == 0) return this.$message.error("入库数量为0，请先入库");
         this.$confirm('采购数量:' + row.goodsTotalNum + ',金额:' + row.totalMoney + '<br/>到货数量:' + row.goodsTotalShipNum + ',金额:' + row.goodsTotalShipAmount, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',