Merge branch 'dev-fix-20201203' into dev-fuwubao-20201209

src/views/goods/create-good.vue

@@ -979,7 +979,7 @@
       fastInput(type){
         ///medications/query/{approvalnumber}
         if(this.formData1.barCode == ''){
-          this.$refs.formData.validateField("barCode")
+          this.$refs.formData1.validateField("barCode")
           return;
         }
         // this.GET("store/medications/query/"+this.formData.approvalNumber).then(res => {
@@ -998,8 +998,8 @@
               });
             }
             const {imageList,medicationInfo} = res.data
-            this.formData.medicationId = medicationInfo.id;
-            this.formData.approvalNumber = medicationInfo.approvalNumber;
+            this.formData1.medicationId = medicationInfo.id;
+            this.formData1.approvalNumber = medicationInfo.approvalNumber;
             const {medicCommonName,
               medicGoodsName,
               dosageId,
@@ -1039,9 +1039,9 @@
             if(categoryIdLevel4 != -1){
                this.getLever(categoryIdLevel4,5,1)
             }
-            this.formData = Object.assign(this.formData,fastParm)
+            this.formData1 = Object.assign(this.formData1,fastParm)
 
-            this.formData.otc1 = this.formData.otc ? '1' : '0'
+            this.formData1.otc1 = this.formData1.otc ? '1' : '0'
 
             this.fileIntrList = this.getImges(imageList,2)