From f4f62e453f0694e1e36bc7f8cbd1f46256801129 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 14 Jul 2023 17:08:36 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.production b/.env.production
index f54ba371..13382a18 100644
--- a/.env.production
+++ b/.env.production
@@ -37,7 +37,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
-# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+ VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/

From 4da4cc0ed4ba854dda54fbcc3a9bfb0f072a5fff Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 17 Jul 2023 09:14:44 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/views/inout/DialogSelectProduct.vue       |  2 +-
 .../api/BasicThirdSysDetailModify.vue         | 50 ++++++++++++-------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/.env.development b/.env.development
index c29652c7..6289c6fa 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://192.168.0.166:10001"
 
diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index af02dc4f..22defdc1 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -282,7 +282,7 @@ export default {
         return;
       }
       let str = this.currentRow.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (this.str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
index 6f8a2cc0..962d6944 100644
--- a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
+++ b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue
@@ -6,7 +6,7 @@
           <div>
             <el-radio-group v-model="inputDetailQuery.fromType" :disabled="!inputDetailQuery.enabled"
                             style="margin-right: 20px" @change="agreeChange">
-              <el-radio-button :label="0" size="mini" disabled>接口实时获取</el-radio-button>
+              <el-radio-button :label="0" size="mini">接口实时获取</el-radio-button>
               <el-radio-button :label="3" size="mini">接口方式</el-radio-button>
               <el-radio-button :label="2" size="mini" disabled>第三方上传缓存</el-radio-button>
               <el-radio-button :label="1" size="mini">文件方式</el-radio-button>
@@ -20,33 +20,33 @@
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle" style="margin-top: 25px">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口名称">
+          <el-form-item label-width="120px" label="接口名称">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                :disabled="true"
-                v-model="inputDetailQuery.name"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              :disabled="true"
+              v-model="inputDetailQuery.name"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口地址">
+          <el-form-item label-width="120px" label="接口地址">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                v-model="inputDetailQuery.value"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              v-model="inputDetailQuery.value"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="请求时间">
+          <el-form-item label-width="120px" label="轮询时间(分钟)">
             <el-input
               style="width: 80%"
-              splaceholder="请输入请求时间 单位：分钟"
+              splaceholder="请输入轮序时间 单位：分钟"
               type="number"
               min="0"
               v-model="inputDetailQuery.time"
@@ -55,15 +55,29 @@
         </el-col>
       </el-row>
 
+      <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
+        <el-col :span="24" class="el-col">
+          <el-form-item label-width="120px" label="下载范围(小时)">
+            <el-input
+              style="width: 80%"
+              splaceholder="请输入请求时间 单位：小时"
+              type="number"
+              min="0"
+              v-model="inputDetailQuery.dlLastTime"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="备注说明">
+          <el-form-item label-width="120px" label="备注说明">
             <el-input
-                style="width: 80%"
-                splaceholder="请输入内容"
-                type="textarea"
-                row="3"
-                v-model="inputDetailQuery.remark"
+              style="width: 80%"
+              splaceholder="请输入内容"
+              type="textarea"
+              row="3"
+              v-model="inputDetailQuery.remark"
             ></el-input>
           </el-form-item>
         </el-col>

From 6fa583a08855787f44686fa068d1d9e98dbd566a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 17 Jul 2023 16:31:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrderSelect.vue | 12 ++++++++++++
 src/views/inout/InvoiceRegByOrder.vue       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index e9771cd2..a68faaab 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -55,6 +55,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input
+                  v-model="filterQuery.remark"
+                  placeholder="请输入备注"
+                  style="width: 90%"
+                  clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 994f6a45..b83cb418 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -185,7 +185,7 @@
             </el-tag>
           </template>
         </el-table-column>
-
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"

From adb1715c4aac5879b1c3e1739502aa39e28fe07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 17 Jul 2023 18:32:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/business/stockOrderPrint.vue | 1 -
 src/views/inout/DialogCreateOrder.vue        | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
index f4b82b12..04d51e3d 100644
--- a/src/views/basic/business/stockOrderPrint.vue
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -430,7 +430,6 @@ export default {
     },
 
     combine(){
-      debugger
       console.log(this.orderQuery)
       if(this.orderQuery==null || this.orderQuery.length==0){
         this.$message.error("请先选择单据！")
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 97a3e8b8..fe6500cd 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -146,7 +146,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorpName"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -1091,7 +1091,6 @@ export default {
       );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
-      debugger
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -1130,6 +1129,7 @@ export default {
           this.refreshCodesPanel();
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
+          this.orderFormData.relId = null;
         } else {
           if (response.code == 502) {
             //该产品绑定多个产品ID处理

From 1187779bb54c8b22731c736eb26f3a285bf24dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 18 Jul 2023 09:14:23 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=20=E7=94=9F=E6=88=90=E4=B8=8D=E4=BA=86?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=98=E6=88=90=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=88=E7=89=87=E4=BB=94?=
 =?UTF-8?q?=E7=99=80=E8=AF=8A=E6=96=AD=E5=92=8C=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=83=BD=E6=9C=89=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/inner/innerOrderEditDialog.vue    | 4 ++++
 src/views/inventory/inner/innerOrderSelectProduct.vue | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 66309fc7..0d7636b7 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -49,6 +49,7 @@
           <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="最小销售产品标识" prop="nameCode" width="140" v-if="showColumn"></el-table-column>
           <el-table-column label="单据数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
@@ -160,6 +161,7 @@ export default {
   },
   data() {
     return {
+      showColumn: false,
       code: "",
       query: {
         orderIdFk: "",
@@ -174,6 +176,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        packLevel:null,
       },
       formRules: {},
       codeArray: [],
@@ -437,6 +440,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        nameCode:null,
       };
       this.orderEditor = false;
     }
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index ff4aaed3..4117d228 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -224,6 +224,8 @@ export default {
       certList: [],
       dialogFormVisible: false,
       multipleSelection: null,
+      nameCode:null,
+
     };
   },
   methods: {
@@ -339,6 +341,7 @@ export default {
       let tQuery = {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
+        nameCode: this.multipleSelection.nameCode,
         count: 1,
         orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,

From c913a1554c24837f3fb463f497ebef0dae97ee2c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 18 Jul 2023 09:23:15 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectProduct.vue       |   8 +-
 .../purOrder/purOrderOrderSelectProduct.vue   | 780 +++++++++---------
 .../purOrder/purOrderSelectProduct.vue        |   3 +-
 .../purPlan/purOrderSelectProduct.vue         |   3 +-
 .../purPlan/purPlanOrderSelectProduct.vue     | 780 +++++++++---------
 5 files changed, 794 insertions(+), 780 deletions(-)

diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index 22defdc1..2b771369 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -140,7 +140,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -170,6 +173,7 @@
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import udiRlDetailDialog from "../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
@@ -282,7 +286,7 @@ export default {
         return;
       }
       let str = this.currentRow.zczbhhzbapzbh;
-      if (this.str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index a6781b3c..4f639c5c 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -1,440 +1,444 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="listQuery" size="mini">
-                    <el-row style="margin-top: 15px;width: 1000px">
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.udiCode"
-                                      style="width: 600px"
-                                      placeholder="请扫描或输入UDI码"
-                                      clearable="true"
-                                      @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :inline="true" :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                    </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-                        </el-form-item>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button-group>
-                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                                <el-button type="primary" icon="search" @click="search">查询</el-button>
-                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
-                            </el-button-group>
-                        </el-form-item>
-                    </el-row>
-                </el-form>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-                <el-table
-                    :data="dataList"
-                    style="width: 100%"
-                    highlight-current-row="false"
-                    v-loading="loading"
-                    :row-class-name="tableRowClassName"
-                    @current-change="handleChange"
-                    ref="multipleTable"
-                >
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
-                    <el-table-column label width="45">
-                        <template slot-scope="scope">
-                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column
-                        label="最小销售产品标识"
-                        prop="nameCode"
-                        width="140"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品编码"
-                        prop="thirdId"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="医疗器械注册人"
-                        prop="ylqxzcrbarmc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品通用名"
-                        prop="cpmctymc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="规格型号"
-                        prop="ggxh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="注册/备案凭证"
-                        prop="zczbhhzbapzbh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="器械类别"
-                        prop="qxlb"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="配送企业"
-                        prop="companyName"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="160">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native.stop="handleDetailClick(scope.row)"
-                            >详情
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="listQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                    :current-page="listQuery.page"
-                ></el-pagination>
-            </div>
-        </el-card>
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiRlDetailVisible"
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="false"
+          v-loading="loading"
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+          ref="multipleTable"
         >
-            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
-        </el-dialog>
+          <!--                    <el-table-column-->
+          <!--                        type="selection"-->
+          <!--                        width="55">-->
+          <!--                    </el-table-column>-->
+          <el-table-column label width="45">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品编码"
+            prop="thirdId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品通用名"
+            prop="cpmctymc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证"
+            prop="zczbhhzbapzbh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="配送企业"
+            prop="companyName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="160">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDetailClick(scope.row)"
+              >详情
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="85%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
 
-        <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
-            <el-form :model="form">
-                <el-form-item label="" prop="isGive">
-                    <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="selectCert">确 定</el-button>
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-            </div>
-        </el-dialog>
+    <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
 import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "stockOrderNewSelectProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
     },
 
-    data() {
-        return {
-            listQuery: {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
+  },
+
+  data() {
+    return {
+      listQuery: {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            ids: [],
-            radioCheck: null,
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            udiRlDetailVisible: false,
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-            currentCert: null,
-            certList: [],
-            dialogFormVisible: false,
-            multipleSelection: null,
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      // this.$router.push({
+      //     path: "",
+      // });
+      this.listQuery = {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+        this.getList();
     },
-    methods: {
-        onReset() {
-            // this.$router.push({
-            //     path: "",
-            // });
-            this.listQuery = {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
-            },
-                this.getList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            this.radioCheck = val.id;
-            this.currentRow = val;
-            this.multipleSelection = val
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            this.udiRlDetailVisible = true;
-
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        search() {
-            this.listQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
-                this.listQuery.companyName=this.data.formData.corpName
-            }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
-                this.listQuery.companyName=this.data.corpName
-            }
-
-            stockOrderDetailFilterProduct(this.listQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.dataList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.dataList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.dataList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
-
-
-        confirmSelect() {
-            if (this.multipleSelection == null) {
-                this.$message.error('未选择产品');
-                return;
-            }
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
 
-            if (this.ids.length > 0) {
-                for (var i = 0; i < this.ids.length; i++) {
-                    if (this.ids[i] == this.multipleSelection.rlId) {
-                        this.$message.error("该产品已录入！");
-                        return
-                    }
-                }
-            }
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
 
-            let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
+        this.listQuery.companyName = this.data.formData.corpName
+      }
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
+        this.listQuery.companyName = this.data.corpName
+      }
 
-      combine() {
-        this.loading = true;
-        let tQuery = {
-          productId:this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
-          count:1,
-          orderIdFk:this.pId,
-          supId:this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
-        };
-        addPlanDetail(tQuery).then((response) => {
+      stockOrderDetailFilterProduct(this.listQuery)
+        .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
-            this.closeDialog(response.data);
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
           } else {
-            if (response.code == 601) {
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-              });
-            } else
-              this.$message.error(response.message);
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
           }
-        }).catch(() => {
+        })
+        .catch(() => {
           this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
         });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
-      },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            } else {
-                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-                this.combine();
-            }
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
 
-        },
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (!isBlank(str) && str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
     },
-    components: {udiRlDetailDialog},
 
-    created() {
-        if (this.$isNotBlank(this.data)) {
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addPlanDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-            // this.listQuery.nameCode = this.data.udi;
-            // if (this.data.billType != null) {
-            //     this.listQuery.billType = this.data.billType;
-            // } else
-            //     this.listQuery.billType = this.data.formData.billType;
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-            // if (this.data.formData != null) {
-            //     this.listQuery.corpId = this.data.formData.corpId;
-            // }
-            // this.orderEditor = this.data.orderEditor;
-            // this.orderId = this.data.orderId;
-            this.ids = [];
-            if (this.data.stockOrderLists.length > 0) {
-                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
-                    this.ids.push(this.data.stockOrderLists[i].productId);
-                }
-            }
-        }
-        this.getList();
     },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+    if (this.$isNotBlank(this.data)) {
+
+      // this.listQuery.nameCode = this.data.udi;
+      // if (this.data.billType != null) {
+      //     this.listQuery.billType = this.data.billType;
+      // } else
+      //     this.listQuery.billType = this.data.formData.billType;
+
+      // if (this.data.formData != null) {
+      //     this.listQuery.corpId = this.data.formData.corpId;
+      // }
+      // this.orderEditor = this.data.orderEditor;
+      // this.orderId = this.data.orderId;
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
+        }
+      }
+    }
+    this.getList();
+  },
 };
 </script>
 
 <style scoped>
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index b7736608..ba88c9f3 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -137,6 +137,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addOrderDetail} from "@/api/purchase/purOrder"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -339,7 +340,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/purchase/purPlan/purOrderSelectProduct.vue b/src/views/purchase/purPlan/purOrderSelectProduct.vue
index 17399f2d..4ac7d18f 100644
--- a/src/views/purchase/purPlan/purOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue
@@ -122,6 +122,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addPlanDetail} from "@/api/purchase/purPlan"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -314,7 +315,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
diff --git a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
index c223e99c..4feb2bc4 100644
--- a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
@@ -1,158 +1,161 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="listQuery" size="mini">
-                    <el-row style="margin-top: 15px;width: 1000px">
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.udiCode"
-                                      style="width: 600px"
-                                      placeholder="请扫描或输入UDI码"
-                                      clearable="true"
-                                      @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :inline="true" :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                    </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方物资编码" clearable="true"></el-input>
-                        </el-form-item>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方物资编码" clearable="true"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button-group>
-                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                                <el-button type="primary" icon="search" @click="search">查询</el-button>
-                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
-                            </el-button-group>
-                        </el-form-item>
-                    </el-row>
-                </el-form>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-                <el-table
-                    :data="dataList"
-                    style="width: 100%"
-                    highlight-current-row="false"
-                    v-loading="loading"
-                    :row-class-name="tableRowClassName"
-                    @current-change="handleChange"
-                    ref="multipleTable"
-                >
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
-                    <el-table-column label width="45">
-                        <template slot-scope="scope">
-                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column
-                        label="最小销售产品标识"
-                        prop="nameCode"
-                        width="140"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="物资编码"
-                        prop="thirdId"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="医疗器械注册人"
-                        prop="ylqxzcrbarmc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品通用名"
-                        prop="cpmctymc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="规格型号"
-                        prop="ggxh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="注册/备案凭证"
-                        prop="zczbhhzbapzbh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="器械类别"
-                        prop="qxlb"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="配送企业"
-                        prop="companyName"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="160">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native.stop="handleDetailClick(scope.row)"
-                            >详情
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="listQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                    :current-page="listQuery.page"
-                ></el-pagination>
-            </div>
-        </el-card>
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiRlDetailVisible"
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="false"
+          v-loading="loading"
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+          ref="multipleTable"
         >
