国内贸易修改完善

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

@@ -1,118 +1,154 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
-    "searchMenuPosition": "right",
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "showSummary": true,
-    "searchIcon": true,
-    "searchIndex": 3,
-    "summaryText": "合计",
-    "sumColumnList": [
-      {
-        "name": "deliveryAmount",
-        "type": "sum"
-      }
-    ],
-    "column":[
-        {
-            "label": "系统编号",
-            "prop": "sysNo",
-            "search": true,
-            "index": 1,
-            "width":100
-        },
-        {
-            "label": "客户名称",
-            "prop": "corpId",
-            "search": true,
-            "index": 1,
-            "width":100,
-            "overHidden": true
-        },{
-            "label": "单据状态",
-            "prop": "deliveryStatus",
-            "type": "select",
-            "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
-            "props": {
-              "label": "dictValue",
-              "value": "dictValue"
-            },
-            "search": true,
-            "index": 2,
-            "width":100
-        },{
-            "label": "所属公司",
-            "prop": "salesCompany",
-            "search": true,
-            "index": 4,
-            "width":100,
-            "overHidden": true
-        },{
-            "label": "匹配订单号",
-            "prop": "srcOrderNo",
-            "search": true,
-            "index": 5,
-            "width":100
-        },{
-            "label": "仓库名称",
-            "prop": "storageId",
-            "search": true,
-            "index": 6,
-            "width":100
-        },{
-            "label": "仓库类型",
-            "prop": "warehouseType",
-            "search": true,
-            "index": 7,
-            "width":100
-        },{
-            "label": "出库金额",
-            "prop": "deliveryAmount",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "label": "出库数量",
-            "prop": "totalQuantity",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "label": "出库日期",
-            "prop": "businessDate",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "pickerOptions": {}
-        },{
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "label": "制单时间",
-            "prop": "createTime",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "pickerOptions": {}
-        }
-    ]
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuPosition": "right",
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 300,
+  "dialogClickModal": false,
+  "searchLabelWidth": 100,
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 3,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "deliveryAmount",
+      "type": "sum"
+    }
+  ],
+  "column": [
+    {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpId",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "所属公司",
+      "prop": "salesCompany",
+      "search": true,
+      "index": 4,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "label": "出库日期",
+      "prop": "businessDate",
+      "search": true,
+      "index": 8,
+      "width": 100,
+      "pickerOptions": {},
+      "overHidden": true
+    },
+    {
+      "label": "仓库",
+      "prop": "storageId",
+      "search": true,
+      "index": 6,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "出库数量",
+      "prop": "totalQuantity",
+      "search": false,
+      "index": 8,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "出库金额",
+      "prop": "deliveryAmount",
+      "search": false,
+      "index": 8,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收货地址",
+      "prop": "a",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收货人",
+      "prop": "b",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收货电话",
+      "prop": "c",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单人",
+      "prop": "createUserName",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "createTime",
+      "search": true,
+      "index": 15,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "search": false,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "匹配订单号",
+      "prop": "srcOrderNo",
+      "search": false,
+      "index": 5,
+      "width": 100,
+      "overHidden": true
+    }
+  ]
 }

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -597,6 +597,7 @@ export default {
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'totalCost', 0)
       this.contactsData.forEach(item => {
+        this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "srcId", item.id)
         this.$set(item, "actualQuantity", (Number(item.orderQuantity) - Number(item.actualQuantity)))
         this.$set(item, "deliveryAmount", item.amount)
@@ -677,6 +678,9 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldGoodsList = []
+        this.oldFeesList = []
+        this.oldUploadList = []
         this.oldForm = Object.assign({}, this.form)
         this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
         this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)

src/views/businessManagement/deliveryNotice/index.vue

@@ -82,6 +82,7 @@
 import option from "./configuration/mainList.json";
 import {customerList, typeSave, deleteDetails} from "@/api/basicData/deliveryNotice"
 import detailPage from "./detailsPageEdit";
