From 38e7c2b50ffd15c2f8dde1ca02e11b087fef72b1 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 11 Jun 2022 18:45:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=8F=9C=E5=8D=95=E5=8F=8A=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thrsys/spsSyncDownload.js         |  27 ++
 src/router/index.js                       |  15 +-
 src/views/thrsys/SysUdimsDownloadData.vue | 363 ++++++++++++++++++++++
 3 files changed, 404 insertions(+), 1 deletion(-)
 create mode 100644 src/api/thrsys/spsSyncDownload.js
 create mode 100644 src/views/thrsys/SysUdimsDownloadData.vue

diff --git a/src/api/thrsys/spsSyncDownload.js b/src/api/thrsys/spsSyncDownload.js
new file mode 100644
index 0000000..1665942
--- /dev/null
+++ b/src/api/thrsys/spsSyncDownload.js
@@ -0,0 +1,27 @@
+import axios from "../../utils/axios";
+
+
+export function filterLog(query) {
+    return axios({
+        url: "/spssync/download/basic/udiinfo/filter",
+        method: "get",
+        params: query
+    });
+}
+
+export function deleteLog(query) {
+    return axios({
+        url: "/spssync/download/basic/udiinfo/deleteByStatus",
+        method: "post",
+        data: query
+    });
+}
+
+export function testConnect(query) {
+    return axios({
+        url: "/spssync/basic/connect/test",
+        method: "get",
+        params: query
+    });
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index a6e2d79..5c4d88e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -108,6 +108,10 @@ import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse";
 import syncConfig from "../views/thrsys/SysUdimsConfig.vue";
 
 import BasicEntrutsRece from "../views/basic/BasicEntrutsRece.vue";
+
+//同步管理
+import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData";
+
 // Vue.use(VueRouter);
 
 const err401 = r =>
@@ -336,12 +340,21 @@ export const asyncRouterMap = [
                     {
                         path: "spsSyncData",
                         component: spsSyncData,
-                        name: "同步记录",
+                        name: "同步任务",
                         icon: "",
                         meta: {
                             authRule: ["spsSyncMange/spsSyncData"]
                         }
                     },
+                    {
+                        path: "sysUdimsDownloadData",
+                        component: sysUdimsDownloadData,
+                        name: "下载记录",
+                        icon: "",
+                        meta: {
+                            authRule: ["spsSyncMange/sysUdimsDownloadData"]
+                        }
+                    },
                 ]
             },
             {
diff --git a/src/views/thrsys/SysUdimsDownloadData.vue b/src/views/thrsys/SysUdimsDownloadData.vue
new file mode 100644
index 0000000..2e2ec78
--- /dev/null
+++ b/src/views/thrsys/SysUdimsDownloadData.vue
@@ -0,0 +1,363 @@
+<template>
+    <div>
+
+
+        <el-card>
+            <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.id" 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-date-picker
+                            v-model="syncTime"
+                            type="datetime"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择下载时间">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table
+                v-loading="loading"
+                :data="list"
+                style="width: 100%"
+            >
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="记录ID"
+                    prop="id"
+                    width="140"
+                    show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                    label="任务类型"
+                    prop="idDatas"
+                    width="140"
+                    show-overflow-tooltip
+                >
+                    <template slot-scope="scope">
+                        <span>{{ type[scope.row.idDatas] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="状态"
+                    prop="status"
+                    width="140"
+                    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="180"
+                    prop="startTime"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="结束时间"
+                    width="180"
+                    prop="endTime"
+                    show-overflow-tooltip
+                ></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
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+
+    </div>
+</template>
+
+<script>
+import {filterLog, deleteLog, createSchedule, findConfig, updateConfig} from "../../api/thrsys/spsSyncDownload";
+import store from "@/store";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                id: null,
+                status: "1",
+                page: 1,
+                limit: 10,
+                syncTime: null,
+            },
+            list: [],
+            headers: {},
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            currentRow: null,
+            editQuery: null,
+            type: {
+                "AutoDownloadOrder": "已完成单据",
+                "AutoDownloadBusType": "单据类型",
+                "AutoDownloadAllData": "基础信息",
+                "AutoDownloadDiProducts": "国家库DI数据"
+            },
+            status: {
+                0: "等待处理",
+                1: "处理完成",
+                2: "处理异常",
+            },
+
+            configQuery: {
+                id: null,
+                typeBus: null,
+                typeScan: null,
+                typeThird: null,
+                basicProducts: null,
+                basicCorp: null,
+                basicInv: null,
+                basicThirdProducts: null,
+                basicThirdCorp: null,
+                basicThirdInv: null,
+                basicThirdBusOrder: null,
+                orderScanFinish: null,
+                dbDiProducts: null,
+                downstreamEnable: null,
+                syncTime: null,
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            templateDlUrl: null,
+            checked: false,
+            syncTime: null,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                id: null,
+                status: "1",
+                page: 1,
+                limit: 20,
+            };
+            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;
+                });
+        },
+
+        getConfig() {
+            findConfig()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.configQuery = response.data;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        saveConfig() {
+            updateConfig(this.configQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("更新成功！");
+                        this.getConfig();
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+
+
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            this.thrCorpSelectVisible = false;
+            if (val) {
+                this.getList();
+            }
+        }
+        ,
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        }
+        ,
+
+        createSchedule(type) {
+            let query = {
+                createType: type,
+                syncTime: this.syncTime,
+            }
+
+            createSchedule(query)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("创建成功！");
+                    } else if (response.code == 501) {
+                        this.$message.warning(response.message);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+        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);
+                this.getList();
+            } 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: "success",
+                2: "danger",
+            };
+            return statusMap[status];
+        }
+        ,
+    },
+
+    mounted() {
+    },
+    components: {},
+    created() {
+        this.headers = {
+            ADMIN_ID: store.getters.adminId,
+            ADMIN_TOKEN: store.getters.token,
+        };
+        this.getList();
+        this.getConfig();
+    },
+};
+</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>

From 3085074ffa75c10def3b2f5dce196f7f3cc1ba4c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 11 Jun 2022 18:54:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2js=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thrsys/spsSyncDownload.js         | 5 ++---
 src/views/thrsys/SysUdimsDownloadData.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/api/thrsys/spsSyncDownload.js b/src/api/thrsys/spsSyncDownload.js
index 1665942..d0dfd1a 100644
--- a/src/api/thrsys/spsSyncDownload.js
+++ b/src/api/thrsys/spsSyncDownload.js
@@ -17,11 +17,10 @@ export function deleteLog(query) {
     });
 }
 
-export function testConnect(query) {
+export function findConfig(query) {
     return axios({
-        url: "/spssync/basic/connect/test",
+        url: "/system/param/syncData/config",
         method: "get",
         params: query
     });
 }
-
diff --git a/src/views/thrsys/SysUdimsDownloadData.vue b/src/views/thrsys/SysUdimsDownloadData.vue
index 2e2ec78..bfcadcf 100644
--- a/src/views/thrsys/SysUdimsDownloadData.vue
+++ b/src/views/thrsys/SysUdimsDownloadData.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import {filterLog, deleteLog, createSchedule, findConfig, updateConfig} from "../../api/thrsys/spsSyncDownload";
+import {filterLog, deleteLog, findConfig, updateConfig} from "../../api/thrsys/spsSyncDownload";
 import store from "@/store";
 
 export default {