-            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
-        </el-dialog>
+          <!--                    <el-table-column-->
+          <!--                        type="selection"-->
+          <!--                        width="55">-->
+          <!--                    </el-table-column>-->
+          <el-table-column label width="45">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="物资编码"
+            prop="thirdId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品通用名"
+            prop="cpmctymc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证"
+            prop="zczbhhzbapzbh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="配送企业"
+            prop="companyName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="160">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleDetailClick(scope.row)"
+              >详情
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="85%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
 
-        <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
-            <el-form :model="form">
-                <el-form-item label="" prop="isGive">
-                    <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="selectCert">确 定</el-button>
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-            </div>
-        </el-dialog>
+    <el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
@@ -160,282 +163,283 @@ import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
 import {addApplyDetail} from "@/api/purchase/purApply";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "stockOrderNewSelectProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
     },
 
-    data() {
-        return {
-            listQuery: {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
+  },
+
+  data() {
+    return {
+      listQuery: {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            ids: [],
-            radioCheck: null,
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            udiRlDetailVisible: false,
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-            currentCert: null,
-            certList: [],
-            dialogFormVisible: false,
-            multipleSelection: null,
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      // this.$router.push({
+      //     path: "",
+      // });
+      this.listQuery = {
+        udiCode: "",
+        unionCode: "",
+        cpmctymc: "",
+        ggxh: "",
+        ylqxzcrbarmc: "",
+        thrPiId: "",
+        page: 1,
+        limit: 10,
+      },
+        this.getList();
     },
-    methods: {
-        onReset() {
-            // this.$router.push({
-            //     path: "",
-            // });
-            this.listQuery = {
-                udiCode: "",
-                unionCode: "",
-                cpmctymc: "",
-                ggxh: "",
-                ylqxzcrbarmc: "",
-                thrPiId: "",
-                page: 1,
-                limit: 10,
-            },
-                this.getList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            this.radioCheck = val.id;
-            this.currentRow = val;
-            this.multipleSelection = val
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            this.udiRlDetailVisible = true;
-
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        search() {
-            this.listQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
-                this.listQuery.companyName=this.data.formData.corpName
-            }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
-                this.listQuery.companyName=this.data.corpName
-            }
-
-            stockOrderDetailFilterProduct(this.listQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.dataList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.dataList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.dataList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
-
-
-        confirmSelect() {
-            if (this.multipleSelection == null) {
-                this.$message.error('未选择产品');
-                return;
-            }
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
 
-            if (this.ids.length > 0) {
-                for (var i = 0; i < this.ids.length; i++) {
-                    if (this.ids[i] == this.multipleSelection.rlId) {
-                        this.$message.error("该产品已录入！");
-                        return
-                    }
-                }
-            }
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
 
-            let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
+        this.listQuery.companyName = this.data.formData.corpName
+      }
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
+        this.listQuery.companyName = this.data.corpName
+      }
 
-      combine() {
-        this.loading = true;
-        let tQuery = {
-          productId:this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
-          count:1,
-          orderIdFk:this.pId,
-          supId:this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
-        };
-        addPlanDetail(tQuery).then((response) => {
+      stockOrderDetailFilterProduct(this.listQuery)
+        .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
-            this.closeDialog(response.data);
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
           } else {
-            if (response.code == 601) {
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-              });
-            } else
-              this.$message.error(response.message);
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
           }
-        }).catch(() => {
+        })
+        .catch(() => {
           this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
         });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
-      },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            } else {
-                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-                this.combine();
-            }
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
 
-        },
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (!isBlank(str) && str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
     },