+import { defaultDate } from "@/util/date";
 
 export default {
   name: "customerInformation",
@@ -117,7 +118,9 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(20), option);
+    this.search.businessDate = defaultDate()
+    this.option = option
+      // this.option = await this.getColumnData(this.getColumnName(20), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

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

@@ -1,103 +1,166 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
-    "searchMenuPosition": "right",
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "searchIcon": true,
-    "searchIndex": 3,
-    "column":[
-        {
-            "label": "系统编号",
-            "prop": "sysNo",
-            "search": true,
-            "index": 1,
-            "width":100
-        },
-        {
-            "label": "来源单号",
-            "prop": "srcOrderNo",
-            "search": true,
-            "index": 1,
-            "width":100
-        },{
-            "label": "银行账号",
-            "prop": "banks",
-            "search": true,
-            "index": 2,
-            "width":100
-        },{
-            "label": "供应商",
-            "prop": "corpId",
-            "search": true,
-            "index": 4,
-            "width":100
-        },{
-            "type": "select",
-            "dicUrl": "/api/blade-system/dict-biz/dictionary?code=payment_term",
-            "props": {
-              "label": "dictValue",
-              "value": "dictValue"
-            },
-            "label": "付款方式",
-            "prop": "paymentType",
-            "search": true,
-            "index": 5,
-            "width":100
-        },{
-            "label": "公司户头",
-            "prop": "banksAccountName",
-            "search": true,
-            "index": 6,
-            "width":100
-        },{
-            "label": "包装要求",
-            "prop": "packageRemarks",
-            "search": true,
-            "index": 7,
-            "width":100
-        },{
-            "label": "运费",
-            "prop": "oceanFreight",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "label": "要求到货日期",
-            "prop": "requiredArrivalDate",
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "pickerOptions": {}
-        },{
-          "label": "合同日期",
-          "type": "date",
-          "unlinkPanels": true,
-          "searchRange": true,
-          "prop": "businesDate",
-          "search": true,
-          "index": 9,
-          "width":100,
-          "format": "yyyy-MM-dd",
-          "valueFormat": "yyyy-MM-dd",
-          "overHidden": true,
-          "pickerOptions": {}
-        }
-    ]
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuPosition": "right",
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 300,
+  "dialogClickModal": false,
+  "searchLabelWidth": 100,
+  "searchIcon": true,
+  "searchIndex": 3,
+  "column": [
+    {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpId",
+      "search": true,
+      "index": 2,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "label": "要求到货日期",
+      "prop": "requiredArrivalDate",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "pickerOptions": {},
+      "overHidden": true
+    },
+    {
+      "label": "订单数量",
+      "prop": "a",
+      "search": false,
+      "index": 4,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收货数量",
+      "prop": "b",
+      "search": false,
+      "index": 5,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=payment_term",
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
+      },
+      "label": "付款方式",
+      "prop": "paymentType",
+      "search": true,
+      "index": 6,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "运费",
+      "prop": "oceanFreight",
+      "search": false,
+      "index": 7,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "包装要求",
+      "prop": "packageRemarks",
+      "search": true,
+      "index": 8,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "公司户头",
+      "prop": "banksAccountName",
+      "search": true,
+      "index": 9,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "合同日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "businesDate",
+      "search": false,
+      "index": 10,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "银行账号",
+      "prop": "banks",
+      "search": false,
+      "index": 11,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "search": false,
+      "index": 12,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "来源单号",
+      "prop": "srcOrderNo",
+      "search": false,
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单人",
+      "prop": "createUserName",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "createTime",
+      "search": true,
+      "index": 15,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    }
+  ]
 }

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -9,6 +9,11 @@
       </div>
       <el-button
         class="el-button--small-yh add-customer-btn"
+        style="right: 245px;"
+        type="primary"
+      >生成采购单</el-button>
+      <el-button
+        class="el-button--small-yh add-customer-btn"
         type="success" style="right: 140px;" @click="copyOrder">
         复制新单
       </el-button>
