From e3d37695b4055ed11db2297f77aad63a77ae7391 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 10 Apr 2023 11:58:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=80=89=E5=85=A5=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 163 +++++++++---------
 src/views/basic/product/UdiInfoSelectRel.vue  |  18 +-
 src/views/basic/product/product.vue           |  22 +--
 .../basic/product/udiInfoselectErpUdi.vue     |   6 +-
 src/views/inout/DialogSelectProduct.vue       |   1 -
 .../products/supAddDiProductSelectUdi.vue     |   1 -
 src/views/system/role/index.vue               |   1 -
 7 files changed, 107 insertions(+), 105 deletions(-)

diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 0aacd1c..a61c266 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -32,7 +32,7 @@
                   clearable="true"
                   style="width: 100%"
                   reserve-keyword
-                  placeholder="医疗器械注册人"
+                  placeholder="请输入医疗器械注册人"
                   :remote-method="findMethod"
                   :loading="loading"
                   @clear="clear"
@@ -53,7 +53,7 @@
                 <el-input
                   :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                   v-model="unionQuery.cpmctymc" clearable="true"
-                  placeholder="器械通用名称"
+                  placeholder="请输入器械通用名称"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -64,7 +64,7 @@
                 <el-input
                   v-model="unionQuery.ggxh" clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -73,7 +73,7 @@
                 <el-input
                   v-model="unionQuery.zczbhhzbapzbh" clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册证/备案号"
+                  placeholder="请输入注册证/备案号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -142,7 +142,7 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作" >
+          <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -164,7 +164,7 @@
         />
       </div>
     </el-card>
-    <el-card class="el-card" >
+    <el-card class="el-card">
       <div>
         <el-form label-width="120px">
           <el-row :gutter="20">
@@ -341,8 +341,9 @@ import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
 import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
+import {isBlank} from "@/utils/strUtil";
 
