Merge branch 'feature/zs-3.21.00000' into 'teasing/3.21.0'

Feature/zs 3.21.00000

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!348

src/views/goods/create-good.vue

@@ -151,7 +151,7 @@
             <el-form-item label="条形码" prop="barCode">
               <el-col :span="18">
                 <el-input
-                    :disabled="barAndGoodsFlag"
+                    :disabled="barAndGoodsFlag || idMedicEdit"
                     size="small"
                     v-model="formData1.barCode"
                     placeholder="请输入条形码"
@@ -166,6 +166,7 @@
                 <el-input
                     size="small"
                     v-model="formData1.approvalNumber"
+                    :disabled="idMedicEdit"
                     placeholder="请输入批准文号"
                     style="width:50%;"
                 ></el-input>
@@ -175,7 +176,7 @@
             <el-form-item label="通用名称" prop="medicCommonName">
               <el-col :span="13">
                 <el-input
-                    :disabled="goodDisabled || barAndGoodsFlag"
+                    :disabled="goodDisabled || barAndGoodsFlag || idMedicEdit"
                     size="small"
                     v-model="formData1.medicCommonName"
                     placeholder="请输入通用名称"
@@ -193,7 +194,7 @@
                     size="small"
                     v-model="formData1.medicGoodsName"
                     placeholder="请输入商品名称"
-
+                    :disabled="idMedicEdit"
                     maxlength="60"
                     show-word-limit
                 ></el-input>
@@ -207,6 +208,7 @@
                     size="small"
                     v-model="formData1.size"
                     placeholder="请输入规格"
+                    :disabled="idMedicEdit"
                     style="width:70%;"
                 ></el-input>
 
@@ -216,8 +218,8 @@
             <div class="inline">
               <el-form-item label="是否是处方药" prop="otc1">
                 <el-col :span="24">
-                  <el-radio size="mini" v-model="formData1.otc1" label="1">处方药</el-radio>
-                  <el-radio v-model="formData1.otc1" label="0">非处方药</el-radio>
+                  <el-radio size="mini" v-model="formData1.otc1" label="1" :disabled="idMedicEdit">处方药</el-radio>
+                  <el-radio v-model="formData1.otc1" label="0" :disabled="idMedicEdit">非处方药</el-radio>
                 </el-col>
               </el-form-item>
               <el-form-item label="剂型" prop="dosageId">
@@ -225,6 +227,7 @@
                     v-model="formData1.dosageId"
                     placeholder="请选择药品剂型"
                     size="small"
+                    :disabled="idMedicEdit"
                     clearable>
                   <el-option
                       v-for="(item,index) in doseAll"
@@ -242,6 +245,7 @@
                     v-model="formData1.usage"
                     placeholder="请输入用法用量"
                     style="width:70%;"
+                    :disabled="idMedicEdit"
                 ></el-input>
 
                 <span class="word-num">例如:每次一袋 每天1-2次</span>
@@ -317,6 +321,7 @@
                     v-model="formData1.manufacturer"
                     placeholder="请输入生产厂家"
                     style="width:70%;"
+                    :disabled="idMedicEdit"
                 ></el-input>
 
                 <span class="word-num"></span>
@@ -328,6 +333,7 @@
                     size="small"
                     v-model="formData1.department"
                     placeholder="请输入适用科室"
+                    :disabled="idMedicEdit"
 
                 ></el-input>
                 <!-- <el-select
@@ -350,6 +356,7 @@
                       size="small"
                       v-model="formData1.treatDisease"
                       placeholder="请输入治疗疾病"
+                      :disabled="idMedicEdit"
 
                   ></el-input>
 
@@ -365,6 +372,7 @@
                     v-model="formData1.expiredTime"
                     placeholder="请输入有效期"
                     style="width:70%;"
+                    :disabled="idMedicEdit"
                 ></el-input>
                <!-- <el-date-picker
                   v-model="formData.expiredTime"
@@ -385,6 +393,7 @@
                     v-model="formData1.modelNo"
                     placeholder="请输入型号"
                     style="width:70%;"
+                    :disabled="idMedicEdit"
                 ></el-input>
                 <span class="word-num"></span>
               </el-col>
@@ -396,6 +405,7 @@
                     v-model="formData1.standardNo"
                     placeholder="请输入执行标准号"
                     style="width:70%;"
+                    :disabled="idMedicEdit"
                 ></el-input>
                 <span class="word-num"></span>
               </el-col>
@@ -1046,6 +1056,11 @@
         uploadProgress:0, // 上传视频进度条
       }
     },
+    computed: {
+      idMedicEdit() {        
+        return this.isEdit && !this.isCheckServe;;
+      }
+    },
     created() {
       vm = this;
       const { id, storeId, goodsType, inputType, commissionFlag, storeType} = this.$route.query;