@@ -647,10 +652,10 @@ export default {
     } else if(this.detailData.copyId) {
       this.queryData(this.detailData.copyId, true)
     } else {
-      let prefix = 'GN-CG'
-      getSysNo(prefix).then(res => {
-        this.$set(this.form, 'sysNo', res.data.data)
-      })
+      // let prefix = 'GN-CG'
+      // getSysNo(prefix).then(res => {
+      //   this.$set(this.form, 'sysNo', res.data.data)
+      // })
     }
   },
   watch: {
@@ -715,6 +720,9 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldGoodsList = []
+        this.oldFeesList = []
+        this.oldUploadList = []
         this.oldForm = Object.assign({}, this.form)
         this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
         this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)

src/views/businessManagement/purchaseOrder/index.vue

@@ -71,6 +71,7 @@
 import option from "./configuration/mainList.json";
 import {customerList, deleteDetails} from "@/api/basicData/purchaseOrder"
 import detailPage from "./detailsPageEdit";
+import { defaultDate } from "@/util/date";
 
 export default {
   name: "customerInformation",
@@ -111,8 +112,9 @@ export default {
     }
   },
   async created() {
-    // this.option = option
-    this.option = await this.getColumnData(this.getColumnName(17), option);
+    this.search.requiredArrivalDate = defaultDate()
+    this.option = option
+    // this.option = await this.getColumnData(this.getColumnName(17), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

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

@@ -1,133 +1,147 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
   "searchMenuPosition": "right",
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "searchIcon": true,
-    "searchIndex": 3,
-    "showSummary": true,
-    "summaryText": "合计",
-    "sumColumnList": [
-      {
-        "name": "deliveryAmount",
-        "type": "sum"
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 300,
+  "dialogClickModal": false,
+  "searchLabelWidth": 100,
+  "searchIcon": true,
+  "searchIndex": 3,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "deliveryAmount",
+      "type": "sum"
+    },
+    {
+      "name": "purchaseAmount",
+      "type": "sum"
+    }
+  ],
+  "column": [
+    {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "采购订单号",
+      "prop": "a",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpId",
+      "search": true,
+      "index": 2,
+      "width": 100
+    },
+    {
+      "label": "所属公司",
+      "prop": "salesCompany",
+      "search": true,
+      "index": 5,
+      "width": 100
+    },
+    {
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "label": "入库日期",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "prop": "businessDate",
+      "search": true,
+      "index": 8,
+      "width": 100,
+      "pickerOptions": {}
+    },
+    {
+      "label": "入库数量",
+      "prop": "totalQuantity",
+      "search": false,
+      "index": 8,
+      "width": 100
+    },
+    {
+      "label": "入库金额",
+      "prop": "deliveryAmount",
+      "search": false,
+      "index": 8,
+      "width": 100
+    },
+    {
+      "label": "采购金额",
+      "prop": "purchaseAmount",
+      "search": false,
+      "index": 8,
+      "width": 100
+    },
+    {
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=procurement_method",
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
       },
-      {
-        "name": "purchaseAmount",
-        "type": "sum"
-      }
-    ],
-    "column":[
-        {
-            "label": "系统编号",
-            "prop": "sysNo",
-            "search": true,
-            "index": 1,
-            "width":100
-        },
-        {
-            "type": "select",
-            "dicUrl": "/api/blade-system/dict-biz/dictionary?code=procurement_method",
-            "props": {
-              "label": "dictValue",
-              "value": "dictValue"
-            },
-            "label": "采购方式",
-            "prop": "purchaseMode",
-            "search": true,
-            "index": 1,
-            "width":100
-        },{
-            "label": "供应商",
-            "prop": "corpId",
-            "search": true,
-            "index": 2,
-            "width":100
-        },{
-            "label": "所属公司",
-            "prop": "salesCompany",
-            "search": true,
-            "index": 5,
-            "width":100
-        },{
-            "label": "匹配订单号",
-            "prop": "srcOrderNo",
-            "search": true,
-            "index": 6,
-            "width":100
-        },{
-            "label": "仓库名称",
-            "prop": "storageId",
-            "search": true,
-            "index": 7,
-            "width":100
-        },{
-            "label": "入库金额",
-            "prop": "deliveryAmount",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "label": "采购金额",
-            "prop": "purchaseAmount",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "label": "入库数量",
-            "prop": "totalQuantity",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "label": "入库日期",
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "prop": "businessDate",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "pickerOptions": {}
-        },{
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "label": "制单时间",
-            "prop": "createTime",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "pickerOptions": {}
-        },{
-          "label": "合同日期",
-          "type": "date",
-          "unlinkPanels": true,
-          "searchRange": true,
-          "prop": "businesDate",
-          "search": true,
-          "index": 9,
-          "width":100,
-          "format": "yyyy-MM-dd",
-          "valueFormat": "yyyy-MM-dd",
-          "overHidden": true,
-          "pickerOptions": {}
-        }
-    ]
+      "label": "采购方式",
+      "prop": "purchaseMode",
+      "search": true,
+      "index": 1,
+      "width": 100
+    },
+    {
+      "label": "仓库",
+      "prop": "storageId",
+      "search": true,
+      "index": 7,
+      "width": 100
+    },
+    {
+      "label": "制单人",
+      "prop": "createUserName",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "createTime",
+      "search": true,
+      "index": 15,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "search": false,
+      "index": 1,
+      "width": 100
+    }
+  ]
 }

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -597,6 +597,7 @@ export default {
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'purchaseAmount', 0)
       this.contactsData.forEach(item => {
+        this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "inventoryNumber", item.storageQuantity)
         this.$set(item, "srcId", item.id)
         this.$set(item, "deliveryAmount", item.amount)
@@ -674,6 +675,9 @@ export default {
             return b > a? b: a;
           })
         }
