Merge branch 'feature/med-goods-zs' into 'testing/3.29.0'

Feature/med goods zs

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

src/views/goods/common/rules.js

@@ -28,7 +28,7 @@ const rules1 = {
     { validator: checkBarcode, trigger: "submit" },
   ],
   medicCommonName: [
-    { required: true, message: "请输入通用名称", trigger: "blur" },
+    { required: true, message: "请输入产品名称/通用名称", trigger: "blur" },
   ],
   medicGoodsName: [
     {

src/views/goods/create-good-new.scss

@@ -65,6 +65,11 @@
     color: #f56c6c;
     margin-right: 4px;
     }
+    .bg-uploader {
+      .el-upload {
+            display: flex;
+          }
+    }
   }
   .basic-item-icon {
     position: relative;

src/views/goods/create-good-new.vue

@@ -181,7 +181,6 @@
           </el-form-item>
           <el-form-item label="商品详情图片" class="label-detailimg">
             <el-upload
-
                 class="bg-uploader"
                 action="#"
                 :show-file-list="false"
@@ -204,7 +203,6 @@
               <img  class="bg-img" src="../../assets/image/small.png" />
               <div class="limit-text">
                 <p>限制大小: 2M</p>
-                <!-- <p>最小尺寸：750*420</p> -->
                 <p>支持jpeg, png格式</p>
               </div>
             </el-upload>
@@ -323,7 +321,7 @@
               </el-form-item>
             </div>
           <el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
-            <el-radio-group v-model="formData.expressLimitFlag" :disabled="!hasRepoFlag">
+            <el-radio-group v-model="formData.expressLimitFlag" :disabled="!hasRepoFlag" @change="radioChange">
               <el-radio :label="1">是</el-radio>
               <el-radio :label="0">否</el-radio>
             </el-radio-group>
@@ -723,6 +721,9 @@
       this.getGoodsListAll();
     },
     methods: {
+      radioChange(val) {
+        this.formData.expressLimitFlag = val;
+      },
       getArr(arr) {
         if (arr.length > 0) {
           let newoodsList = []
@@ -1024,12 +1025,14 @@
           this.isContract = Boolean(contractId);
           // this.formData1 = goodDet;
           this.formData = goodDet;
-          this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag,contractId, cooperationProjectId };
+          
+          this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType,contractId, cooperationProjectId };
           this.formData3.medicationId = medicationInfo.tradeMedicalLibId;
           this.formData3.medicationDetailId = medicationInfo.id;
           this.goodsCategoryIdList = this.getArr(goodsCategoryIdArr);
           this.hasRepoFlag = hasRepoFlag;
           this.buyLimitDtoList = this.formData.buyLimitDtoList;
+          this.formData.expressLimitFlag = expressLimitFlag;
           this.formData.optPrice = this.formData.costPrice/100;
           this.formData.scorePerformance = this.formData.scorePerformance/100;
           this.fileGoodsList = this.getImges(goodDet.goodsImgList,1);
@@ -1139,6 +1142,7 @@
           this.formData.decrStock = ''
         }
         //this.formData.goodsStock = this.formData.stock
+        this.isgoodStock = true;
         this.stockDio = false
       },
       changeStock(type){
@@ -1292,6 +1296,8 @@
                 console.log('上传成功后路径', path);
                 let len = vm.fileGoodsList.length;
                 vm.fileGoodsList.push({ url: path.fullPath, goodsImgUrl: path.fullPath,imageUrl:path.fullPath, imgSort: len+1,imageSort: len+1, goodsId: vm.formData.goodsId });
+                vm.isgoodsImages = true;
+                
                 // vm.fileGoodsList.push({url:path.fullPath,goodsImgUrl: path.fullPath,imageUrl:path.fullPath,imageName:'',imageSort: len+1,imageType: 2,id: null,})
                 vm.$message.success("上传成功");
               });
@@ -1386,6 +1392,7 @@
                 closeLoading(vm);
                 let len = vm.fileIntrList.length;
                 vm.fileIntrList.push({url:path.fullPath,imageUrl:path.fullPath,imageSort: len+1,imageType: 1,id: null, imageType: 4})
+                vm.isSpecification_url = true;
                 vm.$message.success("上传成功");
               });
             //}