From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 十二月 2023 13:35:36 +0800
Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空，现调整为首位数据，且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整
---
src/views/eam/OperationCertificateApplyList.vue | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/OperationCertificateApplyList.vue b/src/views/eam/OperationCertificateApplyList.vue
index ca01c55..ca8f095 100644
--- a/src/views/eam/OperationCertificateApplyList.vue
+++ b/src/views/eam/OperationCertificateApplyList.vue
@@ -111,20 +111,46 @@
>
<a>鎾ゅ洖</a>
</a-popconfirm>
- <a-popconfirm
+ <!-- <a-popconfirm
v-if="record.auditStatus == 'submitted' || record.auditStatus == 'approved'"
title="纭椹冲洖鍚�?"
@confirm="() =>handleCommit(record, 'back')"
>
<a>椹冲洖</a>
- </a-popconfirm>
+ </a-popconfirm> -->
<a-divider
v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted'"
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-divider
+ v-if="record.auditStatus == 'created'"
+ type="vertical"
+ />
+ <a
+ v-show="record.auditStatus == 'submitted'"
+ @click="handleFinish(record)"
+ v-has="'OperationCertificateApply:operationCertificateAudit'"
+ >瀹℃牳</a>
+ <a
+ v-show="record.auditStatus == 'approved'"
+ @click="handleFinish(record)"
+ v-has="'OperationCertificateApply:equipmentAdmin'"
+ >瀹℃牳</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>
@@ -155,6 +181,7 @@
</a-tabs>
<operation-certificate-apply-modal ref="modalForm" @ok="modalFormOk" />
+ <operation-certificate-apply-audit ref="modalFormAudit" @ok="modalFormOk" />
</a-card>
</template>
@@ -162,6 +189,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import OperationCertificateApplyModal from './modules/operationCertificateApply/OperationCertificateApplyModal'
+ import OperationCertificateApplyAudit from './modules/operationCertificateApply/OperationCertificateApplyAudit'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import { getAction, postAction } from '@/api/manage'
import OperationCertificateApplyDetailList from './modules/operationCertificateApply/OperationCertificateApplyDetailList'
@@ -172,7 +200,8 @@
mixins:[JeecgListMixin],
components: {
OperationCertificateApplyModal,
- OperationCertificateApplyDetailList
+ OperationCertificateApplyDetailList,
+ OperationCertificateApplyAudit
},
data () {
return {
@@ -310,6 +339,11 @@
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.isAchievement = true;
},
+ handleFinish: function (record) {
+ this.$refs.modalFormAudit.edit(record);
+ this.$refs.modalFormAudit.title = "鎿嶄綔璇佺敵璇峰鏍�";
+ this.$refs.modalFormAudit.disableSubmit = true;
+ },
onSelectChange(selectedRowKeys, selectionRows) {
if (selectedRowKeys.length == 1) {
--
Gitblit v1.9.3