和小程序端保持一致

src/views/hisStore/storeProductAudit/index.vue

@@ -181,19 +181,53 @@
         </div>
       </template>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="isAuditMode">
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品分类" prop="cateId">
+              <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
+                          placeholder="请选择上级分类" :disabled="isAuditMode"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="商品类型" prop="productType">
+            <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable
+                       size="small">
+              <el-option v-for="item in productTypeOptions" :key="item.dictValue"
+                :label="item.dictLabel" :value="item.dictValue"/>
+            </el-select>
+          </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="商品名称" prop="productName">
               <el-input v-model="form.productName" placeholder="请输入商品名称"/>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="商品分类" prop="cateId">
-              <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
-                          placeholder="请选择上级分类" :disabled="isAuditMode"/>
+            <el-form-item label="通用名称" prop="commonName">
+              <el-input v-model="form.commonName" placeholder="请输入通用名称"/>
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="存储条件" prop="storageConditions" v-if="!isMedicalDeviceCategory">
+              <el-input v-model="form.storageConditions" placeholder="请输入存储条件"/>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="器械编码" prop="medicalDeviceCode" v-if="isMedicalDeviceCategory">
+              <el-input v-model="form.medicalDeviceCode" placeholder="请输入器械编码"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="关键字" prop="keyword">
@@ -205,8 +239,8 @@
               <el-input v-model="form.unitName" placeholder="请输入单位名"/>
             </el-form-item>
           </el-col>
-
         </el-row>
+
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="是否药品" prop="isDrug">
@@ -221,6 +255,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <div v-if="form.isDrug === '1' ">
           <el-form-item label="头图展示" prop="drugImage">
             <Material v-model="drugImageArr" type="image" :num="1" :width="150" :height="150"/>
@@ -232,11 +267,6 @@
                   <el-input v-model="form.drugRegCertNo" placeholder="请输入药品注册证书编号"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="通用名称" prop="commonName">
-                  <el-input v-model="form.commonName" placeholder="请输入通用名称"/>
-                </el-form-item>
-              </el-col>
             </el-row>
 
             <el-row>
@@ -288,14 +318,6 @@
             <el-collapse v-model="activeValue" accordion>
               <el-collapse-item title="" name="1">
 
-<!--                <el-form-item label="医疗器械注册证编号/备案凭证编号" prop="medicalRegCertNo" v-if="isMedicalDeviceCategory">-->
-<!--                  <el-input v-model="form.medicalRegCertNo" type="textarea" placeholder="请输入医疗器械注册证编号/备案凭证编号"/>-->
-<!--                </el-form-item>-->
-
-<!--                <el-form-item label="注册人或者备案人信息" prop="registrantInfo" v-if="isMedicalDeviceCategory">-->
-<!--                  <el-input v-model="form.registrantInfo" type="textarea" placeholder="请输入注册人或者备案人信息"/>-->
-<!--                </el-form-item>-->
-
                 <el-form-item label="生产许可证或者备案凭证编号" prop="prodLicenseNo" v-if="isMedicalDeviceCategory">
                   <el-input v-model="form.prodLicenseNo" type="textarea" placeholder="请输入生产许可证或者备案凭证编号"/>
                 </el-form-item>
@@ -335,6 +357,7 @@
             </el-collapse>
           </div>
         </div>
+
         <el-form-item label="说明书" prop="instructionManual">
           <editor ref="instructionManualRef" @on-text-change="updateInstructionManualText"/>
         </el-form-item>
@@ -617,17 +640,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="商品类型" prop="productType">
-          <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable
-                     size="small">
-            <el-option
-              v-for="item in productTypeOptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            />
-          </el-select>
-        </el-form-item>
+
 
         <el-form-item label="所属店铺" prop="storeId" v-if="medicalMallConfig.isStores">
           <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small">