From ad3bba959c6fc67495b38d9c694cba897b43f2e1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 18 Jul 2023 09:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=A4=87=E6=A1=88=E8=AF=81?=
 =?UTF-8?q?=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

---
 .../inner/innerOrderSelectProduct.vue         |   8 +-
 .../purApply/purOrderSelectProduct.vue        | 683 +++++++--------
 .../purArrival/purArrivalSelectProduct.vue    |   8 +-
 .../purDelivery/purDeliverySelectProduct.vue  |  58 +-
 .../purOrder/purOrderOrderSelectProduct.vue   | 785 +++++++++---------
 .../purOrder/purOrderSelectProduct.vue        |   8 +-
 .../purPlan/purOrderSelectProduct.vue         | 681 +++++++--------
 .../purPlan/purPlanOrderSelectProduct.vue     | 780 ++++++++---------
 8 files changed, 1530 insertions(+), 1481 deletions(-)

diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 1fd614d..b57b77b 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -109,7 +109,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>
@@ -128,6 +131,7 @@ import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
 import {addOrderDetail} from "@/api/inventory/innerOrder";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -324,7 +328,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/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 843cd58..ff519b7 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -1,375 +1,384 @@
 <template>
-    <div>
-        <el-card class="el-card">
-                <el-form  :model="listQuery" label-width="120px" v-show="showSearch">
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="UDI码:" class="query-form-item">
-                            <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                     <el-col :span="6">
-                       <el-form-item label="第三方产品编码:" class="query-form-item">
-                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
-                     </el-form-item>
-                  </el-col>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="UDI码:" class="query-form-item">
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="第三方产品编码:" class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                    <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="物品编码:" class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="物资名称:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入物资名称" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item  label="规格型号:" class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="生产企业:" class="query-form-item">
-                          <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                                    clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                </el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物品编码:" class="query-form-item">
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物资名称:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-          <div class="top-right-btn">
-            <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="el-icon-search" @click="search">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
+      <div class="top-right-btn">
+        <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="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-                <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
-                    <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"></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="操作"  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-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+        <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"></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="操作" 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>
 
-          <pagination
-            v-show="pageTotal>0"
-            :total="pageTotal"
-            :page.sync="listQuery.page"
-            :limit.sync="listQuery.limit"
-            @pagination="handleErpPageChange"
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
 
-          ></pagination>
-        </el-card>
+      ></pagination>
+    </el-card>
 
 
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="80%"
-            :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="udiRlDetailVisible"
+      width="80%"
+      :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 {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
-import {addApplyDetail,addApply} from "../../../api/purchase/purApply";
+import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+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,
-        },
-        pId: {
-          type: Object,
-          required: true,
-        },
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
     },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+  },
 
-    data() {
-        return {
-            showSearch: true,
-            listQuery: {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10,
+  data() {
+    return {
+      showSearch: true,
+      listQuery: {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        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 = {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10
+      }
+      this.multipleSelection = [];
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.listQuery = {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10
-            }
-            this.multipleSelection = [];
-            this.radioCheck = null;
-            this.currentRow = null;
-            this.getList();
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        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;
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    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.page;
-            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;
-            filterCompanyProductRelevance(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();
-        },
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val.page;
+      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;
+      filterCompanyProductRelevance(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;
-            }
+    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 (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      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();
+      }
+    },
 
-        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
-            };
-              addApplyDetail(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;
+    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
+      };
+      addApplyDetail(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;
+      });
 
-        },
+    },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            }else{
-               this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-               this.combine();
-            }
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-        },
     },
-    components: {udiRlDetailDialog},
+  },
+  components: {udiRlDetailDialog},
 
-    created() {
-        console.log(this.data)
-        if (this.$isNotBlank(this.data)) {
-            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);
-                }
-            }
+  created() {
+    console.log(this.data)
+    if (this.$isNotBlank(this.data)) {
+      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);
         }
+      }
+    }
 
-    },
+  },
 };
 </script>
 
@@ -377,10 +386,10 @@ export default {
 
 
 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/purArrival/purArrivalSelectProduct.vue b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
index d1551e9..bd5672e 100644
--- a/src/views/purchase/purArrival/purArrivalSelectProduct.vue
+++ b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
@@ -104,7 +104,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>
@@ -121,6 +124,7 @@
 import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
 import {addOrderDetail} from "@/api/purchase/purArrival"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -317,7 +321,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/purDelivery/purDeliverySelectProduct.vue b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
index 72112a6..7e5ce02 100644
--- a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
+++ b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
@@ -1,16 +1,18 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form  :model="listQuery" label-width="120px" v-show="showSearch">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
           <el-col :span="12">
             <el-form-item label="UDI码:" class="query-form-item">
-              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="第三方产品编码:" class="query-form-item">
-              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -18,16 +20,18 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物品编码:" class="query-form-item">
-              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="产品通用名:" class="query-form-item">
-              <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item  label="规格型号:" class="query-form-item">
+            <el-form-item label="规格型号:" class="query-form-item">
               <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -50,7 +54,7 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row
+      <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
                 :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
         <el-table-column label width="45">
           <template slot-scope="scope">
@@ -66,7 +70,7 @@
         <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="操作"  width="160">
+        <el-table-column label="操作" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
           </template>
@@ -100,7 +104,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>
@@ -118,6 +125,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addOrderDetail} from "@/api/purchase/purDelivery"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -138,7 +146,7 @@ export default {
       type: Object,
       required: true,
     },
