fix(选择产品控件): 选择产品控件优化搜索条件

src/views/contractManage/contractBook/components/searchProduct.vue

@@ -8,44 +8,39 @@
       @submit.native.prevent
     >
       <el-row :gutter="10">
-  
-        
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="关键词">
+          <el-form-item label="编码">
             <el-input
               clearable
               size="small"
-              v-model="where.keyWord"
-              placeholder="型号、牌号"
+              v-model="where.code"
+              placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="编码">
+          <el-form-item label="名称">
             <el-input
               clearable
               size="small"
-              v-model="where.code"
+              v-model="where.name"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="名称">
+          <el-form-item label="型号">
             <el-input
               clearable
               size="small"
-              v-model="where.name"
+              v-model="where.modelType"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
           <el-form-item>
             <el-button
@@ -57,7 +52,7 @@
             >
               查询
             </el-button>
-  
+
             <el-button
               @click="reset"
               icon="el-icon-refresh"
@@ -65,14 +60,25 @@
               size="medium"
               >重置</el-button
             >
-  
             <slot></slot>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="10">
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="牌号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.brandNum"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </template>
-  
+
   <script>
     export default {
       data() {
@@ -80,6 +86,7 @@
         const defaultWhere = {
           name: '',
           code: '',
+          brandNum: '',
           modelType: ''
         };
         return {
@@ -105,8 +112,7 @@
           this.where = { ...this.defaultWhere };
           this.search();
         },
-      
+
       }
     };
   </script>
-  

src/views/purchasingManage/purchaseNeedManage/components/product-list.vue

@@ -10,6 +10,7 @@
     width="80%"
   >
     <el-card shadow="never">
+      <searchProduct @search="reload"></searchProduct>
       <ele-split-layout
         width="244px"
         allow-collapse
@@ -54,8 +55,10 @@
 <script>
   import { getProductList } from '@/api/saleManage/quotation';
   import productTree from '@/components/productTree';
+  import searchProduct from "./product-search.vue";
   export default {
     components: {
+      searchProduct,
       productTree
     },
 
@@ -205,7 +208,7 @@
         if (!this.current) {
           return this.$message.warning('请至少选择一条数据');
         }
-        
+
         if (this.data.map((item) => item.productCode).includes(this.current.code)) {
           return this.$message.error('选择的产品已经存在列表了');
         }

src/views/purchasingManage/purchaseNeedManage/components/product-search.vue

@@ -0,0 +1,118 @@
+<!-- 搜索表单 -->
+<template>
+    <el-form
+      size="small"
+      label-width="60px"
+      class="ele-form-search"
+      @keyup.enter.native="search"
+      @submit.native.prevent
+    >
+      <el-row :gutter="10">
+
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="编码">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.code"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="名称">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.name"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="型号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.modelType"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              class="ele-btn-icon"
+              @click="search"
+            >
+              查询
+            </el-button>
+
+            <el-button
+              @click="reset"
+              icon="el-icon-refresh"
+              class="ele-btn-icon"
+              size="medium"
+              >重置</el-button
+            >
+
+            <slot></slot>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="牌号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.brandNum"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </template>
+
+  <script>
+    export default {
+      data() {
+        // 默认表单数据
+        const defaultWhere = {
+          name: '',
+          code: '',
+          brandNum: '',
+          modelType: ''
+        };
+        return {
+          defaultWhere,
+          // 表单数据
+          where: { ...defaultWhere },
+          loading:false
+        };
+      },
+      computed: {
+        // 是否开启响应式布局
+        styleResponsive() {
+          return this.$store.state.theme.styleResponsive;
+        }
+      },
+      methods: {
+        /* 搜索 */
+        search() {
+          this.$emit('search', this.where);
+        },
+        /*  重置 */
+        reset() {
+          this.where = { ...this.defaultWhere };
+          this.search();
+        },
+
+      }
+    };
+  </script>

src/views/saleManage/quotation/components/searchProduct.vue

@@ -8,44 +8,39 @@
       @submit.native.prevent
     >
       <el-row :gutter="10">
-  
-        
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="关键词">
+          <el-form-item label="编码">
             <el-input
               clearable
               size="small"
-              v-model="where.keyWord"
-              placeholder="型号、牌号"
+              v-model="where.code"
+              placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="编码">
+          <el-form-item label="名称">
             <el-input
               clearable
               size="small"
-              v-model="where.code"
+              v-model="where.name"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="名称">
+          <el-form-item label="型号">
             <el-input
               clearable
               size="small"
-              v-model="where.name"
+              v-model="where.modelType"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
           <el-form-item>
             <el-button
@@ -57,7 +52,7 @@
             >
               查询
             </el-button>
-  
+
             <el-button
               @click="reset"
               icon="el-icon-refresh"
@@ -65,14 +60,26 @@
               size="medium"
               >重置</el-button
             >
-  
+
             <slot></slot>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="10">
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="牌号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.brandNum"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </template>
-  
+
   <script>
     export default {
       data() {
@@ -80,6 +87,7 @@
         const defaultWhere = {
           name: '',
           code: '',
+          brandNum: '',
           modelType: ''
         };
         return {
@@ -105,8 +113,7 @@
           this.where = { ...this.defaultWhere };
           this.search();
         },
-      
+
       }
     };
   </script>
-  

src/views/saleManage/saleOrder/components/searchProduct.vue

@@ -8,44 +8,39 @@
       @submit.native.prevent
     >
       <el-row :gutter="10">
-  
-        
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="关键词">
+          <el-form-item label="编码">
             <el-input
               clearable
               size="small"
-              v-model="where.keyWord"
-              placeholder="型号、牌号"
+              v-model="where.code"
+              placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="编码">
+          <el-form-item label="名称">
             <el-input
               clearable
               size="small"
-              v-model="where.code"
+              v-model="where.name"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-          <el-form-item label="名称">
+          <el-form-item label="型号">
             <el-input
               clearable
               size="small"
-              v-model="where.name"
+              v-model="where.modelType"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
-  
-  
-  
+
         <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
           <el-form-item>
             <el-button
@@ -57,7 +52,7 @@
             >
               查询
             </el-button>
-  
+
             <el-button
               @click="reset"
               icon="el-icon-refresh"
@@ -65,14 +60,26 @@
               size="medium"
               >重置</el-button
             >
-  
+
             <slot></slot>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="10">
+        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+          <el-form-item label="牌号">
+            <el-input
+              clearable
+              size="small"
+              v-model="where.brandNum"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </template>
-  
+
   <script>
     export default {
       data() {
@@ -80,6 +87,7 @@
         const defaultWhere = {
           name: '',
           code: '',
+          brandNum: '',
           modelType: ''
         };
         return {
@@ -105,8 +113,7 @@
           this.where = { ...this.defaultWhere };
           this.search();
         },
-      
+
       }
     };
   </script>
-