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

src/views/hisStore/platformProduct/index.vue

@@ -477,21 +477,21 @@
 
             <el-row>
               <el-col :span="12">
-                <el-form-item label="包装规格" prop="prescribeSpec">
-                  <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '规格/型号' : '包装规格'" prop="prescribeSpec">
+                  <el-input v-model="form.prescribeSpec" :placeholder="isMedicalDeviceCategory ? '请输入规格/型号':'请输入包装规格'"/>
                 </el-form-item>
               </el-col>
             </el-row>
 
             <el-row>
               <el-col :span="12">
-                <el-form-item label="上市许可持有人" prop="mah">
-                  <el-input v-model="form.mah" placeholder="请输入上市许可持有人"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '注册人/备案人' : '上市许可持有人'" prop="mah">
+                  <el-input v-model="form.mah" :placeholder= "isMedicalDeviceCategory ? '请输入注册人/备案人' : '请输入上市许可持有人'"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="持有人地址" prop="mahAddress">
-                  <el-input v-model="form.mahAddress" placeholder="请输入上市许可持有人地址"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '注册人/备案人地址' : '持有人地址'" prop="mahAddress">
+                  <el-input v-model="form.mahAddress" :placeholder= "isMedicalDeviceCategory ? '请输入注册人/备案人地址' : '请输入持有人地址'"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -511,14 +511,14 @@
 
             <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="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="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="请输入生产许可证或者备案凭证编号"/>
@@ -536,8 +536,8 @@
                   <el-input v-model="form.indications" type="textarea" placeholder="请输入适应范围/适用症"/>
                 </el-form-item>
 
-                <el-form-item label="禁忌" prop="contraindications">
-                  <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌"/>
+                <el-form-item label="禁忌症" prop="contraindications">
+                  <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌症"/>
                 </el-form-item>
 
                 <el-form-item label="成分" prop="ingredient" v-if="!isMedicalDeviceCategory">
@@ -931,19 +931,19 @@
           </el-date-picker>
         </el-form-item>
         </div>
