From cf1e83ea56691d8ff4b19ff28501176dd0682926 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sun, 24 Apr 2022 14:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                     |   8 +-
 src/views/basic/CorpExport.vue         |   7 +-
 src/views/basic/UdiinfoExport.vue      | 349 +++++++++--------
 src/views/basic/invWarehouse.vue       |   4 +-
 src/views/thrsys/ThrCorpsExport.vue    | 501 ++++++++++++-------------
 src/views/thrsys/ThrOrderExport.vue    |   7 +-
 src/views/thrsys/ThrProductsExport.vue |   7 +-
 7 files changed, 439 insertions(+), 444 deletions(-)

diff --git a/public/config.json b/public/config.json
index dc76ca6..7ca6b5f 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
-    "BASE_URL":"http://127.0.0.1:9991/",
-    "SERVER_IP": "http://127.0.0.1:9991/",
-    "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/"
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
+    "BASE_URL":"http://192.168.0.109:9991/",
+    "SERVER_IP": "http://192.168.0.109:9991/",
+    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }
diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue
index 15f182d..d370ed5 100644
--- a/src/views/basic/CorpExport.vue
+++ b/src/views/basic/CorpExport.vue
@@ -98,6 +98,7 @@
     import {filterLog, deleteLog} from "../../api/basic/corpExport";
     import corpSelect from "./CorpSelect";
     import axios from "axios";
+    import {formatDate} from "@/utils/date";
     export default {
         data() {
             return {
@@ -182,15 +183,13 @@
                         "?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 =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ]; //  // 下载文件的名字
+                            a.download = "BaseCorp_" + timestamp + ".UpperIn";
                             document.body.appendChild(a);
                             a.click();
                             this.getList();
diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue
index 4548b87..2a081b6 100644
--- a/src/views/basic/UdiinfoExport.vue
+++ b/src/views/basic/UdiinfoExport.vue
@@ -96,200 +96,199 @@
 </template>
 
 <script>
-    import axios from "axios";
-    import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
-    import udiInfoSelect from "./UdIInfoSelect";
+import axios from "axios";
+import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
+import udiInfoSelect from "./UdIInfoSelect";
+import {formatDate} from "@/utils/date";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    type: 3,
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                selectType: 0,
-                udiImportDetailVisible: 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 = {
-                    type: 1,
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
+export default {
+    data() {
+        return {
+            filterQuery: {
+                type: 3,
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
             },
-            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;
-                    });
+            selectType: 0,
+            udiImportDetailVisible: false,
+            list: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            editQuery: null,
+            fromStatus: {
+                0: "产品信息",
+                1: "库存信息",
+                2: "异常第三方上传"
             },
-
-            exportExcel() {
-                this.selectType = 0;
-                this.udiImportDetailVisible = true;
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
             },
-            uploadSmp() {
-                this.selectType = 1;
-                this.udiImportDetailVisible = true;
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
             },
-            downloadExcel(row) {
-
-                axios.get("./config.json").then(res => {
-                    let baseUrl = res.data.BASE_URL;
-                    let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
-                    let a = document.createElement("a");
-                    fetch(href)
-                        .then((res) => res.blob())
-                        .then((blob) => {
-                            a.href = URL.createObjectURL(blob);
-                            console.log(a.href);
-                            a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ]; //  // 下载文件的名字
-                            document.body.appendChild(a);
-                            a.click();
-                            this.getList();
-                        });
+        };
+    },
 
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                type: 1,
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            filterLog(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
+        },
 
+        exportExcel() {
+            this.selectType = 0;
+            this.udiImportDetailVisible = true;
+        },
+        uploadSmp() {
+            this.selectType = 1;
+            this.udiImportDetailVisible = true;
+        },
+        downloadExcel(row) {
 
-            },
-
-            cancelDialog(val) {
-                this.udiImportDetailVisible = 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(() => {
+            axios.get("./config.json").then(res => {
+                let baseUrl = res.data.BASE_URL;
+                let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
+                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 = "BaseProduct_" + timestamp + ".UpperIn";
+                        document.body.appendChild(a);
+                        a.click();
+                        this.getList();
                     });
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                } else {
-                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.getList();
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
 
-                }
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            },
+            });
+
+
         },
-        mounted() {
+
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            if (val) {
+                this.getList();
+            }
         },
-        components: {udiInfoSelect},
-        created() {
-            // this.getBasicThirdSys();
+        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.getList();
+                this.$message.success("文件上传成功,请稍后刷新查看！");
+
+            }
+        },
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
+        },
+    },
+    mounted() {
+    },
+    components: {udiInfoSelect},
+    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/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 2205be2..11b11ab 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -937,8 +937,8 @@ export default {
                 );
                 this.loading = false;
                 const eleLink = document.createElement('a');
-                var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
-                eleLink.download = "仓库信息导出" + timestamp + ".udi";
+                var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+                eleLink.download = "BaseWarehouse_" + timestamp + ".UpperIn";
                 eleLink.style.display = 'none';
                 eleLink.href = url;
                 document.body.appendChild(eleLink)
diff --git a/src/views/thrsys/ThrCorpsExport.vue b/src/views/thrsys/ThrCorpsExport.vue
index c316ceb..f48ce2b 100644
--- a/src/views/thrsys/ThrCorpsExport.vue
+++ b/src/views/thrsys/ThrCorpsExport.vue
@@ -1,293 +1,292 @@
 <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>
