From 89fb04f56e716c3522e354c7d06f0a314684d982 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 7 Apr 2023 14:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/locUdi/UdiInfoDb.vue          |   1 +
 src/views/basic/product/udiInfoImport.vue     | 544 +++++++-------
 src/views/inout/InvoiceRegistration.vue       |  87 ++-
 .../inner/innerOrderSelectProduct.vue         | 684 +++++++++---------
 4 files changed, 667 insertions(+), 649 deletions(-)

diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue
index ca1fae8..9fce6d1 100644
--- a/src/views/basic/locUdi/UdiInfoDb.vue
+++ b/src/views/basic/locUdi/UdiInfoDb.vue
@@ -113,6 +113,7 @@
             <el-button type="primary" icon="el-icon-bottom-right" style="margin-left: 15px">导入器械信息</el-button>
           </el-upload>
         </div>
+        <el-divider style="margin: 15px"></el-divider>
         <el-table
           :data="udidlList"
           style="width: 100%"
diff --git a/src/views/basic/product/udiInfoImport.vue b/src/views/basic/product/udiInfoImport.vue
index f1ef664..2030de1 100644
--- a/src/views/basic/product/udiInfoImport.vue
+++ b/src/views/basic/product/udiInfoImport.vue
@@ -1,291 +1,291 @@
 <template>
-    <div>
-      <el-card>
-        <el-form  :model="query" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="记录ID:">
-                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="处理状态:">
-                    <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="处理中" value="1"></el-option>
-                        <el-option label="已处理" value="3"></el-option>
-                        <el-option label="异常" value="2"></el-option>
-                    </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-        </el-form>
+  <div>
+    <el-card>
+      <el-form :model="query" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="记录ID:">
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理状态:">
+              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="处理中" value="1"></el-option>
+                <el-option label="已处理" value="3"></el-option>
+                <el-option label="异常" value="2"></el-option>
+              </el-select>
+            </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="search" @click="getList">查询</el-button>
-            <el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false" :on-success="handleChange" :file-list="fileList">
-            <el-button  icon="el-icon-upload2" type="primary">导入器械信息</el-button>
-            </el-upload>
-          </el-button-group>
-        </div>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="search" @click="getList">查询</el-button>
+          <el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false"
+                     :on-success="handleChange" :file-list="fileList">
+            <el-button icon="el-icon-upload2" type="primary">导入器械信息</el-button>
+          </el-upload>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-        <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
+                highlight-current-row>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源" prop="fromType" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="导入信息" prop="remark" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
 
-        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-            <el-table-column label="来源" prop="fromType" show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-            <el-table-column label="状态" prop="status" show-overflow-tooltip>
-                <template slot-scope="scope">
-                    <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-                </template>
-            </el-table-column>
-          <el-table-column label="导入信息" prop="remark" show-overflow-tooltip></el-table-column>
-            <el-table-column label="操作"  width="120">
-                <template slot-scope="scope">
-                    <el-button type="text"  @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+      <el-dialog
+        title="器械信息导入详情"
+        :visible.sync="udiImportDetailVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="udiImportDetailVisible"
+      >
+        <udiInfoImportDetail :currentRow="currentRow" :closeDialog="cancelDialog"></udiInfoImportDetail>
+      </el-dialog>
 
-
-        <el-dialog
-            title="器械信息导入详情"
-            :visible.sync="udiImportDetailVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="udiImportDetailVisible"
-        >
-            <udiInfoImportDetail :currentRow="currentRow" :closeDialog="cancelDialog"></udiInfoImportDetail>
-        </el-dialog>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :limit.sync="filterQuery.limit"
-          :page.sync="filterQuery.page"
-          @pagination="handleCurrentChange"
-        ></pagination>
-      </el-card>
-    </div>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+  </div>
 </template>
 
 <script>
-    import axios from "axios";
-    import {filterDetail, filterLog, deleteLog, downloadSmp} from "@/api/basic/udiinfoImport";
-    import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
-    import udiInfoImportDetail from "./udiInfoImportDetail";
+import axios from "axios";
+import {filterDetail, filterLog, deleteLog, downloadSmp} from "@/api/basic/udiinfoImport";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import udiInfoImportDetail from "./udiInfoImportDetail";
 