-export default  {
+export default {
   name: "closeDialog",
   props: {
     closeDialog: {
@@ -384,7 +385,7 @@ export default  {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
-      cpmctymc1:"",
+      cpmctymc1: "",
       combineLoading: false,
       combineQuery: {
         idSpliUdi: false,
@@ -425,12 +426,13 @@ export default  {
         ggxh: "",
         zczbhhzbapzbh: "",
         isCheck: 1
-      },
-        this.actDateRange = [];
+      };
+      this.actDateRange = [];
+      this.udidlList = [];
     },
-    clear(){
-      this.unionQuery.ylqxzcrbarmc==null;
-      this.unionQuery.cpmctymc=null;
+    clear() {
+      this.unionQuery.ylqxzcrbarmc == null;
+      this.unionQuery.cpmctymc = null;
     },
     searchList() {
       this.unionQuery.page = 1;
@@ -530,10 +532,7 @@ export default  {
       return "";
     },
     handleErpChange(val) {
-      debugger
-      console.log("+++"+ this.data.cpmctymc)
-
-      this.cpmctymc1=val.cpmctymc;
+      this.cpmctymc1 = val.cpmctymc;
       this.currentRow = val;
     },
     intentBack() {
@@ -541,42 +540,67 @@ export default  {
     },
 
     checkCombine() {
-      this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称"+this.data.cpmctymc, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-
-          let selectData = this.multipleUdiSelection;
-          let selected = null;
-          if (this.multipleUdiSelection.length == 0) {
-            if (this.relId != null) {
-              this.combineQuery.relId = this.relId;
-              this.combineQuery.keys.push(this.currentRow.uuid);
-              if (this.currentRow.check) {
-                selected = this.currentRow;
-              }
-            } else
-              return;
+      if (isBlank(this.relId)) {
+        this.checkedUdi();
+      } else {
+        this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.checkedUdi();
+          });
+      }
+    },
 
-          } else {
-            selectData.forEach((obj) => {
-              if (obj.check) {
-                selected = obj;
-              }
-              this.combineQuery.keys.push(obj.uuid);
-            });
+    checkedUdi() {
+      let selectData = this.multipleUdiSelection;
+      let selected = null;
+      if (this.multipleUdiSelection.length == 0) {
+        if (this.relId != null) {
+          this.combineQuery.relId = this.relId;
+          this.combineQuery.keys.push(this.currentRow.uuid);
+          if (this.currentRow.check) {
+            selected = this.currentRow;
           }
-          if (selected != null) {
-            this.$message.warning("UDI编码：" + selected.nameCode + "已被选入");
-            return;
+        } else
+          return;
+
+      } else {
+        selectData.forEach((obj) => {
+          if (obj.check) {
+            selected = obj;
           }
-          this.combineLoading = true;
-          checkExitUdi(this.combineQuery)
-            .then((response) => {
-              this.combineLoading = false;
-              if (response.code == 20000) {
+          this.combineQuery.keys.push(obj.uuid);
+        });
+      }
+      if (selected != null) {
+        this.$message.warning("UDI编码：" + selected.nameCode + "已被选入");
+        return;
+      }
+      this.combineLoading = true;
+      checkExitUdi(this.combineQuery)
+        .then((response) => {
+          this.combineLoading = false;
+          if (response.code == 20000) {
+            this.combine();
+            // combineUdi(this.combineQuery)
+            //     .then((response) => {
+            //         this.combineLoading = false;
+            //         if (response.code == 20000) {
+            //             this.$emit("closeUdi", true);
+            //         } else {
+            //             this.$emit("closeUdi", false);
+            //         }
+            //     })
+            //     .catch(() => {
+            //         this.combineLoading = false;
+            //         this.$emit("closeUdi", false);
+            //     });
+          } else if (response.code == 499) {
+            this.$confirm(response.message, {type: "warning"})
+              .then(_ => {
                 this.combine();
                 // combineUdi(this.combineQuery)
                 //     .then((response) => {
@@ -591,36 +615,17 @@ export default  {
                 //         this.combineLoading = false;
                 //         this.$emit("closeUdi", false);
                 //     });
-              } else if (response.code == 499) {
-                this.$confirm(response.message, { type: "warning" })
-                  .then(_ => {
-                    this.combine();
-                    // combineUdi(this.combineQuery)
-                    //     .then((response) => {
-                    //         this.combineLoading = false;
-                    //         if (response.code == 20000) {
-                    //             this.$emit("closeUdi", true);
-                    //         } else {
-                    //             this.$emit("closeUdi", false);
-                    //         }
-                    //     })
-                    //     .catch(() => {
-                    //         this.combineLoading = false;
-                    //         this.$emit("closeUdi", false);
-                    //     });
-                  })
-                  .catch(_ => {
-
-                    this.combineQuery.keys = [];
-                  });
-              }
-            })
-            .catch(() => {
-              this.combineLoading = false;
-              this.$emit("closeUdi", false);
-            });
-        });
+              })
+              .catch(_ => {
 
+                this.combineQuery.keys = [];
+              });
+          }
+        })
+        .catch(() => {
+          this.combineLoading = false;
+          this.$emit("closeUdi", false);
+        });
     },
 
     combine() {
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index dead39a..044becc 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -20,7 +20,7 @@
               <el-form-item class="query-form-item" label="产品编码:">
                 <el-input
                   v-model="erpQuery.code"
-                  placeholder="产品编码/商品条码/医保编码"
+                  placeholder="请输入产品编码/商品条码/医保编码"
                   clearable="true"
                   @keyup.enter.native="keyupErp_submit($event)"
                 ></el-input>
@@ -30,14 +30,14 @@
               <el-form-item class="query-form-item" label="物资名称:">
                 <el-input v-model="erpQuery.name"
                           clearable="true"
-                          placeholder="物资名称"></el-input>
+                          placeholder="请输入物资名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item class="query-form-item" label="注册/备案号:">
                 <el-input v-model="erpQuery.registerNo"
                           clearable="true"
-                          placeholder="注册/备案号"></el-input>
+                          placeholder="请输入注册/备案号"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -47,7 +47,7 @@
               <el-form-item class="query-form-item" label="生产企业:">
                 <el-input v-model="erpQuery.manufactory"
                           clearable="true"
-                          placeholder="生产企业"></el-input>
+                          placeholder="请输入生产企业"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -55,7 +55,7 @@
                 <el-input
                   v-model="erpQuery.spec"
                   clearable="true"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -138,7 +138,7 @@
                   clearable="true"
                   style="width: 100%"
                   reserve-keyword
-                  placeholder="医疗器械注册人"
+                  placeholder="请输入医疗器械注册人"
                   :remote-method="findMethod"
                   :loading="loading"
                 >
@@ -160,7 +160,7 @@
                   v-model="unionQuery.cpmctymc"
                   size="mini"
                   clearable="true"
-                  placeholder="器械通用名称"
+                  placeholder="请输入器械通用名称"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -170,7 +170,7 @@
               <el-form-item class="query-form-item" label="规格型号:">
                 <el-input
                   v-model="unionQuery.ggxh"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                   clearable="true"
                   size="mini"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
@@ -183,7 +183,7 @@
                   v-model="unionQuery.zczbhhzbapzbh"
                   clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册/备案号"
+                  placeholder="请输入注册/备案号"
                   size="mini"
                 ></el-input>
               </el-form-item>
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 7176b75..59efd99 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -30,20 +30,20 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="最小销售标识:">
-                  <el-input v-model="filterQuery.unionCode" placeholder="最小销售标识"
+                  <el-input v-model="filterQuery.unionCode" placeholder="请输入最小销售标识"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="物资名称:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
+                  <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="规格型号:">
-                  <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"
+                  <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
@@ -65,21 +65,21 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
-                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="注册备案人"
+                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入注册备案人"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="第三方编码:">
-                  <el-input v-model="filterQuery.thrPiId" placeholder="第三方主系统编码"
+                  <el-input v-model="filterQuery.thrPiId" placeholder="请输入第三方主系统编码"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="集采状态">
-                  <el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
+                <el-form-item class="query-form-item" label="集采状态:">
+                  <el-select v-model="filterQuery.groupBuy" placeholder="请选择集采状态" clearable style="width: 90%">
                     <el-option label="全部" value=""></el-option>
                     <el-option label="集采" value="true"></el-option>
                     <el-option label="非集采" value="false"></el-option>
@@ -87,8 +87,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="可配送状态">
-                  <el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
+                <el-form-item class="query-form-item" label="可配送状态:">
+                  <el-select v-model="filterQuery.dispatch" placeholder="请选择可配送状态" clearable style="width: 90%">
                     <el-option label="全部" value=""></el-option>
                     <el-option label="可配送" value="true"></el-option>
                     <el-option label="不可配送" value="false"></el-option>
@@ -100,14 +100,14 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册/备案号:">
-                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="生产企业:">
-                  <el-input v-model="filterQuery.manufactory" placeholder="生产企业"
+                  <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index eeb6ef0..cf9a892 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -64,9 +64,9 @@
         <el-button-group style="display:flex;">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
-          <el-button type="primary" icon="search" @click="combine" :loading="combineLoading">选入</el-button>
-          <el-button type="primary" icon="search" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="searchErpList">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="combine" :loading="combineLoading">选入</el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
         </el-button-group>
       </div>
 
diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index 730be70..6481913 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -301,7 +301,6 @@ export default {
     },
 
     combine() {
-      debugger
       let data = {
         relId: this.currentRow.rlId,
         supId: this.currentRow.customerId,
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 2bb5f25..d027c9e 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -390,7 +390,6 @@ export default {
       this.showSearch = !this.showSearch;
     },
     getList() {
-      debugger
       if (
         this.unionQuery.udiCode == '' &&
         this.unionQuery.nameCode == '' &&
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 29cadb4..6945ce7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -677,7 +677,6 @@ export default {
       //   this.$message("请选择供应商角色")
       //   return
       // }
-      debugger
       if(this.form.isCustomer == null){
         if (this.userStatus == 0) {
           this.form.isCustomer = 0;