Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-vue into dev_drug

src/views/basic/product/drug/drugAdd.vue

@@ -1019,11 +1019,12 @@ export default {
 
           //如果都为空 进行补充
           if (!this.$isNotBlank(this.newProductData.sptm) && !this.$isNotBlank(this.newProductData.ybbm)) {
-            getCodeRelDetail({drugcode:row.nameCode}).then((response) => {
+              getCodeRelDetail({drugCode:row.nameCode}).then((response) => {
                 if (response.code == 20000) {
-                if (this.response.data != null && this.response.data.length > 0) {
+                  if (response.data != null && response.data.length > 0) {
-                  this.newProductData.sptm = this.response.data[0].sptm;
+                    this.newProductData.sptm = response.data[0].sptm;
-                  this.newProductData.ybbm = this.response.data[0].ybbm;
+                    this.newProductData.ybbm = response.data[0].ybbm;
+                    this.getYbDrugData()
                   }
                 }
             }).catch(() => {

src/views/basic/product/productEdit.vue

@@ -1748,21 +1748,19 @@ export default {
           this.getDetailList()
           this.getDiLevel();
 
-
           //如果都为空 进行补充
           if (!this.$isNotBlank(this.editQuery.sptm) && !this.$isNotBlank(this.editQuery.ybbm)) {
-            getCodeRelDetail({dinamecode:row.nameCode}).then((response) => {
+            getCodeRelDetail({diNameCode:row.nameCode}).then((response) => {
               if (response.code == 20000) {
-                if (this.response.data != null && this.response.data.length > 0) {
+                if (response.data != null && response.data.length > 0) {
-                  this.editQuery.sptm = this.response.data[0].sptm;
+                  this.editQuery.sptm = response.data[0].sptm;
-                  this.editQuery.ybbm = this.response.data[0].ybbm;
+                  this.editQuery.ybbm = response.data[0].ybbm;
+                  this.getYbHcData()
                 }
               }
             }).catch(() => {
             })
           }
-
-
         } else {
           this.isSave = true
           this.$message.error(res.message)

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -708,11 +708,12 @@ export default {
       this.editQuery.cpms = this.currentRow.cpms;
 
       if (!this.$isNotBlank(this.currentRow.sptm) && !this.$isNotBlank(this.currentRow.ybbm)) {
-        getCodeRelDetail({dinamecode:this.currentRow.nameCode}).then((response) => {
+        getCodeRelDetail({diNameCode:this.currentRow.nameCode}).then((response) => {
           if (response.code == 20000) {
-            if (this.response.data != null && this.response.data.length > 0) {
+            if (response.data != null && response.data.length > 0) {
-              this.editQuery.sptm = this.response.data[0].sptm;
+              this.editQuery.sptm = response.data[0].sptm;
-              this.editQuery.ybbm = this.response.data[0].ybbm;
+              this.editQuery.ybbm = response.data[0].ybbm;
+              this.getYbHcData()
             }
           }
             }).catch(() => {