Merge branch 'dev-check-serve-20201103' of...

Merge branch 'dev-check-serve-20201103' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-check-serve-20201103

src/views/goods/create-good.vue

@@ -800,13 +800,17 @@
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
-        formData: {},
-        formData1: {},
-        formData2: {},
+        formData: {
+        },
+        formData1: {
+        },
+        formData2: {
+        },
         rules: {},
         rules1: {},
         rules2: {},
         goodsId: 0, // 新增时传0，更新时必需>0
+        goodsType: '',
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
@@ -840,15 +844,13 @@
     created() {
       vm = this;
       const { id, storeId, goodsType } = this.$route.query;
-
-
+      this.goodsType = goodsType;
       this.formData = originForm;
       this.formData1 = originForm1;
       this.formData2 = originForm2;
       this.rules = originRules;
       this.rules1 = originRules1;
       this.rules2 = originRules2;
-
       
       this.jumPathThird = '/goods-manage?storeId='+storeId
       //this.jumPathThird = '/create-good?id=add&storeId=46'
@@ -873,13 +875,9 @@
       //eidt状态
       async getDetailByEdit(id, goodsType){
         this.goodsId = id ;
-        // this.isMedic = this.formData.goodsType == 5 ? true : false
-        // this.isCheckServe = this.formData.goodsType == 337 ? true : false
-
         if(goodsType == 337){
           this.isCheckServe = true;
           const res = await getGoodDetails(id);
-
           console.log(`========================>`, res);
           if(res.code != '000000'){
             return this.$message({
@@ -895,11 +893,12 @@
           };
 
           const { goodsInfo, medicalService } = res.data;
-          this.formData1 = goodsInfo;
+
+          this.formData = {...this.formData, ...goodsInfo};
           this.formData2 = medicalService;
-          // this.formData = { ...this.formData, ...goodsInfo, ...medicalService };
-          this.formData = Object.assign(this.formData,{...goodsInfo, ...medicalService});
-          this.formData2.suitableArr = this.formData.suitable.split(',');
+          this.formData = { ...this.formData, ...this.formData2 };
+
+          this.formData2.suitableArr = this.formData.suitableArr = this.formData.suitable.split(',');
           this.formData.optPrice = this.formData.costPrice/100;
           this.formData.stock = this.formData.goodsStock;
           this.fileGoodsList = this.getImges(goodsInfo.goodsHeaderImages,1);
@@ -910,7 +909,6 @@
             ...originRules
           };
             
-            
         }else{
           this.isMedic = true;
           const res = await getGoodsList({
@@ -934,8 +932,7 @@
           }
           const {goodsList} = res.data;
           this.formData1 = goodsList[0];
-          this.formData = Object.assign(this.formData,{...this.formData1});
-          // this.formData = { ...this.formData, ...this.formData1 };
+          this.formData = goodsList[0];
           this.formData.optPrice = this.formData.costPrice/100;
           this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1);
           this.fileIntrList = this.getImges(goodsList[0].medicImgList,2);
@@ -1169,13 +1166,10 @@
       },
       complete() {
         let formName = "formData";
-        console.log(this.formData);
-        console.log(this.formData1);
-        console.log(this.formData2);
-        // debugger
-        // this.formData = {...this.formData, ...this.formData1, ...this.formData2 };
-        Object.assign(this.formData, {...this.formData1, ...this.formData2});
-
+        
+        if(this.goodsType == 337 ){
+          this.formData = { ...this.formData, ...this.formData2 };
+        }
         for(let i=0;i<this.fileGoodsList.length;i++){
           this.fileGoodsList[i].imageSort = i+1
         }