-    customerId:{
+    customerId: {
       type: Object,
       required: true,
     }
@@ -164,7 +172,7 @@ export default {
         erpName: "",
         keys: [],
       },
-      ids:[],
+      ids: [],
       radioCheck: null,
       dataList: [],
       pageTotal: 1,
@@ -305,16 +313,16 @@ export default {
         return;
       }
 
-      if(this.ids.length>0){
-        for(var i=0;i<this.ids.length;i++){
-          if(this.ids[i]==this.multipleSelection.rlId){
+      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 (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;
@@ -326,12 +334,12 @@ export default {
     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
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
       addOrderDetail(tQuery).then((response) => {
         this.loading = false;
@@ -354,7 +362,7 @@ export default {
     selectCert() {
       if (this.currentCert == null) {
         this.$message.error("请先选择对应的注册证！");
-      }else{
+      } else {
         this.multipleSelection.zczbhhzbapzbh = this.currentCert;
         this.combine();
       }
@@ -366,9 +374,9 @@ export default {
   created() {
     console.log(this.data)
     if (this.$isNotBlank(this.data)) {
-      this.ids=[];
-      if(this.data.stockOrderLists.length>0){
-        for(var i=0;i<this.data.stockOrderLists.length;i++){
+      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);
         }
       }
diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index d6118c4..c93447a 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -1,440 +1,447 @@
 <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;
+      }
 
-        },
-    },
-    components: {udiRlDetailDialog},
+      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();
+      }
+    }
+    ,
+
+    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;
+      });
+
+    }
+    ,
 
-    created() {
-        if (this.$isNotBlank(this.data)) {
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-            // 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;
+    }
+    ,
+  },
+  components: {udiRlDetailDialog},
 
-            // 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);
-                }
-            }
+  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();
-    },
+      }
+    }
+    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 5da5950..5360527 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -103,7 +103,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>
@@ -121,6 +124,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",
@@ -313,7 +317,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 6fa6c79..93b89a7 100644
--- a/src/views/purchase/purPlan/purOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue
@@ -1,115 +1,123 @@
 <template>
-    <div>
-        <el-card class="el-card">
-                <el-form  :model="listQuery" label-width="120px" v-show="showSearch">
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="UDI码:" class="query-form-item">
-                            <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                     <el-col :span="6">
-                       <el-form-item label="第三方产品编码:" class="query-form-item">
-                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
-                     </el-form-item>
-                  </el-col>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="UDI码:" class="query-form-item">
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="第三方产品编码:" class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                    <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="物品编码:" class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="产品通用名:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item  label="规格型号:" class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="生产企业:" class="query-form-item">
-                          <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                                    clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                </el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物品编码:" class="query-form-item">
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品通用名:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-          <div class="top-right-btn">
-            <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="el-icon-search" @click="search">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
+      <div class="top-right-btn">
+        <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="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-                <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
-                    <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"></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="操作"  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-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+        <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"></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="操作" 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>
 
-          <pagination
-            v-show="pageTotal>0"
-            :total="pageTotal"
-            :page.sync="listQuery.page"
-            :limit.sync="listQuery.limit"
-            @pagination="handleErpPageChange"
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
 
-          ></pagination>
-        </el-card>
+      ></pagination>
+    </el-card>
 
 
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="80%"
-            :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="udiRlDetailVisible"
+      width="80%"
+      :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>
@@ -117,259 +125,260 @@ 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",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-        pId: {
-          type: Object,
-          required: true,
-        },
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
     },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+  },
 
-    data() {
-        return {
-            showSearch: true,
-            listQuery: {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10,
+  data() {
+    return {
+      showSearch: true,
+      listQuery: {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        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 = {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10
+      }
+      this.multipleSelection = [];
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.listQuery = {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10
-            }
-            this.multipleSelection = [];
-            this.radioCheck = null;
-            this.currentRow = null;
-            this.getList();
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        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;
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    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.page;
-            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;
-            filterCompanyProductRelevance(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();
-        },
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val.page;
+      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;
+      filterCompanyProductRelevance(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;
-            }
+    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 (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      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();
+      }
+    },
 
-        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;
+    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;
+      });
 
-        },
+    },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            }else{
-               this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-               this.combine();
-            }
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-        },
     },
-    components: {udiRlDetailDialog},
+  },
+  components: {udiRlDetailDialog},
 
-    created() {
-        console.log(this.data)
-        if (this.$isNotBlank(this.data)) {
-            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);
-                }
-            }
+  created() {
+    console.log(this.data)
+    if (this.$isNotBlank(this.data)) {
+      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);
         }
+      }
+    }
 
-    },
+  },
 };
 </script>
 
@@ -377,10 +386,10 @@ export default {
 
 
 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/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
index 64db40e..22d9e3c 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>