修改bug

src/components/price-Library/configuration/mainList.json

@@ -153,6 +153,13 @@
       "index": 18,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "index": 19,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/basicData/commodityType/configuration/mainList.json

@@ -4,7 +4,9 @@
   "tip": false,
   "stripe": true,
   "searchShow": true,
-  "searchMenuSpan": 12,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchMenuSpan": 16,
   "searchMenuPosition": "right",
   "border": true,
   "index": true,
@@ -17,6 +19,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
+      "searchSpan": 8,
       "width": 100,
       "overHidden": true,
       "rules": [{
@@ -29,6 +32,8 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true,
       "width": 100,
       "rules": [{
@@ -40,6 +45,8 @@
     {
       "label": "英文名称",
       "prop": "ename",
+      "searchSpan": 8,
+      "search": true,
       "overHidden": true
     },
     {
@@ -50,6 +57,7 @@
     {
       "label": "规格编码",
       "prop": "typeno",
+      "searchSpan": 8,
       "search": true,
       "overHidden": true
     },

src/views/maintenance/priceLibrary/index.vue

@@ -18,6 +18,7 @@
         @saveColumn="saveColumn"
         :cell-style="cellStyle"
         :summary-method="summaryMethod"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
           <el-button
@@ -263,6 +264,7 @@ export default {
     this.getWorkDicts("price_library_currency").then(res => {
       this.currencyList = res.data.data;
     });
+     this.option.height = window.innerHeight - 210;
   },
   filters: {
     orderStateFormat(val) {
@@ -291,6 +293,14 @@ export default {
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 93;
+      } else {
+        this.option.height = this.option.height + 93;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -378,7 +388,11 @@ export default {
         tradeType: "CK"
       };
       this.loading = true;
-      getList(page.currentPage, page.pageSize,Object.assign(params, this.search))
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.search)
+      )
         .then(res => {
           // if (res.data.data.records) {
           //   res.data.data.records.forEach(e => {
@@ -387,9 +401,6 @@ export default {
           // }
           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 - 260;
-          }
         })
         .finally(() => {
           this.loading = false;