From 1451e36b1767a4d7883e80078b371b6273e9eb41 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 七月 2025 14:52:34 +0800
Subject: [PATCH] 三保变更
---
src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 2232cf7..21fbd44 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -43,32 +43,67 @@
<!-- table鍖哄煙-begin -->
<a-table bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination"
:scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">
+ <!--瀹夊叏瑁呯疆妫�鏌ョ粨鏋�-->
+ <template slot="safetyEquipmentCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
- <span slot="action" slot-scope="text, record">
+ <!--绮惧害鍙傛暟妫�鏌ョ粨鏋�-->
+ <template slot="precisionCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鍔熻兘鐘舵�佹鏌ョ粨鏋�-->
+ <template slot="functionalCheckResult" slot-scope="text">
+ <a-switch v-if="text!=='NONE'" checked-children="鏄�" un-checked-children="鍚�" :checked="text==='YES'" disabled/>
+ <span v-else>鏃�</span>
+ </template>
+
+ <!--鍏朵粬妫�鏌ョ粨鏋�-->
+ <template slot="otherCheckResult" slot-scope="text">
+ <a-switch v-if="text!=='NONE'" checked-children="鏄�" un-checked-children="鍚�" :checked="text==='YES'" disabled/>
+ <span v-else>鏃�</span>
+ </template>
+
+ <!--璇曚欢妫�鏌ョ粨鏋�-->
+ <template slot="sampleCheckResult" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
<template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
- <a-popconfirm title="纭畾棰嗗彇鍚楋紵"
- @confirm="handleReceive(record.id)">
+ <a-popconfirm title="纭畾棰嗗彇鍚楋紵" @confirm="handleReceive(record.id)">
<a>棰嗗彇</a>
</a-popconfirm>
<a-divider type="vertical"/>
</template>
- <a @click="handleDetail(record)">璇︽儏</a>
+ <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'||record.evaluationStatus==='LOCKED'">
+ <a @click="handleOrderChange(record)">鍙樻洿</a>
+
+ <a-divider type="vertical"/>
+ </template>
+
+ <a @click="handleDetail(record)" v-if="record.evaluationStatus!=='CHANGING'">璇︽儏</a>
</span>
</a-table>
<!-- table鍖哄煙-end -->
- <!-- 琛ㄥ崟鍖哄煙 -->
+ <!--宸ュ崟寮圭獥-->
<eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk"/>
<technical-status-evaluation-approval-modal ref="technicalStatusEvaluationApprovalModal"
:selectShenpiData="selectedOrderData"/>
+
+ <!--宸ュ崟鍙樻洿寮圭獥-->
+ <eamTechnicalStatusEvaluationOrderChange-modal ref="orderChangeModal" @ok="modalFormOk"/>
</a-card>
</template>
<script>
import EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
+ import EamTechnicalStatusEvaluationOrderChangeModal from './modules/EamTechnicalStatusEvaluationOrderChangeModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
@@ -81,7 +116,8 @@
components: {
TechnicalStatusEvaluationApprovalModal,
LxSearchEquipmentSelect,
- EamTechnicalStatusEvaluationOrderModal
+ EamTechnicalStatusEvaluationOrderModal,
+ EamTechnicalStatusEvaluationOrderChangeModal
},
data() {
return {
@@ -116,6 +152,12 @@
title: '璁惧鍨嬪彿',
align: 'center',
dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '閴村畾鐘舵��',
+ align: 'center',
+ dataIndex: 'evaluationStatus_dictText',
fixed: 'left'
},
{
@@ -154,11 +196,6 @@
dataIndex: 'evaluator_dictText'
},
{
- title: '閴村畾鐘舵��',
- align: 'center',
- dataIndex: 'evaluationStatus_dictText'
- },
- {
title: '鍒涘缓鏂瑰紡',
align: 'center',
dataIndex: 'creationMethod_dictText'
@@ -166,42 +203,47 @@
{
title: '瀹夊叏瑁呯疆妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'safetyEquipmentCheckResult'
+ dataIndex: 'safetyEquipmentCheckResult',
+ scopedSlots: { customRender: 'safetyEquipmentCheckResult' }
},
{
title: '绮惧害鍙傛暟妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'precisionCheckResult'
+ dataIndex: 'precisionCheckResult',
+ scopedSlots: { customRender: 'precisionCheckResult' }
},
{
title: '鍔熻兘鐘舵�佹鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'functionalCheckResult'
+ dataIndex: 'functionalCheckResult',
+ scopedSlots: { customRender: 'functionalCheckResult' }
},
{
title: '鍏朵粬妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'otherCheckResult'
+ dataIndex: 'otherCheckResult',
+ scopedSlots: { customRender: 'otherCheckResult' }
},
{
title: '缁翠慨瀹や富浠荤瀛�',
align: 'center',
- dataIndex: 'repairManagerSignature'
+ dataIndex: 'repairManagerSignature_dictText'
},
{
title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
align: 'center',
- dataIndex: 'repairManagerSignatureTime1'
+ dataIndex: 'repairManagerSignatureTime'
},
{
title: '璇曚欢妫�鏌ョ粨鏋�',
align: 'center',
- dataIndex: 'sampleCheckResult'
+ dataIndex: 'sampleCheckResult',
+ scopedSlots: { customRender: 'sampleCheckResult' }
},
{
title: '宸ヨ壓鍛樼瀛�',
align: 'center',
- dataIndex: 'processTechnicianSignature'
+ dataIndex: 'processTechnicianSignature_dictText'
},
{
title: '宸ヨ壓鍛樼瀛楁椂闂�',
@@ -211,7 +253,7 @@
{
title: '閴村畾缁撴灉',
align: 'center',
- dataIndex: 'evaluationResult'
+ dataIndex: 'evaluationResult_dictText'
},
{
title: '闄�/绂佺敤鍘熷洜',
@@ -221,7 +263,7 @@
{
title: '璁惧妫�鏌ヤ汉绛惧瓧',
align: 'center',
- dataIndex: 'inspectorSignature'
+ dataIndex: 'inspectorSignature_dictText'
},
{
title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
@@ -253,7 +295,8 @@
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- fixed: 'right'
+ fixed: 'right',
+ width: 200
}
],
url: {
@@ -263,6 +306,10 @@
}
},
methods: {
+ /**
+ * 鐐瑰嚮棰嗗彇鏃惰Е鍙�
+ * @param id
+ */
handleReceive(id) {
let that = this
this.loading = true
@@ -284,11 +331,25 @@
})
},
+ /**
+ * 鐐瑰嚮鍙樻洿鏃惰Е鍙�
+ * @param record
+ */
+ handleOrderChange(record) {
+ this.$refs.orderChangeModal.title = '鍙樻洿'
+ this.$refs.orderChangeModal.add(record)
+ },
+
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙�
+ * @param record
+ */
handleDetail(record) {
this.selectedOrderData = Object.assign({}, record)
- this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record)
this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
+ this.$refs.technicalStatusEvaluationApprovalModal.visible = true
this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusEvaluationApprovalModal.handleDetail(record)
}
}
}
--
Gitblit v1.9.3