Merge branch 'dev-fix-20201203' into 'release'

Dev fix 20201203 修复由服务类商品引起的快速录入事件的bug

Dev fix 20201203 修复由服务类商品引起的快速录入事件的bug

See merge request !234

src/views/goods/create-good.vue

@@ -979,12 +979,12 @@
       //快速录入
       fastInput(type){
         ///medications/query/{approvalnumber}
-        if(this.formData.barCode == ''){
-          this.$refs.formData.validateField("barCode")
+        if(this.formData1.barCode == ''){
+          this.$refs.formData1.validateField("barCode")
           return;
         }
         // this.GET("store/medications/query/"+this.formData.approvalNumber).then(res => {
-        this.GET(`store/medications/query/barcode/${this.formData.barCode}`).then(res => {
+        this.GET(`store/medications/query/barcode/${this.formData1.barCode}`).then(res => {
             console.log(res)
             if(res.code != '000000'){
               return this.$message({
@@ -999,8 +999,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,
@@ -1040,9 +1040,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)