修改组件

src/components/crop-select/main.vue

@@ -10,6 +10,8 @@
         filterable
         clearable
         style="width:100%"
+        :multiple="multiple? multiple : false"
+        :collapse-tags="collapseTags?collapseTags: false"
         @change="corpChange"
       >
         <el-option
@@ -132,7 +134,9 @@ export default {
     value: String,
     disabled: Boolean,
     cropIndex: Number,
-    corpType: String
+    corpType: String,
+    multiple: Boolean,
+    collapseTags: Boolean,
   },
   model: {
     prop: "value",

src/components/procurement/config/market.json

@@ -9,7 +9,9 @@
   "cellBtn":false,
   "cancelBtn":false,
   "refreshBtn": false,
-  "searchMenuSpan": 6,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "align": "center",
   "delBtn":true,
   "dialogWidth": "60%",
@@ -26,74 +28,97 @@
       "prop": "orgOrderNo",
       "search": true,
       "index": 1,
-      "width":180
+      "width":180,
+      "overHidden": true
     },
     {
       "label": "提单号",
       "prop": "billNo",
       "index": 2,
-      "width":180
+      "width":180,
+      "overHidden": true
+    },
+    {
+      "label": "客户",
+      "prop": "corp",
+      "search": true,
+      "index": 3,
+      "width":180,
+      "overHidden": true
     },
     {
       "label": "客户",
       "prop": "corpName",
       "search": true,
       "index": 3,
-      "width":180
+      "width":180,
+      "overHidden": true
     },
     {
       "label": "商品名称",
       "prop": "cname",
+      "search": true,
       "index": 4,
-      "width":120
+      "width":120,
+      "overHidden": true
     },
     {
       "label": "编码",
       "prop": "code",
+      "search": true,
       "index": 5,
-      "width":120
+      "width":120,
+      "overHidden": true
     },
     {
       "label": "规格型号",
       "prop": "typeno",
       "index": 6,
-      "width":120
+      "width":120,
+      "overHidden": true
     },
     {
       "label": "货物品种",
       "prop": "priceCategoryNames",
       "index": 7,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "规格名称",
       "prop": "itemType",
       "index": 8,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "件数",
       "prop": "orderQuantity",
       "index": 9,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "发票净重(吨)",
       "prop": "invoiceWeight",
       "index": 10,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "码单重量(吨)",
       "prop": "billWeight",
       "index": 11,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "单价",
       "prop": "price",
       "index": 12,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "合同金额",
       "prop": "amount",
       "index": 13,
-      "width":120
+      "width":120,
+      "overHidden": true
     },{
       "label": "订单日期",
       "prop": "marketDate",
@@ -105,7 +130,21 @@
       "searchRange": true,
       "search": true,
       "index": 14,
-      "width":150
+      "width":150,
+      "overHidden": true
+    },{
+      "label": "订单日期",
+      "prop": "businesDate",
+      "hide": false,
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "index": 14,
+      "width":150,
+      "overHidden": true
     }
   ]
 }

src/components/procurement/market.vue

@@ -10,6 +10,7 @@
                @saveColumn="saveColumn"
                :page.sync="page"
                @on-load="onLoad">
+      <template slot-scope="scope"></template>
     </avue-crud>
     <div class="botoom">
        <span slot="footer" class="dialog-footer">
@@ -60,24 +61,25 @@
       this.option = await this.getColumnData(this.getColumnName(42), option);
       if (this.systemType == 'GN') {
         this.option.column.forEach(item => {
+          if (item.prop == 'corpName') item.label = '供应商'
           if (item.prop == 'billNo' || item.prop == 'invoiceWeight' || item.prop == 'billWeight' || item.prop == 'orgOrderNo'
-            || item.prop == 'priceCategoryNames' || item.prop == 'itemType'
+            || item.prop == 'priceCategoryNames' || item.prop == 'itemType' || item.prop == 'marketDate'
           ) {
             item.hide = true;
             item.showColumn = false;
-          }
-          // 隐藏查询
-          if (item.prop == 'orgOrderNo') {
-            item.search = false
+            // 隐藏查询
+            item.search = false;
           }
         })
       }
       if(this.systemType == 'JK'){
         this.option.column.forEach(item => {
-          if ( item.prop == 'itemType' || item.prop == 'typeno' || item.prop == 'code'  || item.prop == 'corpName'
+          if ( item.prop == 'itemType' || item.prop == 'typeno' || item.prop == 'code'  || item.prop == 'corpName' || item.prop == 'corp'
+            || item.prop == 'businesDate'
           ) {
             item.hide = true;
             item.showColumn = false;
+            item.search = false;
           }
         })
       }
@@ -86,9 +88,9 @@
       this.option.column.forEach(item => {
         if (item.search) i++
       })
-      if (i % 4 !== 0){
-        const num = 4 - Number(i % 4)
-        this.option.searchMenuSpan = num * 6;
+      if (i % 3 !== 0){
+        const num = 3 - Number(i % 3)
+        this.option.searchMenuSpan = num * 8;
         this.option.searchMenuPosition = "right";
       }
     },