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

src/views/goods/create-good.vue

@@ -978,12 +978,12 @@
       //快速录入
       fastInput(type){
         ///medications/query/{approvalnumber}
-        if(this.formData.barCode == ''){
+        if(this.formData1.barCode == ''){
           this.$refs.formData.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({