Merge remote-tracking branch 'origin/dev' into dev

src/components/fee-info/main.vue

@@ -37,7 +37,7 @@
             >删 除</el-button
           >
         </template>
-        <template slot="corpId" slot-scope="{ row }">
+        <template slot="corpId" slot-scope="{ row, index }">
           <customer-dialog
             v-if="row.$cellEdit"
             v-model="row.corpName"
@@ -51,7 +51,7 @@
             size="small"
             type="text"
             @click="rePick(row, index)"
-            :disabled="disabled||!row.$cellEdit"
+            :disabled="disabled || !row.$cellEdit"
             class="picker"
             style="padding:4px 10px;float:left"
             >选择</el-button
@@ -392,7 +392,7 @@ export default {
             });
           });
         }
-      } 
+      }
       // else {
       //   this.selectionList.forEach(e => {
       //     this.feeData.push({

src/util/date.js

@@ -43,9 +43,32 @@ export function dateFormat(date, format) {
       if (new RegExp("(" + k + ")").test(format))
         format = format.replace(RegExp.$1,
           RegExp.$1.length === 1 ? o[k] :
-            ("00" + o[k]).substr(("" + o[k]).length));
+          ("00" + o[k]).substr(("" + o[k]).length));
     return format;
   }
   return '';
 
 }
