From c2f3a056b91798a96c6841939def34be98477c4f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 17:51:21 +0800
Subject: [PATCH] 设备故障登记
---
src/views/eam/repair/EamReportAccidentsRegisterList.vue | 22 +++++++++++++++++++---
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 6 +++---
src/views/eam/repair/EamRepairOrderList.vue | 2 +-
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 4 ++--
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index 2ddc3ed..3ba12e2 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -175,7 +175,7 @@
{
title: '鎶ヤ慨浜�',
align: 'center',
- dataIndex: 'reportPerson',
+ dataIndex: 'reportPerson_dictText',
},
{
title: '缁翠慨寮�濮嬫椂闂�',
diff --git a/src/views/eam/repair/EamReportAccidentsRegisterList.vue b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
index e2df2e8..1caef88 100644
--- a/src/views/eam/repair/EamReportAccidentsRegisterList.vue
+++ b/src/views/eam/repair/EamReportAccidentsRegisterList.vue
@@ -67,6 +67,19 @@
<a v-else @click="handleDetail(record)">璇︽儏</a>
</span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="accidentPhenomenon" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="measure" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="causingResults" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+
</a-table>
<!-- table鍖哄煙-end -->
@@ -188,17 +201,20 @@
{
title: '浜嬫晠鐜拌薄',
align: 'center',
- dataIndex: 'accidentPhenomenon'
+ dataIndex: 'accidentPhenomenon',
+ scopedSlots: {customRender: 'accidentPhenomenon'},
},
{
title: '閲囧彇鎺柦',
align: 'center',
- dataIndex: 'measure'
+ dataIndex: 'measure',
+ scopedSlots: {customRender: 'measure'},
},
{
title: '閫犳垚缁撴灉',
align: 'center',
- dataIndex: 'causingResults'
+ dataIndex: 'causingResults',
+ scopedSlots: {customRender: 'causingResults'},
},
{
title: '鎿嶄綔宸�',
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index ac8cacc..3a07eb3 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -21,7 +21,7 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鎶ヤ慨浜�">
- <a-input placeholder="璇疯緭鍏ユ姤淇汉" v-model="model.reportPerson"/>
+ <a-input placeholder="璇疯緭鍏ユ姤淇汉" v-model="model.reportPerson_dictText" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -40,7 +40,7 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鏁呴殰鐜拌薄">
- <a-textarea :rows="3" placeholder="璇疯緭鍏ユ晠闅滅幇璞�" v-model="model.faultPhenomenon"/>
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ユ晠闅滅幇璞�" v-model="model.faultPhenomenon" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 8c9382e..c06cbab 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -20,13 +20,13 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鏁呴殰绫诲瀷">
+ <a-form-model-item label="鏁呴殰绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag dict-code="fault_type" v-model="model.faultType" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鎶ヤ慨浜�">
- <a-input v-model="model.reportPerson" readOnly/>
+ <a-form-model-item label="鎶ヤ慨浜�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-model="model.reportPerson_dictText" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="12">
--
Gitblit v1.9.3