From 0ec0e4bed059e746ed65b2a27159105c36e75104 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 4 Jul 2023 17:05:12 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=200703=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DialogCarPayload.vue | 2 +- src/components/DialogUpload.vue | 53 +++++++++++-------- src/mixins/basic-add.js | 1 + src/mixins/basic-page.js | 4 +- src/views/atomViews/ListView.vue | 2 +- src/views/atomViews/ListViewWithHead.vue | 4 +- .../components/ListViewWithHead.vue | 2 +- .../components/ListViewWithHead.vue | 2 +- .../components/ListViewWithHead.vue | 2 +- .../components/ListViewWithHead.vue | 2 +- .../material/components/ListViewWithHead.vue | 18 ++++--- .../order/components/ListSectionWithHead.vue | 12 +++-- src/views/modules/pms/order/config.js | 2 +- src/views/modules/sys/role-add-or-update.vue | 8 ++- src/views/modules/sys/role.vue | 44 +++++++-------- src/views/modules/sys/user-add-or-update.vue | 5 +- src/views/modules/sys/user.vue | 2 +- 17 files changed, 95 insertions(+), 70 deletions(-) diff --git a/src/components/DialogCarPayload.vue b/src/components/DialogCarPayload.vue index 1a35963..cd4ecfe 100644 --- a/src/components/DialogCarPayload.vue +++ b/src/components/DialogCarPayload.vue @@ -38,7 +38,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> diff --git a/src/components/DialogUpload.vue b/src/components/DialogUpload.vue index 40d966a..2b710d2 100644 --- a/src/components/DialogUpload.vue +++ b/src/components/DialogUpload.vue @@ -128,34 +128,43 @@ export default { }, handleSuccess(response, file, fileList) { - // console.log("success response", response); + console.log("success response", response); + + try { + if ("code" in response && response.code === 500) { + this.$message({ + message: response.msg, + type: "error", + duration: 1500, + }); + return; + } + + let message = ""; + let isError = false; + + if (typeof response === "object" && "msg" in response) message = response.msg; + if (typeof response === "object" && "data" in response) message = response.data.toString(); + if (typeof response === "string") { + message = response; + isError = true; + } - if ("code" in response && response.code === 500) { + this.handleClose(); + this.$emit("uploadSuccess"); this.$message({ - message: response.msg, + message, + type: isError ? "error" : "info", + duration: 2000, + }); + } catch (err) { + this.$message({ + message: response, type: "error", - duration: 1500, + duration: 2500, }); return; } - - let message = ""; - let isError = false; - - if (typeof response === "object" && "msg" in response) message = response.msg; - if (typeof response === "object" && "data" in response) message = response.data.toString(); - if (typeof response === "string") { - message = response; - isError = true; - } - - this.handleClose(); - - this.$message({ - message, - type: isError ? "error" : "info", - duration: 2000, - }); }, handleError(err, file, fileList) { diff --git a/src/mixins/basic-add.js b/src/mixins/basic-add.js index bd4808c..8f1e05c 100644 --- a/src/mixins/basic-add.js +++ b/src/mixins/basic-add.js @@ -70,6 +70,7 @@ export default { }, // 表单提交 dataFormSubmit() { + console.log('in minxin basic-page dataformsubmit') this.$refs["dataForm"].validate((valid) => { if (!valid) { return false; diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js index 391c639..bccc3d6 100644 --- a/src/mixins/basic-page.js +++ b/src/mixins/basic-page.js @@ -115,8 +115,8 @@ export default { type: "warning", }) .then(() => { - // this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { - this.$http.delete(this.urlOptions.deleteURL + `/${id}`).then(({ data }) => { + this.$http.delete(this.urlOptions.deleteURL, { data: [id] }).then(({ data }) => { + // this.$http.delete(this.urlOptions.deleteURL + `/${id}`).then(({ data }) => { if (data && data.code === 0) { this.$message({ message: "操作成功", diff --git a/src/views/atomViews/ListView.vue b/src/views/atomViews/ListView.vue index c648a5e..b32b092 100644 --- a/src/views/atomViews/ListView.vue +++ b/src/views/atomViews/ListView.vue @@ -28,7 +28,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper" diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index a35394b..1b37083 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -48,7 +48,9 @@ v-if="uploadDialogVisible" title="导入配方" filename="bomTemplate.xlsx" - @refresh-list="getList" /> + @refresh-list="getList" + @uploadSuccess="getList" + @destroy-dialog="() => { uploadDialogVisible = false }" /> diff --git a/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue b/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue index e49ada5..0fe6cc7 100644 --- a/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue +++ b/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue @@ -18,7 +18,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> diff --git a/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue b/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue index e9c1d10..aaecbca 100644 --- a/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue +++ b/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue @@ -20,7 +20,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper" diff --git a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue index 24d5861..c974fe7 100644 --- a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue +++ b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue @@ -19,7 +19,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> diff --git a/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue b/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue index 36a6c17..5ae8bec 100644 --- a/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue +++ b/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue @@ -20,7 +20,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper" diff --git a/src/views/modules/pms/material/components/ListViewWithHead.vue b/src/views/modules/pms/material/components/ListViewWithHead.vue index 3a122be..22e0cfc 100644 --- a/src/views/modules/pms/material/components/ListViewWithHead.vue +++ b/src/views/modules/pms/material/components/ListViewWithHead.vue @@ -23,7 +23,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[1, 5, 10, 20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> @@ -48,7 +48,13 @@ v-if="uploadDialogVisible" title="导入原料" filename="bomTemplate.xlsx" - @refresh-list="getList" /> + @refresh-list="getList" + @uploadSuccess="getList" + @destroy-dialog=" + () => { + uploadDialogVisible = false; + } + " /> @@ -181,7 +187,7 @@ export default { ], }, }, - cachedSearchCondition: {} + cachedSearchCondition: {}, }; }, inject: ["urls"], @@ -280,9 +286,7 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; - this.getList(); + this.getList(this.cachedSearchCondition); } }); }) @@ -343,7 +347,7 @@ export default { this.openDialog(); break; case "查询": { - Object.assign(this.cachedSearchCondition, payload) + Object.assign(this.cachedSearchCondition, payload); this.getList(this.cachedSearchCondition); break; } diff --git a/src/views/modules/pms/order/components/ListSectionWithHead.vue b/src/views/modules/pms/order/components/ListSectionWithHead.vue index 6830209..2ffa78c 100644 --- a/src/views/modules/pms/order/components/ListSectionWithHead.vue +++ b/src/views/modules/pms/order/components/ListSectionWithHead.vue @@ -36,7 +36,7 @@ fullscreen :configs="dialogConfig" @destroy-dialog="renderDialog = false" - @refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params));" /> + @refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params))" /> + @refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params))" /> + @destroy-dialog=" + () => { + uploadDialogVisible = false; + } + " + @uploadSuccess="handleRefreshList" /> diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index bdae3a5..e7435bf 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -569,7 +569,7 @@ export default function () { finishedOrder: "/pms/order/pageEnd", unConfirmedOrder: "/pms/order/pageUnCom", base: "/pms/order", - importUrl: "/pms-am/pms/order/importExcelOrder", + importUrl: "/pms/order/importExcelOrder", templateUrl: "/importTemplates/orderImport.xlsx", payload: "/pms/carHandle", }, diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue index 8447774..1baa20b 100644 --- a/src/views/modules/sys/role-add-or-update.vue +++ b/src/views/modules/sys/role-add-or-update.vue @@ -1,5 +1,5 @@