From b8d07e31f9ee82ab1868d6c3a4fcb439b5ec9ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 30 Jan 2023 16:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E4=BF=A1=E6=81=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   7 +-
 src/api/basic/corpExport.js                   |  33 +
 src/api/basic/corpImport.js                   |  25 +
 src/api/thrsys/thrProducts.js                 |   7 -
 src/views/basic/corpMaintain/corpExport.vue   | 264 ++++++++
 .../basic/corpMaintain/corpExportSmp.vue      | 267 ++++++++
 src/views/basic/corpMaintain/corpImport.vue   | 279 ++++++++
 .../basic/corpMaintain/corpImportDetail.vue   | 173 +++++
 src/views/basic/corpMaintain/corpMaintain.vue | 620 ++++++++++++++++++
 .../basic/corpMaintain/corpMaintainSelect.vue | 131 ++++
 .../basic/corpMaintain/corpRelevance.vue      | 267 ++++++++
 src/views/basic/corpMaintain/corpSelect.vue   | 514 +++++++++++++++
 .../corpMaintain/corpSingleRelevance.vue      | 260 ++++++++
 src/views/thirdSys/product/thrProducts.vue    |  61 +-
 14 files changed, 2838 insertions(+), 70 deletions(-)
 create mode 100644 src/api/basic/corpExport.js
 create mode 100644 src/api/basic/corpImport.js
 create mode 100644 src/views/basic/corpMaintain/corpExport.vue
 create mode 100644 src/views/basic/corpMaintain/corpExportSmp.vue
 create mode 100644 src/views/basic/corpMaintain/corpImport.vue
 create mode 100644 src/views/basic/corpMaintain/corpImportDetail.vue
 create mode 100644 src/views/basic/corpMaintain/corpMaintain.vue
 create mode 100644 src/views/basic/corpMaintain/corpMaintainSelect.vue
 create mode 100644 src/views/basic/corpMaintain/corpRelevance.vue
 create mode 100644 src/views/basic/corpMaintain/corpSelect.vue
 create mode 100644 src/views/basic/corpMaintain/corpSingleRelevance.vue

diff --git a/package.json b/package.json
index 3b625af8..49e30d97 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,8 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "pinyin": "^2.10.2",
+    "qrcodejs2": "^0.0.2",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -56,10 +58,9 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue2-verify": "^1.1.5",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
-    "qrcodejs2": "^0.0.2",
-    "vue2-verify": "^1.1.5"
+    "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/src/api/basic/corpExport.js b/src/api/basic/corpExport.js
new file mode 100644
index 00000000..56574598
--- /dev/null
+++ b/src/api/basic/corpExport.js
@@ -0,0 +1,33 @@
+import axios from "@/utils/request";
+
+
+export function filterLog(query) {
+    return axios({
+        url: "/udiwms/corps/exportLog/filter",
+        method: "get",
+        params: query
+    });
+}
+export function deleteLog(query) {
+    return axios({
+        url: "/udiwms/corps/exportLog/deleteLog",
+        method: "post",
+        data: query
+    });
+}
+
+export function downloadLog(query) {
+    return axios({
+        url: "/udiwms/corps/exportLog/download",
+        method: "get",
+        params: query
+    });
+}
+export function exportExcel(query) {
+    return axios({
+        url: "/udiwms/corps/importLog/export",
+        method: "post",
+        data: query
+    });
+}
+
diff --git a/src/api/basic/corpImport.js b/src/api/basic/corpImport.js
new file mode 100644
index 00000000..c8bdfdd9
--- /dev/null
+++ b/src/api/basic/corpImport.js
@@ -0,0 +1,25 @@
+import axios from "@/utils/request";
+
+export function filterDetail(query) {
+    return axios({
+        url: "/udiwms/corps/importLog/filterDetail",
+        method: "get",
+        params: query
+    });
+}
+
+export function filterLog(query) {
+    return axios({
+        url: "/udiwms/corps/importLog/filter",
+        method: "get",
+        params: query
+    });
+}
+export function deleteLog(query) {
+    return axios({
+        url: "/udiwms/corps/importLog/deleteLog",
+        method: "post",
+        data: query
+    });
+}
+
diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js
index 821480e8..4a570a17 100644
--- a/src/api/thrsys/thrProducts.js
+++ b/src/api/thrsys/thrProducts.js
@@ -16,13 +16,6 @@ export function delThrProducts(query) {
     });
 }
 
