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

src/views/hisStore/components/storeDetails.vue

@@ -33,13 +33,13 @@
         <el-descriptions-item label="店铺电话" >
           <span v-if="item!=null">{{item.phone}}</span>
         </el-descriptions-item>
-        <el-descriptions-item label="资质证书">
-          <el-image
-            style="width: 100px"
-            :src="item.licenseImages"
-            :preview-src-list="[item.licenseImages]">
-          </el-image>
-        </el-descriptions-item>
+<!--        <el-descriptions-item label="资质证书">-->
+<!--          <el-image-->
+<!--            style="width: 100px"-->
+<!--            :src="item.licenseImages"-->
+<!--            :preview-src-list="[item.licenseImages]">-->
+<!--          </el-image>-->
+<!--        </el-descriptions-item>-->
         <el-descriptions-item label="商品总数" >
           <span v-if="item!=null">{{item.productCount}}</span>
         </el-descriptions-item>

src/views/hisStore/storeProduct/index.vue

@@ -577,28 +577,34 @@
               </el-form-item>
             </el-col>
           </el-row>
+            <el-collapse v-model="activeValue" accordion>
+              <el-collapse-item title="" name="1">
+                <el-form-item label="功能主治" prop="indications">
+                  <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治" />
+                </el-form-item>
 
-          <el-form-item label="功能主治" prop="indications">
-            <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治" />
-          </el-form-item>
-
-          <el-form-item label="用法用量" prop="dosage">
-            <el-input v-model="form.dosage" type="textarea" placeholder="请输入用法用量" />
-          </el-form-item>
+                <el-form-item label="用法用量" prop="dosage">
+                  <el-input v-model="form.dosage" type="textarea" placeholder="请输入用法用量" />
+                </el-form-item>
 
-          <el-form-item label="不良反应" prop="adverseReactions">
-            <el-input v-model="form.adverseReactions" type="textarea" placeholder="请输入不良反应" />
-          </el-form-item>
+                <el-form-item label="不良反应" prop="adverseReactions">
+                  <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>
+                <el-form-item label="禁忌" prop="contraindications">
+                  <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌" />
+                </el-form-item>
 
-          <el-form-item label="注意事项" prop="precautions">
-            <el-input v-model="form.precautions" type="textarea" placeholder="请输入注意事项" />
-          </el-form-item>
+                <el-form-item label="注意事项" prop="precautions">
+                  <el-input v-model="form.precautions" type="textarea" placeholder="请输入注意事项" />
+                </el-form-item>
+              </el-collapse-item>
+            </el-collapse>
         </div>
         </div>
+        <el-form-item label="说明书" prop="instructionManual">
+          <editor ref="instructionManualRef"   @on-text-change="updateInstructionManualText" />
+        </el-form-item>
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品简介" prop="productInfo">
@@ -753,7 +759,7 @@
                     <el-input type="text" v-model="scope.row.stock" maxlength="7"/>
                   </template>
                 </el-table-column>
-                <el-table-column prop="barCode" label="商品编号" width="130px" align="center">
+                <el-table-column prop="barCode" label="商品条码" width="130px" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.barCode"/>
                   </template>
@@ -1086,12 +1092,12 @@ export default {
           this.rules.indications = [];
           this.rules.dosage = [];
         } else {
-          this.rules.indications = [
-            { required: true, message: "功能主治不能为空", trigger: "blur" }
-          ];
-          this.rules.dosage = [
-            { required: true, message: "用法用量不能为空", trigger: "blur" }
-          ];
+          // this.rules.indications = [
+          //   { required: true, message: "功能主治不能为空", trigger: "blur" }
+          // ];
+          // this.rules.dosage = [
+          //   { required: true, message: "用法用量不能为空", trigger: "blur" }
+          // ];
         }
 
         // 清除验证状态
@@ -1106,6 +1112,7 @@ export default {
   },
   data() {
     return {
+      activeValue:'0',
       orderOptions:[],
       medicalMallConfig:{},
       companyId: null,
@@ -1238,7 +1245,8 @@ export default {
         cateId: null,
         qualificationExpire:null,
         indications: '',
-        dosage: ''
+        dosage: '',
+        instructionManual:'',
       },
       // 表单校验
       rules: {
@@ -1312,21 +1320,21 @@ export default {
         manufacturerAddress: [
           { 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" }
-        ],
-        precautions: [
-          { 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" }
+        // ],
+        // precautions: [
+        //   { required: true, message: "注意事项不能为空", trigger: "blur" }
+        // ],
         // storeId :[
         //   { required: true, message: "所属店铺不能为空", trigger: "blur"}
         // ],
@@ -1553,6 +1561,9 @@ export default {
     updateText(text){
       this.form.description=text
     },
+    updateInstructionManualText(text){
+      this.form.instructionManual=text
+    },
     handleClick(tab, event) {
       this.queryParams.isShow=tab.name;
       this.getList();
@@ -1730,6 +1741,7 @@ export default {
       this.title = "添加商品";
       setTimeout(() => {
         this.$refs.myeditor.setText("");
+        this.$refs.instructionManualRef.setText("");
       }, 500);
 
     },
@@ -1820,6 +1832,12 @@ export default {
           else{
             this.$refs.myeditor.setText(this.form.description);
           }
+
+          if(this.form.instructionManual==null){
+            this.$refs.instructionManualRef.setText("");
+          }else {
+            this.$refs.instructionManualRef.setText(this.form.instructionManual);
+          }
         }, 200);
         if(this.form.image!=null){
           this.imageArr=this.form.image.split(",");
@@ -1851,7 +1869,7 @@ export default {
             }
           })
           if(checkBoolean){
-            return this.$message.warning("规格，商品编码不能为空！");
+            return this.$message.warning("规格，商品条码不能为空！");
           }
 
           if(this.form.specType === 1 && this.manyFormValidate.length===0){