From eb231718e708442c5e8b580dd93b7fca7ce321c1 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期六, 18 十一月 2023 21:41:51 +0800
Subject: [PATCH] 细节修改
---
src/views/eam/DailyMaintenanceStandardList.vue | 158 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 119 insertions(+), 39 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 4682417..c2b817e 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="鏃ュ父淇濆吇鏍囧噯"
+ title="鍛ㄦ湡鎬т繚鍏绘爣鍑�"
:bordered='false'
>
<div class='table-page-search-wrapper'>
@@ -90,7 +90,7 @@
type='primary'
icon='plus'
v-has="'dailyMaintenanceStandard:add'"
- >鏂板</a-button>
+ >缂栧埗</a-button>
<a-button
type='primary'
@click='searchQuery'
@@ -122,7 +122,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -159,30 +159,49 @@
slot-scope="text, record"
>
<a
- v-if="record.versionStatus == '2'"
- @click="handleRevise(record)"
- v-has="'dailyMaintenanceStandard:revise'"
- >鍗囩増</a>
- <a
- v-if="record.versionStatus == '1'"
- @click="handleTakeEffect(record)"
- v-has="'dailyMaintenanceStandard:takeEffect'"
- >鐢熸晥</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:audit'"
+ >瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:againAudit'"
+ >閲嶆柊瀹℃牳</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:approval'"
+ >瀹℃壒</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
@click="handleEdit(record)"
v-has="'dailyMaintenanceStandard:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-has="'dailyMaintenanceStandard:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus != '1'"
+ @click="handleRevise(record)"
+ v-has="'dailyMaintenanceStandard:revise'"
+ >鍗囩増</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '2'"
+ @click="handleTakeEffect(record)"
+ v-has="'dailyMaintenanceStandard:loseEfficacy'"
+ >澶辨晥</a>
</span>
</a-table>
@@ -242,6 +261,11 @@
ref='modalForm'
@ok='modalFormOk'
></daily-maintenance-standard-modal>
+
+ <audit-approval-modal
+ ref='auditApprovalModal'
+ @ok='modalFormOk'
+ ></audit-approval-modal>
</a-card>
</template>
@@ -255,6 +279,7 @@
import MaintenanceStandardSafetyRequirement from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardSafetyRequirement'
import DailyMaintenanceStandardModal from './modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal'
import MaintenanceStandardWorkInstruction from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstruction'
+import AuditApprovalModal from './modules/dailyMaintenanceStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'
export default {
@@ -265,7 +290,8 @@
DailyMaintenanceStandardModal,
MaintenanceStandardPlanningMaterial,
MaintenanceStandardSafetyRequirement,
- MaintenanceStandardWorkInstruction
+ MaintenanceStandardWorkInstruction,
+ AuditApprovalModal
},
data() {
return {
@@ -281,23 +307,17 @@
}
},
{
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
- {
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
-
{
- title: '璁惧缂栫爜',
+ title: '绛惧鐘舵��',
+ align: 'center',
+ dataIndex: 'approvalStatusName',
+ },
+ {
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -312,7 +332,7 @@
dataIndex: 'equipmentModel',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
@@ -326,21 +346,75 @@
align: 'center',
dataIndex: 'teamName',
},
+ // {
+ // title: '鐗圭璁惧',
+ // align: 'center',
+ // dataIndex: 'specificEquipment',
+ // },
{
- title: '鐗圭璁惧',
+ title: '瀹℃牳鎰忚',
align: 'center',
- dataIndex: 'specificEquipment',
+ dataIndex: 'auditFeedback',
},
{
- title: '鍒涘缓浜�',
+ title: '瀹℃壒鎰忚',
align: 'center',
- dataIndex: 'createBy',
+ dataIndex: 'approvalFeedback',
},
{
- title: '鍒涘缓鏃ユ湡',
+ title: '缂栧埗浜�',
+ align: 'center',
+ dataIndex: 'writePerson',
+ },
+ {
+ title: '瀹℃牳浜�',
+ align: 'center',
+ dataIndex: 'auditPerson',
+ },
+ {
+ title: '瀹℃壒浜�',
+ align: 'center',
+ dataIndex: 'approvalPerson',
+ },
+ {
+ title: '澶辨晥浜�',
+ align: 'center',
+ dataIndex: 'loseEfficacyPerson',
+ },
+ {
+ title: '缂栧埗鏃ユ湡',
align: 'center',
dataIndex: 'createTime',
+ width: 150,
},
+ {
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ width: 150,
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ width: 150,
+ },
+ {
+ title: '鐗堟湰',
+ align: 'center',
+ dataIndex: 'version',
+ },
+ {
+ title: '鐗堟湰鐘舵��',
+ align: 'center',
+ dataIndex: 'versionStatusName',
+ },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: 'center',
+ // dataIndex: 'createBy',
+ // },
+
// {
// title: '鏇存柊浜�',
// align: 'center',
@@ -454,6 +528,12 @@
this.$refs.modalForm.isRevise = false;
},
+ //瀹℃牳瀹℃壒
+ handleAuditApproval: function (record) {
+ this.$refs.auditApprovalModal.showModals(record);
+ this.$refs.auditApprovalModal.title = "瀹℃牳";
+ },
+
//鍗囩増
handleRevise: function (record) {
this.$refs.modalForm.edit(record);
@@ -462,22 +542,22 @@
this.$refs.modalForm.isRevise = true;
},
- //鐢熸晥
+ //澶辨晥
handleTakeEffect(record) {
const that = this;
that.confirmLoading = true;
this.$confirm({
- title: '鏃ュ父淇濆吇鏍囧噯鐗堟湰鐢熸晥锛�',
- content: '鎻愮ず锛氱増鏈敓鏁堝悗涓婁竴鐗堟湰灏嗚嚜鍔ㄥけ鏁堬紝璇疯皑鎱庢搷浣滐紒',
+ title: '淇濆吇鏍囧噯鐗堟湰澶辨晥锛�',
+ content: '鎻愮ず锛氱増鏈け鏁堝悗灏嗙姝娇鐢紝璇疯皑鎱庢搷浣滐紒',
okText: '纭',
cancelText: '鍙栨秷',
onOk() {
- requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
+ requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
if (res.success) {
- that.$message.success("鐗堟湰鐢熸晥鎴愬姛锛�")
+ that.$message.success("鐗堟湰澶辨晥鎴愬姛锛�")
that.loadData(1)
} else {
- that.$message.warning("鐗堟湰鐢熸晥澶辫触锛�")
+ that.$message.warning("鐗堟湰澶辨晥澶辫触锛�")
}
}).finally(() => {
that.confirmLoading = false;
--
Gitblit v1.9.3