Merge branch 'teasing/3.21.0' into 'release'

Teasing/3.21.0

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

src/views/goods/create-good.vue

@@ -1156,11 +1156,12 @@
           };
 
           const { goodsInfo, medicalService, buyLimitDtoList, hasRepoFlag} = res.data;
+          const { goodsName, goodsDescription, goodsType, expressLimitFlag,goodsHeaderImages=[], goodsVideoList=[] } = goodsInfo;
 
           this.formData = {...this.formData, ...goodsInfo};
           this.formData2 = medicalService;
           this.formData = { ...this.formData, ...this.formData2 };
-          this.formData3 = { ...goodsInfo};
+          this.formData3 = { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag };
           this.buyLimitDtoList = buyLimitDtoList;
           this.hasRepoFlag = hasRepoFlag;
           this.$set(this.formData2, 'suitableArr', this.formData.suitable.split(','));
@@ -1202,9 +1203,10 @@
             });
           }
           const {goodsList, hasRepoFlag } = res.data;
+           const { goodsName, goodsDescription, goodsType, expressLimitFlag, goodsHeaderImages=[], goodsVideoList=[] } = goodsList[0];
           this.formData1 = goodsList[0];
           this.formData = goodsList[0];
-          this.formData3 =  goodsList[0];
+          this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag };
           this.hasRepoFlag = hasRepoFlag;
           this.buyLimitDtoList = this.formData.buyLimitDtoList;
           this.formData.optPrice = this.formData.costPrice/100;
@@ -1491,10 +1493,11 @@
         // let formName = "formData";
         if(this.goodsType == 337 ){
           formNameList = ['formData', 'formData2', 'formData3'];
-          this.formData = { ...this.formData, ...this.formData2,...this.formData3 };
+          this.formData = { ...this.formData, ...this.formData3,...this.formData2 };
         }else{
+          
           formNameList = ['formData', 'formData1', 'formData3'];
-          this.formData =  { ...this.formData, ...this.formData1,...this.formData3 };
+          this.formData =  { ...this.formData,...this.formData1,...this.formData3};
         }
         for(let i=0;i<this.fileGoodsList.length;i++){
           this.fileGoodsList[i].imageSort = i+1
@@ -1502,7 +1505,6 @@
         for(let j=0;j<this.fileIntrList.length;j++){
           this.fileIntrList[j].imageSort = j+1
         }
-
         this.formData.categoryId = this.formData.goodsType
         this.formData.otc = this.formData.otc1 == 1 ? true : false
         this.isgoodStock = this.formData.stock > 0 ? true : false

src/views/goods/goods-manage.vue

@@ -633,8 +633,8 @@
       },
       uploadTemp(){
         // let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx'"
-        const url = 'https://files.yunqueyi.com/template/goods_import_template_1.xlsx';
-       
+        // const url = 'https://files.yunqueyi.com/template/goods_import_template_1.xlsx';
+        const url = 'https://test1-file.yunqueyi.com/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet/common/20211103204355554.xlsx';
         window.location.href = url
       },
       getLever(id=0){

src/views/goods/rules.js

@@ -27,18 +27,18 @@ const rules1 = {
     { required: true, message: "请输入条形码", trigger: "submit" },
     { validator: checkBarcode, trigger: "submit" }
   ],
-  medicCommonName:[
-    { required: true, message: "请输入商品通用名称", trigger: "blur" }
-  ],
+  // medicCommonName:[
+  //   { required: true, message: "请输入商品通用名称", trigger: "blur" }
+  // ],
   // size:[
   //   { required: true, message: "请输入商品规格", trigger: "blur" }
   // ],
   // manufacturer:[
   //   { required: true, message: "请输入生产厂家", trigger: "blur" }
   // ],
-  approvalNumber:[
-    { required: true, message: "请输入批准文号", trigger: "blur" }
-  ],
+  // approvalNumber:[
+  //   { required: true, message: "请输入批准文号", trigger: "blur" }
+  // ],
   // dosageId:[
   //   { required: true, message: "请选择剂型", trigger: "change" }
   // ],