From 7f6af6907202cb7c9395a7020d249bd62e17d50f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 05 一月 2024 17:59:17 +0800
Subject: [PATCH] 1、解决车间看板页面因浏览器兼容性问题导致的样式不适配问题（使用浏览器86版本与其他版本做对比） 2、优化车间看板页面代码，将看板拖拽区域设置高度后再设置限制拖拽以试图解决进入页面后有概率设备无法自由拖拽问题（猜想因父子组件渲染顺序导致，父组件还未渲染完成，子组件就已限制区域，此时区域高度可能0，未在现场调试，本地调试无问题） 3、优化设备利用率、开动率及班次利用率页面代码，解决因浏览器版本问题导致表格前3列文字无法垂直排列导致的布局问题以及调整右上角区间展示区域为响应式布局
---
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