把搜索条件都改成组件查询

src/views/inspectionPoint/components/search.vue

@@ -1,64 +1,36 @@
-<!-- 搜索表单 --> 6
+<!-- 搜索表单 --> 
 <template>
-  <el-form label-width="60px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
-    <el-row :gutter="24">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 4 }">
-        <el-form-item label="名称:">
-          <el-input clearable v-model="where.pointName" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 4 }">
-        <el-form-item label="编码:">
-          <el-input clearable v-model="where.pointCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-
-      <el-col v-bind="styleResponsive ? { lg: 12, md: 10 } : { span: 12 }" style="text-align: right;">
-        <div class="ele-form-actions">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
 export default {
   data() {
-    // 默认表单数据
-    const defaultWhere = {
-      pointName: '',
-      pointCode: '',
-    };
     return {
-      defaultWhere,
-      // 表单数据
-      where: { ...defaultWhere },
-
+      // 表格列配置
+      seekList: [
+        {
+          label: '名称:',
+          value: 'pointName',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '编码:',
+          value: 'pointCode',
+          type: 'input',
+          placeholder: '请输入'
+        }
+      ]
     };
   },
   computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
   },
   methods: {
     /* 搜索 */
-    search() {
-      this.$emit('search', this.where);
-    },
-    /*  重置 */
-    reset() {
-
-      this.where = { ...this.defaultWhere };
-      this.search();
-    }
+      search(e) {
+        this.$emit('search', { ...e });
+      },
   }
 };
 </script>

src/views/inspectionStandard/components/search.vue

@@ -1,112 +1,56 @@
 <!-- 搜索表单 -->
 6
 <template>
-  <el-form
-    label-width="77px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准代码:">
-          <el-input
-            clearable
-            v-model="where.standardCode"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准类型:">
-          <DictSelection
-            dictName="质检标准类型"
-            v-model="where.type"
-          ></DictSelection>
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="状态:">
-          <el-select
-            v-model="where.status"
-            class="m-2"
-            placeholder="请选择"
-            size="large"
-            style="width: 100%"
-          >
-            <el-option label="停用" :value="0" />
-            <el-option label="启用" :value="1" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-<!--      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">-->
-<!--        <el-form-item label="组织机构:">-->
-<!--          <auth-selection-->
-<!--            data-type="Array"-->
-<!--            v-model="where.deptIds"-->
-<!--            style="width: 100%"-->
-<!--          ></auth-selection>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-      <el-col
-        style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 4, md: 18 } : { span: 4 }"
-      >
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
-  export default {
-    data() {
-      // 默认表单数据
-      const defaultWhere = {
-        name: '',
-        standardCode: '',
-        status: ''
-      };
-      return {
-        defaultWhere,
-        // 表单数据
-        where: { ...defaultWhere }
-      };
-    },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
-    },
-    methods: {
-      /* 搜索 */
-      search() {
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
-      }
+export default {
+  data() {
+    return {
+      statusList: [
+        { label: '停用', value: 0 },
+        { label: '启用', value: 1 }
+      ]
+    };
+  },
+  computed: {
+    seekList() {
+      return [
+        {
+          label: '标准名称:',
+          value: 'name',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '标准代码:',
+          value: 'standardCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '标准类型:',
+          value: 'type',
+          type: 'DictSelection',
+          dictName: '质检标准类型',
+          placeholder: '请选择'
+        },
+
+        {
+          label: '状态:',
+          value: 'status',
+          type: 'select',
+          placeholder: '请选择',
+          planList: this.statusList
+        }
+      ];
+    }
+  },
+  methods: {
+    search(e) {
+      this.$emit('search', { ...e });
     }
-  };
+  }
+};
 </script>

src/views/inspectionStatistics/qualityControlWorkOrder/components/search.vue

@@ -1,132 +1,52 @@
-<!-- 搜索表单 --> 6
+<!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="77px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="批次号:">
-          <el-input clearable v-model="where.batchNo" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="计划号:">
-          <el-input
-            clearable
-            v-model="where.standardCode"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="产品编码:">
-          <el-input
-            clearable
-            v-model="where.productCode"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="产品规格:">
-          <el-input
-            clearable
-            v-model="where.specification"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            data-type="Array"
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
-        </el-form-item>
-      </el-col> -->
-      <el-col
-        v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
-        style="width: 300px"
-      >
-        <el-form-item label="日期" prop="createTime">
-          <el-date-picker
-            v-model="where.createTime"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :default-time="['00:00:00', '23:59:59']"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col
-        style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 18, md: 18 } : { span: 18 }"
-      >
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
 export default {
   data() {
-    // 默认表单数据
-    const defaultWhere = {
-      batchNo: '',
-      productName: '',
-      productCode: '',
-      specification: '',
-      // deptIds: [],
-      createTime: []
-    };
     return {
-      defaultWhere,
-      // 表单数据
-      where: { ...defaultWhere }
     };
   },
   computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
+    seekList() {
+      return [
+        {
+          label: '批次号:',
+          value: 'batchNo',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '计划号:',
+          value: 'standardCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '产品编码:',
+          value: 'productCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '产品规格:',
+          value: 'specification',
+          type: 'input',
+          placeholder: '请输入'
+        },
+      ];
     }
   },
