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

src/views/hisStore/platformProduct/index.vue

@@ -112,10 +112,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="功能主治" prop="indications">
+        <el-form-item label="功能主治/适用范围" prop="indications">
           <el-input
             v-model="queryParams.indications"
-            placeholder="请输入功能主治"
+            placeholder="请输入功能主治/适用范围"
             clearable
             size="small"
           />
@@ -139,10 +139,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="禁忌" prop="contraindications">
+        <el-form-item label="禁忌症" prop="contraindications">
           <el-input
             v-model="queryParams.contraindications"
-            placeholder="请输入禁忌"
+            placeholder="请输入禁忌症"
             clearable
             size="small"
           />
@@ -532,8 +532,8 @@
                   <el-input v-model="form.productStructure" type="textarea" placeholder="请输入结构及组成"/>
                 </el-form-item>
 
-                <el-form-item label="适应范围/适用症" prop="indications">
-                  <el-input v-model="form.indications" type="textarea" placeholder="请输入适应范围/适用症"/>
+                <el-form-item label="功能主治/适用范围" prop="indications">
+                  <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治/适用范围"/>
                 </el-form-item>
 
                 <el-form-item label="禁忌症" prop="contraindications">
@@ -1272,7 +1272,7 @@ export default {
           // 恢复其他字段的必填规则
           const requiredRules = {
             storageConditions: [{ required: true, message: "存储条件不能为空", trigger: "blur" }],
-            indications: [{ required: true, message: "功能主治不能为空", trigger: "blur" }],
+            indications: [{ required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }],
             dosage: [{ required: true, message: "用法用量不能为空", trigger: "blur" }],
             adverseReactions: [{ required: true, message: "不良反应不能为空", trigger: "blur" }],
             contraindications: [{ required: true, message: "禁忌不能为空", trigger: "blur" }],
@@ -1656,7 +1656,7 @@ export default {
         //   { required: true, message: "GMP认证不能为空！", trigger: "blur"  }
         // ],
         indications: [
-          { required: true, message: "功能主治不能为空", trigger: "blur" }
+          { required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }
         ],
         dosage: [
           { required: true, message: "用法用量不能为空", trigger: "blur" }
@@ -2668,7 +2668,7 @@ export default {
     initPrescriptionDrugRules() {
       // 初始化处方药相关字段的校验规则
       this.$set(this.rules, 'indications', [
-        { required: true, message: "功能主治不能为空", trigger: "blur" }
+        { required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }
       ]);
 
       this.$set(this.rules, 'ingredient', [

src/views/hisStore/store/index.vue

@@ -176,7 +176,7 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="地址" align="center" prop="address" width="200px"/>
+      <el-table-column label="地址" align="center" prop="enterpriseAddress" width="200px"/>
       <el-table-column label="店铺电话" align="center" prop="phone" width="120px"/>
       <el-table-column label="审核状态" align="center" prop="isAudit">
         <template slot-scope="scope">
@@ -341,8 +341,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址"/>
+            <el-form-item label="地址" prop="enterpriseAddress">
+              <el-input v-model="form.enterpriseAddress" placeholder="请输入地址"/>
             </el-form-item>
           </el-col>
         </el-row>

src/views/hisStore/storeProduct/index.vue

@@ -148,10 +148,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="功能主治" prop="indications">
+        <el-form-item label="功能主治/适用范围" prop="indications">
           <el-input
             v-model="queryParams.indications"
-            placeholder="请输入功能主治"
+            placeholder="请输入功能主治/适用范围"
             clearable
             size="small"
           />
@@ -176,10 +176,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="禁忌" prop="contraindications">
+        <el-form-item label="禁忌症" prop="contraindications">
           <el-input
             v-model="queryParams.contraindications"
-            placeholder="请输入禁忌"
+            placeholder="请输入禁忌症"
             clearable
             size="small"
           />
@@ -662,8 +662,8 @@
                   <el-input v-model="form.productStructure" type="textarea" placeholder="请输入结构及组成"/>
                 </el-form-item>
 
-                <el-form-item label="适应范围/适用症" prop="indications">
-                  <el-input v-model="form.indications" type="textarea" placeholder="请输入适应范围/适用症"/>
+                <el-form-item label="功能主治/适用范围" prop="indications">
+                  <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治/适用范围"/>
                 </el-form-item>
 
                 <el-form-item label="禁忌症" prop="contraindications">
@@ -1397,7 +1397,7 @@ export default {
           // 恢复其他字段的必填规则
           const requiredRules = {
             storageConditions: [{ required: true, message: "存储条件不能为空", trigger: "blur" }],
-            indications: [{ required: true, message: "功能主治不能为空", trigger: "blur" }],
+            indications: [{ required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }],
             dosage: [{ required: true, message: "用法用量不能为空", trigger: "blur" }],
             adverseReactions: [{ required: true, message: "不良反应不能为空", trigger: "blur" }],
             contraindications: [{ required: true, message: "禁忌不能为空", trigger: "blur" }],
@@ -1794,7 +1794,7 @@ export default {
           { required: true, message: "GMP认证不能为空！", trigger: "blur"  }
         ],
         indications: [
-          { required: true, message: "功能主治不能为空", trigger: "blur" }
+          { required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }
         ],
         dosage: [
           { required: true, message: "用法用量不能为空", trigger: "blur" }
@@ -2827,7 +2827,7 @@ export default {
     initPrescriptionDrugRules() {
       // 初始化处方药相关字段的校验规则
       this.$set(this.rules, 'indications', [
-        { required: true, message: "功能主治不能为空", trigger: "blur" }
+        { required: true, message: "功能主治/适用范围不能为空", trigger: "blur" }
       ]);
 
       this.$set(this.rules, 'ingredient', [

src/views/hisStore/storeProductAudit/index.vue

@@ -302,8 +302,8 @@
                   <el-input v-model="form.productStructure" type="textarea" placeholder="请输入结构及组成"/>
                 </el-form-item>
 
-                <el-form-item label="适应范围/适用症" prop="indications">
-                  <el-input v-model="form.indications" type="textarea" placeholder="请输入适应范围/适用症"/>
+                <el-form-item label="功能主治/适用范围" prop="indications">
+                  <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治/适用范围"/>
                 </el-form-item>
 
                 <el-form-item label="成分" prop="ingredient" v-if="!isMedicalDeviceCategory" >