From 5eb201663c723d215014106c69b093a304e932b6 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期五, 03 十一月 2023 18:05:49 +0800
Subject: [PATCH] 问题修改
---
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue | 21 +++++++++++----------
src/views/eam/OperationCertificateApplyList.vue | 16 ++++++++++++++--
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue | 4 ++--
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/views/eam/OperationCertificateApplyList.vue b/src/views/eam/OperationCertificateApplyList.vue
index ca01c55..349cd26 100644
--- a/src/views/eam/OperationCertificateApplyList.vue
+++ b/src/views/eam/OperationCertificateApplyList.vue
@@ -123,8 +123,20 @@
type="vertical"
/>
<a @click="handleEdit(record)" v-if="record.auditStatus == 'created'">缂栬緫</a>
- <a @click="handleCommit(record,'approved')" v-if="record.auditStatus == 'submitted'">瀹℃壒</a>
- <a @click="handleCommit(record,'audited')" v-if="record.auditStatus == 'approved'">瀹℃牳</a>
+ <a-popconfirm
+ v-if="record.auditStatus == 'submitted'"
+ title="纭閫氳繃瀹℃壒鍚�?"
+ @confirm="() =>handleCommit(record, 'approved')"
+ >
+ <a>瀹℃壒</a>
+ </a-popconfirm>
+ <a-popconfirm
+ v-if="record.auditStatus == 'approved'"
+ title="纭閫氳繃瀹℃牳鍚�?"
+ @confirm="() =>handleCommit(record, 'audited')"
+ >
+ <a>瀹℃牳</a>
+ </a-popconfirm>
<a-divider type="vertical" v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted' || record.auditStatus == 'approved'"/>
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
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()
diff --git a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue
index 2e2272e..983bb8b 100644
--- a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue
+++ b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue
@@ -8,7 +8,7 @@
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel">
- <operation-certificate-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" isAchievement="isAchievement"/>
+ <operation-certificate-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :achievement="isAchievement"/>
</j-modal>
</template>
@@ -27,7 +27,7 @@
width:800,
visible: false,
disableSubmit: false,
- isAchievement:false
+ isAchievement: false
}
},
methods:{
--
Gitblit v1.9.3