Merge remote-tracking branch 'remotes/origin/master' into 20240109-yw

src/views/basic/product/rel/productEdit.vue

@@ -86,20 +86,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row type="flex" class="edit-row">-->
+        <!--        <el-row type="flex" class="edit-row">-->
-<!--          <el-col :span="12">-->
+        <!--          <el-col :span="12">-->
-<!--            <el-form-item label="产品描述:" class="query-form-item" show-overflow-tooltip>-->
+        <!--            <el-form-item label="产品描述:" class="query-form-item" show-overflow-tooltip>-->
-<!--              <el-input-->
+        <!--              <el-input-->
-
+
-<!--                style="width: 80%"-->
+        <!--                style="width: 80%"-->
-<!--                size="small"-->
+        <!--                size="small"-->
-<!--                :disabled="true"-->
+        <!--                :disabled="true"-->
-<!--                splaceholder="请输入内容"-->
+        <!--                splaceholder="请输入内容"-->
-<!--                v-model="detailQuery.cpms"-->
+        <!--                v-model="detailQuery.cpms"-->
-<!--              ></el-input>-->
+        <!--              ></el-input>-->
-<!--            </el-form-item>-->
+        <!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        </el-row>-->
 
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
@@ -123,6 +123,67 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="医疗器械分类:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.categoryLevel"
+                placeholder="医疗器械分类"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+                <el-option label="一类" value="一类"></el-option>
+                <el-option label="二类" value="二类"></el-option>
+                <el-option label="三类" value="三类"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="集采类型:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.groupBuy"
+                placeholder="请选择集采类型"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+                <el-option label="集采" :value="1"></el-option>
+                <el-option label="非集采" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="医保类型:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.chsType"
+                placeholder="医保类型"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+                <el-option label="医保" :value="1"></el-option>
+                <el-option label="非医保" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="进口类型:" class="query-form-item">
+              <el-select
+                v-model="detailQuery.importType"
+                placeholder="请选进口类型"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+                <el-option label="进口" :value="1"></el-option>
+                <el-option label="非进口" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="商品名称:" class="query-form-item">
@@ -176,7 +237,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-card>
       <el-card>