From 6f3fb8728a3c153d4dd92afd785aadf76fce47e2 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 20 Jul 2022 11:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=EF=BC=8C=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/ThrCorpsImport.vue       | 529 +++++++-------
 src/views/thrsys/ThrInvProductsImport.vue |   5 +
 src/views/thrsys/ThrOrderImport.vue       | 816 +++++++++++-----------
 src/views/thrsys/ThrProductsImport.vue    |   7 +
 4 files changed, 691 insertions(+), 666 deletions(-)

diff --git a/src/views/thrsys/ThrCorpsImport.vue b/src/views/thrsys/ThrCorpsImport.vue
index 15c9932..2223c53 100644
--- a/src/views/thrsys/ThrCorpsImport.vue
+++ b/src/views/thrsys/ThrCorpsImport.vue
@@ -86,6 +86,13 @@
                 show-overflow-tooltip
                 :formatter="formatterThirdSys"
             ></el-table-column>
+
+            <el-table-column
+                label="备注"
+                prop="remark"
+                show-overflow-tooltip
+            ></el-table-column>
+
             <el-table-column
                 label="状态"
                 prop="status"
@@ -151,294 +158,294 @@
 </template>
 
 <script>
-    import {filterLog, deleteLog} from "../../api/thrsys/thrCorpsImport";
-    import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
-    import {downloadAll} from "../../api/thrsys/thrCorps";
-    import {selectIp} from "../../api/param/systemParamConfig";
-    import thrCorpsImportDetail from "./ThrCorpsImportDetail";
-    import thrCorpSelect from "./ThrCorpSelect";
-    import axios from "axios";
+import {filterLog, deleteLog} from "../../api/thrsys/thrCorpsImport";
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {downloadAll} from "../../api/thrsys/thrCorps";
+import {selectIp} from "../../api/param/systemParamConfig";
+import thrCorpsImportDetail from "./ThrCorpsImportDetail";
+import thrCorpSelect from "./ThrCorpSelect";
+import axios from "axios";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                udiImportDetailVisible: false,
-                thrCorpSelectVisible: false,
-                checked: false,
-                list: [],
-                fileList:[],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                currentRow: null,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                templateDlUrl: null,
-            };
-        },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
+export default {
+    data() {
+        return {
+            filterQuery: {
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
             },
-            getList() {
-                this.loading = true;
-                filterLog(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
+            udiImportDetailVisible: false,
+            thrCorpSelectVisible: false,
+            checked: false,
+            list: [],
+            fileList: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            currentRow: null,
+            editQuery: null,
+            fromStatus: {
+                0: "产品信息",
+                1: "库存信息",
+                2: "异常第三方上传"
             },
-            downloadCorps() {
-                this.selectType = 3;
-                this.thrCorpSelectVisible = true;
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
             },
-            genInCode() {
-                this.selectBasicUdiVisible = true;
-            },
-            sysChange() {
-                this.getThirdSysDetail();
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
             },
+            templateDlUrl: null,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            filterLog(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        downloadCorps() {
+            this.selectType = 3;
+            this.thrCorpSelectVisible = true;
+        },
+        genInCode() {
+            this.selectBasicUdiVisible = true;
+        },
+        sysChange() {
+            this.getThirdSysDetail();
+        },
 
 
-            handleDetailClick(row) {
-                this.currentRow = row;
-                this.udiImportDetailVisible = true;
+        handleDetailClick(row) {
+            this.currentRow = row;
+            this.udiImportDetailVisible = true;
 
+        }
+        ,
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            this.thrCorpSelectVisible = false;
+            if (val) {
+                this.getList();
             }
-            ,
-            cancelDialog(val) {
-                this.udiImportDetailVisible = false;
-                this.thrCorpSelectVisible = false;
-                if (val) {
+        }
+        ,
+        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.uploadData.thirdSys = this.filterQuery.thirdSysFk;
                     this.getList();
+                    this.getThirdSysDetail();
+                    this.selectSysParam();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            // axios.get("./config.json").then(res => {
+            //     // 基础地址
+            //     let response = res.data.BASE_URL;
+            //     this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
+            //
+            // });
+
+        }
+        ,
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/corp/upload";
                 }
-            }
-            ,
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
+            });
+        }
+        ,
+        handleChange(response, files, fileList) {
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+                this.getList();
+            } else {
+                this.$message.success(response.data);
                 this.getList();
             }
-            ,
-            deleteDialog(rowId) {
-                this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
+            this.fileList = [];
+        }
+        ,
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
+        }
+        ,
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "corpUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
                 })
-                    .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.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                        this.getList();
-                        this.getThirdSysDetail();
-                        this.selectSysParam();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                // axios.get("./config.json").then(res => {
-                //     // 基础地址
-                //     let response = res.data.BASE_URL;
-                //     this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
-                //
-                // });
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            axios.get("./config.json").then(res => {
+                let response = res.data.SERVER_IP;
+                this.templateDlUrl = response + "/第三方往来单位信息导入模板.xlsx";
+            });
 
