进口细

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

@@ -66,12 +66,12 @@
     },{
       "label": "数量",
       "prop": "actualQuantity",
-      "index": 4,
+      "index": 5,
       "width":120
     },{
       "label": "码单重量(吨)",
       "prop": "billWeight",
-      "index": 5,
+      "index": 6,
       "width":120,
       "rules": [
         {
@@ -83,7 +83,7 @@
     },{
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
-      "index": 6,
+      "index": 7,
       "width":120,
       "rules": [
         {
@@ -95,18 +95,18 @@
     },{
       "label": "单价",
       "prop": "price",
-      "index": 7,
+      "index": 8,
       "width":100
     },{
       "label": "合同金额",
       "prop": "contractAmount",
-      "index": 8,
+      "index": 9,
       "width":120
     },
    {
       "label": "货物详情",
       "prop": "cname",
-      "index": 9,
+      "index": 10,
       "width":120,
       "cell": true,
       "rules": [
@@ -119,13 +119,13 @@
     },{
       "label": "税率",
       "prop": "taxRate",
-      "index": 10,
+      "index": 11,
       "width":100,
       "cell": true
     },{
       "label": "备注",
       "prop": "remarks",
-      "index": 11,
+      "index": 12,
       "width":120,
       "cell": true,
       "rules": [

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -284,7 +284,7 @@ export default {
       disabled: false,
       goodsDisable:false,
       marketDialog:false,
-      customerContact: {},
+      customerContact: customerContact,
       contactsForm: {},
       contactsData: [],
       storageIdDic:[],
@@ -437,7 +437,7 @@ export default {
     }
   },
   async created() {
-    this.customerContact = await this.getColumnData(this.getColumnName(44), customerContact);
+    // this.customerContact = await this.getColumnData(this.getColumnName(44), customerContact);
     getStorage().then(res =>{
       this.storageIdDic = res.data
     })

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

@@ -76,18 +76,18 @@
     {
       "label": "库存",
       "prop": "kuCun",
-      "index": 5,
+      "index": 4,
       "width":120
     },
    {
       "label": "数量",
       "prop": "actualQuantity",
-      "index": 6,
+      "index": 5,
       "width":120
     },{
       "label": "码单重量(吨)",
       "prop": "billWeight",
-      "index": 7,
+      "index": 6,
       "width":120,
       "rules": [
         {
@@ -100,7 +100,7 @@
     {
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
-      "index": 8,
+      "index": 7,
       "width":120,
       "rules": [
         {
@@ -112,7 +112,7 @@
     },{
       "label": "单价",
       "prop": "price",
-      "index": 9,
+      "index": 8,
       "width":120,
       "rules": [
         {
@@ -124,7 +124,7 @@
     },{
       "label": "合同金额",
       "prop": "contractAmount",
-      "index": 10,
+      "index": 9,
       "width":120,
       "rules": [
         {
@@ -136,7 +136,7 @@
     },{
       "label": "货物详情",
       "prop": "itemDescription",
-      "index": 11,
+      "index": 10,
       "width":150,
       "cell": true,
       "rules": [
@@ -149,7 +149,7 @@
     },{
       "label": "税率",
       "prop": "taxRate",
-      "index": 12,
+      "index": 11,
       "width":120,
       "cell": true,
       "rules": [
@@ -162,7 +162,7 @@
     },{
       "label": "备注",
       "prop": "remarks",
-      "index": 13,
+      "index": 12,
       "width":150,
       "cell": true,
       "rules": [

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -287,7 +287,7 @@ export default {
       form: {},
       disabled: false,
       receiptDisable:false,
-      customerContact: {},
+      customerContact: customerContact,
       contactsForm: {},
       contactsData: [],
       contractDic:[],
@@ -455,7 +455,7 @@ export default {
     }
   },
   async created() {
-    this.customerContact = await this.getColumnData(this.getColumnName(41), customerContact);
+    // this.customerContact = await this.getColumnData(this.getColumnName(41), customerContact);
     getStorage().then(res =>{
       this.storageIdDic = res.data
     })

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

@@ -16,7 +16,9 @@
   "delBtn": false,
   "menuWidth": 220,
   "dialogClickModal": false,
-  "searchLabelWidth": 60,
+  "searchLabelWidth": 100,
+  "searchIcon": true,
+  "searchIndex": 3,
   "addBtnText": "新单",
   "expand": true,
   "column":[
@@ -24,9 +26,9 @@
       "label": "合同号",
       "prop": "orderNo",
       "search": true,
-      "searchIndex": 1,
+      "searchIndex": 2,
       "index": 1,
-      "width":100
+      "width":150
     },
     {
       "label": "合同日期",
@@ -43,85 +45,87 @@
       "label": "供应商",
       "prop": "strCorpName",
       "search": true,
-      "searchIndex": 2,
+      "searchIndex": 1,
       "index": 3,
-      "width":120
+      "width":200
     },{
       "label": "采购商",
       "prop": "strPurchaserName",
       "index": 4,
-      "width":120
+      "width":200
     },
     {
-      "label": "付款日期/开证日期",
-      "prop": "accountsCollectionDate",
+      "label": "采购日期",
+      "prop": "createTime",
       "type": "date",
-      "search": true,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "unlinkPanels": true,
       "searchRange": true,
+      "search": true,
+      "searchIndex": 3,
       "index": 5,
-      "width":150
-    },{
-      "label": "到港日期",
-      "prop": "arrivalDate",
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "unlinkPanels": true,
-      "searchRange": true,
+      "width":100
+    },
+    {
+      "label": "码单重量",
+      "prop": "billWeight",
       "index": 6,
-      "width":150
+      "width":100
     },{
-      "label": "合同金额",
-      "prop": "orderAmount",
-      "search": true,
+      "label": "发票净重",
+      "prop": "invoiceWeight",
       "index": 7,
       "width":100
-    },{
+    },
+    {
+      "label": "单价",
+      "prop": "salesPrice",
+      "index": 8,
+      "width":100
+    },
+   {
       "label": "币别",
       "prop": "currency",
-      "index": 8,
+      "index": 9,
       "width":100
     },{
       "label": "汇率",
-      "prop": "exChangeRate",
-      "index": 8,
+      "prop": "exchangeRate",
+      "index": 10,
       "width":100
     },{
-      "label": "是否全部到货",
-      "prop": "arrival",
-      "index": 8,
-      "width":100
-    },{
-      "label": "单据状态",
-      "prop": "status",
-      "index": 8,
+      "label": "合同金额",
+      "prop": "orderAmount",
+      "search": true,
+      "index": 11,
       "width":100
     },{
-      "label": "单据类型",
+      "label": "合同类型",
       "prop": "orderType",
-      "index": 8,
-      "width":100
-    },{
-      "label": "备注",
-      "prop": "orderRemark",
-      "index": 8,
+      "index": 12,
       "width":100
     },
     {
-      "label": "采购日期",
-      "prop": "createTime",
+      "label": "单据状态",
+      "prop": "status",
+      "index": 13,
+      "width":100
+    }, {
+      "label": "付款日期/开证日期",
+      "prop": "accountsCollectionDate",
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "unlinkPanels": true,
       "searchRange": true,
-      "search": true,
-      "searchIndex": 3,
-      "index": 8,
-      "width":100
+      "index": 14,
+      "width":150
+    },{
+      "label": "备注",
+      "prop": "orderRemark",
+      "index": 15,
+      "width":200
     }
   ]
 }

src/views/purchase/contract/detailsPage.vue

@@ -178,17 +178,17 @@
               >录入明细
               </el-button>
               <el-button type="warning"
-                         icon="el-icon-s-check"
                          size="small"
                          :disabled="selectContact.length == 0"
-                         @click="beforePage(true)"
-              >申请付款(开证)
+                         @click="beforePage(false)"
+              >生成收货单
               </el-button>
               <el-button type="warning"
+                         icon="el-icon-s-check"
                          size="small"
                          :disabled="selectContact.length == 0"
-                         @click="beforePage(false)"
-              >生成收货单
+                         @click="beforePage(true)"
+              >申请付款(开证)
               </el-button>
               <el-button type="info"
                          size="small"

src/views/purchase/contract/index.vue

@@ -92,7 +92,7 @@ export default {
   data() {
     return {
       loading:false,
-      option: {},
+      option: option,
       detailData:{},
       dataList: [],
       page: {
@@ -109,7 +109,7 @@ export default {
     detailPage
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(36), option);
+    // this.option = await this.getColumnData(this.getColumnName(36), option);
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/salesManagement/salesContract/detailsPage.vue

@@ -163,7 +163,7 @@
                          size="small"
                          @click="newDetails"
               >录入明细</el-button>
-              <el-button type="primary"
+              <el-button type="warning"
                          size="small"
                          :disabled="selection.length < 1"
                          @click="generateShipmentD"