diff --git a/src/api/purchase/purApply.js b/src/api/purchase/purApply.js
index 90a0a91..7b73129 100644
--- a/src/api/purchase/purApply.js
+++ b/src/api/purchase/purApply.js
@@ -85,3 +85,6 @@ export function delApplyDetail(id) {
     })
 }
 
+
+
+
diff --git a/src/api/purchase/purPlan.js b/src/api/purchase/purPlan.js
index a6f21b6..3950edc 100644
--- a/src/api/purchase/purPlan.js
+++ b/src/api/purchase/purPlan.js
@@ -83,4 +83,12 @@ export function delApplyDetail(id) {
         method: 'delete'
     })
 }
+export function selectApply(query) {
+    return axios({
+        url: "/purchase/plan/selectApply",
+        method: "post",
+        data: query
+    });
+}
+
 
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 0dec83c..72d4873 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -1209,6 +1209,7 @@ export default {
             let rlId = this.editQuery.rlId;
             this.editQuery = row;
             this.editQuery.rlId = rlId;
+            this.editQuery.id = rlId;
         },
 
 
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index ac8bb2a..eef45e8 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -176,7 +176,7 @@
                         prop="spec"
                         show-overflow-tooltip
                     ></el-table-column>
-                    <el-table-column width="150" label="申购数量">
+                    <el-table-column width="150" label="采购数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
                                       placeholder="请输入数量" style="width: 80%"
@@ -260,12 +260,13 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             width="85%"
+            append-to-body
             v-if="selectApplyVisible"
         >
-            <selectReceiveOrderDialog
-                :closeDialog="closeDialog"
+            <select-apply-list-dialog
                 :data="thisData"
-            ></selectReceiveOrderDialog>
+                :closeDialog="closeDialogC2"
+            ></select-apply-list-dialog>
         </el-dialog>
 
     </div>
@@ -278,6 +279,7 @@ import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {getBusChange} from "@/api/basic/busTypeChange";
+import SelectApplyListDialog from "@/views/purchase/selectApplyListDialog";
 
 export default {
     name: "idQuery",
@@ -344,6 +346,7 @@ export default {
         };
     },
     components: {
+        SelectApplyListDialog,
         draggable,
         stockOrderNewSelectProduct,
     },
@@ -426,6 +429,7 @@ export default {
 
         closeDialogC2(rData) {
             this.selectProductVisible = false;
+            this.selectApplyVisible = false;
             this.thisData = {};
             if (this.$isNotBlank(rData)) {
                 this.codeArray = [];
diff --git a/src/views/purchase/selectApplyListDialog.vue b/src/views/purchase/selectApplyListDialog.vue
index 7c05d3a..f0e7bac 100644
--- a/src/views/purchase/selectApplyListDialog.vue
+++ b/src/views/purchase/selectApplyListDialog.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-card class="el-card" style="margin-top: -15px">
-            <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
+            <el-form :inline="true" :model="filterQuery" style="display: flex;" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
                         <el-input
@@ -52,13 +52,6 @@
                 <el-table-column label="申购仓库" prop="invName"></el-table-column>
                 <el-table-column label="申购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="申购说明" prop="remark"></el-table-column>
-                <el-table-column label="状态" prop="status">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ statusMap[scope.row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
             </el-table>
             <el-pagination
                 :page-size="filterQuery.limit"
@@ -86,6 +79,8 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+import {selectApply} from "@/api/purchase/purPlan";
+import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
 
 export default {
     name: "selectApplyListDialog",
@@ -107,24 +102,17 @@ export default {
                 billAction: null,
                 billNo: "",
                 originType: null,
-                thirdSysFk: "",
                 page: 1,
                 limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
             },
             formName: null,
-            formMap: {
-                add: "新增申购单据",
-                update: "申购单据详情",
-            },
             statusMap: {
                 1: "草稿",
                 2: "未审核",
                 3: "已审核",
                 4: "已拒绝"
             },
+            ids: [],
             idQuery: {},
             editType: 2,
             total: 0,
@@ -135,6 +123,7 @@ export default {
             list: [],
             detailList: [],
             loading: false,
+            currentRow: null,
             actDateRange: [],
             newSpDistributionVisible: false,
             pickerOptions: {
@@ -224,12 +213,12 @@ export default {
                 });
         },
         handleDetail(row) {
+            this.currentRow = row;
             let query = {orderIdFk: row.id};
             this.loading = true;
             listApplyDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-
                     this.loading = false;
                 })
                 .catch(() => {
@@ -288,24 +277,55 @@ export default {
             this.getList();
         },
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
-
+        combine() {
+            if (this.$isBlank(this.currentRow.id)) {
+                return;
+            }
+            if (this.ids.length > 0) {
+                for (var i = 0; i < this.ids.length; i++) {
+                    for (let j = 0; j < this.detailList.length; j++) {
+                        if (this.ids[i] == this.detailList[j].productId) {
+                            this.$message.error("该申购单已有产品被选入！");
+                            return;
+                        }
+                    }
+                }
+            }
+            let productDatas = [];
+            for (let j = 0; j < this.detailList.length; j++) {
+                let data = {
+                    relId: this.detailList[j].productId,
+                    supId: this.detailList[j].supId,
+                    zczbhhzbapzbh: this.detailList[j].zczbhhzbapzbh,
+                    count:this.detailList[j].count,
+                }
+                productDatas.push(data);
+            }
+            this.loading = true;
+            let tQuery = {
+                datas: productDatas,
+                stockOrderLists: this.data.stockOrderLists,
+                purType: 1,
+            };
+            getStockOrderDetailInstrumentById(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;
+            });
 
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.formName = "update";
-            } else
-                this.formName = "add";
-            this.newSpDistributionVisible = true;
         },
 
+
     },
     created() {
         let end = new Date();
@@ -313,6 +333,14 @@ export default {
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
         this.getList();
+
+        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);
+            }
+        }
+
     },
     components: {
         pureApplyDetail
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index b83a56e..6f146cb 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -1,431 +1,431 @@
 <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
+                    :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-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>
+            <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>
+        <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>
+    </div>
 </template>
 
 <script>
 import {
-  getStockOrderDetailInstrumentById,
-  stockOrderDetailFilterProduct
+    getStockOrderDetailInstrumentById,
+    stockOrderDetailFilterProduct
 } from "../../api/warehouse/stockOrder";
 import store from "../../store";
 import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
 
 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: {
-        purType: null,
-        billNo: "",
-        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]);
+    data() {
+        return {
+            listQuery: {
+                purType: null,
+                billNo: "",
+                page: 1,
+                limit: 10,
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              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 * 90);
-              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]);
+                        },
+                    },
+                ],
             },