-            }
-            ,
-            selectSysParam() {
+        }
+        ,
+        jumpDl() {
+            window.open(this.templateDlUrl, '_blank');
+        }
+        ,
+        downloadDatas() {
+            this.$confirm("此操作从第三方系统下载全部往来单位信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
                 let query = {
-                    key: "thirdIpUrl",
                     thirdSysFk: this.filterQuery.thirdSysFk
                 };
-                selectIp(query).then((response) => {
+                downloadAll(query).then((response) => {
+
                     if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/corp/upload";
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
                     }
-                });
-            }
-            ,
-            handleChange(response, files, fileList) {
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                    this.getList();
-                } else {
-                    this.$message.success(response.data);
                     this.getList();
-                }
-                this.fileList = [];
-            }
-            ,
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            }
-            ,
-            getThirdSysDetail() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk,
-                    key: "corpUrl",
-                };
-                filterDetailByKey(query)
-                    .then((response) => {
-                        this.thirdSysDetail = response.data;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                axios.get("./config.json").then(res => {
-                    let response = res.data.SERVER_IP;
-                    this.templateDlUrl = response + "/第三方往来单位信息导入模板.xlsx";
-                });
-
-            }
-            ,
-            jumpDl() {
-                window.open(this.templateDlUrl, '_blank');
-            }
-            ,
-            downloadDatas() {
-                this.$confirm("此操作从第三方系统下载全部往来单位信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                }).then(() => {
-                    let query = {
-                        thirdSysFk: this.filterQuery.thirdSysFk
-                    };
-                    downloadAll(query).then((response) => {
-
-                        if (response.code == 20000) {
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                        this.getList();
-                    });
                 });
-            }
-            ,
-            formatterThirdSys(key) {
-                let data = null;
-                this.thirdSys.forEach((item, index) => {
-                    if (key.thirdSysFk == item.thirdId) {
-                        data = item.thirdName;
-                    }
-                });
-                return data;
-            }
-            ,
-        },
+            });
+        }
+        ,
+        formatterThirdSys(key) {
+            let data = null;
+            this.thirdSys.forEach((item, index) => {
+                if (key.thirdSysFk == item.thirdId) {
+                    data = item.thirdName;
+                }
+            });
+            return data;
+        }
+        ,
+    },
 
-        mounted() {
-        },
-        components: {thrCorpsImportDetail, thrCorpSelect},
-        created() {
-            this.getBasicThirdSys();
-            // this.getList();
-        },
-    };
+    mounted() {
+    },
+    components: {thrCorpsImportDetail, thrCorpSelect},
+    created() {
+        this.getBasicThirdSys();
+        // this.getList();
+    },
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>
diff --git a/src/views/thrsys/ThrInvProductsImport.vue b/src/views/thrsys/ThrInvProductsImport.vue
index 8b43071..208ebbd 100644
--- a/src/views/thrsys/ThrInvProductsImport.vue
+++ b/src/views/thrsys/ThrInvProductsImport.vue
@@ -98,6 +98,11 @@
                     >
                 </template>
             </el-table-column>
+            <el-table-column
+                label="备注"
+                prop="remark"
+                show-overflow-tooltip
+            ></el-table-column>
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
                     <el-button
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index c2eea22..c839b1d 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -1,156 +1,162 @@
 <template>
