Merge branch 'testing/open-otc' into 'release'

放开otc修改

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

src/views/goods/create-good.vue

@@ -234,8 +234,8 @@
             <div class="inline">
               <el-form-item label="是否是处方药" prop="otc1">
                 <el-col :span="24">
-                  <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-radio size="mini" v-model="formData1.otc1" label="1" >处方药</el-radio>
+                  <el-radio v-model="formData1.otc1" label="0" >非处方药</el-radio>
                 </el-col>
               </el-form-item>
               <el-form-item label="剂型" prop="dosageId">
@@ -1192,20 +1192,21 @@
             });
           }
           const {goodsList, hasRepoFlag } = res.data;
-           const { goodsName, goodsDescription, goodsType, businessCategoryId,expressLimitFlag, goodsHeaderImages=[], goodsVideoList=[] } = goodsList[0];
-          this.formData1 = goodsList[0];
-          this.formData = goodsList[0];
+          const { goodsName, goodsDescription, goodsType, businessCategoryId,expressLimitFlag, goodsHeaderImages=[], goodsVideoList=[] } = goodsList[0];
+          const goodDet = goodsList[0];
+          goodDet.otc1 = goodDet.otc ? '1' : '0';
+          this.formData1 = goodDet;
+          this.formData = goodDet;
           this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType,businessCategoryId, expressLimitFlag };
           this.hasRepoFlag = hasRepoFlag;
           this.buyLimitDtoList = this.formData.buyLimitDtoList;
           this.formData.optPrice = this.formData.costPrice/100;
           this.formData.scorePerformance = this.formData.scorePerformance/100;
-          this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1);
-          this.fileIntrList = this.getImges(goodsList[0].medicImgList,2);
+          this.fileGoodsList = this.getImges(goodDet.goodsImgList,1);
+          this.fileIntrList = this.getImges(goodDet.medicImgList,2);
           this.formData.stock = this.formData.goodsStock;
-          this.formData.otc1 = this.formData.otc ? '1' : '0';
-          if (goodsList[0].goodsVideoList.length > 0) {
-              this.videoList.push(goodsList[0].goodsVideoList[0]);
+          if (goodDet.goodsVideoList.length > 0) {
+              this.videoList.push(goodDet.goodsVideoList[0]);
               this.videoModel.videoFullPath = this.videoList[0].goodsImgUrl;
           }
           let newImgList = [];
@@ -1329,9 +1330,10 @@
             if(categoryIdLevel4 != -1){
                this.getLever(categoryIdLevel4,5,1)
             }
+            this.formData1.otc1 = this.formData1.otc ? '1' : '0'
+
             this.formData1 = Object.assign(this.formData1,fastParm)
 
-            this.formData1.otc1 = this.formData1.otc ? '1' : '0'
             this.goodDisabled = medicationInfo.medicalCategoryId ? true : false
 
             this.fileIntrList = this.getImges(imageList,2)