-                <el-form-item>
-                    <el-button-group style="display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+  <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>
+          <el-button-group style="display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</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="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="操作" fixed="right" width="160">
-                <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-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="dlCount"
+          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="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="thrCorpSelectVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="thrCorpSelectVisible"
-        >
-            <thrCorpSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-            ></thrCorpSelect>
-        </el-dialog>
+    <el-dialog
+        title="导出往来单位信息"
+        :visible.sync="thrCorpSelectVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrCorpSelectVisible"
+    >
+      <thrCorpSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+      ></thrCorpSelect>
+    </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>
 import {filterLog, deleteLog} from "../../api/thrsys/thrCorpsExport.js";
 import thrCorpSelect from "./ThrCorpSelect";
 import axios from "axios";
+import {formatDate} from "@/utils/date";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                genKey: null,
-                status: null,
-                fromType: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            },
-            selectType: 0,
-            thrCorpSelectVisible: false,
-            list: [],
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            editQuery: null,
-            fromStatus: {
-                0: "产品信息",
-                1: "库存信息",
-                2: "异常第三方上传"
-            },
-            status: {
-                0: "等待处理",
-                1: "正在处理",
-                2: "处理异常",
-                3: "处理完成"
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-        };
-    },
+  data() {
+    return {
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      thrCorpSelectVisible: 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,
-                limit: 20,
-                thirdSysFk: null,
-            };
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterLog(this.filterQuery)
-                .then((response) => {
+  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);
-                    }
+            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;
-                });
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
-        exportExcel() {
-            this.selectType = 0;
-            this.thrCorpSelectVisible = true;
-        },
-        uploadSmp() {
-            this.selectType = 1;
-            this.thrCorpSelectVisible = true;
-        },
-        downloadExcel(row) {
-            axios.get("./config.json").then(res => {
-                let baseUrl = res.data.BASE_URL;
-                let href = baseUrl + "/udiwms/thrCorp/exportLog/download" +
-                    "?genKey=" + row.genKey;
-                let a = document.createElement("a");
-                fetch(href)
-                    .then((res) => res.blob())
-                    .then((blob) => {
-                        a.href = URL.createObjectURL(blob);
-                        console.log(a.href);
-                        a.download =
-                            row.filePath.split("/")[
-                            row.filePath.split("/").length - 1
-                                ]; //  // 下载文件的名字
-                        document.body.appendChild(a);
-                        a.click();
-                        this.getList();
-                    });
+    exportExcel() {
+      this.selectType = 0;
+      this.thrCorpSelectVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.thrCorpSelectVisible = true;
+    },
+    downloadExcel(row) {
+      axios.get("./config.json").then(res => {
+        let baseUrl = res.data.BASE_URL;
+        let href = baseUrl + "/udiwms/thrCorp/exportLog/download" +
+            "?genKey=" + row.genKey;
+        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 = "ThirdCorp_" + timestamp + ".UpperIn";
+              document.body.appendChild(a);
+              a.click();
+              this.getList();
             });
-        },
+      });
+    },
 
-        cancelDialog(val) {
-            if (val) {
-                this.getList();
-            }
-            this.thrCorpSelectVisible = 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;
-                        });
+    cancelDialog(val) {
+      if (val) {
+        this.getList();
+      }
+      this.thrCorpSelectVisible = 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;
                 });
-        },
-        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];
-        },
+          })
+          .catch(() => {
+          });
     },
-    mounted() {
+    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("文件上传成功,请稍后刷新查看！");
+      }
     },
-    components: {thrCorpSelect},
-    created() {
-        // this.getBasicThirdSys();
-        this.getList();
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
     },
+  },
+  mounted() {
+  },
+  components: {thrCorpSelect},
+  created() {
+    // this.getBasicThirdSys();
+    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/ThrOrderExport.vue b/src/views/thrsys/ThrOrderExport.vue
index 112b618..1209f02 100644
--- a/src/views/thrsys/ThrOrderExport.vue
+++ b/src/views/thrsys/ThrOrderExport.vue
@@ -98,6 +98,7 @@
     import {filterLog, deleteLog} from "../../api/thrsys/thrOrderExport";
     import thrOrderSelect from "./ThrOrderSelect";
     import axios from "axios";
+    import {formatDate} from "@/utils/date";
 
     export default {
         data() {
@@ -185,15 +186,13 @@
                     let baseUrl = res.data.BASE_URL;
                     let href = baseUrl + "/udiwms/thrOrder/exportLog/download" + "?genKey=" + row.genKey;
                     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 =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ]; //  // 下载文件的名字
+                            a.download = "ThirdOrder_" + timestamp + ".UpperIn";
                             document.body.appendChild(a);
                             a.click();
                             this.getList();
diff --git a/src/views/thrsys/ThrProductsExport.vue b/src/views/thrsys/ThrProductsExport.vue
index 5c5ca78..69ea73b 100644
--- a/src/views/thrsys/ThrProductsExport.vue
+++ b/src/views/thrsys/ThrProductsExport.vue
@@ -98,6 +98,7 @@
     import {filterLog, deleteLog} from "../../api/thrsys/thrProductsExport.js";
     import thrProductsSelect from "./ThrProductsSelect";
     import axios from "axios";
+    import {formatDate} from "@/utils/date";
     export default {
         data() {
             return {
@@ -182,15 +183,13 @@
                     let baseUrl = res.data.BASE_URL;
                     let href = baseUrl + "/udiwms/thrProducts/exportLog/download" + "?genKey=" + row.genKey;
                     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 =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ];
+                            a.download = "ThirdProduct_" + timestamp + ".UpperIn";
                             document.body.appendChild(a);
                             a.click();
                             this.getList();