-    <div>
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
-                </el-form-item>
+  <div>
+    <el-form :inline="true" :model="query" class="query-form" size="mini">
+      <el-row>
+        <el-form-item class="query-form-item">
+          <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+        </el-form-item>
 
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.status" 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-form-item class="query-form-item">
+          <el-select v-model="filterQuery.status" 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-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
-                        <el-option
-                            v-for="item in thirdSys"
-                            :key="item.value"
-                            :label="item.thirdName"
-                            :value="item.thirdId">
-                            <span style="float: left">{{ item.thirdName }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item class="query-form-item">
+          <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
+            <el-option
+                v-for="item in thirdSys"
+                :key="item.value"
+                :label="item.thirdName"
+                :value="item.thirdId">
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item>
-                    <el-button-group style="display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-upload
-                            :action="uploadFileUrl"
-                            multiple
-                            :limit="1"
-                            :data="uploadData"
-                            :show-file-list="false"
-                            :on-success="handleChange"
-                            v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
-                            :file-list="fileList"
-                        >
-                            <el-button size="mini" type="primary">导入业务单据</el-button>
-                        </el-upload>
-                        <el-button type="primary" icon="search" @click="jumpDl"
-                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载
-                        </el-button>
-                        <el-button type="primary" icon="search" @click="downloadOrderss"
-                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
-                            下载业务单据
-                        </el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+        <el-form-item>
+          <el-button-group style="display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-upload
+                :action="uploadFileUrl"
+                multiple
+                :limit="1"
+                :data="uploadData"
+                :show-file-list="false"
+                :on-success="handleChange"
+                v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
+                :file-list="fileList"
+            >
+              <el-button size="mini" type="primary">导入业务单据</el-button>
+            </el-upload>
+            <el-button type="primary" icon="search" @click="jumpDl"
+                       v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载
+            </el-button>
+            <el-button type="primary" icon="search" @click="downloadOrderss"
+                       v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
+              下载业务单据
+            </el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="记录ID"
-                prop="genKey"
-                show-overflow-tooltip
-            ></el-table-column>
+    <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @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="fromType"
-                show-overflow-tooltip
-            >
-            </el-table-column>
-            <el-table-column
-                label="更新日期"
-                prop="updateTime"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="来源系统"
-                prop="thirdSysFk"
-                :formatter="formatterThirdSys"
-                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="操作" fixed="right" width="160">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(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="udiImportDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="udiImportDetailVisible"
-        >
-            <thrOrderImportDetail
-                :currentRow="currentRow"
-            ></thrOrderImportDetail>
-        </el-dialog>
+      <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="thirdSysFk"
+          :formatter="formatterThirdSys"
+          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-dialog
-            title="下载业务单据"
-            :visible.sync="thrOrderSelectVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="thrOrderSelectVisible"
-        >
-            <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
-            ></thrOrderSelect>
-        </el-dialog>
+      <el-table-column
+          label="备注"
+          prop="remark"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="160">
+        <template slot-scope="scope">
+          <el-button
+              type="text"
+              size="small"
+              @click.native.stop="handleDetailClick(scope.row)"
+          >详情
+          </el-button
+          >
+          <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="udiImportDetailVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="udiImportDetailVisible"
+    >
+      <thrOrderImportDetail
+          :currentRow="currentRow"
+      ></thrOrderImportDetail>
+    </el-dialog>
 
+    <el-dialog
+        title="下载业务单据"
+        :visible.sync="thrOrderSelectVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrOrderSelectVisible"
+    >
+      <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
+      ></thrOrderSelect>
+    </el-dialog>
 
-        <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-        ></el-pagination>
-    </div>
+
+    <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+    ></el-pagination>
+  </div>
 </template>
 
 <script>
@@ -164,298 +170,298 @@ import thrOrderSelect from "./ThrOrderSelect";
 import {selectIp} from "../../api/param/systemParamConfig";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                genKey: null,
-                status: null,
-                fromType: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            },
-            udiImportDetailVisible: false,
-            checked: false,
-            list: [],
-            fileList: [],
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            currentRow: null,
-            editQuery: null,
-            fromStatus: {
-                0: "产品信息",
-                1: "库存信息",
-                2: "异常第三方上传"
-            },
-            status: {
-                0: "等待处理",
-                1: "正在处理",
-                2: "处理异常",
-                3: "处理完成"
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-            templateDlUrl: null,
-            busTypes: [],
-            thrOrderSelectVisible: false,
-        };
-    },
-
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                fromType: null,
-                genKey: null,
-                status: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            };
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterLog(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-        handleDetailClick(row) {
-            this.currentRow = row;
-            console.log(this.currentRow.genKey)
-            this.udiImportDetailVisible = true;
-        },
-
-        sysChange() {
-            this.getThirdSysDetail();
-            // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
-        },
-
-        cancelDialog(val) {
-            this.udiImportDetailVisible = false;
-            this.thrOrderSelectVisible = false;
+  data() {
+    return {
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      udiImportDetailVisible: false,
+      checked: false,
+      list: [],
+      fileList: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      currentRow: null,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      templateDlUrl: null,
+      busTypes: [],
+      thrOrderSelectVisible: false,
+    };
+  },
 
-            if (val) {
-                this.getList();
-            }
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        jumpDl() {
-            window.open(this.templateDlUrl, '_blank');
-        },
-        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.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                    this.getList();
-                    this.getThirdSysDetail();
-                    this.selectSysParam();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-            axios.get("./config.json").then(res => {
-                // 基础地址
-                let response = res.data.BASE_URL;
-                // this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
-                let response2 = res.data.SERVER_IP;
-                this.templateDlUrl = response2 + "/第三方业务单据导入模板.xlsx";
-                console.log(res.data.BASE_URL + "\n");
-            });
-        },
-
-        selectSysParam() {
-            let query = {
-                key: "thirdIpUrl",
-                thirdSysFk: this.filterQuery.thirdSysFk
-            };
-            selectIp(query).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/order/upload";
-                }
-            });
-        },
-
-        formatterThirdSys(key) {
-            let data = null;
-            this.thirdSys.forEach((item, index) => {
-                if (key.thirdSysFk == item.thirdId) {
-                    data = item.thirdName;
-                }
-            });
-            return data;
-        },
-        handleChange(response, files, fileList) {
-            console.log(response);
-            if (response.code != 20000) {
-                this.$message.error(response.message);
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
             } else {
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                this.$message.success("文件上传成功,请稍后刷新查看！");
-                this.getList();
+              this.$message.error(response.message);
             }
-            this.fileList = [];
-        },
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "warning",
-                2: "danger",
-                3: "success",
-            };
-            return statusMap[status];
-        },
-        getThirdSysDetail() {
-            let query = {
-                thirdSysFk: this.filterQuery.thirdSysFk,
-                key: "orderQueryUrl",
-            };
-            filterDetailByKey(query)
-                .then((response) => {
-                    this.thirdSysDetail = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
-        },
-        downloadOrderss() {
-            this.selectType = 3;
-            this.thrOrderSelectVisible = true;
-        },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      console.log(this.currentRow.genKey)
+      this.udiImportDetailVisible = true;
+    },
 
-        downloadDatas() {
-            this.$confirm("此操作从第三方系统下载全部业务单据信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let query = {
-                    billAction: this.filterQuery.billAction,
-                    thirdSysFk: this.filterQuery.thirdSysFk
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            });
+    sysChange() {
+      this.getThirdSysDetail();
+      // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+    },
 
+    cancelDialog(val) {
+      this.udiImportDetailVisible = false;
+      this.thrOrderSelectVisible = false;
 
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
+      if (val) {
+        this.getList();
+      }
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    jumpDl() {
+      window.open(this.templateDlUrl, '_blank');
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该业务单据信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let dQuery = {
+              id: rowId,
             };
-            getBussinessType(query)
+            deleteLog(dQuery)
                 .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                  this.getList();
                 })
                 .catch(() => {
+                  this.loading = false;
                 });
-        },
-        formatter(row, index) {
-            if (row.isE == true) {
-                row.Registrationstate = "已注册"
-            }
-            if (row.Registrationstate == false) {
-                row.Registrationstate = "未注册"
-            }
-            return row.Registrationstate
+          })
+          .catch(() => {
+          });
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+            this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getList();
+            this.getThirdSysDetail();
+            this.selectSysParam();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        // this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
+        let response2 = res.data.SERVER_IP;
+        this.templateDlUrl = response2 + "/第三方业务单据导入模板.xlsx";
+        console.log(res.data.BASE_URL + "\n");
+      });
+    },
+
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/order/upload";
         }
