diff --git a/public/config.json b/public/config.json
index 07fe4ff..7ca6b5f 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
-    "SERVER_IP": "http://139.9.178.73:8080/",
+    "BASE_URL":"http://192.168.0.109:9991/",
+    "SERVER_IP": "http://192.168.0.109:9991/",
     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }
diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index 2f7e707..b061532 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -30,3 +30,10 @@ export function downloadBussinessType(query) {
         data: query
     });
 }
+export function getOriginJoinBusType(query) {
+    return axios({
+        url: "/udiwms/originBusType/filterJoin",
+        method: "get",
+        params: query
+    });
+}
diff --git a/src/api/basic/companyProductRelevance.js b/src/api/basic/companyProductRelevance.js
index a281b21..b5aecc5 100644
--- a/src/api/basic/companyProductRelevance.js
+++ b/src/api/basic/companyProductRelevance.js
@@ -19,9 +19,26 @@ export function insertFilter(query) {
     );
 }
 
+export function insertCompanyProductRelevance(query) {
+    return axios(
+        {
+            url: "/sale/info/insertCompanyProductRelevance",
+            method: "post",
+            data: query
+        }
+    );
+}
 
 
-
+export function deleteCompanyProductRelevance(query) {
+    return axios(
+        {
+            url: "/sale/info/deleteCompanyProductRelevance",
+            method: "post",
+            data: query
+        }
+    );
+}
 
 
 
diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js
new file mode 100644
index 0000000..ac7680f
--- /dev/null
+++ b/src/api/thrsys/thrOrderReceive.js
@@ -0,0 +1,9 @@
+import axios from "@/utils/axios";
+
+export function inserThrOrderWeb(query) {
+    return axios({
+        url: "/udiwms/thrsys/order/insertWeb",
+        method: "post",
+        data: query
+    });
+}
diff --git a/src/router/index.js b/src/router/index.js
index 6548e20..1f7b78a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,7 +97,8 @@ import UdiInfoDonwloadSmp from "../views/basic/UdiInfoDonwloadSmp.vue";
 import thrOrderExportSmp from "../views/thrsys/ThrOrderExportSmp.vue";
 import thrProductsExportSmp from "../views/thrsys/ThrProductsExportSmp.vue";
 import thrCorpsExportSmp from "../views/thrsys/ThrCorpsExportSmp.vue";
-
+import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue";
+import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue";
 
 import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse";
 import syncConfig from "../views/thrsys/SysUdimsConfig.vue";
