进口修改

src/components/bill/config/mainList.json

@@ -21,6 +21,8 @@
   "selection": true,
   "menu": false,
   "menuWidth": 0,
+  "searchIcon": true,
+  "searchIndex": 2,
   "dialogClickModal": false,
   "column": [
     {

src/views/financialManagement/billDetails/billDetails.vue

@@ -77,7 +77,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 310 ;
+      option.height = window.innerHeight - 200 ;
     },
     methods: {
       //新单打开

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -23,26 +23,6 @@
   "headerAlign": "center",
   "column": [
     {
-      "label": "单据状态",
-      "prop": "billType",
-      "type": "select",
-      "search": true,
-      "searchOrder": 7,
-      "overHidden": true,
-      "index": 1,
-      "width": 120,
-      "dicData": [
-        {
-          "label": "申请",
-          "value": "申请"
-        },
-        {
-          "label": "销售",
-          "value":"销售"
-        }
-      ]
-    },
-    {
       "label": "合同号",
       "prop": "accSysNo",
       "search": true,
@@ -56,7 +36,7 @@
       "search": true,
       "overHidden": true,
       "width": 120,
-      "index": 2
+      "index": 3
     },
     {
       "label": "客户名称",
@@ -70,14 +50,33 @@
       "prop": "corpName",
       "overHidden": true,
       "width": 200,
-      "index": 3
+      "index": 4
+    },
+    {
+      "label": "单据状态",
+      "prop": "billType",
+      "type": "select",
+      "search": true,
+      "overHidden": true,
+      "index": 1,
+      "width": 120,
+      "dicData": [
+        {
+          "label": "申请",
+          "value": "申请"
+        },
+        {
+          "label": "销售",
+          "value":"销售"
+        }
+      ]
     },
     {
       "label": "费用名称",
       "prop": "itemName",
       "overHidden": true,
       "width": 150,
-      "index": 4
+      "index": 5
     },
     {
       "label": "费用名称",
@@ -91,48 +90,48 @@
       "prop": "quantity",
       "overHidden": true,
       "width": 120,
-      "index": 5
+      "index": 6
     },
     {
       "label": "单价",
       "prop": "price",
       "width": 120,
       "overHidden": true,
-      "index": 6
+      "index": 7
     },
     {
       "label": "账单金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
-      "index": 7
+      "index": 8
     },
     {
       "label": "结算金额",
       "prop": "settlementAmount",
       "width": 120,
       "overHidden": true,
-      "index": 8
+      "index": 9
     },
     {
       "label": "币别",
       "prop": "currency",
       "width": 120,
       "overHidden": true,
-      "index": 9
+      "index": 10
     },
     {
       "label": "汇率",
       "prop": "exchangeRate",
       "width": 120,
       "overHidden": true,
-      "index": 10
+      "index": 11
     },
     {
       "label": "录入人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width": 120
     },
     {
@@ -146,13 +145,13 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "width": 200,
-      "index": 12
+      "index": 13
     },
     {
       "label": "备注",
       "prop": "remark",
       "overHidden": true,
-      "index": 13,
+      "index": 14,
       "width": 200
     }
   ]

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

@@ -3,14 +3,14 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 16,
   "dialogWidth": "60%",
   "align": "center",
   "searchSpan": 8,
   "searchMenuPosition": "right",
+  "tree": true,
   "border": true,
   "index": true,
-  "selection": false,
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
@@ -20,21 +20,47 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
-  "headerAlign": "center",
+  "expand": true,
+  "expandWidth": 38,
+  "selectionWidth": 40,
   "column": [
     {
+      "label": "合同号",
+      "prop": "srcOrderno",
+      "index": 2,
+      "overHidden": true,
+      "searchOrder": 1,
+      "search": true,
+      "width": 150
+    },
+    {
+      "label": "提单号",
+      "prop": "billNo",
+      "overHidden": true,
+      "search": true,
+      "searchOrder": 2,
+      "width": 150,
+      "index": 2
+    },
+    {
       "label": "客户名称",
       "prop": "corpId",
-      "searchOrder": 3,
       "search": true,
+      "searchOrder": 3,
       "hide": true
     },
     {
+      "label": "客户名称",
+      "prop": "corpName",
+      "overHidden": true,
+      "width": 180,
+      "index": 3
+    },
+    {
       "label": "单据状态",
       "prop": "checkStatus",
       "type": "select",
       "search": true,
-      "searchOrder": 7,
       "overHidden": true,
       "index": 1,
       "width": 120,
@@ -50,31 +76,6 @@
       ]
     },
     {
-      "label": "合同号",
-      "prop": "srcOrderno",
-      "overHidden": true,
-      "search": true,
-      "searchOrder": 1,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "overHidden": true,
-      "search": true,
-      "searchOrder": 2,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
-      "overHidden": true,
-      "width": 180,
-      "index": 2
-    },
-    {
       "label": "总金额",
       "prop": "amount",
       "overHidden": true,
@@ -86,16 +87,15 @@
       "prop": "accountBank",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 5
     },
     {
       "label": "银行账户",
       "prop": "accountName",
       "search": true,
-      "searchOrder": 4,
       "overHidden": true,
       "width": 150,
-      "index": 7
+      "index": 6
     },
     {
       "label": "银行账号",
@@ -109,7 +109,6 @@
       "prop": "createTime",
       "type": "date",
       "search": true,
-      "searchOrder": 5,
       "unlinkPanels": true,
       "searchRange": true,
       "overHidden": true,
@@ -129,7 +128,6 @@
       "label": "备注",
       "overHidden": true,
       "search": true,
-      "searchOrder": 6,
       "prop": "remark",
       "index": 10,
       "width": 200

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -98,16 +98,7 @@
       detailPage
     },
     mounted() {
-      this.option.height = window.innerHeight - 310;
-      let i = 0;
-      this.option.column.forEach(item => {
-        if (item.search) i++
-      })
-      if (i % 3 !== 0){
-        const num = 3 - Number(i % 3)
-        this.option.searchMenuSpan = num * 8;
-        this.option.searchMenuPosition = "right";
-      }
+      this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -313,6 +313,8 @@
       }
     },
     created() {
+      //是否需要根据 登录人所属公司  区分不用option
+
       //币别
       this.getWorkDicts("currency").then(res =>{
         this.currencyDic = res.data.data

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -23,13 +23,35 @@
   "headerAlign": "center",
   "column": [
     {
+      "label": "合同号",
+      "prop": "srcOrderno",
+      "overHidden": true,
+      "search": true,
+      "width": 150,
+      "index": 2
+    },
+    {
+      "label": "提单号",
+      "prop": "billNo",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 3
+    },
+    {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
-      "searchOrder": 2,
       "hide": true
     },
     {
+      "label": "客户名称",
+      "prop": "corpName",
+      "overHidden": true,
+      "width": 200,
+      "index": 4
+    },
+    {
       "label": "单据状态",
       "prop": "financeStatus",
       "type": "select",
@@ -49,34 +71,11 @@
       ]
     },
     {
-      "label": "合同号",
-      "prop": "srcOrderno",
-      "overHidden": true,
-      "search": true,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "search": true,
-      "overHidden": true,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
-      "overHidden": true,
-      "width": 200,
-      "index": 2
-    },
-    {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
-      "index": 4
+      "index": 5
     },
     {
       "label": "结算日期",
@@ -87,7 +86,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "width": 150,
-      "index": 3
+      "index": 6
     },
 
     {
@@ -95,7 +94,7 @@
       "prop": "accountBank",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 7
     },
     {
       "label": "银行户头",
@@ -103,20 +102,20 @@
       "search": true,
       "overHidden": true,
       "width": 150,
-      "index": 7
+      "index": 8
     },
     {
       "label": "银行卡号",
       "prop": "accountNo",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 9
     },
     {
       "label": "申请人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 9,
+      "index": 10,
       "width": 120
     },
     {
@@ -127,14 +126,14 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "width": 150,
-      "index": 8
+      "index": 11
     },
     {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 10,
+      "index": 12,
       "width": 120
     }
   ]

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -103,7 +103,7 @@
       detailPage
     },
     mounted() {
-      this.option.height = window.innerHeight - 310;
+      this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -22,7 +22,7 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -497,27 +497,15 @@
   }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   ::v-deep .el-form-item {
     margin-bottom: 0;
   }
-  .main-head {
-    position: fixed;
-    top: 105px;
-    width: 100%;
-    margin-left: -10px;
-    height: 62px;
-    background: #ffffff;
-    box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-    z-index: 999;
-  }
-  .main-back {
-    cursor: pointer;
-    line-height: 62px;
-    font-size: 16px;
-    color: #323233;
-    font-weight: 400;
+
+  .trading-form ::v-deep .el-form-item {
+    margin-bottom: 8px !important;
   }
+
   .upper_right_button{
     display: flex;
     position: fixed;

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -23,13 +23,35 @@
   "headerAlign": "center",
   "column": [
     {
+      "label": "合同号",
+      "prop": "srcOrderno",
+      "overHidden": true,
+      "search": true,
+      "width": 150,
+      "index": 2
+    },
+    {
+      "label": "提单号",
+      "prop": "billNo",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 3
+    },
+    {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
-      "searchOrder": 2,
       "hide": true
     },
     {
+      "label": "客户名称",
+      "prop": "corpName",
+      "overHidden": true,
+      "width": 200,
+      "index": 4
+    },
+    {
       "label": "单据状态",
       "prop": "status",
       "type": "select",
@@ -49,34 +71,11 @@
       ]
     },
     {
-      "label": "合同号",
-      "prop": "srcOrderno",
-      "overHidden": true,
-      "search": true,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "search": true,
-      "overHidden": true,
-      "width": 150,
-      "index": 1
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
-      "overHidden": true,
-      "width": 200,
-      "index": 2
-    },
-    {
-      "label": "金额",
+      "label": "总金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
-      "index": 4
+      "index": 5
     },
     {
       "label": "收款日期",
@@ -87,7 +86,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "width": 150,
-      "index": 3
+      "index": 6
     },
 
     {
@@ -95,7 +94,7 @@
       "prop": "accountBank",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 7
     },
     {
       "label": "银行户头",
@@ -103,20 +102,20 @@
       "search": true,
       "overHidden": true,
       "width": 150,
-      "index": 7
+      "index": 8
     },
     {
       "label": "银行卡号",
       "prop": "accountNo",
       "overHidden": true,
       "width": 150,
-      "index": 6
+      "index": 9
     },
     {
       "label": "申请人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 9,
+      "index": 10,
       "width": 120
     },
     {
@@ -127,14 +126,14 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "width": 150,
-      "index": 8
+      "index": 11
     },
     {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 10,
+      "index": 12,
       "width": 120
     }
   ]

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -105,7 +105,7 @@
       }
     },
     mounted() {
-      this.option.height = window.innerHeight - 310;
+      this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -26,7 +26,7 @@
     <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <avue-form ref="form" v-model="form" :option="option">
+        <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
               v-model="form.corpId"
@@ -495,31 +495,19 @@
   }
 </script>
 
-<style scoped>
-  ::v-deep .el-form-item {
-    margin-bottom: 0;
-  }
-  .main-head {
-    position: fixed;
-    top: 105px;
-    width: 100%;
-    margin-left: -10px;
-    height: 62px;
-    background: #ffffff;
-    box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-    z-index: 999;
-  }
-  .main-back {
-    cursor: pointer;
-    line-height: 62px;
-    font-size: 16px;
-    color: #323233;
-    font-weight: 400;
-  }
-  .upper_right_button{
-    display: flex;
-    position: fixed;
-    right: 20px;
-    top: 43px;
-  }
+<style lang="scss" scoped>
+::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.trading-form ::v-deep .el-form-item {
+  margin-bottom: 8px !important;
+}
+
+.upper_right_button{
+  display: flex;
+  position: fixed;
+  right: 20px;
+  top: 43px;
+}
 </style>

src/views/importTrade/invoice/config/customerContact.json

@@ -71,14 +71,16 @@
       "prop": "inventoryNumber",
       "index": 5,
       "width":120
-    },{
+    },
+    {
       "label": "件数",
       "prop": "actualQuantity",
       "index": 6,
       "width":120
-    },{
-      "label": "码单重量(吨)",
-      "prop": "billWeight",
+    },
+    {
+      "label": "发票重量(吨)",
+      "prop": "invoiceWeight",
       "index": 7,
       "width":120,
       "rules": [
@@ -90,20 +92,9 @@
       ]
     },
     {
-      "label": "单价",
-      "prop": "price",
+      "label": "码单重量(吨)",
+      "prop": "billWeight",
       "index": 8,
-      "width":100
-    },{
-      "label": "发票金额",
-      "prop": "contractAmount",
-      "index": 9,
-      "width":120
-    },
-    {
-      "label": "发票重量(吨)",
-      "prop": "invoiceWeight",
-      "index": 10,
       "width":120,
       "rules": [
         {
@@ -114,6 +105,17 @@
       ]
     },
     {
+      "label": "单价",
+      "prop": "price",
+      "index": 9,
+      "width":100
+    },{
+      "label": "发票金额",
+      "prop": "contractAmount",
+      "index": 10,
+      "width":120
+    },
+    {
       "label": "币别",
       "prop": "currency",
       "type": "select",

src/views/importTrade/invoice/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 8,
   "searchSpan": 8,
   "align": "center",
   "searchMenuPosition": "right",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -404,9 +404,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '码单重量',
-            prop: 'billWeight',
+          },
+          {
+            label: '发票重量',
+            prop: 'invoiceWeight',
             disabled: true,
             rules: [
               {
@@ -415,9 +416,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '发票重量',
-            prop: 'invoiceWeight',
+          },
+          {
+            label: '码单重量',
+            prop: 'billWeight',
             disabled: true,
             rules: [
               {
@@ -426,7 +428,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
             label: '备注',
             prop: 'deliveryRemarks',
             span: 24,
@@ -480,8 +483,11 @@ export default {
     if (this.detailData.form) {
       this.buttonLoading = true;
       this.form = JSON.parse(this.detailData.form);
+      this.$set(this.form,"saleman",this.detailData.form.salesName)
+      //是否计算合同号
       this.form.id = null
       this.form.sysNo = null
+
       this.form.orderItemsList.forEach((item, index) => {
         item.srcId = item.id
         item.itemId = item.itemId
@@ -745,7 +751,7 @@ export default {
             return this.$message.error(`请输入第${i + 1}行的货物品种`);
           }
           if (this.contactsData[i].actualQuantity === "") {
-            return this.$message.error(`请输入第${i + 1}行的数量`);
+            return this.$message.error(`请输入第${i + 1}行的件数`);
           }
         }
         this.form.billNo = this.contactsData.map(item => {

src/views/importTrade/invoice/index.vue

@@ -123,7 +123,7 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(43), option);
   },
   mounted() {
-    this.option.height = window.innerHeight - 310;
+    this.option.height = window.innerHeight - 200;
   },
   activated() {
     setTimeout(() => {

src/views/importTrade/receipt/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 12,
+  "searchMenuSpan": 8,
   "searchSpan": 8,
   "searchMenuPosition": "right",
   "align": "center",

src/views/importTrade/receipt/index.vue

@@ -133,16 +133,7 @@ export default {
     }, 100);
   },
   mounted() {
-    this.option.height = window.innerHeight - 310;
-    let i = 0;
-    this.option.column.forEach(item => {
-      if (item.search) i++
-    })
-    if (i % 3 !== 0){
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    this.option.height = window.innerHeight - 200;
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -275,11 +266,6 @@ export default {
       selectReceiptList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        if (this.page.total) {
-          this.option.height = window.innerHeight - 350;
-        } else {
-          this.option.height = window.innerHeight - 305;
-        }
       }).finally(()=>{
         this.loading = false
       })

src/views/purchase/contract/config/customerContact.json

@@ -103,7 +103,6 @@
       "prop": "amount",
       "index": 8,
       "width":120,
-      "cell": true,
       "rules": [
         {
           "required": false,

src/views/purchase/contract/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "align": "center",
   "searchSpan": 8,

src/views/purchase/contract/detailsPage.vue

@@ -19,11 +19,16 @@
                    :loading="buttonLoading"
                    @click.stop="applyPayment()">申请货款
         </el-button>
+<!--        <el-button type="warning"
+                   size="small"
+                   class="el-button&#45;&#45;small-yh "
+                   :loading="buttonLoading"
+                   @click.stop="applyPayment()">取消货款
+        </el-button>-->
         <el-button type="info"
                    size="small"
                    :loading="buttonLoading"
-                   @click="applicationDialog = true,
-                   applicationData = contactsData"
+                   @click="openApplicationDialog"
         >查看申请记录
         </el-button>
         <el-button type="success"
@@ -96,7 +101,9 @@
             @saveColumn="saveColumn"
           >
             <template slot="priceCategory" slot-scope="{ row, index}">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <goods-select
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value,row)"
@@ -106,6 +113,7 @@
               <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="itemType" slot-scope="{ row, index }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-select
                 v-if="row.$cellEdit"
                 v-model="row.itemType"
@@ -129,17 +137,19 @@
             <template slot="orderQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.orderQuantity"
                 placeholder="请输入"
                 size="small"
-                style="width: 93%"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
               ></el-input>
               <span v-else>{{ row.orderQuantity }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.price"
                 placeholder="请输入"
@@ -150,7 +160,9 @@
               <span v-else>{{ row.price }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.invoiceWeight"
                 placeholder="请输入"
@@ -161,7 +173,9 @@
               <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.billWeight"
                 placeholder="请输入"
@@ -173,7 +187,9 @@
               <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.amount"
                 placeholder="请输入"
@@ -233,24 +249,17 @@
       append-to-body
       class="el-dialogDeep"
       :visible.sync="applicationDialog"
-      width="60%"
+      width="70%"
       :close-on-click-modal="false"
       :destroy-on-close="true"
       :close-on-press-escape="false"
       v-dialog-drag
     >
-      <basic-container>
-        <avue-crud :option="customerContact"
-                   :table-loading="applicationLoading"
-                   :data="applicationData"
-                   ref="applicationCrud"
-                   @refresh-change="applicationRefreshChange"
-                   :page.sync="applicationPage"
-                   @on-load="applicationOnLoad"></avue-crud>
-      </basic-container>
-      <span slot="footer" class="dialog-footer">
-          <el-button @click="applicationDialog = false ">关 闭</el-button>
-        </span>
+      <bill-application
+        :billType="billType"
+        @choceApplication="choceApplication"
+      >
+      </bill-application>
     </el-dialog>
     <el-dialog
       append-to-body
@@ -284,6 +293,7 @@ import commodity from "./config/commodity.json"
 import feeInfo from "@/components/fee-info/main";
 import uploadFile from "@/components/upload-file/main";
 import _ from "lodash";
+import  billApplication from "@/components/bill/billApplication";
 //商品详情接口
 import {corpsattn, corpsbank,  getDeptLazyTreeS} from "@/api/basicData/configuration"
 import { getList } from "@/api/basicData/commodityType"
@@ -298,6 +308,12 @@ export default {
       type: Object
     }
   },
+  components: {
+    ApplyPayment,
+    feeInfo,
+    uploadFile,
+    billApplication
+  },
   data() {
     return {
       form: {},
@@ -307,6 +323,7 @@ export default {
       contactsData: [],
       buttonLoading:false,
       applyPaymentDialog:false,
+      applicationDialog:false,
       commodityData: false,
       takeDisabled:false, //收货状态
       tableData: [],
@@ -403,15 +420,6 @@ export default {
       tableDataCost: [],
       treeDeptIdCost: '',
       choiceIndex: '',
-      //查看申请记录
-      applicationDialog:false,
-      applicationLoading:false,
-      applicationData:[],
-      applicationPage:{
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
       //对比新旧数据信息
       oldContactsData:[],
       oldForm:{},
@@ -731,11 +739,6 @@ export default {
       this.$set(this.form,"exchangeRate",6.3686)
     }
   },
-  components: {
-    ApplyPayment,
-    feeInfo,
-    uploadFile
-  },
   methods: {
     valueName(value,row){
       this.$set(row,"priceCategory",value)
@@ -1011,13 +1014,13 @@ export default {
     choceFun(){
       this.applyPaymentDialog  = false
     },
-    //刷新
-    applicationRefreshChange(){
-
+    //打开申请记录
+    openApplicationDialog(){
+      this.applicationDialog = true
     },
-    //申请记录
-    applicationOnLoad(){
-
+    //关闭申记录
+    choceApplication(){
+      this.applicationDialog = false
     },
     //商品编辑
     rowCell(row, index) {

src/views/purchase/contract/index.vue

@@ -30,17 +30,15 @@
         </template>
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
-            <el-table-column   align="center"  width="60"></el-table-column>
-            <el-table-column   type="selection" align="center"  width="50"></el-table-column>
-            <el-table-column  label="#" type="index" align="center"  width="50"></el-table-column>
+            <el-table-column   type="selection" align="center"  width="40"></el-table-column>
             <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
             <el-table-column  label="货物品种" prop="priceCategoryNames" align="center" show-overflow-tooltip width="180"></el-table-column>
             <el-table-column  label="件数" prop="purchaseQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="毛重(KG)" prop="grossWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="净重(KG)" prop="netWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="发票重量" prop="grossWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="码单重量" prop="netWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="合同金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
-            <el-table-column  label="是否到货" prop="isArrival" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
+            <el-table-column  label="已发件数" prop="isArrival" align="center" show-overflow-tooltip width="200"></el-table-column>
           </el-table>
         </template>
         <template slot="menuLeft">
@@ -129,16 +127,7 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(36), option);
   },
   mounted() {
-    this.option.height = window.innerHeight - 180;
-    let i = 0;
-    this.option.column.forEach(item => {
-      if (item.search) i++
-    })
-    if (i % 4 !== 0){
-      const num = 4 - Number(i % 4)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    this.option.height = window.innerHeight - 200;
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/salesManagement/salesContract/config/importInventory.json

@@ -80,52 +80,52 @@
       ]
     },
     {
-      "label": "码单重量(吨)",
-      "prop": "billWeight",
+      "label": "发票重量(吨)",
+      "prop": "invoiceWeight",
       "index": 5,
       "width":120,
       "rules": [
         {
           "required": false,
-          "message": "请输入码单重量(吨)",
+          "message": "请输入发票净重(吨)",
           "trigger": "blur"
         }
       ]
     },
     {
-      "label": "单价",
-      "prop": "price",
+      "label": "码单重量(吨)",
+      "prop": "billWeight",
       "index": 6,
       "width":120,
       "rules": [
         {
           "required": false,
-          "message": "请输入单价",
+          "message": "请输入码单重量(吨)",
           "trigger": "blur"
         }
       ]
-    },{
-      "label": "合同金额",
-      "prop": "amount",
+    },
+    {
+      "label": "单价",
+      "prop": "price",
       "index": 7,
       "width":120,
       "rules": [
         {
           "required": false,
-          "message": "请输入合同金额",
+          "message": "请输入单价",
           "trigger": "blur"
         }
       ]
-    },
-    {
-      "label": "发票重量(吨)",
-      "prop": "invoiceWeight",
+    },{
+      "label": "发票金额",
+      "prop": "amount",
       "index": 8,
       "width":120,
       "rules": [
         {
           "required": false,
-          "message": "请输入发票净重(吨)",
+          "message": "请输入发票金额",
           "trigger": "blur"
         }
       ]

src/views/salesManagement/salesContract/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 8,
   "searchSpan": 8,
   "searchMenuPosition": "right",
   "dialogWidth": "60%",

src/views/salesManagement/salesContract/detailsPage.vue

@@ -192,12 +192,12 @@
                          @click="generateShipmentD"
               >生成发货单
               </el-button>
-              <el-button type="info"
+<!--              <el-button type="info"
                          size="small"
                          :disabled="importInventoryData.length < 1"
                          @click="payeeDialog = true"
               >收款记录
-              </el-button>
+              </el-button>-->
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
@@ -505,8 +505,8 @@ export default {
             ]
           },
           {
-            label: '码单重量',
-            prop: 'billWeight',
+            label: '发票重量',
+            prop: 'invoiceWeight',
             disabled: true,
             rules: [
               {
@@ -515,9 +515,10 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },{
-            label: '发票重量',
-            prop: 'invoiceWeight',
+          },
+          {
+            label: '码单重量',
+            prop: 'billWeight',
             disabled: true,
             rules: [
               {
@@ -811,7 +812,7 @@ export default {
               return this.$message.error(`请正确输入第${i + 1}行的价格`);
             }
             if (orderFeesList[i].orderQuantity == 0) {
-              return this.$message.error(`请正确输入第${i + 1}行的数量`);
+              return this.$message.error(`请正确输入第${i + 1}行的件数`);
             }
           }
           let orderUpLoadList = this.$refs.uploadFile.submitData();
@@ -826,7 +827,7 @@ export default {
               return this.$message.error(`请输入销售明细第${j + 1}行的货品物种`);
             }
             if (this.importInventoryData[j].orderQuantity === "") {
-              return this.$message.error(`请输入销售明细第${j + 1}行的数量`);
+              return this.$message.error(`请输入销售明细第${j + 1}行的件数`);
             }
           }
           this.buttonLoading = true;
@@ -956,7 +957,10 @@ export default {
     },
     //商品明细导入
     newDetails(){
-      this.$refs.importInventory.rowCellAdd();
+      const params = {
+        price:this.form.salesPrice
+      }
+      this.$refs.importInventory.rowCellAdd(params);
     },
     //商品编辑
     rowCell(row, index) {

src/views/salesManagement/salesContract/index.vue

@@ -117,7 +117,7 @@ export default {
     detailPage
   },
   mounted() {
-    this.option.height = window.innerHeight - 310;
+    this.option.height = window.innerHeight - 200;
   },
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(38), option);