11/12 供应商选入增加查询条件制剂规格 包装规格

src/views/supplier/companyDrug/basicCompanyProductsImport.vue

@@ -15,6 +15,16 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="制剂规格:">
+              <el-input v-model="filterQuery.prepnSpec" style="width: 90%" placeholder="制剂规格" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装规格:">
+              <el-input v-model="filterQuery.bzgg" style="width: 90%" placeholder="包装规格" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="医保编码:">
               <el-input v-model="filterQuery.ybbm" style="width: 90%" placeholder="医保编码" clearable="true"></el-input>
@@ -26,25 +36,26 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="生产企业:">
               <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="生产企业" clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="对照条件:" class="query-form-item">
-              <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>
-                <el-option label="全部" :value="0"></el-option>
-                <el-option label="对照完成" :value="1"></el-option>
-                <el-option label="未对照产品编码" :value="2"></el-option>
-                <!--<el-option label="未对照" :value="3"></el-option>-->
-                <el-option label="未对照其他产品编码" :value="4"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
+        <!--<el-row>-->
+
+          <!--<el-col :span="6">-->
+          <!--  <el-form-item label="对照条件:" class="query-form-item">-->
+          <!--    <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>-->
+          <!--      <el-option label="全部" :value="0"></el-option>-->
+          <!--      <el-option label="对照完成" :value="1"></el-option>-->
+          <!--      <el-option label="未对照产品编码" :value="2"></el-option>-->
+          <!--      &lt;!&ndash;<el-option label="未对照" :value="3"></el-option>&ndash;&gt;-->
+          <!--      <el-option label="未对照其他产品编码" :value="4"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+        <!--</el-row>-->
       </el-form>
 
 
@@ -768,7 +779,9 @@ export default {
         limit: 10,
         addType: 1,
         isDisable: false,
-        productsType: 2
+        productsType: 2,
+        bzgg:"",
+        prepnSpec:"",
       },
 
 
@@ -912,7 +925,9 @@ export default {
         page: 1,
         limit: 10,
         addType: 1,
-        productsType: 2
+        productsType: 2,
+        bzgg:"",
+        prepnSpec:"",
       };
       this.getList();
     },