From aaa6c804a1ba8f832b190e9ccbc345a474c7ae25 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 28 Jun 2022 15:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=B0=E5=BD=95taskId?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sync/SysDownloadData.vue |   4 +-
 src/views/sync/SysUploadData.vue   | 701 +++++++++++++++--------------
 2 files changed, 354 insertions(+), 351 deletions(-)

diff --git a/src/views/sync/SysDownloadData.vue b/src/views/sync/SysDownloadData.vue
index 45c5a86..da4712f 100644
--- a/src/views/sync/SysDownloadData.vue
+++ b/src/views/sync/SysDownloadData.vue
@@ -8,13 +8,14 @@
             <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-input v-model="filterQuery.taskId" 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="3"></el-option>
                             <el-option label="已处理" value="1"></el-option>
                             <el-option label="异常" value="2"></el-option>
                         </el-select>
@@ -146,6 +147,7 @@ export default {
     data() {
         return {
             filterQuery: {
+                taskId: null,
                 id: null,
                 status: "0",
                 page: 1,
diff --git a/src/views/sync/SysUploadData.vue b/src/views/sync/SysUploadData.vue
index 44039c3..365ab1a 100644
--- a/src/views/sync/SysUploadData.vue
+++ b/src/views/sync/SysUploadData.vue
@@ -1,133 +1,133 @@
 <template>
-  <div>
+    <div>
 
-    <el-card>
-      <div>
-        <span style="color: red;">说明:&nbsp;此页面用于记录接收下游上传数据日志记录，上传数据至上游日志记录 </span>
-      </div>
+        <el-card>
+            <div>
+                <span style="color: red;">说明:&nbsp;此页面用于记录接收下游上传数据日志记录，上传数据至上游日志记录 </span>
+            </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.id" placeholder="记录ID"></el-input>
-          </el-form-item>
+            <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.taskId" 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>
-            <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-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="taskId"
-            width="180"
-            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
+            <el-table
+                v-loading="loading"
+                :data="list"
+                style="width: 100%"
             >
-          </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="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="任务ID"
+                    prop="taskId"
+                    width="180"
+                    show-overflow-tooltip
+                ></el-table-column>
 
-        <el-table-column
-            label="同步信息"
-            prop="remark"
-            show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-            label="文件路径"
-            prop="cacheFilePath"
-            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="detailDialog(scope.row.id)"
-            >详情
-            </el-button
-            >
-            <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>
+                <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="文件路径"
+                    prop="cacheFilePath"
+                    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="detailDialog(scope.row.id)"
+                        >详情
+                        </el-button
+                        >
+                        <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>
 
-    <el-dialog
-        title="同步信息"
-        width="25%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :visible.sync="syncVisible"
-    >
-      <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
-    </el-dialog>
+        <el-dialog
+            title="同步信息"
+            width="25%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="syncVisible"
+        >
+            <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
+        </el-dialog>
 
-  </div>
+    </div>
 </template>
 
 <script>
@@ -135,271 +135,272 @@ import {filterUploadStatus, deleteUploadStatus, updateConfig} from "../../api/sy
 import store from "@/store";
 
 export default {
-  data() {
-    return {
-      filterQuery: {
-        id: null,
-        status: "0",
-        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,
+    data() {
+        return {
+            filterQuery: {
+                taskId: null,
+                id: null,
+                status: "0",
+                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: "处理异常",
+            },
 
-      },
-      uploadFileUrl: null,
-      uploadData: {
-        thirdSys: "thirdId",
-      },
-      templateDlUrl: null,
-      checked: false,
-      syncTime: null,
-      syncInfo: null,
-      syncVisible: false
-    };
-  },
+            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,
 
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        id: null,
-        page: 1,
-        limit: 20,
-      };
-      this.syncTime = null;
-      this.getList();
-    },
-    getList() {
-      this.loading = true;
-      filterUploadStatus(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;
-          });
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            templateDlUrl: null,
+            checked: false,
+            syncTime: null,
+            syncInfo: null,
+            syncVisible: false
+        };
     },
 
-    saveConfig() {
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                id: null,
+                page: 1,
+                limit: 20,
+            };
+            this.syncTime = null;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            filterUploadStatus(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;
+                });
+        },
+
+        saveConfig() {
 
-      updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("更新成功！");
-              this.getConfig();
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
+            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();
-    }
-    ,
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            this.thrCorpSelectVisible = false;
+            if (val) {
+                this.getList();
+            }
+        }
+        ,
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        }
+        ,
 
-    /* createScheduleDialog(type) {
-         if (this.$isNotBlank(this.syncTime)) {
-             this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
-                 confirmButtonText: "确定",
-                 cancelButtonText: "取消",
-                 type: "warning",
-             })
-                 .then(() => {
-                     this.createSchedule(type);
+        /* createScheduleDialog(type) {
+             if (this.$isNotBlank(this.syncTime)) {
+                 this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+                     confirmButtonText: "确定",
+                     cancelButtonText: "取消",
+                     type: "warning",
                  })
-                 .catch(() => {
-                 });
-         } else {
-             this.createSchedule(type);
-         }
+                     .then(() => {
+                         this.createSchedule(type);
+                     })
+                     .catch(() => {
+                     });
+             } else {
+                 this.createSchedule(type);
+             }
 
-     },
+         },
 
-     createSchedule(type) {
-         let query = {
-             createType: type,
-             syncTime: this.syncTime,
-         }
+         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) {
+             createSchedule(query)
+                 .then((response) => {
+                     this.loading = false;
+                     if (response.code == 20000) {
+                         this.$message.success("创建成功！");
+                     } else if (response.code == 501) {
 
-                     this.$alert(response.message, '提示', {
-                         confirmButtonText: '确定',
-                         type: "warning",
-                         callback: action => {
-                         }
-                     });
+                         this.$alert(response.message, '提示', {
+                             confirmButtonText: '确定',
+                             type: "warning",
+                             callback: action => {
+                             }
+                         });
 
-                 } 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,
-            };
-            deleteUploadStatus(dQuery)
-                .then((response) => {
-                  this.loading = false;
-                  if (response.code == 20000) {
-                    this.$message.success("删除成功");
-                  } else {
-                    this.$message.error(response.message);
-                  }
-                  this.getList();
+                     } 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,
+                    };
+                    deleteUploadStatus(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(() => {
-                  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];
-    },
-    detailDialog(id) {
-      this.syncVisible = true;
-      this.list.forEach(item => {
-        if (id === item.id) {
-          this.syncInfo = item.remark;
         }
-      })
-    }
-  },
+        ,
+        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];
+        },
+        detailDialog(id) {
+            this.syncVisible = true;
+            this.list.forEach(item => {
+                if (id === item.id) {
+                    this.syncInfo = item.remark;
+                }
+            })
+        }
+    },
 
-  mounted() {
-  },
-  components: {},
-  created() {
-    this.headers = {
-      ADMIN_ID: store.getters.adminId,
-      ADMIN_TOKEN: store.getters.token,
-    };
-    this.getList();
-    this.getConfig();
-  },
+    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;
+    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;
 }
 
 .syncInfo {
-  font-size: medium;
-  font-family: "Microsoft YaHei";
-  line-height: 25px;
+    font-size: medium;
+    font-family: "Microsoft YaHei";
+    line-height: 25px;
 }
 </style>