From 545c2af2401e9665b49b38619245ab35918710e7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:09:46 +0800
Subject: [PATCH] 问题项修改
---
src/views/eam/DailyInspectionStandardList.vue | 32 ++++++++++++++++
src/views/eam/DailyMaintenanceStandard3List.vue | 10 +++++
src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue | 11 ++++-
src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue | 11 ++++-
src/views/eam/DailyMaintenanceStandardList.vue | 10 +++++
5 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 3db495e..70a8850 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -137,6 +137,24 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
+ <span
+ slot="disUda1"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
+ </span>
+ <span
+ slot="teamName"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="10"
+ />
+ </span>
<!-- <span
slot='action'
@@ -249,11 +267,13 @@
import DailylnspectionStandardModal from './modules/dailyInspectionStandard/DailylnspectionStandardModal'
import AuditApprovalModal from './modules/dailyInspectionStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'
+import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: 'DailyInspectionStandardList',
mixins: [JeecgListMixin],
components: {
+ JEllipsis,
DailyInspectionStandardDetail,
DailylnspectionStandardModal,
AuditApprovalModal
@@ -281,6 +301,7 @@
title: '绠＄悊鍒跺害',
align: 'center',
dataIndex: 'disUda1',
+ scopedSlots: { customRender: 'disUda1' },
},
{
title: '绛惧鐘舵��',
@@ -312,6 +333,7 @@
title: '璐ｄ换鐝粍',
align: 'center',
dataIndex: 'teamName',
+ scopedSlots: { customRender: 'teamName' },
},
// {
// title: '娲惧伐鏂瑰紡',
@@ -319,11 +341,21 @@
// dataIndex: 'assignModeName',
// },
{
+ title: '瀹℃牳缁撴灉',
+ align: 'center',
+ dataIndex: 'disUda2',
+ },
+ {
title: '瀹℃牳鎰忚',
align: 'center',
dataIndex: 'auditFeedback',
},
{
+ title: '瀹℃壒缁撴灉',
+ align: 'center',
+ dataIndex: 'disUda3',
+ },
+ {
title: '瀹℃壒鎰忚',
align: 'center',
dataIndex: 'approvalFeedback',
diff --git a/src/views/eam/DailyMaintenanceStandard3List.vue b/src/views/eam/DailyMaintenanceStandard3List.vue
index 96409ab..62a3c7b 100644
--- a/src/views/eam/DailyMaintenanceStandard3List.vue
+++ b/src/views/eam/DailyMaintenanceStandard3List.vue
@@ -367,11 +367,21 @@
// dataIndex: 'specificEquipment',
// },
{
+ title: '瀹℃牳缁撴灉',
+ align: 'center',
+ dataIndex: 'maintenanceStandardUda1',
+ },
+ {
title: '瀹℃牳鎰忚',
align: 'center',
dataIndex: 'auditFeedback',
},
{
+ title: '瀹℃壒缁撴灉',
+ align: 'center',
+ dataIndex: 'maintenanceStandardUda2',
+ },
+ {
title: '瀹℃壒鎰忚',
align: 'center',
dataIndex: 'approvalFeedback',
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 1959e41..9f10714 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -367,11 +367,21 @@
// dataIndex: 'specificEquipment',
// },
{
+ title: '瀹℃牳缁撴灉',
+ align: 'center',
+ dataIndex: 'maintenanceStandardUda1',
+ },
+ {
title: '瀹℃牳鎰忚',
align: 'center',
dataIndex: 'auditFeedback',
},
{
+ title: '瀹℃壒缁撴灉',
+ align: 'center',
+ dataIndex: 'maintenanceStandardUda2',
+ },
+ {
title: '瀹℃壒鎰忚',
align: 'center',
dataIndex: 'approvalFeedback',
diff --git a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
index 5d3d0eb..9abab04 100644
--- a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
@@ -127,12 +127,12 @@
validatorRules: {
auditFeedback: {
rules: [
- { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ { required: false, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
]
},
approvalFeedback: {
rules: [
- { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
+ { required: false, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
]
},
},
@@ -171,10 +171,13 @@
let formData = Object.assign(this.model, values);
if (this.model.approvalStatus == '1') {
formData.approvalStatus = '2'
+ formData.disUda2 = "椹冲洖"
} else if (this.model.approvalStatus == '3') {
formData.approvalStatus = '4'
+ formData.disUda3 = "椹冲洖"
} else if (this.model.approvalStatus == '4') {
formData.approvalStatus = '2'
+ formData.disUda2 = "椹冲洖"
}
requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
if (res.success) {
@@ -200,12 +203,16 @@
let formData = Object.assign(this.model, values);
if (this.model.approvalStatus == '1') {
formData.approvalStatus = '3'
+ formData.disUda2 = "閫氳繃"
} else if (this.model.approvalStatus == '2') {
formData.approvalStatus = '3'
+ formData.disUda2 = "閫氳繃"
} else if (this.model.approvalStatus == '3') {
formData.approvalStatus = '5'
+ formData.disUda3 = "閫氳繃"
} else if (this.model.approvalStatus == '4') {
formData.approvalStatus = '3'
+ formData.disUda2 = "閫氳繃"
}
requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
if (res.success) {
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue
index e629313..5945034 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue
@@ -121,12 +121,12 @@
validatorRules: {
auditFeedback: {
rules: [
- { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ { required: false, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
]
},
approvalFeedback: {
rules: [
- { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
+ { required: false, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
]
},
},
@@ -165,10 +165,13 @@
let formData = Object.assign(this.model, values);
if (this.model.approvalStatus == '1') {
formData.approvalStatus = '2'
+ formData.maintenanceStandardUda1 = "椹冲洖"
} else if (this.model.approvalStatus == '3') {
formData.approvalStatus = '4'
+ formData.maintenanceStandardUda2 = "椹冲洖"
} else if (this.model.approvalStatus == '4') {
formData.approvalStatus = '2'
+ formData.maintenanceStandardUda1 = "椹冲洖"
}
requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
if (res.success) {
@@ -194,12 +197,16 @@
let formData = Object.assign(this.model, values);
if (this.model.approvalStatus == '1') {
formData.approvalStatus = '3'
+ formData.maintenanceStandardUda1 = "閫氳繃"
} else if (this.model.approvalStatus == '2') {
formData.approvalStatus = '3'
+ formData.maintenanceStandardUda1 = "閫氳繃"
} else if (this.model.approvalStatus == '3') {
formData.approvalStatus = '5'
+ formData.maintenanceStandardUda2 = "閫氳繃"
} else if (this.model.approvalStatus == '4') {
formData.approvalStatus = '3'
+ formData.maintenanceStandardUda1 = "閫氳繃"
}
requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
if (res.success) {
--
Gitblit v1.9.3