From 07017c3802f14e1aa5391dc2c17896447d7da269 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 15 May 2023 11:49:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=A0=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biz/orderUploadLog/index.vue | 15 ++++++--- src/views/inout/IoAuditedOrder.vue | 45 +++++++++++++++++++++++++- src/views/inout/IoEditOrder.vue | 9 +++--- src/views/system/role/index.vue | 38 ++++++++++++++-------- 4 files changed, 82 insertions(+), 25 deletions(-) diff --git a/src/views/biz/orderUploadLog/index.vue b/src/views/biz/orderUploadLog/index.vue index 878e9cae..90676f80 100644 --- a/src/views/biz/orderUploadLog/index.vue +++ b/src/views/biz/orderUploadLog/index.vue @@ -434,13 +434,18 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除biz编号为"' + ids + '"的数据项？').then(() => { + this.$modal.confirm('是否确认删除？').then(() => { this.loading = true; return delOrderUploadLog(ids); - }).then(() => { - this.loading = false; - this.getList(); - this.$modal.msgSuccess("删除成功"); + }).then((res) => { + if (res.code == 20000) { + this.loading = false; + this.getList(); + this.$modal.msgSuccess("删除成功"); + } else { + this.$modal.msgError(res.message); + } + }).catch(() => { }).finally(() => { this.loading = false; diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index dbb38b1e..5d851ca4 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -164,6 +164,15 @@ >撤回 + + 复制 + + + @@ -355,6 +364,22 @@ + + + + + @@ -371,6 +396,7 @@ import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeList} from "@/api/inout/code"; import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" +import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder"; const formJson = { @@ -499,9 +525,11 @@ export default { resultTotal: 0, resultDetailLoading: false, resultDetailList: [], + stockChangeVisible: false, + curRow: null, }; }, - components: {}, + components: {DialogcChangeNewOrder}, methods: { onReset() { this.$router.push({ @@ -833,6 +861,21 @@ export default { // this.$message.info('回退失败'); }); }, + + generOrder(row) { + this.stockChangeVisible = true; + this.curRow = row; + }, + + closeDialog(type) { + this.stockChangeVisible = false; + this.getList(); + if (this.$isNotBlank(type)) { + this.detailList = []; + } + }, + + statusFilterType(status) { const statusMap = { 5: "warning", diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue index 2cebdbc0..3cae6b20 100644 --- a/src/views/inout/IoEditOrder.vue +++ b/src/views/inout/IoEditOrder.vue @@ -694,7 +694,7 @@ export default { page: 1, limit: 10 }; - if(!isBlank(this.currentRow.billNo)) { + if (!isBlank(this.currentRow.billNo)) { this.getBizDetailList(); } }, @@ -733,7 +733,7 @@ export default { limit: 10 }; - if(!isBlank(this.currentRow.billNo)) { + if (!isBlank(this.currentRow.billNo)) { this.getCodeDetailList(); } }, @@ -774,7 +774,7 @@ export default { limit: 10 }; - if(!isBlank(this.currentRow.billNo)) { + if (!isBlank(this.currentRow.billNo)) { this.getResultDetailList(); } }, @@ -838,8 +838,7 @@ export default { }, }, - filters: { - }, + filters: {}, mounted() { document.body.ondrop = function (event) { event.preventDefault(); diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index a771823c..d503e209 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -121,7 +121,7 @@ - + 正常 禁用 @@ -293,7 +293,7 @@ export default { // roleKey: [ // {required: true, message: "权限字符不能为空", trigger: "blur"} // ], - menuOptions:[ + menuOptions: [ {required: true, message: "角色列表不能为空", trigger: "blur"} ], roleSort: [ @@ -378,8 +378,13 @@ export default { let text = row.status === "0" ? "启用" : "禁用"; this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function () { return changeRoleStatus(row.roleId, row.status); - }).then(() => { - this.$modal.msgSuccess(text + "成功"); + }).then((res) => { + if (res.code == 20000) { + this.$modal.msgSuccess(text + "成功"); + } else { + this.$modal.msgError(res.message); + } + }).catch(function () { row.status = row.status === "0" ? "1" : "0"; }); @@ -538,22 +543,22 @@ export default { if (valid) { if (this.form.roleId != undefined) { this.form.menuIds = this.getMenuAllCheckedKeys(); - if( this.form.menuIds.length==0){ + if (this.form.menuIds.length == 0) { this.$message.error("菜单权限不能为空"); return } updateRole(this.form).then(response => { - if(response.code === 20000){ - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); - }else{ + if (response.code === 20000) { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + } else { this.$message.error(response.message); } }); } else { this.form.menuIds = this.getMenuAllCheckedKeys(); - if(this.form.menuIds.length==0){ + if (this.form.menuIds.length == 0) { this.$message.error("菜单权限不能为空"); return } @@ -582,9 +587,14 @@ export default { const roleIds = row.roleId || this.ids; this.$modal.confirm('是否确认删除该角色？').then(function () { return delRole(roleIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); + }).then((res) => { + if (res.code == 20000) { + this.getList(); + this.$modal.msgSuccess("删除成功"); + } else { + this.$modal.msgError(res.message); + } + }).catch(() => { }); },