-
-        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
-          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>
-        </el-form-item>
-        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">
-          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
-        </el-form-item>
-        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">
-          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>
-        </el-form-item>
-        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">
-          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>
-        </el-form-item>
+        <!--商品类型选择Rx时候会出现该-->
+        <!--        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">-->
+        <!--          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">-->
+        <!--          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">-->
+        <!--          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">-->
+        <!--          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -1532,6 +1532,15 @@ export default {
       },
       // 表单校验
       rules: {
+        prodLicenseNo:[
+          {required: true, message: "生产许可证或者备案凭证编号不能为空！", trigger: "blur"}
+        ],
+        prodTechReqNo:[
+          {required: true, message: "产品技术要求编号不能为空！", trigger: "blur"}
+        ],
+        productStructure:[
+          {required: true, message: "结构及组成不能为空！", trigger: "blur"}
+        ],
         ingredient: [
           { required: true, message: "成分不能为空", trigger: "blur" },
           {

src/views/hisStore/storeProduct/index.vue

@@ -608,21 +608,21 @@
 <!--                </el-form-item>-->
 <!--              </el-col>-->
               <el-col :span="12">
-                <el-form-item label="包装规格" prop="prescribeSpec">
-                  <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '规格/型号' : '包装规格'" prop="prescribeSpec">
+                  <el-input v-model="form.prescribeSpec" :placeholder="isMedicalDeviceCategory ? '请输入规格/型号':'请输入包装规格'"/>
                 </el-form-item>
               </el-col>
             </el-row>
 
             <el-row>
               <el-col :span="12">
-                <el-form-item label="上市许可持有人" prop="mah">
-                  <el-input v-model="form.mah" placeholder="请输入上市许可持有人"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '注册人/备案人' : '上市许可持有人'" prop="mah">
+                  <el-input v-model="form.mah" :placeholder= "isMedicalDeviceCategory ? '请输入注册人/备案人' : '请输入上市许可持有人'"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="持有人地址" prop="mahAddress">
-                  <el-input v-model="form.mahAddress" placeholder="请输入上市许可持有人地址"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '注册人/备案人地址' : '持有人地址'" prop="mahAddress">
+                  <el-input v-model="form.mahAddress" :placeholder= "isMedicalDeviceCategory ? '请输入注册人/备案人地址' : '请输入持有人地址'"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -642,14 +642,13 @@
 
             <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="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="请输入生产许可证或者备案凭证编号"/>
@@ -1055,20 +1054,19 @@
           </el-date-picker>
         </el-form-item>
         </div>
-
-
-        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
-          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>
-        </el-form-item>
-        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">
-          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
-        </el-form-item>
-        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">
-          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>
-        </el-form-item>
-        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">
-          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>
-        </el-form-item>
+        <!--商品类型选择Rx时候会出现该-->
+<!--        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">-->
+<!--          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">-->
+<!--          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">-->
+<!--          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">-->
+<!--          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -1678,6 +1676,15 @@ export default {
             trigger: "blur"
           }
         ],
+        prodLicenseNo:[
+          {required: true, message: "生产许可证或者备案凭证编号不能为空！", trigger: "blur"}
+        ],
+        prodTechReqNo:[
+          {required: true, message: "产品技术要求编号不能为空！", trigger: "blur"}
+        ],
+        productStructure:[
+          {required: true, message: "结构及组成不能为空！", trigger: "blur"}
+        ],
         image: [
           {required: true, message: "商品图片不能为空", trigger: "blur"}
         ],

src/views/hisStore/storeProductAudit/index.vue

@@ -79,7 +79,7 @@
 	    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table  height="500" border v-loading="loading" :data="storeProductList" @selection-change="handleSelectionChange">
+    <el-table  height="700" border v-loading="loading" :data="storeProductList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="productId" />
       <el-table-column label="商品图片" align="center" width="120">
@@ -184,7 +184,7 @@
           <el-col :span="12">
             <el-form-item label="商品分类" prop="cateId">
               <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
-                          placeholder="请选择上级分类"/>
+                          placeholder="请选择上级分类" :disabled="isAuditMode"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -247,14 +247,9 @@
             </el-row>
 
             <el-row>
-<!--              <el-col :span="12">-->
-<!--                <el-form-item label="生产批号/序列号" prop="batchNumber">-->
-<!--                  <el-input v-model="form.batchNumber" placeholder="请输入生产批号/序列号"/>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
               <el-col :span="12">
-                <el-form-item label="包装规格" prop="prescribeSpec">
-                  <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格"/>
+                <el-form-item :label="isMedicalDeviceCategory ? '规格/型号' : '包装规格'" prop="prescribeSpec">
+                  <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格/型号"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -286,13 +281,14 @@
             </el-row>
             <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="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="请输入生产许可证或者备案凭证编号"/>
@@ -325,8 +321,8 @@
                   <el-input v-model="form.adverseReactions" type="textarea" placeholder="请输入不良反应"/>
                 </el-form-item>
 
-                <el-form-item label="禁忌" prop="contraindications">
-                  <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌"/>
+                <el-form-item label="禁忌症" prop="contraindications">
+                  <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌症"/>
                 </el-form-item>
 
                 <el-form-item label="注意事项" prop="precautions">
@@ -726,18 +722,19 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
-          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>
-        </el-form-item>
-        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">
-          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
-        </el-form-item>
-        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">
-          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>
-        </el-form-item>
-        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">
-          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>
-        </el-form-item>
+        <!--商品类型选择Rx时候会出现该-->
+        <!--        <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">-->
+        <!--          <el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="规格" v-if="form.productType==2" prop="prescribeSpec">-->
+        <!--          <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">-->
+        <!--          <el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="处方名" v-if="form.productType==2" prop="prescribeName">-->
+        <!--          <el-input v-model="form.prescribeName" placeholder="请输入处方名"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <el-divider content-position="left">审核</el-divider>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="80px">