-    export default {
-        data() {
-            return {
-                showSearch: true,
-                filterQuery: {
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                udiImportDetailVisible: false,
-                checked: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                currentRow: null,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                templateDlUrl: null,
-            };
-        },
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      udiImportDetailVisible: false,
+      checked: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      currentRow: null,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      templateDlUrl: null,
+    };
+  },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                filterLog(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            hideSearch() {
-              this.showSearch = !this.showSearch;
-            },
-            genInCode() {
-                this.selectBasicUdiVisible = true;
-            },
-            handleDetailClick(row) {
-                this.currentRow = row;
-                console.log(this.currentRow.genKey)
-                this.udiImportDetailVisible = true;
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    genInCode() {
+      this.selectBasicUdiVisible = true;
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      console.log(this.currentRow.genKey)
+      this.udiImportDetailVisible = true;
 
-            },
-            cancelDialog() {
-                this.udiImportDetailVisible = false;
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val.page;
-                this.getList();
-            },
-            deleteDialog(rowId) {
-                this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        let dQuery = {
-                            id: rowId,
-                        };
-                        deleteLog(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                                this.getList();
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
-                    })
-                    .catch(() => {
-                    });
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        // this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                        this.getList();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                axios.get("./config.json").then(res => {
-                    let response = res.data.BASE_URL;
-                    this.uploadFileUrl = response + "/udiwms/products/importLog/upload";
-                });
-                axios.get("./config.json").then(res => {
-                    let response = res.data.SERVER_IP;
-                    this.templateDlUrl = response + "/已对照产品信息模板.xlsx";
-                });
-            },
-            jumpDl() {
-                window.open(this.templateDlUrl, '_blank');
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                } else {
-                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.getList();
-                    this.$message.success(response.data);
-                }
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            },
-            dlSmp() {
-                this.loading = true;
-                downloadSmp()
-                    .then((response) => {
-                        this.loading = false;
-                        this.$message.success(response.data);
-                        this.getList();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    });
-            }
-        },
-        mounted() {
-        },
-        components: {udiInfoImportDetail},
-        created() {
-            this.getBasicThirdSys();
-            this.getList();
-        },
-    };
+    },
+    cancelDialog() {
+      this.udiImportDetailVisible = false;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          // this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.getList();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+      axios.get("./config.json").then(res => {
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/products/importLog/upload";
+      });
+      axios.get("./config.json").then(res => {
+        let response = res.data.SERVER_IP;
+        this.templateDlUrl = response + "/已对照产品信息模板.xlsx";
+      });
+    },
+    jumpDl() {
+      window.open(this.templateDlUrl, '_blank');
+    },
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.getList();
+        this.$message.success(response.data);
+      }
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    dlSmp() {
+      this.loading = true;
+      downloadSmp()
+        .then((response) => {
+          this.loading = false;
+          this.$message.success(response.data);
+          this.getList();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    }
+  },
+  mounted() {
+  },
+  components: {udiInfoImportDetail},
+  created() {
+    this.getBasicThirdSys();
+    this.getList();
+  },
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
 </style>
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index e84f1b5..e40501f 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -185,7 +185,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
-        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+        <el-table :data="codeDetailList" style="width: 100%" border
                   @current-change="BizDetail"
                   row-key="id" highlight-current-row
         >
@@ -273,66 +273,66 @@
     </el-tabs>
 
 
-
     <el-tabs type="border-card" style="margin: 15px">
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
-        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+        <el-table :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+
           <el-table-column
-            label="规格型号"
-            prop="ggxh"
+            label="物资名称"
+            prop="cpmctymc" width="150"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="物资名称"
-            prop="cpmctymc"
+            label="规格型号" width="150"
+            prop="ggxh"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="批次号"
+            label="批次号" width="100"
             prop="batchNo"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="机器编码"
+            label="机器编码" width="150"
             prop="machineNo"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="发票代码"
+            label="发票代码" width="150"
             prop="invoiceCode"
           ></el-table-column>
           <el-table-column
-            label="发票编码"
+            label="发票编码" width="150"
             prop="invoiceEncode"
           ></el-table-column>
           <el-table-column
-            label="开票日期"
+            label="开票日期" width="150"
             prop="invoiceDate"
           ></el-table-column>
           <el-table-column
             label="发票价格"
-            prop="price"
+            prop="price" width="100"
           ></el-table-column>
           <el-table-column
-            label="生产日期"
+            label="生产日期" width="100"
             prop="productDate"
           ></el-table-column>
           <el-table-column
             label="失效日期"
-            prop="expireDate"
+            prop="expireDate" width="100"
           ></el-table-column>
 
           <el-table-column
             label="备注"
-            prop="remark"
+            prop="remark" width="140"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column label="操作" width="160">
+          <el-table-column label="操作" width="160" fixed="right">
             <template slot-scope="scope">
 
               <el-button
@@ -440,8 +440,6 @@ import {previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
-
-
 const formJson = {
   site_id: "",
   site_name: "",
@@ -531,7 +529,7 @@ export default {
         billNo: ""
       },
       actDateRange: [],
-      auditDateRange:[],
+      auditDateRange: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -591,6 +589,7 @@ export default {
       resultDetailList: [],
       acceptQuery: null,
       acceptOrderVisible: false,
+      subRow: null,
     };
   },
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
@@ -614,17 +613,27 @@ export default {
       this.getList();
     },
     InvoiceRegister(row) {
-      insertInvoice(row)
-        .then(response => {
-          if (response.code === 20000) {
-            this.closeInvoice(row);
-          } else {
+
+      this.$confirm('是否登记新的发票？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.insertInvoice(row)
+          .then(response => {
+            if (response.code === 20000) {
+              this.closeInvoice(row);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch((response) => {
             this.$message.error(response.message);
-          }
-        })
-        .catch((response) => {
-          this.$message.error(response.message);
-        });
+          });
+      }).catch(() => {
+      });
+
+
     },
     onSubmit() {
       this.loading = true;
@@ -704,7 +713,7 @@ export default {
     },
 
     deleteInvoice(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+      this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -714,7 +723,7 @@ export default {
           deleteById(params)
             .then((response) => {
               if (response.code == 20000) {
-                this.getBizDetailList();
+                this.getBizDetailList(this.subRow);
                 this.$message({
                   type: "success",
                   message: "删除成功！",
@@ -911,7 +920,8 @@ export default {
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
-      this.bizQuery.bizIdFk = row.id;
+      this.bizQuery.batchNo = row.batchNo;
+      this.bizQuery.relId = row.bindRlFk;
       filterListInvoice(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
@@ -929,13 +939,10 @@ export default {
         this.bizTotal = 0;
       })
     },
-
-    BizDetail(val){
-      debugger
-      this.bizQuery.page=1;
-      this.bizQuery.productName=val.coName;
-      this.bizQuery.batchNo=val.batchNo;
-      this.getBizDetailList();
+    BizDetail(row) {
+      this.bizQuery.page = 1;
+      this.subRow = row;
+      this.getBizDetailList(row);
     },
 
 
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 56f2148..f62db9e 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -1,376 +1,386 @@
 <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="18">
+            <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-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>
 
-          <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-row>
+          <el-col :span="8">
+            <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-col :span="8">
+            <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-row>
+        <el-row>
 
-          <pagination
-            v-show="pageTotal>0"
-            :total="pageTotal"
-            :page.sync="listQuery.page"
-            :limit.sync="listQuery.limit"
-            @pagination="handleErpPageChange"
+          <el-col :span="8">
+            <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="8">
+            <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="8">
+            <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>
 
-          ></pagination>
-        </el-card>
+      <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-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>
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
 
-        <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 :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>
+      ></pagination>
+    </el-card>
 
-    </div>
+
+    <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 :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>
 </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 {addOrderDetail} from "@/api/inventory/innerOrder";
 
 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 (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
-            };
-          addOrderDetail(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
+      };
+      addOrderDetail(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>
 
@@ -378,10 +388,10 @@ export default {
 
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>