Merge remote-tracking branch 'origin/dev_drug' into dev_drug

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -722,7 +722,7 @@ export default {
       if (isBlank(this.relId)) {
         this.checkedUdi();
       } else {
-        this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
+        this.$confirm("是否确定关联此DI!" , "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -749,6 +749,7 @@ export default {
         }
 
       } else {
+        this.combineQuery.relId = this.relId;
         selectData.forEach((obj) => {
           if (obj.check) {
             selected = obj;

src/views/inout/InvoiceRegByOrder.vue

@@ -1245,7 +1245,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();

src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue

@@ -1246,7 +1246,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();

src/views/supplier/company/basicCompanyProductsImport.vue

@@ -1019,7 +1019,7 @@ export default {
         this.loading = false;
         if (response.code == 20000) {
           this.$message.success(response.data);
-          this.$emit("closeSelDialog", true);
+          // this.$emit("closeSelDialog", true);
           this.closeSelDialog();
         } else {
           this.$message.error(response.message);