-          },
-        ],
-      },
-      orderEditor: false,
-      orderId: "",
-      currentCert: null,
-      certList: [],
-      dialogFormVisible: false,
-      multipleSelection: null,
-    };
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.listQuery.udiCode = null
-      this.listQuery.unionCode = null
-      this.listQuery.cpmctymc = null
-      this.listQuery.ggxh = null
-      this.listQuery.ylqxzcrbarmc = null
-      this.listQuery.thrPiId = null
-      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
+            orderEditor: false,
+            orderId: "",
+            currentCert: null,
+            certList: [],
+            dialogFormVisible: false,
+            multipleSelection: null,
+        };
     },
-    handleDetailClick(row) {
-      this.currentRow = row;
-      this.udiRlDetailVisible = true;
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery.udiCode = null
+            this.listQuery.unionCode = null
+            this.listQuery.cpmctymc = null
+            this.listQuery.ggxh = null
+            this.listQuery.ylqxzcrbarmc = null
+            this.listQuery.thrPiId = null
+            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;
-      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();
-    },
+        },
+        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;
+            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;
-      }
+        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
-          }
-        }
-      }
+            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();
-      }
-    },
+            let str = this.multipleSelection.zczbhhzbapzbh;
+            if (str.search(",") != -1) {
+                this.currentCert = null;
+                this.certList = str.split(',');
+                this.dialogFormVisible = true;
+            } else {
+                this.combine();
+            }
+        },
 
-    combine() {
-      let ids = [];
-      let data = {
-        relId: this.multipleSelection.rlId,
-        supId: this.multipleSelection.customerId
-      }
-      ids.push(data);
-      this.loading = true;
-      let tQuery = {
-        datas: ids,
-        stockOrderLists: this.data.stockOrderLists,
-        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
-        purType: this.purType
-      };
-      getStockOrderDetailInstrumentById(tQuery).then((response) => {
-        this.loading = false;
-        if (response.code === 20000) {
-          this.closeDialog(response.data);
-        } else {
-          if (response.code == 601) {
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
+        combine() {
+            let ids = [];
+            let data = {
+                relId: this.multipleSelection.rlId,
+                supId: this.multipleSelection.customerId,
+                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
+            }
+            ids.push(data);
+            this.loading = true;
+            let tQuery = {
+                datas: ids,
+                stockOrderLists: this.data.stockOrderLists,
+                purType: this.purType
+            };
+            getStockOrderDetailInstrumentById(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;
             });
-          } 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() {
-    if (this.$isNotBlank(this.data)) {
+    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;
+            // 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);
+            // 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>