diff --git a/src/api/excel.js b/src/api/excel.js index db7344b..93db6fd 100644 --- a/src/api/excel.js +++ b/src/api/excel.js @@ -54,6 +54,15 @@ const uploadExcelDbs = (data) => { }) } +const uploadExcelWorkDate = (data) => { + return request({ + url: '/excel/uploadWorkDate', + method: 'post', + data: data, + timeout: 600000 + }) +} + const uploadExcelOrders = (data) => { return request({ url: '/excel/uploadKateOrders', @@ -199,5 +208,6 @@ export { downloadWorkSummaryExcel, uploadExcelBaseGoods, uploadExcelKanban, - uploadWorkFlow + uploadWorkFlow, + uploadExcelWorkDate } \ No newline at end of file diff --git a/src/excel/UploadExcelWorkDate.vue b/src/excel/UploadExcelWorkDate.vue new file mode 100644 index 0000000..68e765b --- /dev/null +++ b/src/excel/UploadExcelWorkDate.vue @@ -0,0 +1,98 @@ + + + \ No newline at end of file diff --git a/src/layout/dbsTable.vue b/src/layout/dbsTable.vue index 7c1c115..f70e5f9 100644 --- a/src/layout/dbsTable.vue +++ b/src/layout/dbsTable.vue @@ -9,8 +9,10 @@ 重置 - 导入 + 导入DBS + 导入工作日历
@@ -123,6 +125,33 @@ + +
+ 上次更新 +
+
+
+
时间:
+ +
+
+
人员:
+ +
+
+
+
文件名:
+ + +
+
+
+
+ 再次更新 + +
+
@@ -136,6 +165,7 @@ import { errorBox } from '@/utils/myMessageBox.js' import { ref, reactive } from 'vue' import { dateFormatter, timeFormatter } from '@/utils/formatter.js' import UploadExcelDbs from '@/excel/UploadExcelDbs.vue' +import UploadExcelWorkDate from '@/excel/UploadExcelWorkDate.vue' import { queryUploadRecord } from '@/api/excel.js' import { Search } from '@element-plus/icons-vue' @@ -161,7 +191,8 @@ export default { dbsFormEntity: reactive({}), labelPosition: 'top', dbsFormRef: ref(), - rules: reactive({}) + rules: reactive({}), + uploadWorkDateDialogVisible: false, } }, mounted() { @@ -269,11 +300,11 @@ export default { getCurrentRow(row) { this.dbsId = row.dbsId }, - openUploadDialog() { + openUploadDialog(uploadType) { // 请求上传记录 const param = { userName: store.getters.getUserName, - fileDescription: 'DBS', + fileDescription: uploadType == 1 ? 'DBS' : 'WORK_DATE', isAsc: false, sortBy: 'upload_time' } @@ -299,7 +330,11 @@ export default { console.log(err) errorBox('发生异常') }) - this.uploadDialogVisible = true + if (uploadType == 1) { + this.uploadDialogVisible = true + } else { + this.uploadWorkDateDialogVisible = true + } }, }, }