+/**
+ * 获取上月第一天和下月最后一天
+ * type 1为 [yyyy-MM-dd,yyyy-MM-dd]
+ * type 2为 [yyyy-MM-dd 00:00:00,yyyy-MM-dd 23:59:59]
+ * type为空默认2
+ */
+export function defaultDate(type) {
+  type = type ? type : 2
+  const date = new Date();
+  const startDate = new Date(date.getFullYear(), date.getMonth() - 1, 1);
+  const endDate = new Date(date.getFullYear(), date.getMonth() + 2, 0);
+  if (type == 1) {
+    return [
+      dateFormat(startDate, "yyyy-MM-dd"),
+      dateFormat(endDate, "yyyy-MM-dd")
+    ];
+  } else {
+    return [
+      dateFormat(startDate, "yyyy-MM-dd") + " 00:00:00",
+      dateFormat(endDate, "yyyy-MM-dd") + " 23:59:59"
+    ];
+  }
+}

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) {
@@ -1594,18 +1598,26 @@ export default {
           }
           // 计算毛利额
           this.$set(this.form, 'grossProfit', 0)
+          this.$set(this.form, 'orderAmount', 0)
           this.contactsData.forEach(item => {
             this.form.grossProfit += Number(item.amount)
+            this.form.orderAmount += Number(item.amount)
           })
+          if (this.form.orderAmount && this.form.overPayment) {
+            this.form.debitAmount = Number(this.form.orderAmount) - Number(this.form.overPayment)
+          }
+          if (this.form.orderAmount && this.form.settlmentAmount) {
+            this.$set(this.form, "balanceAmount", (Number(this.form.orderAmount) - Number(this.form.settlmentAmount)).toFixed(2));
+          }
           // 计算毛利率
           // if (this.form.orderAmount) {
           //   this.form.grossProfitRate = ((Number(this.form.grossProfit) / Number(this.form.orderAmount)) * 100).toFixed(2)
           // }
           // 计算应收账款
-          this.$set(this.form, 'debitAmount', 0)
-          this.contactsData.forEach(item => {
-            this.form.debitAmount += Number(item.amount)
-          })
+          // this.$set(this.form, 'debitAmount', 0)
+          // this.contactsData.forEach(item => {
+          //   this.form.debitAmount += Number(item.amount)
+          // })
           //商品信息
           this.form.orderItemsList = this.contactsData
           this.form.orderFeesList = this.advantageProjectData
@@ -1632,17 +1644,17 @@ export default {
     },
     // 计算应收未收款
     computedCost() {
-      // 应收预付款
-      let advancePayment = 0;
+      // 销售金额
+      let orderAmount = 0;
       // 已收款
       let settlmentAmount = 0;
-      if (this.form.advancePayment) {
-        advancePayment = this.form.advancePayment
+      if (this.form.orderAmount) {
+        orderAmount = this.form.orderAmount
       }
       if (this.form.settlmentAmount) {
         settlmentAmount = this.form.settlmentAmount
       }
-      this.$set(this.form, "accountsReceivable", Number(advancePayment) - Number(settlmentAmount)).toFixed(2);
+      this.$set(this.form, "balanceAmount", (Number(orderAmount) - Number(settlmentAmount)).toFixed(2));
     },
     quantityChange(row) {
       if (!row.orderQuantity) {
@@ -1661,6 +1673,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"

src/views/exportTrade/customerInquiry/config/mainList.json

@@ -1,6 +1,6 @@
 {
   "searchShow": true,
-  "searchMenuSpan": 12,
+  "searchMenuSpan": 6,
   "border": true,
   "index": true,
   "viewBtn": false,
@@ -12,25 +12,75 @@
   "searchIcon": true,
   "searchIndex": 3,
   "column": [{
-      "label": "系统号",
-      "prop": "sysNo",
+      "label": "客户名称",
+      "prop": "corpId",
       "search": true,
       "index": 1,
       "width": 100,
       "overHidden": true
-    }, {
-      "label": "客户名称",
-      "prop": "corpId",
+    },
+    {
+      "label": "订单日期",
+      "prop": "businesDate",
       "search": true,
       "index": 2,
       "width": 100,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd 00:00:00",
+      "overHidden": true
+    },
+    {
+      "label": "有效日期",
+      "prop": "dateValidity",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd 00:00:00",
+      "overHidden": true
+    },
+    {
+      "label": "价格条款",
+      "prop": "priceTerms",
+      "index": 4,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收款方式",
+      "prop": "paymentType",
+      "index": 5,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "运输方式",
+      "prop": "transport",
+      "index": 6,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "箱型",
+      "prop": "boxPile",
+      "index": 7,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "箱量",
+      "prop": "boxNumber",
+      "index": 8,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,
-      "index": 4,
+      "index": 9,
       "width": 100,
       "overHidden": true,
       "type": "select",
@@ -39,30 +89,20 @@
         "label": "dictValue",
         "value": "dictValue"
       }
-    }, {
-      "label": "联系人",
-      "prop": "corpAttn",
-      "index": 5,
-      "width": 100,
-      "overHidden": true
-    }, {
-      "label": "电话",
-      "prop": "corpTel",
-      "index": 6,
-      "width": 100,
-      "overHidden": true
-    }, {
+    },
+    {
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
-      "index": 7,
+      "index": 10,
       "width": 100,
       "overHidden": true
-    }, {
+    },
+    {
       "label": "目的港",
       "prop": "portOfDestination",
       "search": true,
-      "index": 8,
+      "index": 11,
       "width": 100,
       "overHidden": true,
       "type": "select",
@@ -72,60 +112,95 @@
         "label": "name",
         "value": "name"
       }
-    }, {
-      "label": "运输方式",
-      "prop": "transport",
-      "index": 9,
-      "width": 100,
-      "overHidden": true
-    }, {
-      "label": "价格条款",
-      "prop": "priceTerms",
-      "index": 10,
-      "width": 100,
-      "overHidden": true
-    }, {
-      "label": "订单日期",
-      "prop": "businesDate",
-      "search": true,
+    },
+    {
+      "label": "数量合计",
+      "prop": "",
       "index": 12,
       "width": 100,
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd 00:00:00",
       "overHidden": true
-    }, {
-      "label": "有效日期",
-      "prop": "dateValidity",
+    },
+    {
+      "label": "毛利额",
+      "prop": "",
       "index": 13,
       "width": 100,
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd 00:00:00",
       "overHidden": true
-    }, {
-      "label": "收款方式",
-      "prop": "paymentType",
+    },
+    {
+      "label": "毛利率",
+      "prop": "",
       "index": 14,
       "width": 100,
       "overHidden": true
-    }, {
-      "label": "币别",
-      "prop": "currency",
+    },
+    {
+      "label": "销售金额",
+      "prop": "",
       "index": 15,
       "width": 100,
       "overHidden": true
-    }, {
-      "label": "汇率",
-      "prop": "exchangeRate",
+    },
+    {
+      "label": "采购金额",
+      "prop": "",
       "index": 16,
       "width": 100,
       "overHidden": true
-    }, {
+    },
+    {
+      "label": "商品名称",
+      "prop": "",
+      "search": true,
+      "index": 17,
+      "width": 100,
+      "overHidden": true,
+      "showColumn":false
+    },
+    {
+      "label": "系统号",
+      "prop": "SysNo",
+      "search": true,
+      "index": 17,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "制单人",
+      "prop": "",
+      "index": 18,
+      "width": 100,
+      "search": true,
+      "overHidden": true
+    },
+    {
+      "label": "制单日期",
+      "prop": "",
+      "index": 19,
+      "width": 100,
+      "search": true,
+      "overHidden": true
+    },
+    {
       "label": "备注",
       "prop": "orderRemark",
       "index": 20,
       "width": 100,
+      "search": true,
+      "overHidden": true
+    },
+    {
+      "label": "采购备注",
+      "prop": "purchaseRemark",
+      "index": 21,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "销售备注",
+      "prop": "shippingRemark",
+      "index": 20,
+      "width": 100,
       "overHidden": true
     }
   ]

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -525,8 +525,12 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-            row: true
+            valueFormat: "yyyy-MM-dd 00:00:00"
+          },
+          {
+            label: "订单号",
+            prop: "orderNo",
+            span: 8
           },
           {
             label: "币别",

src/views/exportTrade/customerInquiry/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="portOfLoadSearch">
           <port-info v-model="search.portOfLoad" />
@@ -87,6 +88,7 @@
 import option from "./config/mainList.json";
 import { getList, remove } from "@/api/basicData/customerInquiry";
 import detailPage from "./detailsPage.vue";
+import { defaultDate } from "@/util/date";
 export default {
   name: "customerInformation",
   data() {
@@ -115,6 +117,7 @@ export default {
   },
   components: { detailPage },
   async created() {
+    this.search.businesDate=defaultDate()
     /**
      * 已定义全局方法，直接使用，getColumnData获取列数据，参数传值(表格名称，引入的本地JSON的数据定义的名称)
      * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
@@ -142,6 +145,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {
@@ -192,15 +198,19 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params) {
+      if (this.search.businesDate.length>0) {
+        params={
+          orderStartDate:this.search.businesDate[0],
+          orderEndDate:this.search.businesDate[1],
+        }
+      }
       this.loading = true;
       getList(page.currentPage, page.pageSize, params)
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 380;
-          } else {
-            this.option.height = window.innerHeight - 305;
+            this.option.height = window.innerHeight - 420;
           }
         })
         .finally(() => {

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

@@ -31,8 +31,7 @@
     },
     {
       "label": "销售订单号",
-      "prop": "orderNo",
-      "search": true,
+      "prop": "srcOrderNo",
       "index": 3,
       "width": 100,
       "overHidden": true

src/views/exportTrade/invoice/detailsPage.vue

@@ -76,6 +76,9 @@
               >报 表</el-button
             >
           </template>
+          <template slot-scope="scope" slot="corpId">
+            {{ scope.row.corpsName }}
+          </template>
           <template slot="itemType" slot-scope="{ row }">
             <el-select
               v-if="row.$cellEdit"

src/views/exportTrade/invoice/index.vue

@@ -16,6 +16,7 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         :summary-method="summaryMethod"
+        :cell-style="cellStyle"
       >
         <template slot-scope="scope" slot="corpId">
           {{ scope.row.corpsName }}
@@ -157,6 +158,9 @@ export default {
     }, 100);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -30,7 +30,6 @@
     {
       "label": "采购订单号",
       "prop": "orderNo",
-      "search": true,
       "index": 3,
       "width": 100,
       "overHidden": true

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -402,6 +402,11 @@ export default {
             span: 8
           },
           {
+            label: "采购订单号",
+            prop: "orderNo",
+            span: 8
+          },
+          {
             label: "币别",
             prop: "currency",
             span: 8,
@@ -420,6 +425,7 @@ export default {
               }
             }
           },
+
           {
             label: "汇率",
             prop: "exchangeRate",
@@ -522,7 +528,13 @@ export default {
       orderItemIds: [],
       itemtypeList: [],
       goodsSelections: [],
-      reData: null
+      reData: null,
+      oldform: {
+        orderStatus: "录入"
+      },
+      olddata: [],
+      oldorderFeesList: [],
+      oldorderFilesList: []
     };
   },
   props: {
@@ -572,11 +584,6 @@ export default {
         };
       }
     });
-    if (this.detailData.pageType == "new") {
-      getSysNo().then(res => {
-        this.form.sysNo = res.data.data;
-      });
-    }
     this.getWorkDicts("product_properties").then(res => {
       this.findObject(this.tableOption.column, "itemProp").dicData =
         res.data.data;
@@ -762,10 +769,20 @@ export default {
           ? res.data.data.orderFilesList
           : [];
         this.configuration.dicData = this.form.corpsName;
+        this.oldform = res.data.data;
+        this.olddata = this.deepClone(
+          res.data.data.itemsVOList ? res.data.data.itemsVOList : []
+        );
+        this.oldorderFeesList = this.deepClone(
+          res.data.data.orderFeesList ? res.data.data.orderFeesList : []
+        );
+        this.oldorderFilesList = this.deepClone(
+          res.data.data.orderFilesList ? res.data.data.orderFilesList : []
+        );
       });
     },
     //修改提交触发
-    editCustomer() {
+    editCustomer(status) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -792,6 +809,9 @@ export default {
           }).then(res => {
             this.$message.success(this.form.id ? "修改成功" : "提交成功");
             this.getDetail(res.data.data);
+            if (status == "goBack") {
+              this.$emit("goBack");
+            }
           });
         } else {
           return false;
@@ -800,7 +820,28 @@ export default {
     },
     //返回列表
     backToList() {
-      this.$emit("goBack");
+      let orderFeesList = this.$refs.feeInfo.submitData();
+      let orderFilesList = this.$refs.uploadFile.submitData();
+      if (
+        contrastObj(this.form, this.oldform) ||
+        contrastList(this.data, this.olddata) ||
+        contrastList(orderFeesList, this.oldorderFeesList) ||
+        contrastList(orderFilesList, this.oldorderFilesList)
+      ) {
+        this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.editCustomer("goBack");
+          })
+          .catch(() => {
+            this.$emit("goBack");
+          });
+      } else {
+        this.$emit("goBack");
+      }
     },
     openReport() {
       this.switchDialog = !this.switchDialog;

src/views/exportTrade/purchaseContract/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -107,7 +108,7 @@ export default {
       },
       search: {},
       form: {},
-      option:{},
+      option: {},
       parentId: 0,
       dataList: [],
       page: {
@@ -121,7 +122,7 @@ export default {
     };
   },
   components: { detailPage },
-    async created() {
+  async created() {
     this.option = await this.getColumnData(this.getColumnName(2), option);
     let _this = this;
     this.option.column.forEach(e => {
@@ -144,6 +145,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {

src/views/exportTrade/purchaseInquiry/config/mainList.json

@@ -27,6 +27,13 @@
       "overHidden": true
     },
     {
+      "label": "订单号",
+      "prop": "orderNo",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,
@@ -59,7 +66,7 @@
       "width": 100,
       "overHidden": true,
       "type": "select",
-      "filterable":true,
+      "filterable": true,
       "dicData": [],
       "props": {
         "label": "name",
@@ -73,7 +80,7 @@
       "width": 100,
       "overHidden": true,
       "type": "select",
-      "filterable":true,
+      "filterable": true,
       "dicData": [],
       "props": {
         "label": "name",

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -319,6 +319,11 @@ export default {
             valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
+            label: "订单号",
+            prop: "orderNo",
+            span: 8
+          },
+          {
             label: "币别",
             prop: "currency",
             span: 8,

src/views/exportTrade/purchaseInquiry/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button type="info" size="small">报表</el-button>
@@ -80,7 +81,7 @@ export default {
         dicData: []
       },
       search: {},
-      option:{},
+      option: {},
       parentId: 0,
       dataList: [],
       page: {
@@ -94,7 +95,7 @@ export default {
     };
   },
   components: { detailPage },
-    async created() {
+  async created() {
     this.option = await this.getColumnData(this.getColumnName(10), option);
     let _this = this;
     this.option.column.forEach(e => {
@@ -122,6 +123,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定将选择数据删除?", {

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

@@ -31,7 +31,7 @@
     },
     {
       "label": "采购订单号",
-      "prop": "orderNo",
+      "prop": "srcOrderNo",
       "search": true,
       "index": 3,
       "width": 120,

src/views/exportTrade/receipt/detailsPage.vue

@@ -321,8 +321,7 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-            disabled: true,
-            row: true
+            disabled: true
           },
           {
             label: "仓库名称",

src/views/exportTrade/receipt/index.vue

@@ -16,6 +16,7 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         :summary-method="summaryMethod"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -34,6 +35,9 @@
             :configuration="configuration"
           ></select-component>
         </template>
+        <template slot-scope="scope" slot="corpId">
+          {{ scope.row.corpsName }}
+        </template>
         <template slot-scope="scope" slot="menu">
           <el-button
             type="text"
@@ -130,6 +134,9 @@ export default {
     }, 100);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {

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

@@ -29,7 +29,6 @@
     {
       "label": "销售订单号",
       "prop": "orderNo",
-      "search": true,
       "index": 3,
       "width": 100,
       "overHidden": true

src/views/exportTrade/salesContract/detailsPage.vue

@@ -254,7 +254,7 @@
                 type="warning"
                 icon="el-icon-plus"
                 size="small"
-                :disabled="detailData.status == 1 || orderItemIds.length == 0"
+                :disabled="detailData.status == 1 || tableOption.length == 0"
                 @click="getInvoice"
                 >生成发货单
               </el-button>
@@ -545,8 +545,12 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-            row: true
+            valueFormat: "yyyy-MM-dd 00:00:00"
+          },
+          {
+            label: "销售订单号",
+            prop: "orderNo",
+            span: 8
           },
           {
             label: "币别",

src/views/exportTrade/salesContract/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -100,7 +101,7 @@ export default {
       },
       search: {},
       form: {},
-      option:{},
+      option: {},
       parentId: 0,
       dataList: [],
       page: {
@@ -142,6 +143,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {

src/views/exportTrade/shippingInquiry/config/mainList.json

@@ -27,6 +27,13 @@
       "overHidden": true
     },
     {
+      "label": "订单号",
+      "prop": "orderNo",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -256,6 +256,11 @@ export default {
             }
           },
           {
+            label: "订单号",
+            prop: "orderNo",
+            span: 8
+          },
+          {
             label: "计划交期",
             prop: "dateValidity",
             span: 8,
@@ -268,7 +273,7 @@ export default {
             prop: "orderRemark",
             type: "textarea",
             minRows: 2,
-            span: 16
+            span: 24
           }
         ]
       },

src/views/exportTrade/shippingInquiry/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button type="info" size="small">报表</el-button>
@@ -72,7 +73,7 @@ export default {
         dicData: []
       },
       search: {},
-      option:{},
+      option: {},
       parentId: 0,
       dataList: [],
       page: {
@@ -114,6 +115,9 @@ export default {
     });
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //查看跳转页面
     beforeOpenPage(row, status) {
       this.detailData = {

src/views/mallManagement/commodity/classification/configuration/mainList.json

@@ -100,6 +100,21 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "分类图片",
+      "prop": "picture",
+      "type": "upload",
+      "listType": "picture-img",
+      "dataType": "string",
+      "tip": "只能上传jpg/png/jpeg文件，且不超过1M,宽高为1比1",
+      "action": "/api/blade-resource/oss/endpoint/put-file",
+      "propsHttp": {
+        "res": "data",
+        "url": "link"
+      },
+      "hide": true,
+      "span": 24
     }
   ]
 }

src/views/mallManagement/commodity/classification/index.vue

@@ -13,6 +13,7 @@
                @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
+               :upload-before="uploadBefore"
                @selection-change="selectionChange"
                @current-change="currentChange"
                @size-change="sizeChange"
@@ -57,6 +58,45 @@ export default {
 
   },
   methods: {
+    // 上传前
+    uploadBefore(file, done, loading, column) {
+      const is2M = file.size / 1024 / 1024 < 2;
+      const isType =
+          file.type === "image/jpeg" ||
+          file.type === "image/png" ||
+          file.type === "image/jpg";
+      if (!isType) {
+        this.$message.error("图片只能是JPG、JPEG、PNG格式");
+        loading();
+      }
+      if (!is2M) {
+        this.$message.error("图片大小不能超过2M");
+        loading();
+      }
+      const img = new Image();
+      const _URL = window.URL || window.webkitURL;
+      let isSize = null;
+      img.onload = () => {
+        if (column.label == "图片") {
+          isSize = img.width === img.height;
+          if (!isSize) {
+            this.$message.error("图片宽高限制比例为1:1");
+          }
+        } else {
+          console.log(img.width,img.height)
+          isSize = img.width === img.height
+          if (!isSize) {
+            this.$message.error("图宽为"+img.width+"高为"+img.height+"，高不能超过"+img.width+"或小于"+img.width);
+          }
+        }
+        if (is2M && isType && isSize) {
+          done();
+        } else {
+          loading();
+        }
+      };
+      img.src = _URL.createObjectURL(file);
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定将选择数据删除?", {

src/views/mallManagement/commodity/productList/configuration/imgUploadList.json

@@ -50,7 +50,7 @@
         "url": "link"
       },
       "span": 24,
-      "listType": "picture-card",
+      "listType": "picture-img",
       "tip": "只能上传jpg/png/jpeg文件，且不超过2M,宽为750，高不大于1000",
       "action": "/api/blade-resource/oss/endpoint/put-file",
       "rules": [