From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期三, 29 十一月 2023 16:36:39 +0800 Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱 --- src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue index 3064b2e..fa9fee4 100644 --- a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue +++ b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue @@ -88,7 +88,6 @@ }, data() { return { - isAchievement:false, labelCol: { xs: { span: 24 }, sm: { span: 5 } @@ -232,7 +231,7 @@ default: false, required: false }, - isAchievement: { + achievement: { type: Boolean, default: false, required: false @@ -243,7 +242,7 @@ return this.disabled }, achievementDisabled() { - return this.isAchievement + return this.achievement } }, created() { @@ -309,13 +308,15 @@ console.log("formData===>",formData); httpAction(url, formData, method).then((res) => { if (res.success) { - httpAction(this.url.addOperationCertificate, formData.operationCertificateApplyDetailList, 'post').then((res) => { - if (res.success) { - this.$message.success(res.message) - }else { - this.$message.warning(res.message) - } - }) + if(this.achievementDisabled){ + httpAction(this.url.addOperationCertificate, formData.operationCertificateApplyDetailList, 'post').then((res) => { + if (res.success) { + this.$message.success(res.message) + }else { + this.$message.warning(res.message) + } + }) + } this.$message.success(res.message) this.$emit('ok') this.close() -- Gitblit v1.9.3