修改bug

src/util/columnSetting.js

@@ -31,7 +31,6 @@ export async function saveColumnData(columnKey, option) {
   }
 }
 export async function delColumnData(columnKey, option) {
-  console.log(option)
   let res = await delColumn({
     fileName: columnKey
   })

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

@@ -11,8 +11,7 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
@@ -29,37 +28,44 @@
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -498,6 +498,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -1862,7 +1863,7 @@ export default {
     async resetColumn() {
       this.tableOption = tableOption;
       const inSave = await this.delColumnData(
-        this.getColumnName(5),
+        this.getColumnName(1),
         tableOption
       );
       if (inSave) {
@@ -1883,6 +1884,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(26),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   },
   watch: {

src/views/exportTrade/customerInquiry/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :cell-style="cellStyle"
         :summary-method="summaryMethod"
         @selection-change="selectionChange"
@@ -436,6 +437,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(0), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

src/views/exportTrade/invoice/detailsPage.vue

@@ -86,6 +86,7 @@
           :option="tableOption"
           @row-del="rowDel"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :summary-method="summaryMethod"
           :cell-style="cellStyle"
         >
@@ -245,6 +246,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -954,6 +956,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(9),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(30),
@@ -964,6 +980,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(30),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/invoice/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
@@ -355,6 +356,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(8), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -107,6 +107,7 @@
             @row-del="rowDel"
             @selection-change="goodsSelectionChange"
             @saveColumn="saveColumn"
+            @resetColumn="resetColumn"
             :summary-method="summaryMethod"
             :cell-style="cellStyle"
           >
@@ -275,6 +276,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -1078,6 +1080,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(3),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(27),
@@ -1088,6 +1104,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(30),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/purchaseContract/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
       >
@@ -306,6 +307,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(2), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -65,6 +65,7 @@
           :option="tableOption"
           @row-del="rowDel"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :summary-method="summaryMethod"
           :cell-style="cellStyle"
         >
@@ -255,6 +256,8 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
+              :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
         </el-row>
@@ -865,6 +868,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(11),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(31),
@@ -875,6 +892,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(31),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/purchaseInquiry/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
       >
@@ -283,6 +284,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(10), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

src/views/exportTrade/receipt/detailsPage.vue

@@ -86,6 +86,7 @@
           :option="tableOption"
           @row-del="rowDel"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :summary-method="summaryMethod"
           :cell-style="cellStyle"
         >
@@ -230,6 +231,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -961,6 +963,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(7),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(29),
@@ -971,6 +987,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(29),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/receipt/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
@@ -339,6 +340,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(6), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

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

@@ -11,8 +11,7 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
@@ -29,37 +28,44 @@
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/salesContract/detailsPage.vue

@@ -548,6 +548,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -2000,6 +2001,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(28),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/salesContract/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :cell-style="cellStyle"
         :summary-method="summaryMethod"
         @expand-change="expandChange"
@@ -473,6 +474,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(4), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   },
   watch: {

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -63,6 +63,7 @@
           :option="tableOption"
           @row-del="rowDel"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :summary-method="summaryMethod"
           :cell-style="cellStyle"
         >
@@ -181,6 +182,7 @@
               :page.sync="page"
               @on-load="onLoad"
               @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn"
               :cell-style="cellStyle"
             ></avue-crud>
           </el-col>
@@ -644,6 +646,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(13),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(32),
@@ -654,6 +670,20 @@ export default {
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetGoodsColumn() {
+      this.goodsOption = goodsOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(32),
+        goodsOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
     }
   }
 };

src/views/exportTrade/shippingInquiry/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         :cell-style="cellStyle"
       >
         <template slot="menuLeft">
@@ -208,6 +209,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(12), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/wel/home/defaultPage.vue

@@ -67,7 +67,7 @@ export default {
   width: 100%;
   height: 95.5vh;
   grid-template-columns: repeat(auto-fill, 10%);
-  grid-template-rows: 120px 170px 180px 350px 400px;
+  grid-template-rows: 140px 180px 180px 350px 400px;
   grid-template-areas:
     "a a a a a a a a a a"
     "b b b b b b b b b b"