@@ -336,7 +337,34 @@ export const asyncRouterMap = [
             //         authRule: ["inout/ioErrorOrder"]
             //     }
             // },
+            {
+                path: "/receiveOrder",
+                component: Empty,
+                name: "耗材领用管理",
+                redirect: "/receiveOrder/receiveOrderNew",
+                meta: {
+                    authRule: ["receiveOrder"]
+                },
+                children: [
+                    {
+                        path: "receiveOrderNew",
+                        component: receiveOrderNew,
+                        name: "新增领用单据",
+                        meta: {
+                            authRule: ["stock/receiveOrderNew"]
+                        }
+                    },
+                    {
+                        path: "receiveOrderSearch",
+                        component: receiveOrderSearch,
+                        name: "领用单查询",
+                        meta: {
+                            authRule: ["stock/receiveOrderSearch"]
+                        }
+                    },
 
+                ]
+            },
 
             {
                 path: "/inoutOrder",
diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index f1a078a..31063d2 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -5,7 +5,7 @@
                 <el-row>
                     <el-form-item class="query-form-item">
                         <el-select
-                            v-model="filterQuery.companyName"
+                            v-model="filterQuery.unitFk"
                             filterable
                             remote
                             clearable="true"
@@ -18,7 +18,7 @@
                                 v-for="item in fromOptions"
                                 :key="item.name"
                                 :label="item.name"
-                                :value="item.name"
+                                :value="item.erpId"
                             >
                                 <span style="float: left">{{ item.name }}</span>
                             </el-option>
@@ -68,6 +68,13 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button
+                                type="primary"
+                                icon="search"
+                                @click="selectProduct()"
+                            >选入产品
+                            </el-button
+                            >
                             <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine"
                             >锁定
                             </el-button
@@ -147,7 +154,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column width="80" label="操作" fixed="right">
+                <el-table-column width="200" label="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
@@ -155,6 +162,13 @@
                             @click.native.stop="handleModifyClick(scope.row)"
                         >详情
                         </el-button>
+
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteClick(scope.row)"
+                        >移除
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -696,12 +710,31 @@
                     @closeUdi="closeUdi"
                 ></selectUdiVersion>
             </el-dialog>
+
+            <el-dialog
+                title="选入产品信息"
+                :visible.sync="selectProductVisible"
+                width="85%"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                v-if="selectProductVisible"
+            >
+                <selectProduct
+                    :closeSelDialog="closeDialog"
+                    :uuid="uuid"
+                    :unitFk="filterQuery.unitFk"
+                ></selectProduct>
+            </el-dialog>
+
+
             <el-pagination
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
             ></el-pagination>
+
+
         </el-card>
     </div>
 </template>
@@ -718,9 +751,9 @@ import {
 } from "../../api/basic/udiRelevance";
 import {selectSysParamByKey} from "../../api/param/systemParamConfig";
 import {filterByUuid, filterCompany} from "../../api/basic/udiInfo";
-import {filterCompanyProductRelevance} from "../../api/basic/companyProductRelevance";
+import {filterCompanyProductRelevance, deleteCompanyProductRelevance} from "../../api/basic/companyProductRelevance";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-
+import selectProduct from "./basicCompanyProductsImport";
 import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
@@ -742,6 +775,7 @@ export default {
                 thrPiId: null,
                 filterType: null,
                 companyName: null,
+                unitFk: null,
             },
             fromOptions: [],
             editQuery: null,
@@ -776,6 +810,7 @@ export default {
                 cpmctymc: null,
                 ggxh: null
             },
+            selectProductVisible: false,
             multipleSelection: [],
             editDialogVisible: false,       //详情
             selectUdiDialogVisible: false,  //关联选入
@@ -784,7 +819,7 @@ export default {
             selectVersionVisible: false,
             isUseDyCheck: false,
             lockStatusMap: {"1": "未提交", "2": "已提交", "3": "已锁定"},
-            loading:false,
+            loading: false,
         };
     },
 
@@ -798,7 +833,8 @@ export default {
                 unionCode: null,
                 udiCode: null,
                 ylqxzcrbarmc: "",
-                cpmctymc: "", thrPiId: null,
+                cpmctymc: "",
+                thrPiId: null,
                 nameCode: "",
                 ggxh: null,
                 page: 1,
@@ -808,6 +844,10 @@ export default {
             this.getList();
         },
         getList() {
+            if (this.$isBlank(this.filterQuery.unitFk)) {
+                this.$message.error("请先选择供应商！");
+                return;
+            }
             this.loading = true;
             filterCompanyProductRelevance(this.filterQuery)
                 .then((response) => {
@@ -1026,6 +1066,37 @@ export default {
         },
 
 
+        deleteClick(row) {
+            this.$confirm("是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.productLoading = true;
+                let tquery = {
+                    id: row.id,
+                };
+                deleteCompanyProductRelevance(tquery)
+                    .then((response) => {
+                        this.productLoading = false;
+                        if (response.code === 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "删除成功！",
+                            });
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.productLoading = false;
+                    });
+            }).catch(() => {
+            });
+        },
+
+
         lockProducts(status) {
             let selectData = this.multipleSelection;
             let postQuery = {
@@ -1112,6 +1183,7 @@ export default {
             this.selectErpDialogVisible = false;
             this.selectLocalVisible = false;
             this.selectVersionVisible = false;
+            this.selectProductVisible = false;
         },
         onAddSubmit() {
             if (this.checked == true) {
@@ -1179,7 +1251,7 @@ export default {
         },
 
         findMethod(query) {
-            console.log(query);
+            this.fromOptions = [];
             let cQuery = {
                 key: query,
                 page: 1,
@@ -1192,25 +1264,34 @@ export default {
                 })
                 .catch(() => {
                     this.loading = false;
-                    this.options = [];
+                    this.fromOptions = [];
                 });
         },
+        selectProduct() {
+            this.selectProductVisible = true;
+        },
 
-    },
+    }
+    ,
     mounted() {
-    },
+    }
+    ,
     components: {
         selectUdi,
         selectErp,
         selectLocalUdi,
-    },
+        selectProduct
+    }
+    ,
     created() {
-        this.getList();
+        // this.getList();
         this.selectSysParam();
         this.getSysFilter();
         this.findMethod();
-    },
-};
+    }
+    ,
+}
+;
 </script>
 <style scoped>
 .itemTag {
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
new file mode 100644
index 0000000..829b6d7
--- /dev/null
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -0,0 +1,956 @@
+<template>
+    <div>
+
+        <el-form :inline="true" :model="filterQuery" size="mini">
+
+            <el-row>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+                </el-form-item>
+
+
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
+                        <el-option
+                            v-for="item in filterList"
+                            :key="item.filterType"
+                            :label="item.sysName"
+                            :value="item.filterType">
+                            <span style="float: left">{{ item.sysName }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-row>
+
+            <el-row>
+
+
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人" clearable="true"></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.supName" placeholder="配送企业" clearable="true"></el-input>
+                </el-form-item>
+
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.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="submitSearch">查询</el-button>
+                        <el-button type="primary" icon="search" @click="selectExport"
+                        >选中导入
+                        </el-button>
+                    </el-button-group>
+                </el-form-item>
+            </el-row>
+        </el-form>
+
+        <el-table
+            v-loading="loading"
+            :data="list"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" :selectable="checkSelectable"></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="supName"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column width="200" label="操作" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleModifyClick(scope.row)"
+                    >详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog
+            title="产品信息详情"
+            :visible.sync="editDialogVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="editDialogVisible"
+        >
+            <el-table :data="sysList" style="width: 100%" border>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="第三方系统名称"
+                    prop="sysName"
+                    show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                    label="第三方产品名称"
+                    prop="thirdName"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="第三方产品ID"
+                    prop="thirdId"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+            <el-table
+                v-loading="loading"
+                :data="detailList"
+                style="width: 100%; margin-top: 20px"
+                border
+                @current-change="handleDetail"
+            >
+                <el-table-column
+                    label="产品标识"
+                    prop="nameCode"
+                    show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                    label="产品通用名"
+                    prop="cpmctymc"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装级别"
+                    prop="packLevel"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装层级"
+                    prop="bzcj"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+
+            <el-form
+                :model="editQuery"
+                :rules="rules"
+                ref="editQuery"
+                label-width="100px"
+                style="margin-top: 20px"
+            >
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.cpmctymc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品标识:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.nameCode"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>规格型号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ggxh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>器械类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.qxlb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cplb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>分类编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.flbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>商品条码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sptm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医保编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ybbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医疗器械注册人:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="ylqxzcrbarmc"
+                                v-model="editQuery.ylqxzcrbarmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册人英文名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ylqxzcrbarywmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>统一社会信用号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.tyshxydm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册证/备案号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zczbhhzbapzbh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>上级产品编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sjcpbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包装级别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.packLevel"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>计量单位/包装级别:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bzcj"
+                                :disabled="true"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.bhxjsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级产品编码:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhxjcpbm"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含最小销售包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhzxxsbzsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含批号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.scbssfbhph"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含序列号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                v-model="editQuery.scbssfbhxlh"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含生产日期:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.scbssfbhscrq"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>是否包含失效日期:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                v-model="editQuery.scbssfbhsxrq"
+                                size="small"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品描述:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cpms"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zxxsbzbhsydysl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <el-form-item prop="name">
+                            <el-checkbox v-model="checked" class="text item itemTag"
+                            >以使用单元数量入库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+
+        </el-dialog>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+    </div>
+</template>
+
+<script>
+import {
+    getUdiInfos,
+    updateErpProduct,
+    thirdSysDetail,
+    getSmUdiInfos
+} from "../../api/basic/udiRelevance";
+import {udiUpload} from "../../api/thrsys/smp"
+import {exportExcel} from "../../api/basic/udiInfoExport"
+import {selectSysParamByKey} from "../../api/param/systemParamConfig";
+import {filterByUuid} from "../../api/basic/udiInfo";
+import {
+    insertCompanyProductRelevance,
+    updateCompanyProductRelevance, insertFilter
+} from "../../api/basic/companyProductRelevance";
+import store from "../../store";
+
+export default {
+    name: "UdIInfoSelect",
+    props: {
+        unitFk: {
+            type: Object,
+            required: true,
+        },
+        selectType: {
+            type: Object,
+            required: true,
+        },
+        closeSelDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            filterQuery: {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName: null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
+                isDisable: false,
+            },
+
+            editQuery: null,
+            relevanceEdit: {
+                id: null,
+                thirdId: "",
+                isUseDy: false,
+            },
+            isImport: false,
+            isImportUdi: false,
+            isUploadSmp: false,
+            isImportFile: false,
+            uploadFileUrl: null,
+            checked: false,
+            list: [],
+            detailList: [],
+            sysList: [],
+            total: 0,
+            thirdNo: "",
+            uuid: "111",
+            thirdId: null,
+            relId: "",
+            thisData: {
+                nameCode: null,
+                cpmctymc: null,
+                ggxh: null
+            },
+            multipleSelection: [],
+            editDialogVisible: false,
+            selectUdiDialogVisible: false,
+            selectErpDialogVisible: false,
+            selectLocalVisible: false,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName: null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                unitFk: null,
+                addType: 1,
+            };
+            this.getList();
+        },
+
+
+        submitSearch() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            getSmUdiInfos(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;
+                });
+        },
+
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleDetail(row) {
+            this.editQuery = row;
+            console.log(row);
+        },
+
+        combine() {
+            this.combineQuery.productUuid = this.currentRow.uuid;
+            this.combineQuery.customerId = store.getters.customerId;
+            insertCompanyProductRelevance(this.combineQuery).then(response => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.$message.success("添加成功");
+                    this.closeDialog(true);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+
+
+        selectExport() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.rlIds.push(obj.id);
+            });
+            this.filterQuery.unitFk = this.unitFk;
+            this.allExport();
+
+        },
+        allExport() {
+            this.filterQuery.customerId = store.getters.customerId;
+            insertFilter(this.filterQuery).then(response => {
+                this.loading = false;
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                    console.log("关闭弹窗");
+                    this.$emit("closeSelDialog", true);
+                    this.closeSelDialog();
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+
+        intentDetail() {
+            this.isImportUdi = false;
+            this.selectUdiDialogVisible = true;
+        },
+
+        intentImportErp(val) {
+            this.uuid = val.uuid;
+            this.relId = val.id;
+            this.isImport = true;
+            this.thisData = val;
+            this.selectErpDialogVisible = true;
+        },
+        uploadSMP() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.uuids.push(obj.uuid);
+            });
+            this.allUploadSMP();
+        },
+
+        allUploadSMP() {
+            udiUpload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "上传成功！",
+                        });
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: response.message,
+                        });
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
+                    });
+                    this.$emit("cancelDialog", true);
+                });
+        },
+        handleSelectionChange(val) {
+            console.log("----" + val);
+            this.multipleSelection = val;
+        },
+
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleModifyClick(row) {
+            this.editDialogVisible = true;
+            this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.id,
+                thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+            };
+            this.checked = row.isUseDy == 1;
+
+            let ttquery = {
+                uuid: row.uuid,
+                page: 1,
+                limit: 10,
+            };
+            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
+
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+        },
+        closeUdi(val) {
+            this.selectUdiDialogVisible = false;
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+            if (val) {
+                this.getList();
+            }
+        },
+        getThirdSysDetail() {
+            let query = {
+                id: this.relevanceEdit.id,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        },
+        checkSelectable(row) {
+            return !row.isSelect;
+        },
+        uploadErpProduct() {
+            updateErpProduct()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: response.data,
+                        });
+                        this.$emit("closeDialog", true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        closeDialog() {
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+        },
+
+        selectSysParam() {
+            let query = {
+                paramKey: "smp_isUploadProuct",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isUploadSmp = true;
+                    }
+                }
+            });
+            let query1 = {
+                paramKey: "upload_pi_file_enabled",
+            };
+            selectSysParamByKey(query1).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isImportFile = true;
+                    }
+                }
+            });
+            let query2 = {
+                paramKey: "upload_pi_file_url",
+            };
+            selectSysParamByKey(query2).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.paramValue;
+                }
+            });
+        },
+    },
+    mounted() {
+    },
+    components: {},
+    created() {
+
+        console.log(" this.filterQuery.unitFk = " + this.unitFk)
+        this.getList();
+        this.selectSysParam();
+    },
+};
+</script>
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
new file mode 100644
index 0000000..5c8cd91
--- /dev/null
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -0,0 +1,496 @@
+<template>
+    <div>
+        <el-card class="el-card">
+
+
+            <el-form :inline="true" :model="filterQuery"
+                     class="query-form" size="mini">
+                <el-row>
+
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.billNo"
+                            placeholder="单据号"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.corpName"
+                            placeholder="往来单位"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+
+                        <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+                            <el-option
+                                v-for="item in originTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                        item.thirdSysName
+                                    }}</span>
+                            </el-option>
+
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
+                                新增订单
+                            </el-button>
+
+
+                        </el-button-group>
+
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                      @current-change="handleDetail">
+                <el-table-column label="序号" type="index" width="60"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+                <el-table-column label="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName"
+                                 show-overflow-tooltip="true"></el-table-column>
+<!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="newDistributionForm(scope.$index, scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                        >删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <!--                <el-table-column label="单据数量" prop="reCount"></el-table-column>-->
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-dialog
+            title="编辑"
+            :visible.sync="newSpDistributionVisible"
+            width="80%"
+            v-if="newSpDistributionVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
+            <thrOrderNew
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :closeConfirmFunction="closeConfirmFunction"
+            ></thrOrderNew>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import {
+    delThrOrders, delAll, downloadAll
+} from "../../api/thrsys/thrOrder";
+import {getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {getOriginBusType} from "../../api/basic/busOriginType";
+
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {selectIp} from "../../api/param/systemParamConfig";
+import {
+    getCloudErp,
+} from "../../api/inout/erpOrder";
+import thrOrderNew from "./thrOrderNew";
+import store from "@/store";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                originType: null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            },
+            idQuery: {},
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            uploadFileUrl: null,
+            fileList: [],
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            closeConfirm: false,
+            loading: false,
+            actDateRange: [],
+            newSpDistributionVisible: false,
+            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]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        getList() {
+            if (this.filterQuery.thirdSysFk == null) {
+                this.$message.warning("请先选择第三方系统！")
+                return;
+            }
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            getCloudErp(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+            this.detailList = row.subErpOrders;
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: row.id,
+                    };
+                    delThrOrders(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+
+                })
+                .catch(() => {
+                });
+        },
+        clearAll() {
+            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delAll()
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.success(response.message);
+                            }
+                        })
+                        .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.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+                    this.selectSysParam();
+                    this.getThirdSysDetail();
+                    this.getBusType();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        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.$message.success("文件上传成功,请稍后刷新查看！");
+            }
+        },
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+                }
+            });
+        },
+        thirdSysChange() {
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getThirdSysDetail();
+        },
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+
+        },
+        downloadDatas() {
+            let query = {
+                billAction: this.filterQuery.billAction
+            };
+            downloadAll(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+        closeConfirmFunction(type) {
+            if (this.$isNotBlank(type) && type) {
+                this.closeConfirm = type;
+            }
+        },
+        getlocalName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+                corpType:1,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+            getOriginBusType(query)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                    // this.filterQuery.originType = this.originTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+
+
+        },
+
+        closeDialog() {
+            this.newSpDistributionVisible = false;
+            this.getList();
+            this.detailList = [];
+        },
+
+
+        newDistributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+            }
+            this.newSpDistributionVisible = true;
+        },
+
+    },
+    components: {
+        thrOrderNew,
+    },
+    mounted() {
+    },
+    created() {
+        this.getBasicThirdSys();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+    },
+};
+</script>
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>
+
diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
new file mode 100644
index 0000000..e5278bb
--- /dev/null
+++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
@@ -0,0 +1,499 @@
+<template>
+    <div>
+        <el-card class="el-card">
+
+
+            <el-form :inline="true" :model="filterQuery"
+                     class="query-form" size="mini">
+                <el-row>
+
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.billNo"
+                            placeholder="单据号"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.corpName"
+                            placeholder="往来单位"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+
+                        <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+                            <el-option
+                                v-for="item in originTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                        item.thirdSysName
+                                    }}</span>
+                            </el-option>
+
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <!--<el-form-item class="query-form-item">-->
+                    <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
+                    <!--<el-option-->
+                    <!--v-for="item in thirdSys"-->
+
+
+                    <!--:key="item.value"-->
+                    <!--:label="item.thirdName"-->
+                    <!--:value="item.thirdId">-->
+                    <!--<span style="float: left">{{ item.thirdName }}</span>-->
+                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
+                    <!--</el-option>-->
+                    <!--</el-select>-->
+                    <!--</el-form-item>-->
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
+                            <!--<el-upload-->
+                            <!--v-if="!this.thirdSysDetail.enabled"-->
+                            <!--:action="uploadFileUrl"-->
+                            <!--multiple-->
+                            <!--:limit="3"-->
+                            <!--:data="uploadData"-->
+                            <!--:show-file-list="false"-->
+                            <!--:on-success="handleChange"-->
+                            <!--:file-list="fileList"-->
+                            <!--&gt;-->
+                            <!--<el-button size="mini" type="primary">导入业务单据</el-button>-->
+                            <!--</el-upload>-->
+                            <!--<el-button type="primary" icon="search" @click="downloadDatas"-->
+                            <!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入业务单据-->
+                            <!--</el-button>-->
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                      @current-change="handleDetail">
+                <el-table-column label="序号" type="index" width="60"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+                <el-table-column label="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
+                <el-table-column label="往来单位" prop="corpName"
+                                 show-overflow-tooltip="true"></el-table-column>
+<!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+
+
+                <!--        <el-table-column label="扫码单据类型" prop="billType">-->
+                <!--          <template slot-scope="scope">-->
+                <!--            <span>{{ getActionName(scope.row.billType) }}</span>-->
+                <!--          </template>-->
+                <!--        </el-table-column>-->
+                <!--        <el-table-column label="目标单据类型" prop="billType">-->
+                <!--          <template slot-scope="scope">-->
+                <!--            <span>{{ getlocalName(scope.row.billType) }}</span>-->
+                <!--          </template>-->
+                <!--        </el-table-column>-->
+                <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                        >删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="reCount"></el-table-column>
+                <el-table-column label="实际数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+    </div>
+</template>
+<script>
+import {
+    delThrOrders, delAll, downloadAll
+} from "../../api/thrsys/thrOrder";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {getOriginBusType} from "../../api/basic/busOriginType";
+
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {selectIp} from "../../api/param/systemParamConfig";
+import {
+    getCloudErp,
+} from "../../api/inout/erpOrder";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                originType:null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 0,
+            },
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes:[],
+            list: [],
+            detailList: [],
+            uploadFileUrl: null,
+            fileList: [],
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            loading: false,
+            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]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 0,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        getList() {
+            if (this.filterQuery.thirdSysFk == null) {
+                this.$message.warning("请先选择第三方系统！")
+                return;
+            }
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            getCloudErp(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+
+            this.detailList = row.subErpOrders;
+            // console.log(row.billNo);
+            // let query = {
+            //     orderIdFk: row.id
+            // };
+            // this.loading = true;
+            // getThrOrderDetails(query)
+            //     .then((response) => {
+            //         this.loading = false;
+            //         this.detailList = response.data.list || [];
+            //         this.total = response.data.total || 0;
+            //     })
+            //     .catch(() => {
+            //         this.loading = false;
+            //         this.list = [];
+            //         this.total = 0;
+            //     });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: row.id,
+                    };
+                    delThrOrders(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+
+                })
+                .catch(() => {
+                });
+        },
+        clearAll() {
+            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delAll()
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.success(response.message);
+                            }
+                        })
+                        .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.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+                    this.selectSysParam();
+                    this.getThirdSysDetail();
+                    this.getBusType();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        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.$message.success("文件上传成功,请稍后刷新查看！");
+            }
+        },
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+                }
+            });
+        },
+        thirdSysChange() {
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getThirdSysDetail();
+        },
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+
+        },
+        downloadDatas() {
+            let query = {
+                billAction: this.filterQuery.billAction
+            };
+            downloadAll(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+
+        getlocalName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+            getOriginBusType(query)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                    // this.filterQuery.originType = this.originTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+
+
+        },
+
+    },
+    components: {},
+    mounted() {
+    },
+    created() {
+        this.getBasicThirdSys();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+    },
+};
+</script>
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>
+
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
new file mode 100644
index 0000000..07a017f
--- /dev/null
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -0,0 +1,1114 @@
+<template>
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button
+              type="primary"
+              @click.native="saveOrder('1')"
+              :loading="loading"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+              type="primary"
+              @click.native="saveOrder('0')"
+              :loading="loading"
+          >提交单据
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+
+      <el-card style="margin-top: -5px;">
+        <el-row :gutter="20" style="margin-top: 10px;">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>单据号：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billNo">
+              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>单据日期：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billdate">
+              <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
+              <el-date-picker
+                  v-model="formData.billdate"
+                  type="date"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  :clearable="false"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" style="margin-top: -10px">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>业务类型：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="billType">
+              <el-select v-model="formData.billType" placeholder="请选择业务类型"
+                         @change="actionChange" clearable>
+                <el-option
+                    v-for="item in busTypes"
+                    :key="item.thirdAction"
+                    :label="item.thirdName"
+                    :value="item.thirdAction">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>往来单位：</span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item class="query-form-item" prop="corpName"
+                          v-if="curAction.corpType ==0 || curAction.corpType == 3 || (curAction.corpType == 2 && !curAction.genUnit)">
+              <el-select
+                  v-model="formData.corpName"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="请输入往来单位"
+                  :remote-method="findMethod"
+                  :loading="loading"
+                  @change="selectOne"
+              >
+                <el-option
+                    v-for="item in fromOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="query-form-item" prop="fromCorp"
+                          v-if="curAction.corpType ==1">
+              <el-select
+                  v-model="formData.corpName"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="请输入仓库信息"
+                  :remote-method="findStorageMethod"
+                  :loading="loading"
+                  @change="storageChange"
+              >
+                <el-option
+                    v-for="item in fromStorageOptions"
+                    :key="item.value"
+                    :label="item.code"
+                    :value="item">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="query-form-item" prop="fromCorp"
+                          v-if="curAction.corpType ==2 && curAction.genUnit">
+              <el-input v-model="formData.corpName" auto-complete="off"
+                        clearable
+                        placeholder="请输入病人住院号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20" style="margin-top: -10px">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>当前仓库：</span>
+            </div>
+          </el-col>
+
+          <el-col :span="7">
+            <el-form-item prop="locStorageCode">
+              <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                         clearable>
+                <el-option
+                    v-for="item in storageList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span></span>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item prop="type" style="margin-right: 20px;"
+                          v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
+              <el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" style="margin-top: -10px;">
+
+        </el-row>
+
+      </el-card>
+
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="selectProductFunction()"
+              style="margin: 0px 60px 10px auto; height: 35px"
+              :loading="loading"
+          >产品录入
+          </el-button
+          >
+        </el-button-group>
+
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
+                  :row-class-name="tableRowClassName"
+                  max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column width="150"
+                           label="产品通用名"
+                           prop="productName"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="spec"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150" label="批次号">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号" style="width: 80%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="失效日期(yyMMdd)">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="单据数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="价格">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.price"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        placeholder="请输入价格" style="width: 80%"
+              ></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="150"
+                           label="注册/备案凭证号"
+                           prop="zczbhhzbapzbh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="生产厂家"
+                           prop="ylqxzcrbarmc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+
+              <el-button
+                  type="text"
+                  size="small"
+                  :disabled="scope.row.index === selectedIndex"
+                  @click.stop="true"
+                  @click.native="rowChange(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="copyDetail(scope.row)"
+              >复制
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="deleteCodeArray(scope.$index, scope.row)"
+              >删除
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+
+    <el-dialog
+        title="产品录入"
+        :visible.sync="selectProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectProductVisible"
+        :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+      ></stockOrderNewSelectProduct>
+    </el-dialog>
+
+    <el-dialog
+        title="库存产品录入"
+        :visible.sync="selectInvProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectInvProductVisible"
+        :append-to-body='true'
+    >
+      <dialogInvProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :invQueryData="invQueryData"
+      ></dialogInvProduct>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  stockOrderDetail,
+  submitStockOrder,
+  stockOrderGenerateBillNo,
+  getStockOrderDetailInstrument,
+  insertStockOrderWeb,
+  deleteStockOrderDetailById,
+  addStockOrderDetailFromCode,
+  uploadStockOrderDetail,
+  stockOrderDetailQueryProduct,
+  getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
+} from "../../api/inout/stockOrder";
+import draggable from "vuedraggable";
+import store from "../../store";
+import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
+import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
+import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
+import dialogInvProduct from "../inventory/DialogInvProduct"
+import {getOriginJoinBusType} from "@/api/basic/busOriginType";
+import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
+import {getThrOrderDetails} from "@/api/thrsys/thrOrder";
+
+export default {
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    closeConfirmFunction: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {noInvOut: false, locStorageCode: null},
+      formRules: {
+        corpName: [
+          {required: true, message: "请输入供应商", trigger: "blur"}
+        ],
+        billdate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        locStorageCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+        // type: [
+        //     {required: true, message: "请选择采购类型", trigger: "blur"}
+        // ],
+      },
+      codeArray: [],
+      fromOptions: [],
+      fromStorageOptions: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        101: "未处理",
+        102: "已处理",
+        201: "未配货",
+        202: "已配货",
+        301: "已打印",
+        401: "异常",
+        501: "未提交",
+        502: "已提交",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      curAction: {
+        corpType: 0,
+        genUnit: false,
+      },
+      orderEditor: true,
+      iCount: 0,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+      storageList: [],
+      invQueryData: {},
+
+    };
+  },
+  components: {
+    draggable,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    saveOrder(status) {
+
+      this.code = "";
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
+
+          for (let i = 0; i < this.codeArray.length; i++) {
+            if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
+              return this.$message.error('生产日期格式错误');
+            }
+            if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
+              return this.$message.error('失效日期格式错误');
+            }
+
+          }
+
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              if (this.$isBlank(this.codeArray[i].batchNo)) {
+                return this.$message.error('批次号不能为空');
+              }
+              if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                return this.$message.error('生产日期与失效日期不能全部为空');
+              }
+              // if (this.$isBlank(this.codeArray[i].expireDate)) {
+              //     return this.$message.error('失效日期不能为空');
+              // }
+
+
+            }
+          }
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+            }
+          }
+
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.submitFunction(status);
+            }).catch(() => {
+              this.loading = false;
+            });
+          }
+
+
+        }
+      });
+    },
+    storageChange(row) {
+      console.log(row);
+      this.formData.corpId = row.code;
+      this.formData.corpName = row.name;
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].advanceType;
+        }
+      }
+    },
+    findStorageMethod(query) {
+      console.log(query);
+      if (this.formData.locStorageCode == null)
+        return;
+      this.fromStorageOptions = [];
+      let cQuery = {
+        locInvCode: this.formData.locStorageCode,
+      };
+      filterAllByLoc(cQuery)
+          .then((response) => {
+            let temp = response.data || [];
+            for (let i = 0; i < temp.length; i++) {
+              if (temp[i].code != this.formData.locStorageCode) {
+                this.fromStorageOptions.push(temp[i]);
+              }
+            }
+
+          })
+          .catch(() => {
+          });
+    },
+    submitFunction(status) {
+      let tMessage = status === '501' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = this.formData;
+      tQuery.editStatus = status;
+      tQuery.subErpOrders = this.codeArray;
+      // tQuery.billType = this.formData.bi;
+      console.log(tQuery);
+      inserThrOrderWeb(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+    },
+    selectProductFunction(event) {
+
+      if (event == null) {
+        // this.$refs.inputRef.focus();
+      } else {
+        event.target.select();
+      }
+      if (this.$isBlank(event)) {
+
+        if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
+          this.$message.error("往来信息和单据类型不能为空！")
+          return;
+        }
+        this.code = "";
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+        this.thisData.code = "";
+        this.thisData.orderEditor = this.orderEditor;
+        this.thisData.orderId = "";
+        if (this.orderEditor) {
+          this.thisData.orderId = this.formData.id
+        }
+        this.curAction = this.getActionItem(this.formData.billType);
+        this.thisData.stockOrderLists = this.codeArray;
+        this.thisData.formData = this.formData;
+        this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
+        this.thisData.billType = this.curAction.localAction;
+
+        // this.thisData.formData.billType = this.curAction.localAction;
+        if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+          this.invQueryData = {
+            locStorageCode: this.formData.locStorageCode,
+          };
+          this.selectInvProductVisible = true;
+        } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+
+          this.invQueryData = {
+            locStorageCode: this.formData.corpId,
+
+          };
+          console.log("his.invQueryData " + this.invQueryData.locStorageCode);
+          this.selectInvProductVisible = true;
+        } else {
+          this.selectProductVisible = true;
+        }
+
+
+        return;
+      }
+      // this.code = this.code.trim();
+      //
+      // if (this.code.length > 13) {
+      //     let tStr = this.code.substring(0, 2);
+      //     tStr = tStr.replace('m', 'M');
+      //     tStr = tStr.replace('a', 'A');
+      //     if (tStr.indexOf("MA") !== -1) {
+      //         this.code = tStr + this.code.substring(2, this.code.length);
+      //     }
+      // }
+      //
+      // this.loading = true;
+      // let tQuery = {
+      //     code: this.code,
+      //     customerId: store.getters.customerId,
+      // };
+      //
+      // stockOrderDetailQueryProduct(tQuery).then((response) => {
+      //     this.loading = false;
+      //     console.log(response)
+      //     if (response.code === 20000) {
+      //         if (response.data.getType === "1") {
+      //             this.loading = true;
+      //
+      //             let ids = [response.data.getId];
+      //             let tQuery2 = {
+      //                 ids: ids,
+      //                 udiEntity: response.data
+      //             };
+      //             getStockOrderDetailInstrumentById(tQuery2).then((response) => {
+      //                 this.loading = false;
+      //                 if (response.code === 20000) {
+      //                     this.closeDialogC2(response.data);
+      //                 } else {
+      //                     this.$message.error(response.message);
+      //                 }
+      //             }).catch(() => {
+      //                 this.loading = false;
+      //             });
+      //         } else {
+      //             this.thisData = response.data;
+      //             this.thisData.code = this.code;
+      //             this.thisData.orderEditor = this.orderEditor;
+      //             this.thisData.orderId = "";
+      //             if (this.orderEditor) {
+      //                 this.thisData.orderId = this.formData.id
+      //             }
+      //             this.thisData.stockOrderLists = this.codeArray;
+      //             this.selectProductVisible = true;
+      //         }
+      //     } else {
+      //         this.$message.warning(response.message);
+      //         // this.focusNext('inputRef');
+      //         if (this.$isNotBlank(event)) {
+      //             event.target.select();
+      //         }
+      //         // event.target.select();
+      //         // event.currentTarget.select();
+      //     }
+      // });
+
+
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.thisData = {};
+
+      if (this.$isNotBlank(rData)) {
+        this.codeArray = [];
+        rData.forEach((obj, index) => {
+          this.codeArray.unshift(obj);
+        });
+        console.log(this.codeArray);
+        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+        this.currentRow = this.codeArray[0];
+        this.selectedIndex = 0;
+        this.focusNext('iCount');
+        this.closeConfirmFunction(true);
+      }
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+      this.iCount = val.count;
+
+      this.focusNext('iCount');
+
+      // let sc = this.selectedIndex + 'reCount';
+      // const _this = this;
+      // this.$nextTick(() => {
+      //     setTimeout(function() {
+      //         console.log(sc);
+      //         console.log(_this.$refs[sc]);
+      //         console.log(_this.$refs[sc].focus());
+      //         _this.$refs[sc].focus();
+      //     }, 1)
+      //     // this.$refs['inputBatchNoRef'][0].focus()
+      // })
+    },
+    iCountChange() {
+      // console.log(this.iCount)
+      // this.currentRow.count = this.iCount;
+      // this.currentRow.reCount = this.iCount;
+    },
+    iCountEnterFunction() {
+      if (this.$isNotBlank(this.currentRow)) {
+        this.currentRow.count = this.iCount;
+        // this.currentRow.reCount = this.iCount;
+      }
+      this.focusNext('inputRef');
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    focusNext(nextRef) {
+      this.$refs[nextRef].focus()
+    },
+    focusNextToTable(nextRef) {
+      this.$refs[nextRef][0].focus()
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    addCode() {
+      this.code = this.code.trim();
+      if (this.$isBlank(this.code)) {
+        this.$message.warning('请输入条码');
+        return;
+      }
+      if (this.iCount <= 0) {
+        this.$message.warning('请输入数量');
+        return;
+      }
+      this.loading = true;
+      let tQuery = {
+        orderId: this.formData.id,
+        count: this.iCount,
+        code: this.code,
+      };
+      if (this.orderEditor) {
+        addStockOrderDetailFromCode(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getStockOrderDetailList();
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      } else {
+        getStockOrderDetailInstrument(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.codeArray[i].productId === response.data.productId) {
+                this.$alert("已添加", '提示', {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  closeOnClickModal: true,
+                  callback: action => {
+                    this.$refs.inputRef.focus();
+                  }
+                });
+                break;
+              }
+              if (i + 1 === this.codeArray.length) {
+                this.codeArray.push(response.data);
+              }
+            }
+            if (this.codeArray.length === 0) {
+              this.codeArray.push(response.data);
+            }
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      }
+    },
+    saveCodeArray(index, row) {
+      if (this.$isBlank(row.batchNo)) {
+        return this.$message.error('批次号不能为空');
+      }
+      // if (this.$isBlank(row.productDate)) {
+      //     return this.$message.error('生产日期不能为空');
+      // }
+      // if (this.$isBlank(row.expireDate)) {
+      //     return this.$message.error('失效日期不能为空');
+      // }
+
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+
+      this.detailLoading = true;
+      // row.count = row.reCount;
+      let tQuery = row;
+      uploadStockOrderDetail(tQuery).then((response) => {
+        this.detailLoading = false;
+        if (response.code === 20000) {
+          this.$message.success("修改完成");
+          this.getStockOrderDetailList();
+          this.$refs.inputRef.focus();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            deleteStockOrderDetailById({id: row.id})
+                .then(response => {
+                  this.detailLoading = false;
+                  if (response.code === 20000) {
+                    this.$message.success(response.data);
+                    // this.getStockOrderDetailList();
+                    this.codeArray.splice(index, 1);
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.detailLoading = false;
+                })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
+        }
+      }).catch(() => {
+
+      });
+    },
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let rData = JSON.parse(JSON.stringify(row));
+        rData.id = null;
+        if (this.codeArray.length === 0) {
+          this.codeArray.push(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        } else {
+          this.codeArray.unshift(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        }
+        this.$message.success("复制成功");
+        this.iCount = this.currentRow.count;
+        this.focusNext('iCount');
+      }).catch(() => {
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      getThrOrderDetails(this.query) //查找该单号下的所有条码
+          .then((response) => {
+            console.log(response)
+            this.codeArray = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
+    generateBillNo() {
+      let tQuery = {
+        action: this.formData.billType
+      }
+      this.loading = true;
+      generateBillNoInt(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.formData.billNo = response.data;
+              // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
+              this.formData.billdate = new Date();
+            } else {
+              this.closeDialog(true);
+            }
+          });
+    },
+    getBusType(invCode) {
+      let query = {
+        enabled: true,
+        corpType: 1,
+      };
+      getOriginJoinBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.curAction = this.busTypes[0];
+          })
+          .catch(() => {
+          });
+    },
+    selectOne(event) {
+
+      this.formData.corpName = event.name;
+      this.formData.corpId = event.erpId;
+      this.formData.unitIdFk = event.erpId;
+      // console.log("this.inputQuery.companyId" + item);
+      console.log("this.inputQuery.companyId" + event.erpId);
+    },
+    findMethod(query) {
+      console.log(query);
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        outType: null,
+      };
+      if (this.curAction.corpType == 3) {//特殊往来
+        cQuery.corpType = 4;
+        this.formData.corpId = this.curAction.defaultUnit;
+      } else if (this.curAction.corpType == 2)//客户
+      {
+        cQuery.corpType = 4;
+        cQuery.outType = 2;
+
+      } else if (this.curAction.corpType == 0) {
+        cQuery.corpType = 2;
+      } else return;
+
+      getBasicUnitMaintains(cQuery)
+          .then((response) => {
+            this.loading = false;
+            this.fromOptions = response.data.page.list || [];
+            if (this.curAction.corpType == 3) {
+              for (let i = 0; i < this.fromOptions.length; i++) {
+                if (this.fromOptions[i].erpId == this.formData.corpId) {
+                  this.formData.corpName = this.fromOptions[i].name;
+                }
+              }
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].thirdAction === action) {
+          return this.busTypes[i];
+        }
+      }
+    },
+    actionChange(item) {
+      console.log(item);
+      this.curAction = this.getActionItem(item);
+      console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
+      this.findMethod();
+      // }
+
+    },
+    locInChange(item) {
+      console.log(item);
+      this.formData.locStorageCode = item;
+      this.$forceUpdate();
+      this.getBusType(item);
+      this.findStorageMethod();
+    }
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType("NOCODE");
+    this.getStorage();
+    this.formData = {};
+    this.codeArray = [];
+    this.closeConfirmFunction(false);
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      this.formData = {
+        billdate: "",
+        customerId: store.getters.customerId,
+        billType: "",
+        type: "2",
+      };
+      this.iCount = 0;
+      this.orderEditor = false;
+      this.generateBillNo();
+    }
+  },
+};
+</script>
+<style>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+