+  watch: {},
+  created() {},
   methods: {
-    /* 搜索 */
-    search() {
-      const where = { ...this.where };
-      if (where.createTime?.length) {
-        where.startTime = where.createTime[0];
-        where.endTime = where.createTime[1];
-      }
-      delete where.createTime;
-      this.$emit('search', where);
-    },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere };
-      this.search();
+    search(e) {
+      this.$emit('search', { ...e });
     }
   }
 };
 </script>
+<style lang="scss" scoped>
+</style>

src/views/unqualifiedProduct/unqualifiedList/components/order-search.vue

@@ -1,91 +1,61 @@
 <!-- 搜索表单 -->
 6
 <template>
-  <el-form label-width="77px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
-    <el-row :gutter="24">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="来源编码:">
-          <el-input clearable v-model="where.sourceCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="编码:">
-          <el-input clearable v-model="where.unqualifiedProductsCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="创建人:">
-          <el-input clearable v-model="where.reviewerName" placeholder="请输入" />
-        </el-form-item>
-      </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="创建时间:">
-          <el-date-picker class="w100" style="width: 100%" v-model="where.createTime" type="daterange"
-            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="工序:">
-          <el-input clearable v-model="where.taskName" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 8 } : { span: 4 }">
-        <el-form-item label="状态:">
-          <el-select v-model="where.status" style="width:100%">
-            <el-option v-for="item in statusList" :key="item.code" :value="item.code" :label="item.name"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
-        <div class="ele-form-actions">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
 export default {
   data() {
-    // 默认表单数据
-    const defaultWhere = {
-      code: '',
-      produceTaskName: '',
-      deptIds: ''
-    };
     return {
-      defaultWhere,
-      // 表单数据
-      where: { ...defaultWhere },
       statusList: [
         { name: '待处理', code: 0 },
         { name: '处理中', code: 1 },
-        { name: '已处理', code: 2 },
-      ],
+        { name: '已处理', code: 2 }
+      ]
     };
   },
   computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
+    seekList() {
+      return [
+        {
+          label: '来源编码:',
+          value: 'sourceCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '编码:',
+          value: 'unqualifiedProductsCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '创建人:',
+          value: 'reviewerName',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '工序:',
+          value: 'taskName',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        
+        {
+          label: '状态:',
+          value: 'status',
+          type: 'select',
+          placeholder: '请选择',
+          planList: this.statusList
+        }
+      ];
     }
   },
   methods: {
-    /* 搜索 */
-    search() {
-      this.$emit('search', this.where);
-    },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere };
-      this.search();
+    search(e) {
+      this.$emit('search', { ...e });
     }
   }
 };

src/views/unqualifiedProduct/unqualifiedList/components/probationalGoods-search.vue

@@ -1,163 +1,69 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="90px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="编码:">
-          <el-input
-            clearable
-            v-model="where.code"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="样品编码:">
-          <el-input clearable v-model="where.sampleCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品编码:">
-          <el-input clearable v-model="where.categoryCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品名称:">
-          <el-input
-            clearable
-            v-model="where.categoryName"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="批次号:">
-          <el-input clearable v-model="where.batchNo" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-    
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="产品规格:">
-          <el-input
-            clearable
-            v-model="where.specification"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="状态:">
-
-          <el-select v-model="where.status" style="width:100%">
-            <el-option
-              v-for="item in statusList"
-              :key="item.code"
-              :value="item.code"
-              :label="item.name"
-
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col> -->
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            data-type="Array"
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
-        </el-form-item>
-      </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label-width="0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
-  export default {
-    props: [],
-    data() {
-      // 默认表单数据
-      const defaultWhere = {
-        batchNo: '',
-        code: '',
-        sampleCode: '',
-        specification: '',
-        categoryName:'',
-        categoryCode: '',
-        createTime: []
-      };
-      return {
-        // 表单数据
-        where: { ...defaultWhere },
-        statusList: [
-          { name: '待处理', code: 0 },
-          { name: '处理中', code: 1 },
-          { name: '已处理', code: 2 }
-        ]
-      };
-    },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
-    },
-    watch: {},
-    created() {},
-    methods: {
-      /* 搜索 */
-      search() {
-        const where = { ...this.where };
-        if (where.createTime?.length) {
-          where.startTime = where.createTime[0];
-          where.endTime = where.createTime[1];
+export default {
+  data() {
+    return {
+      statusList: [
+        { name: '待处理', code: 0 },
+        { name: '处理中', code: 1 },
+        { name: '已处理', code: 2 }
+      ]
+    };
+  },
+  computed: {
+    seekList() {
+      return [
+        {
+          label: '编码:',
+          value: 'code',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '样品编码:',
+          value: 'sampleCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '物品编码:',
+          value: 'categoryCode',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '物品名称:',
+          value: 'categoryName',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '批次号:',
+          value: 'batchNo',
+          type: 'input',
+          placeholder: '请输入'
+        },
+        {
+          label: '产品规格:',
+          value: 'specification',
+          type: 'input',
+          placeholder: '请输入'
         }
-        delete where.createTime;
-        this.$emit('search', where);
-      },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
-      }
+      ];
+    }
+  },
+  watch: {},
+  created() {},
+  methods: {
+    search(e) {
+      this.$emit('search', { ...e });
     }
-  };
+  }
+};
 </script>
 <style lang="scss" scoped>
-  .ele-form-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
 </style>