Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

src/views/collect/CollectOrderNew.vue

@@ -357,7 +357,14 @@ export default {
       this.showSearch = !this.showSearch;
     },
     onReset() {
-      this.filterQuery = {};
+      this.filterQuery = {
+        tagStatus: this.tagStatus,
+        billNo: null,
+        busType: null,
+        workPlaceCode: null,
+        page: 1,
+        limit: 10,
+      };
       this.actDateRange = [];
       this.getList();
     },

src/views/thirdSys/product/thrProducts.vue

@@ -49,6 +49,24 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="产品类型:">
+              <el-select v-model="filterQuery.productType" placeholder="请选择产品类型"
+                         style="width: 90%" clearable
+              >
+                <el-option
+                  v-for="item in productTypes"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                  <span style="float: left">{{ item.label }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
@@ -184,6 +202,15 @@ export default {
         cpms: null
       },
       configParms: {},
+      productTypes: [
+        {
+          value: 1,
+          label: '耗材'
+        }, {
+          value: 2,
+          label: '药品'
+        }
+      ],
     };
   },
 
@@ -199,6 +226,7 @@ export default {
         manufactory: null,
         name: "",
         thirdSys: this.mainThirdSys,
+        productType:null,
         page: 1,
         limit: 20,
       };