+        this.oldGoodsList = []
+        this.oldFeesList = []
+        this.oldUploadList = []
         this.oldForm = Object.assign({}, this.form)
         this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
         this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)

src/views/businessManagement/receipt/index.vue

@@ -6,6 +6,7 @@
                  ref="crud"
                  v-model="form"
                  :page.sync="page"
+                 :search.sync="search"
                  @row-del="rowDel"
                  @row-update="rowUpdate"
                  :before-open="beforeOpen"
@@ -63,6 +64,7 @@
 import option from "./configuration/mainList.json";
 import {customerList, typeSave, deleteDetails} from "@/api/basicData/receipt"
 import detailPage from "./detailsPageEdit";
+import { defaultDate } from "@/util/date";
 
 export default {
   name: "customerInformation",
@@ -72,6 +74,7 @@ export default {
   data() {
     return {
       form: {},
+      search: {},
       option: {},
       parentId: 0,
       dataList: [],
@@ -90,7 +93,9 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(23), option);
+    this.search.businessDate = defaultDate()
+    this.option = option
+      // this.option = await this.getColumnData(this.getColumnName(23), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

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

@@ -1,166 +1,272 @@
 {
-    "height": "auto",
-    "addBtnText": "新单",
-    "lazy": true,
-    "tip": false,
-    "searchMenuPosition": "right",
-    "simplePage": true,
-    "searchShow": true,
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "searchIcon": true,
-    "searchIndex": 3,
-    "column":[
-        {
-            "label": "系统编号",
-            "prop": "sysNo",
-            "search": true,
-            "index": 1,
-            "width":100,
-          "overHidden": true
-        },
-        {
-            "label": "销售订单号",
-            "prop": "orderNo",
-            "search": true,
-            "index": 2,
-            "width":100,
-          "overHidden": true
-        },
-        {
-            "label": "主订单号",
-            "prop": "morderNo",
-            "search": true,
-            "index": 3,
-            "width":100,
-          "overHidden": true
-        },
-        {
-          "label": "客户名称",
-          "prop": "corpId",
-          "search": true,
-          "index": 4,
-          "width":100,
-          "overHidden": true
-        },
-        {
-          "label": "合同日期",
-          "type": "date",
-          "unlinkPanels": true,
-          "searchRange": true,
-          "prop": "businesDate",
-          "search": true,
-          "index": 4,
-          "width":100,
-          "format": "yyyy-MM-dd",
-          "valueFormat": "yyyy-MM-dd",
-          "overHidden": true
-        },
-        {
-            "label": "发货地址",
-            "prop": "shippingAddress",
-            "search": true,
-            "index": 4,
-            "width":100,
-          "overHidden": true
-        },{
-            "label": "到货地址",
-            "prop": "arrivalAddress",
-            "search": true,
-            "index": 5,
-            "width":100,
-        "overHidden": true
-        },{
-            "type": "select",
-            "dicUrl": "/api/blade-system/dict-biz/dictionary?code=payment_term",
-            "props": {
-                "label": "dictValue",
-                "value": "dictValue"
-            },
-            "label": "付款方式",
-            "prop": "paymentType",
-            "search": true,
-            "index": 6,
-            "width":100,
-        "overHidden": true
-        },{
-            "label": "包装要求",
-            "prop": "packageRemarks",
-            "search": true,
-            "index": 7,
-            "width":100,
-        "overHidden": true
-        },{
-            "label": "运费",
-            "prop": "oceanFreight",
-            "search": true,
-            "index": 8,
-            "width":100,
-        "overHidden": true
-        },{
-            "label": "银行帐号",
-            "prop": "banks",
-            "search": true,
-            "index": 8,
-            "width":100,
-        "overHidden": true
-        },
-        {
-          "label": "发货日期",
-          "type": "date",
-          "unlinkPanels": true,
-          "searchRange": true,
-          "prop": "actualDeliveryDate",
-          "search": true,
-          "index": 8,
-          "width":100,
-          "format": "yyyy-MM-dd",
-          "valueFormat": "yyyy-MM-dd",
-          "overHidden": true,
-          "pickerOptions": {}
-        },
-        {
-            "label": "要求发货日期",
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "prop": "requiredDeliveryDate",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "overHidden": true,
-            "pickerOptions": {}
-      },{
-            "label": "要求到货日期",
-            "type": "date",
-            "unlinkPanels": true,
-            "searchRange": true,
-            "prop": "requiredArrivalDate",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "format": "yyyy-MM-dd",
-            "valueFormat": "yyyy-MM-dd",
-            "overHidden": true,
-            "pickerOptions": {}
-      },{
-            "label": "公司户头",
-            "prop": "banksAccountName",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "overHidden": true
-        }
-    ]
+  "height": "auto",
+  "addBtnText": "新单",
+  "lazy": true,
+  "tip": false,
+  "searchMenuPosition": "right",
+  "simplePage": true,
+  "searchShow": true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 300,
+  "dialogClickModal": false,
+  "searchLabelWidth": 100,
+  "searchIcon": true,
+  "searchIndex": 3,
+  "column": [
+    {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpId",
+      "search": true,
+      "index": 2,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "合同日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "businesDate",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "预收款日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "advanceCollectionDate",
+      "search": false,
+      "index": 4,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "订单来源",
+      "prop": "a",
+      "search": true,
+      "index": 5,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "毛利额",
+      "prop": "grossProfit",
+      "search": false,
+      "index": 6,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "毛利率",
+      "prop": "grossProfitRate",
+      "search": false,
+      "index": 7,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "销售金额",
+      "prop": "orderAmount",
+      "search": false,
+      "index": 8,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "应收金额",
+      "prop": "debitAmount",
+      "search": false,
+      "index": 9,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "未收金额",
+      "prop": "balanceAmount",
+      "search": false,
+      "index": 10,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "订单数量",
+      "prop": "b",
+      "search": false,
+      "index": 11,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "已发数量",
+      "prop": "b",
+      "search": false,
+      "index": 12,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "所属公司",
+      "prop": "belongToCorpName",
+      "search": false,
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "发货地址",
+      "prop": "shippingAddress",
+      "search": true,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "到货地址",
+      "prop": "arrivalAddress",
+      "search": true,
+      "index": 15,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=payment_term",
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
+      },
+      "label": "付款方式",
+      "prop": "paymentType",
+      "search": false,
+      "index": 16,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "发货日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "actualDeliveryDate",
+      "search": true,
+      "index": 17,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "要求发货日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "requiredDeliveryDate",
+      "search": true,
+      "index": 18,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "label": "要求到货日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "requiredArrivalDate",
+      "search": true,
+      "index": 19,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    },
+    {
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
+      },
+      "label": "单据状态",
+      "prop": "orderStatus",
+      "search": true,
+      "index": 20,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "公司户头",
+      "prop": "banksAccountName",
+      "search": false,
+      "index": 21,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "search": true,
+      "index": 22,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "主订单号",
+      "prop": "morderNo",
+      "search": true,
+      "index": 23,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单人",
+      "prop": "createUserName",
+      "search": true,
+      "index": 24,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "prop": "createTime",
+      "search": true,
+      "index": 19,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true,
+      "pickerOptions": {}
+    }
+  ]
 }

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -678,7 +678,7 @@ export default {
             ]
           }, {
             label: '应收未收款',
-            prop: 'accountsReceivable',//无
+            prop: 'balanceAmount',//无
             disabled: true,
             rules: [
               {
@@ -865,6 +865,7 @@ export default {
           {
             label: '销售订单号',
             prop: 'orderNo',
+            disabled: true,
             rules: [
               {
                 required: true,
@@ -1107,7 +1108,11 @@ export default {
           })
         }
         this.oldForm = Object.assign({}, this.form)
+        this.oldGoodsList = []
+        this.oldFeesList = []
+        this.oldUploadList = []
         this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
+        console.log(this.oldGoodsList)
         this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
         this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
         if (isCopy) {
@@ -1584,7 +1589,6 @@ export default {
     },
     //修改提交触发
     editCustomer(isBack = false) {
-      console.log(this.form)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           for (let item in this.contactsData) {
@@ -1661,6 +1665,10 @@ export default {
     },
     //返回列表
     backToList() {
+      console.log(contrastObj(this.form, this.oldForm))
+      console.log(contrastList(this.contactsData, this.oldGoodsList))
+      console.log(contrastList(this.advantageProjectData, this.oldFeesList))
+      console.log(contrastList(this.bankOfDepositData, this.oldUploadList))
       if (contrastObj(this.form, this.oldForm) ||
         contrastList(this.contactsData, this.oldGoodsList) ||
         contrastList(this.advantageProjectData, this.oldFeesList) ||

src/views/businessManagement/salesOrder/index.vue

@@ -76,6 +76,7 @@ import option from "./configuration/mainList.json";
 import {customerList, typeSave, deleteDetails} from "@/api/basicData/configuration"
 import detailPage from "./detailsPageEdit";
 import search from "../../../page/index/search";
+import { defaultDate } from "@/util/date";
 
 export default {
   name: "customerInformation",
@@ -90,6 +91,7 @@ export default {
         collapseTags: false,
         placeholder: "请点击右边按钮选择",
         dicData: [],
+        clearable: true
       },
       form: {},
       option: {},
@@ -111,7 +113,9 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(14), option);
+    this.search.businesDate = defaultDate()
+    this.option = option
+    // this.option = await this.getColumnData(this.getColumnName(14), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -293,7 +297,10 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page,this.search);
     },
-    onLoad(page, params = {parentId: 0}) {
+    onLoad(page, params) {
+      if (this.search.businesDate.length > 0) {
+        console.log(this.search.businesDate)
+      }
       if (params) {
         if (params.requiredDeliveryDate) {
           params.deliveryStartDate = params.requiredDeliveryDate[0]+ " " + "00:00:00"