+      });
     },
 
-    mounted() {
+    formatterThirdSys(key) {
+      let data = null;
+      this.thirdSys.forEach((item, index) => {
+        if (key.thirdSysFk == item.thirdId) {
+          data = item.thirdName;
+        }
+      });
+      return data;
     },
-    components: {thrOrderImportDetail, thrOrderSelect},
-    created() {
-        this.getBasicThirdSys();
-        this.getBusType();
+    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("文件上传成功,请稍后刷新查看！");
         this.getList();
+      }
+      this.fileList = [];
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+          .then((response) => {
+            this.thirdSysDetail = response.data;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+
     },
+    downloadOrderss() {
+      this.selectType = 3;
+      this.thrOrderSelectVisible = true;
+    },
+
+    downloadDatas() {
+      this.$confirm("此操作从第三方系统下载全部业务单据信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let query = {
+          billAction: this.filterQuery.billAction,
+          thirdSysFk: this.filterQuery.thirdSysFk
+        };
+        downloadAll(query).then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      });
+
+
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getBussinessType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+          })
+          .catch(() => {
+          });
+    },
+    formatter(row, index) {
+      if (row.isE == true) {
+        row.Registrationstate = "已注册"
+      }
+      if (row.Registrationstate == false) {
+        row.Registrationstate = "未注册"
+      }
+      return row.Registrationstate
+    }
+  },
+
+  mounted() {
+  },
+  components: {thrOrderImportDetail, thrOrderSelect},
+  created() {
+    this.getBasicThirdSys();
+    this.getBusType();
+    this.getList();
+  },
 };
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/thrsys/ThrProductsImport.vue b/src/views/thrsys/ThrProductsImport.vue
index a377ec9..167055e 100644
--- a/src/views/thrsys/ThrProductsImport.vue
+++ b/src/views/thrsys/ThrProductsImport.vue
@@ -96,6 +96,13 @@
                     >
                 </template>
             </el-table-column>
+
+            <el-table-column
+                label="备注"
+                prop="remark"
+                show-overflow-tooltip
+            ></el-table-column>
+
             <el-table-column label="操作" fixed="right" width="160">
                 <template slot-scope="scope">
                     <el-button