fix

src/util/date.js

@@ -60,7 +60,6 @@ export function defaultDate(type) {
   const date = new Date();
   const startDate = new Date(date.getFullYear(), date.getMonth() - 1, 1);
   const endDate = new Date(date.getFullYear(), date.getMonth() + 2, 0);
-  console.log(dateFormat(startDate, "yyyy-MM-dd"))
   if (type == 1) {
     return [
       dateFormat(startDate, "yyyy-MM-dd"),

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/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 = {