-    components: {udiRlDetailDialog},
 
-    created() {
-        if (this.$isNotBlank(this.data)) {
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addPlanDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-            // this.listQuery.nameCode = this.data.udi;
-            // if (this.data.billType != null) {
-            //     this.listQuery.billType = this.data.billType;
-            // } else
-            //     this.listQuery.billType = this.data.formData.billType;
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-            // if (this.data.formData != null) {
-            //     this.listQuery.corpId = this.data.formData.corpId;
-            // }
-            // this.orderEditor = this.data.orderEditor;
-            // this.orderId = this.data.orderId;
-            this.ids = [];
-            if (this.data.stockOrderLists.length > 0) {
-                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
-                    this.ids.push(this.data.stockOrderLists[i].productId);
-                }
-            }
-        }
-        this.getList();
     },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+    if (this.$isNotBlank(this.data)) {
+
+      // this.listQuery.nameCode = this.data.udi;
+      // if (this.data.billType != null) {
+      //     this.listQuery.billType = this.data.billType;
+      // } else
+      //     this.listQuery.billType = this.data.formData.billType;
+
+      // if (this.data.formData != null) {
+      //     this.listQuery.corpId = this.data.formData.corpId;
+      // }
+      // this.orderEditor = this.data.orderEditor;
+      // this.orderId = this.data.orderId;
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
+        }
+      }
+    }
+    this.getList();
+  },
 };
 </script>
 
 <style scoped>
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>