-export function delAll(query) {
-    return axios({
-        url: "/udiwms/thrsys/products/delAll",
-        method: "get",
-        params: query
-    });
-}
 
 export function downloadAll(query) {
     return axios({
diff --git a/src/views/basic/corpMaintain/corpExport.vue b/src/views/basic/corpMaintain/corpExport.vue
new file mode 100644
index 00000000..3a89ac38
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpExport.vue
@@ -0,0 +1,264 @@
+<template>
+    <div>
+      <el-card class="el-card">
+        <el-form :model="query" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+          <el-row>
+            <el-col :span="6">
+                <el-form-item label="记录ID:">
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                </el-form-item>
+            </el-col>
+            </el-row>
+        </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-upload2" @click="exportExcel">导出往来单位信息</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+
+        <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleSelectionChange">
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
+            <el-table-column l abel="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
+            <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag >
+                </template>
+            </el-table-column>
+            <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="120">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click.native.stop="downloadExcel(scope.row)">下载</el-button>
+                    <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-dialog
+            title="导出往来单位信息"
+            :visible.sync="corpImportDetailVisible"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="corpImportDetailVisible"
+        >
+            <corpSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+            ></corpSelect>
+        </el-dialog>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="filterQuery.page"
+          :limit.sync="filterQuery.limit"
+          @pagination="handleCurrentChange"
+
+        ></pagination>
+      </el-card>
+    </div>
+</template>
+
+<script>
+    import {filterLog, deleteLog} from "@/api/basic/corpExport";
+    import corpSelect from "./corpSelect";
+    import axios from "axios";
+    import {formatDate} from "@/utils/date";
+    export default {
+        data() {
+            return {
+                showSearch: true,
+                filterQuery: {
+                    genKey: null,
+                    status: null,
+                    fromType: null,
+                    page: 1,
+                    limit: 20,
+                    type: 3,
+                    thirdSysFk: null,
+                },
+                selectType: 0,
+                corpImportDetailVisible: false,
+                list: [],
+                detailList: [],
+                thirdSys: [],
+                thirdSysDetail: null,
+                total: 0,
+                editQuery: null,
+                fromStatus: {
+                    0: "产品信息",
+                    1: "库存信息",
+                    2: "异常第三方上传"
+                },
+                status: {
+                    0: "等待处理",
+                    1: "正在处理",
+                    2: "处理异常",
+                    3: "处理完成"
+                },
+                uploadFileUrl: null,
+                uploadData: {
+                    thirdSys: "thirdId",
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    fromType: null,
+                    genKey: null,
+                    status: null,
+                    page: 1,
+                    type: 1,
+                    limit: 20,
+                    thirdSysFk: null,
+                };
+                this.getList();
+            },
+            hideSearch() {
+             this.showSearch = !this.showSearch;
+            },
+            getList() {
+                this.loading = true;
+                filterLog(this.filterQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                        this.total = 0;
+                    });
+            },
+
+            exportExcel() {
+                this.selectType = 0;
+                this.corpImportDetailVisible = true;
+            },
+            uploadSmp() {
+                this.selectType = 1;
+                this.corpImportDetailVisible = true;
+            },
+            downloadExcel(row) {
+                axios.get("./config.json").then(res => {
+                    let baseUrl = res.data.BASE_URL;
+                    let href = baseUrl + "/udiwms/corps/exportLog/download" +
+                        "?genKey=" + row.genKey;
+                    console.log("href = " + href);
+                    let a = document.createElement("a");
+                    var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+                    fetch(href)
+                        .then((res) => res.blob())
+                        .then((blob) => {
+                            a.href = URL.createObjectURL(blob);
+                            console.log(a.href);
+                            a.download = "BaseCorp_" + timestamp + ".UpperIn";
+                            document.body.appendChild(a);
+                            a.click();
+                            this.getList();
+                        });
+                });
+
+
+            },
+
+            cancelDialog(val) {
+                this.corpImportDetailVisible = false;
+                if (val) {
+                    this.getList();
+                }
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val.page;
+                this.getList();
+            },
+            deleteDialog(rowId) {
+                this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        let dQuery = {
+                            id: rowId,
+                        };
+                        deleteLog(dQuery)
+                            .then((response) => {
+                                this.loading = false;
+                                if (response.code == 20000) {
+                                    this.$message.success("删除成功");
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                                this.getList();
+                            })
+                            .catch(() => {
+                                this.loading = false;
+                            });
+                    })
+                    .catch(() => {
+                    });
+            },
+            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("文件上传成功,请稍后刷新查看！");
+                }
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "warning",
+                    2: "danger",
+                    3: "success",
+                };
+                return statusMap[status];
+            },
+        },
+        mounted() {
+        },
+        components: {corpSelect},
+        created() {
+            // this.getBasicThirdSys();
+            this.getList();
+        },
+    };
+</script>
+<style>
+    .itemTag {
+        float: left;
+        text-align: left;
+        margin-top: 10px;
+        width: 100px;
+    }
+
+    .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/basic/corpMaintain/corpExportSmp.vue b/src/views/basic/corpMaintain/corpExportSmp.vue
new file mode 100644
index 00000000..0b76b61f
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpExportSmp.vue
@@ -0,0 +1,267 @@
+<template>
+    <div>
+      <el-card class="el-card">
+        <el-form  :model="query" label-width="100px" v-show="showSearch" size="mini">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="记录ID:">
+                    <el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-share" @click="uploadSmp">同步至自助平台</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+        <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleSelectionChange" >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
+            <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
+            <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="备注" prop="remark" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="60">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        @click.native.stop="deleteDialog(scope.row.id)"
+                    >删除
+                    </el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-dialog
+            title="导出往来单位信息"
+            :visible.sync="corpImportDetailVisible"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="corpImportDetailVisible"
+        >
+            <corpSelect :selectType="selectType"   v-on:cancelDialog="cancelDialog"
+            ></corpSelect>
+        </el-dialog>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="filterQuery.page"
+          :limit.sync="filterQuery.limit"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </el-card>
+    </div>
+</template>
+
+<script>
+    import axios from "axios";
+    import {filterLog, deleteLog} from "@/api/basic/corpExport";
+    import corpSelect from "./corpSelect";
+
+    export default {
+        data() {
+            return {
+                showSearch: true,
+                filterQuery: {
+                    genKey: null,
+                    status: null,
+                    fromType: null,
+                    type:2,
+                    page: 1,
+                    limit: 20,
+                    thirdSysFk: null,
+                },
+                selectType: 0,
+                corpImportDetailVisible: false,
+                list: [],
+                detailList: [],
+                thirdSys: [],
+                thirdSysDetail: null,
+                total: 0,
+                editQuery: null,
+                fromStatus: {
+                    0: "产品信息",
+                    1: "库存信息",
+                    2: "异常第三方上传"
+                },
+                status: {
+                    0: "等待处理",
+                    1: "正在处理",
+                    2: "处理异常",
+                    3: "处理完成"
+                },
+                uploadFileUrl: null,
+                uploadData: {
+                    thirdSys: "thirdId",
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    fromType: null,
+                    genKey: null,
+                    status: null,
+                    page: 1,
+                    type:2,
+                    limit: 20,
+                    thirdSysFk: null,
+                };
+                this.getList();
+            },
+            hideSearch() {
+              this.showSearch = !this.showSearch;
+           },
+            getList() {
+                this.loading = true;
+                filterLog(this.filterQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                        this.total = 0;
+                    });
+            },
+
+            exportExcel() {
+                this.selectType = 0;
+                this.corpImportDetailVisible = true;
+            },
+            uploadSmp() {
+                this.selectType = 1;
+                this.corpImportDetailVisible = true;
+            },
+            downloadExcel(row) {
+                let href =
+                    "http://127.0.0.1:9991" +
+                    "/udiwms/corps/exportLog/download" +
+                    "?genKey=" +row.genKey;
+                let a = document.createElement("a");
+                fetch(href)
+                    .then((res) => res.blob())
+                    .then((blob) => {
+                        // 将链接地址字符内容转变成blob地址
+                        a.href = URL.createObjectURL(blob);
+                        console.log(a.href);
+                        //   a.download = ""; // 下载文件的名字
+                        a.download =
+                            row.filePath.split("/")[
+                            row.filePath.split("/").length - 1
+                                ]; //  // 下载文件的名字
+                        document.body.appendChild(a);
+                        a.click();
+                        this.getList();
+                    });
+            },
+
+            cancelDialog(val) {
+                this.corpImportDetailVisible = false;
+                if (val) {
+                    this.getList();
+                }
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+            deleteDialog(rowId) {
+                this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        let dQuery = {
+                            id: rowId,
+                        };
+                        deleteLog(dQuery)
+                            .then((response) => {
+                                this.loading = false;
+                                if (response.code == 20000) {
+                                    this.$message.success("删除成功");
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                                this.getList();
+                            })
+                            .catch(() => {
+                                this.loading = false;
+                            });
+                    })
+                    .catch(() => {
+                    });
+            },
+            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("文件上传成功,请稍后刷新查看！");
+                }
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "warning",
+                    2: "danger",
+                    3: "success",
+                };
+                return statusMap[status];
+            },
+        },
+        mounted() {
+        },
+        components: {corpSelect},
+        created() {
+            // this.getBasicThirdSys();
+            this.getList();
+        },
+    };
+</script>
+<style>
+    .itemTag {
+        float: left;
+        text-align: left;
+        margin-top: 10px;
+        width: 100px;
+    }
+
+    .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/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue
new file mode 100644
index 00000000..598e8afc
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpImport.vue
@@ -0,0 +1,279 @@
+<template>
+    <div>
+      <el-card class="el-card">
+        <el-form  :model="query" label-width="100px" v-show="showSearch" size="mini">
+          <el-row>
+            <el-col :span="6">
+                <el-form-item label="记录ID:">
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="处理状态:">
+                    <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option label="处理中" value="0"></el-option>
+                        <el-option label="已处理" value="1"></el-option>
+                        <el-option label="异常" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            </el-row>
+        </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-upload
+              :action="uploadFileUrl"
+              multiple
+              :limit="1"
+              :data="uploadData"
+              :show-file-list="false"
+              :on-success="handleChange"
+              :file-list="fileList"
+            >
+              <el-button icon="el-icon-upload2" size="mini" type="primary">导入往来单位信息</el-button>
+            </el-upload>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+
+        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
+            <el-table-column label="来源" prop="fromType" show-overflow-tooltip></el-table-column>
+            <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
+            <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                <template slot-scope="scope">
+                   <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" width="120">
+                <template slot-scope="scope">
+                    <el-button type="text" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
+                    <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+
+        <el-dialog
+            title="往来单位信息导入详情"
+            :visible.sync="corpImportDetailVisible"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="corpImportDetailVisible"
+        >
+            <corpImportDetail :currentRow="currentRow" :closeDialog="corpImportDetail"></corpImportDetail>
+        </el-dialog>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="filterQuery.page"
+          :limit.sync="filterQuery.limit"
+          @pagination="handleCurrentChange"
+
+        ></pagination>
+      </el-card>
+    </div>
+</template>
+
+<script>
+import axios from "axios";
+import {filterLog, deleteLog} from "@/api/basic/corpImport";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import corpImportDetail from "./corpImportDetail";
+
+export default {
+    data() {
+        return {
+            showSearch: true,
+            filterQuery: {
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            },
+            corpImportDetailVisible: false,
+            checked: false,
+            list: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            currentRow: null,
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            templateDlUrl: null,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            };
+            this.getList();
+        },
+      hideSearch() {
+        this.showSearch = !this.showSearch;
+      },
+        getList() {
+            this.loading = true;
+            filterLog(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        handleDetailClick(row) {
+            this.currentRow = row;
+            console.log(this.currentRow.genKey)
+            this.corpImportDetailVisible = true;
+
+        },
+        cancelDialog() {
+            this.corpImportDetailVisible = false;
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        deleteDialog(rowId) {
+            this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: rowId,
+                    };
+                    deleteLog(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                            this.getList();
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+                })
+                .catch(() => {
+                });
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    // this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                this.uploadFileUrl = response + "/udiwms/corps/importLog/upload";
+            });
+            axios.get("./config.json").then(res => {
+                let response = res.data.SERVER_IP;
+                this.templateDlUrl = response + "/已对照往来单位模板.xlsx";
+            });
+        },
+        jumpDl() {
+            window.open(this.templateDlUrl, '_blank');
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success(response.data);
+                this.getList();
+            }
+        },
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
+        },
+    },
+    mounted() {
+    },
+    components: {corpImportDetail},
+    created() {
+        this.getBasicThirdSys();
+        this.getList();
+    },
+};
+</script>
+<style>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
+
+.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/basic/corpMaintain/corpImportDetail.vue b/src/views/basic/corpMaintain/corpImportDetail.vue
new file mode 100644
index 00000000..994184b4
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpImportDetail.vue
@@ -0,0 +1,173 @@
+<template>
+    <div>
+      <el-card class="el-card">
+            <el-form  :model="query"  size="mini" label-width="100px" v-show="showSearch">
+              <el-row>
+                <el-col :span="6">
+                    <el-form-item label="往来单位编码:">
+                        <el-input v-model="filterQuery.erpId" style="width: 90%" placeholder="请输入往来单位编码"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="处理状态:">
+                        <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="未处理" value="0"></el-option>
+                            <el-option label="已完成" value="1"></el-option>
+                            <el-option label="异常" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                </el-row>
+            </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange"  border highlight-current-row>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip width="100"></el-table-column>
+                <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
+                <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
+                <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+                <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <el-tag :type="statusFilterType(scope.row.importStatus)">{{ status[scope.row.importStatus] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
+            </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="filterQuery.page"
+          :limit.sync="filterQuery.limit"
+          @pagination="handleCurrentChange"
+
+        ></pagination>
+
+        </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        filterDetail,
+    } from "@/api/basic/corpImport";
+
+    export default {
+        name: "corpImportDetail",
+        props: {
+            currentRow: {
+                type: Object,
+                required: true,
+            },
+
+        },
+        data() {
+            return {
+                showSearch: true,
+                filterQuery: {
+                    erpId:null,
+                    status:null,
+                    page: 1,
+                    limit: 10,
+                },
+                list: [],
+                detailList: [],
+                total: 0,
+                status: {
+                    0: "未处理",
+                    2: "已完成",
+                    1: "异常"
+                },
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.filterQuery = {
+                    genKey: null,
+                    udiCode:null,
+                    status:null,
+                    page: 1,
+                    limit: 10,
+                };
+                this.getList();
+            },
+            hideSearch() {
+              this.showSearch = !this.showSearch;
+            },
+            getList() {
+                this.loading = true;
+                console.log(" this.genKeyFk = "+ this.currentRow.genKey)
+                this.filterQuery.genKey = this.currentRow.genKey;
+                filterDetail(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;
+                    });
+            },
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "warning",
+                    1: "danger",
+                    2: "success",
+                };
+                return statusMap[status];
+            },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
+        },
+        mounted() {
+        },
+        created() {
+            this.getList();
+        },
+        filters: {
+
+        },
+    };
+</script>
+<style>
+    .itemTag {
+        float: left;
+        text-align: left;
+        margin-top: 10px;
+        width: 100px;
+    }
+
+    .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/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
new file mode 100644
index 00000000..9b59c397
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -0,0 +1,620 @@
+<template>
+    <div>
+      <el-card class="el-card">
+        <el-form  :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
+            <el-row>
+              <el-col span="6">
+                <el-form-item label="搜索:">
+                    <el-input v-model="query.key" placeholder="搜索" style="width: 90%" clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col span="6">
+                <el-form-item label="往来单位类型:">
+                    <el-select v-model="query.corpType" style="width: 90%" placeholder="请选择往来单位类型">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option label="客户" value="1"></el-option>
+                        <el-option label="供应商" value="2"></el-option>
+                        <el-option label="特殊往来" value="4"></el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
+
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search"   @click="search">查询</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)" :disabled="!configParms.basicCorp">新增</el-button>
+              <el-button type="primary" icon="el-icon-bottom-right" @click="intentDetail">选入往来单位信息</el-button>
+            </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+
+        <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
+            <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
+            <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="120">
+                <template slot-scope="scope">
+                   <el-button type="text"  @click.native="handleForm(scope.$index, scope.row)">编辑</el-button>
+                    <el-button  type="text"  :disabled="!configParms.basicCorp" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="query.page"
+          :limit.sync="query.limit"
+          @pagination="handleCurrentChange"
+        ></pagination>
+
+
+
+        <el-dialog
+            :title="combinTypeMap[combinType]"
+            :visible.sync="selectDrugDialogVisible"
+            width="85%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="selectDrugDialogVisible"
+        >
+            <selectUnit v-on:closeMain="closeMain"></selectUnit>
+        </el-dialog>
+
+        <el-dialog
+            :title="combinTypeMap[combinType]"
+            :visible.sync="selectSingleUnitVisible"
+            width="85%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="selectSingleUnitVisible"
+        >
+            <selectSingleUnit v-on:cancelDialog="cancelDialog" :corpData="corpData"
+                              :defaultSys="defaultSys"></selectSingleUnit>
+        </el-dialog>
+
+
+        <!--表单-->
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="formVisible"
+            :before-close="hideForm"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="60%"
+            top="5vh"
+        >
+            <el-table :data="sysList" style="width: 100%" border v-if="formName=='update'">
+                <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="第三方往来单位ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">关联</el-button>
+                        <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-form :model="editQuery" :rules="formRules" style="margin-top: 20px" label-width="120px" ref="dataForm">
+              <el-row  type="flex">
+                <el-col :span="11" type="flex">
+                  <el-form-item label="往来单位名称" prop="name">
+                      <el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()" splaceholder="请输入往来单位名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" type="flex">
+                  <el-form-item label="往来单位编码" prop="erpId">
+                    <el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true" splaceholder="请输入往来单位编码"></el-input>
+                  </el-form-item>
+                </el-col>
+                </el-row>
+                <el-row type="flex">
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="社会信用号" prop="creditNo">
+                      <el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="联系人" prop="contact">
+                      <el-input v-model="editQuery.contact"  splaceholder="请输入联系人" style="width: 90%" auto-complete="off"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :type="flex">
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="地址" prop="addr">
+                      <el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%" auto-complete="off"></el-input></el-form-item>
+                    </el-col>
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="联系电话" prop="mobile">
+                      <el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off" style="width: 90%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :type="flex">
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="往来单位类型" prop="corpType">
+                      <el-select v-model="editQuery.corpType"  style="width: 90%" placeholder="请选择往来单位类型">
+                        <el-option
+                          v-for="item in corpTypeList"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="11" type="flex">
+                    <el-form-item label="拼音码" prop="spell">
+                      <el-input v-model="editQuery.spell"  placeholder="请输入拼音码" auto-complete="off" style="width: 90%"></el-input>
+                    </el-form-item>
+                   </el-col>
+                </el-row>
+            </el-form>
+          <div style='text-align: center; margin-bottom: 10px;'>
+                <el-button @click.native="hideForm">取消</el-button>
+                <el-button type="primary" @click.native="formSubmit()" :loading="formLoading" :disabled="!configParms.basicCorp">提交</el-button>
+            </div>
+        </el-dialog>
+      </el-card>
+    </div>
+</template>
+
+<script>
+import {getBasicUnitMaintains, basicUnitMaintainSave, deleteBasicUnitMaintain, getThrsysUnit, removeRl} from "@/api/basic/basicUnitMaintain";
+import selectUnit from "./corpRelevance";
+import selectSingleUnit from "./corpSingleRelevance";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import {findConfig} from "@/api/thrsys/spsSyncStatus";
+
+var pinyin = require("pinyin");
+
+export default {
+    data() {
+        return {
+            query: {
+                key: "",
+                page: 1,
+                limit: 20,
+            },
+            showSearch:true,
+            erpIdColumn: false,
+            thirdIdColumn: false,
+            editQuery: {
+                id: "",
+                thirdId: "",
+                erpId: "",
+                name: "",
+                spell: "",
+                addr: "",
+                status: "",
+                type: "",
+                creditNo: "",
+                contact: "",
+                mobile: ""
+            },
+
+            corpData: null,
+            checked: false,
+            formName: null,
+            formMap: {
+                add: "新增",
+                update: "编辑"
+            },
+            formLoading: false,
+            formVisible: false,
+            combinType: 0,//0:新增，1，修改
+            combinTypeMap: {
+                0: "选入往来单位信息",
+                1: "关联往来单位信息",
+            },
+
+            corpTypeList: [
+                {
+                    value: 1,
+                    label: "客户"
+                },
+                {
+                    value: 2,
+                    label: "供应商"
+                },
+                {
+                    value: 5,
+                    label: "医院客户"
+                },
+                {
+                    value: 4,
+                    label: "特殊往来"
+                }
+
+            ],
+            formRules: {
+                // name: [
+                //     {required: true, message: "请输入名称", trigger: "blur"}
+                // ],
+                // erpId: [
+                //     {required: true, message: "请输入自定义码", trigger: "blur"}
+                // ],
+                // creditNo: [
+                //     {required: true, message: "请输入社会信用号", trigger: "blur"}
+                // ]
+            },
+            spellUpdate: false,
+            editDialogVisible: false,
+            selectDrugDialogVisible: false,
+            selectSingleUnitVisible: false,
+            list: [],
+            sysList: [],
+            loading:false,
+            total: 0,
+            multipleSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+            defaultSys: null,
+            configParms: {},
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.query = {
+                key: "",
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        search() {
+            this.query.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.erpIdColumn = false;
+            this.thirdIdColumn = false;
+            debugger
+            getBasicUnitMaintains(this.query)
+                .then((response) => {
+                  debugger
+                    this.loading = false;
+                    this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false;
+                    this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
+                    this.list = response.data.page.list || [];
+                    this.total = response.data.page.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+      hideSearch() {
+        this.showSearch = !this.showSearch;
+      },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        // 隐藏表单
+        hideForm() {
+            // 更改值
+            this.formVisible = !this.formVisible;
+            this.getList();
+            return true;
+        },
+        // 显示表单
+        handleForm(index, row) {
+            this.formVisible = true;
+            this.formName = "add";
+            this.spellUpdate = false;
+            if (index !== null) {
+                this.index = index;
+                this.formName = "update";
+                this.spellUpdate = true;
+                this.editQuery = row;
+
+            } else {
+                this.editQuery = {
+                    id: "",
+                    thirdId: "",
+                    erpId: "",
+                    name: "",
+                    spell: "",
+                    addr: "",
+                    status: "",
+                    type: "",
+                    creditNo: "",
+                    contact: "",
+                    mobile: ""
+                };
+            }
+
+            this.getThirdSysDetail();
+        },
+        formSubmit() {
+
+            if (this.$isBlank(this.editQuery.corpType)) {
+                this.$message.error("往来单位类型不能为空！");
+                return;
+            }
+
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.formLoading = true;
+                    this.editQuery.thirdId = null;
+                    this.editQuery.thirdId1 = null;
+                    this.editQuery.thirdId2 = null;
+                    this.editQuery.thirdId3 = null;
+                    this.editQuery.thirdId4 = null;
+                    this.editQuery.thirdName = null;
+                    this.editQuery.thirdName1 = null;
+                    this.editQuery.thirdName2 = null;
+                    this.editQuery.thirdName3 = null;
+                    this.editQuery.thirdName4 = null;
+                    let data = Object.assign({}, this.editQuery);
+
+                    basicUnitMaintainSave(data, this.formName)
+                        .then(response => {
+                            this.formLoading = false;
+                            if (response.code !== 20000) {
+                                this.$message.error(response.message);
+                                return false;
+                            }
+                            this.$message.success("操作成功");
+                            this.formVisible = false;
+                            if (this.formName === "add") {
+                                // 向头部添加数据
+                                if (response.data && response.data.id) {
+                                    data.id = response.data.id;
+                                    this.list.unshift(data);
+                                }
+                            } else {
+                                this.list.splice(this.index, 1, data);
+                            }
+                            // 刷新表单
+                            this.resetForm();
+                            this.getList();
+                        })
+                        .catch(() => {
+                            this.formLoading = false;
+                        });
+                }
+            });
+        },
+
+        deleteUnit(data) {
+            this.loading = true;
+            let tquery = {
+                id: data.id + "",
+            };
+
+            deleteBasicUnitMaintain(tquery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
+
+                })
+                .catch(() => {
+                });
+        },
+
+        cancelDialog() {
+            this.editDialogVisible = false;
+            this.selectSingleUnitVisible = false;
+            this.getList();
+            this.getThirdSysDetail();
+        },
+        closeMain(val) {
+            this.selectDrugDialogVisible = false;
+
+            if (val) {
+                this.$message.success("添加成功！");
+                this.getList();
+            } else {
+                this.$message.error("添加失败！");
+            }
+        },
+
+
+        handleModifyClick(row) {
+            this.editDialogVisible = true;
+            this.editQuery = row;
+
+
+            this.getThirdSysDetail();
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteUnit(rowId);
+                })
+                .catch(() => {
+                });
+        },
+
+        exportTxt() {
+        },
+
+        intentDetail() {
+            this.combinType = 0;
+            this.selectDrugDialogVisible = true;
+        },
+
+        intentSelect(row) {
+            this.combinType = 1;
+            this.corpData = this.editQuery;
+            this.defaultSys = row.sysId;
+            this.selectSingleUnitVisible = true;
+        },
+
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+
+        handleCurrentChange(val) {
+            this.query.page = val.page;
+            this.getList();
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: null,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.thirdSysFk = this.thirdSys[0].thirdId;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+
+        getThirdSysDetail() {
+
+            let query = {};
+
+            if (this.formName == "update") {
+                query = {
+                    id: this.editQuery.id,
+                }
+            }
+            getThrsysUnit(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        }
+        ,
+        change() {
+            var pinyin = require("pinyin");
+            var py = pinyin(this.editQuery.name, {
+                style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+                heteronym: true,
+            });
+            var str = "";
+            py.forEach((item) => {
+                str = str + item[0];
+            });
+            this.editQuery.spell = str;
+        },
+        removeErp(row) {
+            this.$confirm("此操作将解除该绑定往来单位信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let query = {
+                        relId: this.editQuery.id,
+                        thirdSys: row.sysId
+                    };
+                    removeRl(query)
+                        .then((response) => {
+                            if (response.code == 20000) {
+                                this.getThirdSysDetail()();
+                                this.$message({
+                                    type: "success",
+                                    message: "解绑成功！",
+                                });
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                        });
+                })
+                .catch(() => {
+                });
+        },
+        getSyncConfig() {
+            findConfig()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.configParms = response.data;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+    }
+    ,
+    mounted() {
+    }
+    ,
+    components: {
+        selectUnit, selectSingleUnit
+    }
+    ,
+    created() {
+        this.getList();
+        this.getSyncConfig();
+        this.getBasicThirdSys();
+    }
+    ,
+}
+;
+</script>
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+
+}
+
+.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/basic/corpMaintain/corpMaintainSelect.vue b/src/views/basic/corpMaintain/corpMaintainSelect.vue
new file mode 100644
index 00000000..c14bf720
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpMaintainSelect.vue
@@ -0,0 +1,131 @@
+<template>
+    <div>
+        <el-card class="el-card">
+                <el-form :model="query"label-width="100px" v-show="showSearch" size="mini">
+                  <el-row>
+                    <el-col  :span="6">
+                    <el-form-item label="搜索:">
+                        <el-input v-model="query.key" placeholder="搜索" style="90%" clearable="true"></el-input>
+                    </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="combine" :loading="combineLoading">选入</el-button>
+            </el-button-group>
+          </div>
+
+                <el-table v-loading="loading" :data="list"  highlight-current-row @current-change="handleSelectChange" style="width: 100%">
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+                </el-table>
+        </el-card>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </div>
+</template>
+
+<script>
+import {combineSingle, getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+
+export default {
+    name: "combinType",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+
+    },
+    data() {
+        return {
+            showSearch: true,
+            query: {
+                key: "",
+                page: 1,
+                limit: 20,
+            },
+            total: 0,
+            loading: false,
+            list: [],
+            currentRow: null,
+            combineLoading: false,
+        };
+    },
+    methods: {
+        handlepageChange(val) {
+            this.unitQuery.page = val;
+            this.getList();
+        },
+        handleErppageChange(val) {
+            this.erpQuery.page = val.page;
+            this.getErpList();
+        },
+      hideSearch() {
+        this.showSearch = !this.showSearch;
+      },
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.query = {
+                key: "",
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            getBasicUnitMaintains(this.query)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.page.list || [];
+                    this.total = response.data.page.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+
+        handleSelectChange(val) {
+            this.currentRow = val;
+        },
+
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getList();
+        },
+        combine() {
+            this.closeDialog(this.currentRow);
+        },
+        handleSelectionUdiChange(val) {
+            console.log("----" + val[0].id);
+            this.multipleUdiSelection = val;
+        },
+    },
+    created() {
+    },
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/corpMaintain/corpRelevance.vue b/src/views/basic/corpMaintain/corpRelevance.vue
new file mode 100644
index 00000000..5830b371
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpRelevance.vue
@@ -0,0 +1,267 @@
+<template>
+    <div>
+        <el-card class="el-card" v-if="checked">
+          <el-form size="mini" :model="erpQuery" label-width="100px" v-show="showSearch">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="往来单位ID:">
+                <el-input v-model="erpQuery.unitId" placeholder="请输入往来单位ID" style="width: 90%" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="往来单位:">
+                <el-input v-model="erpQuery.name" placeholder="往来单位" style="width: 90%" clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          </el-form>
+
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="getErpList">查询</el-button>
+            </el-button-group>
+          </div>
+
+          <el-divider style="margin: 15px"></el-divider>
+                <el-table :data="erpList" style="width: 100%" border highlight-current-row @current-change="handleCurrentChange">
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="第三方往来单位ID" prop="customid" width="200"></el-table-column>
+                    <el-table-column label="往来单位名称" prop="customname" width="400"></el-table-column>
+                </el-table>
+          <pagination
+            v-show="erpTotal>0"
+            :total="erpTotal"
+            :page.sync="erpQuery.page"
+            :limit.sync="erpQuery.limit"
+            @pagination="handleErppageChange"
+          ></pagination>
+        </el-card>
+
+        <el-card class="el-card">
+                <el-form :model="unitQuery" size="mini" label-width="100px" v-show="showSearch">
+                  <el-row>
+                    <el-col :span="6">
+                      <el-form-item label="往来单位编码:">
+                         <el-input v-model="unitQuery.unitId"  style="width: 90%" placeholder="请输入往来单位编码" clearable></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                    <el-form-item label="请设置主系统:">
+                        <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请设置主系统" disabled>
+                            <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-col>
+                  </el-row>
+                </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="combine">选入</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="combineAll">结果全部选入</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
+                <el-table :data="unitlList" style="width: 100%" @selection-change="handleSelectionUdiChange" border highlight-current-row>
+                    <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="id"></el-table-column>
+                    <el-table-column label="往来单位名称"prop="name"  show-overflow-tooltip></el-table-column>
+                    <el-table-column label="往来单位简写" show-overflow-tooltip prop="spell"></el-table-column>
+                    <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+                </el-table>
+        </el-card>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="unitQuery.page"
+        :limit.sync="unitQuery.limit"
+        @pagination="handlepageChange"
+
+      ></pagination>
+    </div>
+</template>
+
+<script>
+import {combine, ucloudUnit, combineAll} from "@/api/basic/basicUnitMaintain";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+
+
+export default {
+    data() {
+        return {
+            showSearch: true,
+            unitQuery: {
+                page: 1,
+                limit: 10,
+                key: "",
+                thirdSys: null,
+            },
+            combineQuery: {
+                thirdSys: "",
+                keys: [],
+                custmandocResponses: [],
+            },
+            total: 0,
+            erpTotal: 0,
+            checked: false,
+            unitlList: [],
+            erpList: [],
+            currentRow: null,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+        };
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.unitQuery = {
+                key: "",
+                page: 1,
+                limit: 10,
+                thirdSys: null,
+            };
+            this.getList();
+        },
+       hideSearch() {
+         this.showSearch = !this.showSearch;
+       },
+        handlepageChange(val) {
+            this.unitQuery.page = val.page;
+            this.getList();
+        },
+        handleErppageChange(val) {
+            this.erpQuery.page = val;
+            this.getErpList();
+        },
+        checkSelectable(row) {
+            return !row.checked;
+        },
+        search() {
+            this.unitQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.unitQuery.thirdSys = this.thirdSysFk;
+            ucloudUnit(this.unitQuery)
+                .then((response) => {
+                    this.loading = false;
+
+                    if (response.code == 20000) {
+                        this.unitlList = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                        this.unitlList = [];
+                        this.total = 0;
+                    }
+
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.unitlList = [];
+                    this.total = 0;
+                });
+        },
+
+        intentBack() {
+            this.$router.go(-1);
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+                mainSys: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        combine() {
+            let selectData = this.multipleUdiSelection;
+            var ids = [];
+            selectData.forEach((obj) => {
+                ids.push(obj);
+            });
+            if (ids.length == 0) {
+                this.$message.warning("请选择往来单位信息！");
+                return;
+            }
+            this.combineQuery.thirdSys = this.thirdSysFk;
+            this.combineQuery.custmandocResponses = ids;
+            combine(this.combineQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$emit("closeMain", true);
+                    } else {
+                        this.$emit("closeMain", false);
+                    }
+                })
+                .catch(() => {
+                    this.$emit("closeMain", false);
+                });
+        },
+        combineAll() {
+
+            this.$confirm("此操作将在后台自动选入所有查询结果, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.unitQuery.thirdSys = this.thirdSysFk;
+                    combineAll(this.unitQuery)
+                        .then((response) => {
+                            if (response.code == 20000) {
+                                this.$emit("closeMain", true);
+                            } else {
+                                this.$emit("closeMain", false);
+                            }
+                        })
+                        .catch(() => {
+                            this.$emit("closeMain", false);
+                        });
+                })
+                .catch(() => {
+                });
+
+
+
+        },
+        handleCurrentChange(val) {
+            this.currentRow = val;
+            this.unitQuery.key = this.currentRow.name;
+        },
+
+        handleSelectionUdiChange(val) {
+            this.multipleUdiSelection = val;
+        },
+    },
+    created() {
+        this.getBasicThirdSys();
+    },
+};
+</script>
diff --git a/src/views/basic/corpMaintain/corpSelect.vue b/src/views/basic/corpMaintain/corpSelect.vue
new file mode 100644
index 00000000..2a2d600e
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpSelect.vue
@@ -0,0 +1,514 @@
+<template>
+    <div>
+      <el-card class="el-card">
+        <el-form  :model="query" label-width="100px" v-show="showSearch" size="mini">
+          <el-row>
+            <el-col :span="6">
+                <el-form-item label="搜索:">
+                    <el-input v-model="query.key" placeholder="搜索" style="width: 90%"></el-input>
+                </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group style="display:flex;">
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search"  @click="getList">查询</el-button>
+              <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
+              <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
+              <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP" v-if="selectType==1">选中上传</el-button>
+              <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP" v-if="selectType==1">一键上传</el-button>
+            </el-button-group>
+        </div>
+
+        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip width="100" v-if="erpIdColumn"></el-table-column>
+            <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
+            <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
+            <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="60">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small" @click.native="handleForm(scope.$index, scope.row)">详情</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="query.page"
+          :limit.sync="query.limit"
+          @pagination="handleCurrentChange"
+        ></pagination>
+
+        <!--表单-->
+        <el-dialog
+            title="往来单位详情"
+            :visible.sync="formVisible"
+            :before-close="hideForm"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+        >
+            <el-table :data="sysList" style="width: 100%" border highlight-current-row>
+                <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="第三方往来单位ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+            </el-table>
+
+            <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="往来单位名称:" prop="name">
+                    <el-input v-model="formData.name" size="small" style="width: 90%"  @input="change()" splaceholder="请输入往来单位名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="往来单位编码:" prop="erpId">
+                    <el-input v-model="formData.erpId" style="width: 90%" splaceholder="请输入往来单位编码" auto-complete="off" disabled="true"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="社会信用号:" prop="creditNo">
+                    <el-input v-model="formData.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="联系人:" prop="contact">
+                    <el-input v-model="formData.contact" style="width: 90%" splaceholder="请输入联系人" auto-complete="off"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="地址:" prop="addr">
+                    <el-input type="" v-model="formData.addr" style="width: 90%" splaceholder="请输入地址" ete="off"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                <el-form-item label="联系电话:" prop="mobile">
+                  <el-input v-model="formData.mobile" auto-complete="off" splaceholder="请输入联系电话" style="width: 90%"></el-input>
+                </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="拼音码:" prop="spell">
+                    <el-input v-model="formData.spell" auto-complete="off" splaceholder="请输入拼音码" style="width: 90%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+        </el-dialog>
+      </el-card>
+    </div>
+</template>
+
+<script>
+    import {
+        getBasicUnitMaintains,
+        basicUnitMaintainSave,
+        deleteBasicUnitMaintain, getThrsysUnit
+    } from "@/api/basic/basicUnitMaintain";
+    import {corpUpload} from "@/api/thrsys/smp"
+    import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+    import {exportExcel} from "@/api/basic/corpExport"
+
+    var pinyin = require("pinyin");
+
+    const formJson = {
+        id: "",
+        thirdId: "",
+        erpId: "",
+        name: "",
+        spell: "",
+        addr: "",
+        status: "",
+        type: "",
+        creditNo: "",
+        contact: "",
+        mobile: ""
+    };
+    export default {
+        name: "CorpInfoSelect",
+        props: {
+            selectType: {
+                type: Object,
+                required: true,
+            },
+        },
+
+        data() {
+            return {
+              showSearch: true,
+                query: {
+                    ids: [],
+                    key: "",
+                    page: 1,
+                    limit: 20,
+                },
+                erpIdColumn: false,
+                thirdIdColumn: false,
+                editQuery: null,
+                corpData: null,
+                checked: false,
+                formName: null,
+                formMap: {
+                    add: "新增",
+                    update: "编辑"
+                },
+                formLoading: false,
+                formVisible: false,
+                formData: formJson,
+                combinType: 0,//0:新增，1，修改
+                combinTypeMap: {
+                    0: "选入往来单位信息",
+                    1: "关联往来单位信息",
+                },
+                formRules: {},
+                spellUpdate: false,
+                editDialogVisible: false,
+                selectDrugDialogVisible: false,
+                selectSingleUnitVisible: false,
+                list: [],
+                sysList: [],
+                total: 0,
+                multipleSelection: [],
+                thirdSys: [],
+                thirdSysFk: null,
+            };
+        },
+
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: "",
+                });
+                this.query = {
+                    key: "",
+                    page: 1,
+                    limit: 20,
+                };
+                this.getList();
+            },
+          hideSearch() {
+            this.showSearch = !this.showSearch;
+          },
+            getList() {
+                this.loading = true;
+                this.erpIdColumn = false;
+                this.thirdIdColumn = false;
+                getBasicUnitMaintains(this.query)
+                    .then((response) => {
+                        console.log(response)
+                        this.loading = false;
+                        this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false;
+                        this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
+                        this.list = response.data.page.list || [];
+                        this.total = response.data.page.total || 0;
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                        this.total = 0;
+                    });
+            },
+            // 刷新表单
+            resetForm() {
+                if (this.$refs["dataForm"]) {
+                    // 清空验证信息表单
+                    this.$refs["dataForm"].clearValidate();
+                    // 刷新表单
+                    this.$refs["dataForm"].resetFields();
+                    this.getList();
+                }
+            },
+            // 隐藏表单
+            hideForm() {
+                // 更改值
+                this.formVisible = !this.formVisible;
+                return true;
+            },
+            // 显示表单
+            handleForm(index, row) {
+                this.formVisible = true;
+                this.formData = JSON.parse(JSON.stringify(formJson));
+                if (row !== null) {
+                    this.formData = Object.assign({}, row);
+                }
+                this.formName = "add";
+                this.spellUpdate = false;
+                if (index !== null) {
+                    this.index = index;
+                    this.formName = "update";
+                    this.spellUpdate = true;
+                }
+                this.editQuery = row;
+                this.getThirdSysDetail();
+            },
+            formSubmit() {
+                this.$refs["dataForm"].validate(valid => {
+                    if (valid) {
+                        this.formLoading = true;
+                        let data = Object.assign({}, this.formData);
+
+                        // if (!this.spellUpdate) {
+                        //     var py = pinyin(data.name.trim(), {
+                        //         style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+                        //         heteronym: true
+                        //     });
+                        //     var pyStr = py.join('');
+                        //     data.spell = pyStr.toUpperCase();
+                        // }
+
+                        console.log('------2------');
+                        basicUnitMaintainSave(data, this.formName)
+                            .then(response => {
+                                this.formLoading = false;
+                                if (response.code !== 20000) {
+                                    this.$message.error(response.message);
+                                    return false;
+                                }
+                                this.$message.success("操作成功");
+                                this.formVisible = false;
+                                if (this.formName === "add") {
+                                    // 向头部添加数据
+                                    if (response.data && response.data.id) {
+                                        data.id = response.data.id;
+                                        this.list.unshift(data);
+                                    }
+                                } else {
+                                    this.list.splice(this.index, 1, data);
+                                }
+                                // 刷新表单
+                                this.resetForm();
+                                this.getList();
+                            })
+                            .catch(() => {
+                                this.formLoading = false;
+                            });
+                    }
+                });
+            },
+            change() {
+                var pinyin = require("pinyin");
+                var py = pinyin(this.formData.name, {
+                    style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+                    heteronym: true,
+                });
+                var str = "";
+                py.forEach((item) => {
+                    str = str + item[0];
+                });
+                this.formData.spell = str;
+            },
+
+            deleteUnit(data) {
+                this.loading = true;
+                let tquery = {
+                    id: data.id + "",
+                };
+
+                deleteBasicUnitMaintain(tquery)
+                    .then((response) => {
+                        if (response.code == 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "删除成功！",
+                            });
+                        } else {
+                            this.$message.error(response.message);
+                        }
+
+                    })
+                    .catch(() => {
+                    });
+            },
+
+            cancelDialog() {
+                this.editDialogVisible = false;
+                this.selectSingleUnitVisible = false;
+                this.getList();
+            },
+            closeMain(val) {
+                this.selectDrugDialogVisible = false;
+
+                if (val) {
+                    this.$message.success("添加成功！");
+                    this.getList();
+                } else {
+                    this.$message.error("添加失败！");
+                }
+            },
+
+            selectExport() {
+                var selectData = this.multipleSelection;
+                selectData.forEach((obj) => {
+                    this.query.ids.push(obj.id);
+                });
+                this.allExport();
+            },
+            allExport() {
+                exportExcel(this.query)
+                    .then((response) => {
+                        if (response.code == 20000) {
+                            this.$message({
+                                type: "success",
+                                message: "导出成功，后台正在生成Json文件，请稍后刷新查看！",
+                            });
+                        } else {
+                            this.$message({
+                                type: "error",
+                                message: response.message,
+                            });
+                        }
+                        this.$emit("cancelDialog", true);
+                    })
+                    .catch(() => {
+                        this.$message({
+                            type: "error",
+                            message: "上传失败",
+                        });
+                    });
+            },
+
+            uploadSMP() {
+                var selectData = this.multipleSelection;
+                selectData.forEach((obj) => {
+                    this.query.ids.push(obj.id);
+                });
+                this.allUploadSMP();
+            },
+
+            allUploadSMP() {
+                corpUpload(this.query)
+                    .then((response) => {
+                        if (response.code == 20000) {
+                            this.$message.success("提交成功，后台正在上传！")
+                        } else {
+                            this.$message.error(response.message)
+                        }
+                        this.$emit("cancelDialog", true);
+                    })
+                    .catch(() => {
+                        this.$message.error("上传失败！");
+                    });
+            },
+
+            handleModifyClick(row) {
+                this.editDialogVisible = true;
+                this.editQuery = row;
+                this.getThirdSysDetail();
+            },
+
+            deleteDialog(rowId) {
+                this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.deleteUnit(rowId);
+                    })
+                    .catch(() => {
+                    });
+            },
+
+            intentDetail() {
+                this.combinType = 0;
+                this.selectDrugDialogVisible = true;
+            },
+
+            intentSelect(row) {
+                this.combinType = 1;
+                this.corpData = row;
+                this.selectSingleUnitVisible = true;
+            },
+
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+
+            handleCurrentChange(val) {
+                this.query.page = val;
+                this.getList();
+            },
+            getBasicThirdSys() {
+                let query = {
+                    enabled: null,
+                };
+                getBasicThirdSys(query)
+                    .then((response) => {
+                        this.thirdSys = response.data.list || [];
+                        this.thirdSysFk = this.thirdSys[0].thirdId;
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.list = [];
+                    });
+            },
+
+            getThirdSysDetail() {
+                let query = {
+                    id: this.editQuery.id,
+                };
+
+                getThrsysUnit(query)
+                    .then((response) => {
+                        this.loading = false;
+                        this.sysList = response.data.list || [];
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.sysList = [];
+                    });
+            },
+        }
+        ,
+        mounted() {
+        }
+        ,
+        components: {}
+        ,
+        created() {
+            this.getList();
+            this.getBasicThirdSys();
+        }
+        ,
+    }
+    ;
+</script>
+<style scoped>
+    .itemTag {
+        float: left;
+        text-align: left;
+        margin-top: 10px;
+    }
+
+    .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/basic/corpMaintain/corpSingleRelevance.vue b/src/views/basic/corpMaintain/corpSingleRelevance.vue
new file mode 100644
index 00000000..f3d9b207
--- /dev/null
+++ b/src/views/basic/corpMaintain/corpSingleRelevance.vue
@@ -0,0 +1,260 @@
+<template>
+    <div>
+        <el-card class="el-card" v-if="checked">
+                <el-form :inline="true" :model="erpQuery"  size="mini" label-width="100px" v-show="showSearch">
+                  <el-row>
+                    <el-col :span="6">
+                     <el-form-item label="单位编码:">
+                        <el-input v-model="erpQuery.customname" placeholder="搜索" style="width: 90%"></el-input>
+                     </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="getErpList">查询</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
+
+                <el-table :data="erpList" style="width: 100%" border highlight-current-row @current-change="handleCurrentChange">
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="第三方往来单位ID" prop="customid" width="200"></el-table-column>
+                    <el-table-column label="往来单位名称" prop="customname" width="400"></el-table-column>
+                </el-table>
+
+          <pagination
+            v-show="erpTotal>0"
+            :total="erpTotal"
+            :page.sync="erpQuery.page"
+            :limit.sync="erpQuery.limit"
+            @pagination="handleErppageChange"
+          ></pagination>
+        </el-card>
+
+        <el-card class="el-card">
+                <el-form :model="unitQuery" label-width="100px" v-show="showSearch" size="mini">
+                    <el-form-item label="往来单位编码:">
+                        <el-input v-model="unitQuery.unitId" style="width: 90%" placeholder="往来单位编码" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="往来单位:">
+                        <el-input v-model="unitQuery.name" style="width: 90%" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="外部系统:">
+                        <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请选择第三方系统" disabled="true">
+                            <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>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-bottom-right" @click="combine" :loading="combineLoading">选入</el-button>
+            </el-button-group>
+          </div>
+
+          <el-divider style="margin: 15px"></el-divider>
+                <el-table border highlight-current-row @current-change="handleCurrentChange" :data="unitlList" :row-class-name="tableRowClassName" style="width: 100%">
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="往来单位编码" prop="id"></el-table-column>
+                    <el-table-column label="往来单位名称" prop="name" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="往来单位简写" show-overflow-tooltip prop="spell"></el-table-column>
+                    <el-table-column label="地址" prop="addr"></el-table-column>
+                </el-table>
+        </el-card>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="unitQuery.page"
+        :limit.sync="unitQuery.limit"
+        @pagination="handlepageChange"
+
+      ></pagination>
+    </div>
+</template>
+
+<script>
+import {combineSingle, ucloudUnit, removeRl} from "@/api/basic/basicUnitMaintain";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+
+export default {
+    name: "combinType",
+    props: {
+        corpData: {
+            type: Object,
+            required: true,
+        },
+        defaultSys: {
+            type: Object,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            showSearch: true,
+            unitQuery: {
+                page: 1,
+                limit: 10,
+                key: "",
+                thirdSys: null,
+            },
+            combineQuery: {
+                thirdSys: "",
+                key: null,
+                erpUnitsResponse: [],
+            },
+            total: 0,
+            erpTotal: 0,
+            checked: false,
+            unitlList: [],
+            erpList: [],
+            currentRow: null,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+            combineLoading: false,
+        };
+    },
+    methods: {
+        handlepageChange(val) {
+            this.unitQuery.page = val;
+            this.getList();
+        },
+        handleErppageChange(val) {
+            this.erpQuery.page = val;
+            this.getErpList();
+        },
+        searchList() {
+            this.unitQuery.page = 1;
+            this.getList();
+        },
+        hideSearch() {
+          this.showSearch = !this.showSearch;
+        },
+        onReset() {
+            this.unitQuery = {
+                page: 1,
+                limit: 10,
+                key: "",
+                thirdSys: null,
+            }
+            this.total = 0;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.unitQuery.thirdSys = this.thirdSysFk;
+            ucloudUnit(this.unitQuery)
+                .then((response) => {
+                    console.log(response);
+                    this.loading = false;
+
+                    if (response.code == 20000) {
+                        this.unitlList = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                        this.unitlList = [];
+                        this.total = 0;
+                    }
+
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.unitlList = [];
+                    this.total = 0;
+                });
+        },
+
+        intentBack() {
+            this.$router.go(-1);
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.thirdSysFk = this.thirdSys[0].thirdId;
+                    if (this.defaultSys != null) {
+                        this.thirdSysFk = this.defaultSys;
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+
+        handleCurrentChange(val) {
+            console.log(val);
+            this.combineQuery.thirdSys = this.thirdSysFk;
+            this.combineQuery.key = this.corpData.id;
+            this.combineQuery.erpUnitsResponse = val;
+        },
+        combine() {
+
+            if (this.combineQuery.key == null) {
+                this.$message.warning("未选择往来单位！");
+                return;
+            }
+            if (this.combineQuery.erpUnitsResponse.checked == true) {
+                this.$message.warning("该往来单位已被关联，不能重复选入！");
+                return;
+            }
+
+            this.combineLoading = true;
+            combineSingle(this.combineQuery)
+                .then((response) => {
+                    this.combineLoading = false;
+                    this.$emit("cancelDialog", true);
+                    if (response.code == 20000) {
+                        this.$message.success("关联成功！");
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.combineLoading = false;
+                    this.$emit("cancelDialog", false);
+                });
+        },
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        handleSelectionUdiChange(val) {
+            console.log("----" + val[0].id);
+            this.multipleUdiSelection = val;
+        },
+
+    },
+    created() {
+        this.getBasicThirdSys();
+    },
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index d6951451..bb16ed72 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -120,8 +120,7 @@
   </div>
 </template>
 <script>
-import {
-  getThrProducts, delThrProducts, delAll, downloadAll, saveNewProduct
+import {delThrProducts, saveNewProduct
 } from "@/api/thrsys/thrProducts";
 import {getInvbasdoc} from "@/api/thrsys/getErps";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
@@ -227,31 +226,6 @@ export default {
           this.total = 0;
         });
     },
-    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.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-
-        })
-        .catch(() => {
-        });
-    },
     deleteDialog(row) {
       this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -318,43 +292,10 @@ export default {
         });
 
     },
-    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.thirdSys
-      };
-      selectIp(query).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-        }
-      });
-    },
     thirdSysChange() {
       this.uploadData.thirdSys = this.filterQuery.thirdSys;
       this.getThirdSysDetail();
     },
-    downloadDatas() {
-      let query = {
-        thirdSysFk: this.filterQuery.thirdSys
-      };
-      downloadAll(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success(response.data);
-        } else {
-          this.$message.error(response.message);
-        }
-      });
-
-    },
     saveNewProduct() {
       this.addProductVisible = false;
       saveNewProduct(this.newProductData).then((res) => {