diff --git a/bs-admin/pom.xml b/bs-admin/pom.xml index b424d0a..937821d 100644 --- a/bs-admin/pom.xml +++ b/bs-admin/pom.xml @@ -16,7 +16,11 @@ - + + cn.hutool + hutool-all + 5.7.16 + org.springframework.boot diff --git a/bs-ui/src/mixins/table-mixin.js b/bs-ui/src/mixins/table-mixin.js index 3545092..a1ca702 100644 --- a/bs-ui/src/mixins/table-mixin.js +++ b/bs-ui/src/mixins/table-mixin.js @@ -62,17 +62,17 @@ export default { ).then(() => { this.$emit('exportData', {...this.query}); }); - + }, async getTableList() { if (this.$refs.seachForm && this.queryRules) { const valid = await this.$refs.seachForm.validate(); if (!valid) { - + return; } } - + this.$emit('getTableList', {...this.query}); if (!this.MXPageInfo().pageListApi) { return; @@ -92,7 +92,7 @@ export default { }); }, didGetTableList(success) { - + }, queryTable() { this.page = { @@ -147,4 +147,4 @@ export default { }); } }, -}; \ No newline at end of file +}; diff --git a/bs-ui/src/views/task-distribut/feedback/other-task/index.vue b/bs-ui/src/views/task-distribut/feedback/other-task/index.vue index 00e103c..aadad63 100644 --- a/bs-ui/src/views/task-distribut/feedback/other-task/index.vue +++ b/bs-ui/src/views/task-distribut/feedback/other-task/index.vue @@ -3,8 +3,8 @@
- - +
+
- - +
+
@@ -185,7 +185,7 @@ \ No newline at end of file + diff --git a/bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue b/bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue index 9f8f057..0edb4cd 100644 --- a/bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue +++ b/bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue @@ -20,7 +20,7 @@
- + 关闭 @@ -31,7 +31,7 @@ import SectionTitle from "@/views/task-distribut/components/SectionTitle.vue"; import Detail from './Detail.vue'; import AuditItem from './AuditItem.vue'; -// import { listFeedback } from ""; +import { listFeedback } from "@/api/task/feedback"; // import { getDateStr } from "@/utils/util"; export default { @@ -144,4 +144,4 @@ export default { \ No newline at end of file + diff --git a/bs-ui/src/views/task-distribut/send/other-task/components/AuditItem.vue b/bs-ui/src/views/task-distribut/send/other-task/components/AuditItem.vue index fa9b18a..a791277 100644 --- a/bs-ui/src/views/task-distribut/send/other-task/components/AuditItem.vue +++ b/bs-ui/src/views/task-distribut/send/other-task/components/AuditItem.vue @@ -15,7 +15,7 @@ {{ dialogForm.checkUserName || '-' }} - + - + \ No newline at end of file + diff --git a/bs-ui/src/views/task-distribut/send/other-task/components/RemarkDialog.vue b/bs-ui/src/views/task-distribut/send/other-task/components/RemarkDialog.vue index afc5a94..2928c3a 100644 --- a/bs-ui/src/views/task-distribut/send/other-task/components/RemarkDialog.vue +++ b/bs-ui/src/views/task-distribut/send/other-task/components/RemarkDialog.vue @@ -42,7 +42,8 @@ \ No newline at end of file + diff --git a/bs-ui/src/views/task-distribut/send/other-task/index.vue b/bs-ui/src/views/task-distribut/send/other-task/index.vue index a86738c..0b35675 100644 --- a/bs-ui/src/views/task-distribut/send/other-task/index.vue +++ b/bs-ui/src/views/task-distribut/send/other-task/index.vue @@ -3,8 +3,8 @@
- - +
+
- - +
+
@@ -192,14 +192,14 @@
- + \ No newline at end of file +