From 11fc602abfc00455ae7302d3c185dcec18e7780e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 11:17:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 15 +++++++
src/views/eam/repair/EamRepairOrderList.vue | 48 +++++++++++++++++++++---
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 15 +++++++
3 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index b31d079..2ddc3ed 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -61,7 +61,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
:scroll="{x:'max-content'}">
<span slot="action" slot-scope="text, record">
- <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE'">
+ <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'">
<a @click="handleFillIn(record)">濉姤</a>
<a-divider type="vertical"/>
<a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
@@ -70,6 +70,23 @@
</template>
<a v-else @click="handleDetail(record)">璇︽儏</a>
+ </span>
+
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="faultPhenomenon" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultReason" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultAnalysis" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultProcess" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="faultPrevent" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
</span>
</a-table>
</div>
@@ -149,7 +166,16 @@
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'repairCode',
- fixed: 'left'
+ },
+ {
+ title: '鏁呴殰绫诲瀷',
+ align: 'center',
+ dataIndex: 'faultType_dictText',
+ },
+ {
+ title: '鎶ヤ慨浜�',
+ align: 'center',
+ dataIndex: 'reportPerson',
},
{
title: '缁翠慨寮�濮嬫椂闂�',
@@ -175,24 +201,34 @@
width: 200
},
{
+ title: '鏁呴殰鐜拌薄',
+ align: 'center',
+ dataIndex: 'faultPhenomenon',
+ scopedSlots: {customRender: 'faultPhenomenon'},
+ },
+ {
title: '鏁呴殰鍘熷洜',
align: 'center',
- dataIndex: 'faultReason'
+ dataIndex: 'faultReason',
+ scopedSlots: {customRender: 'faultReason'},
},
{
title: '鏁呴殰鍒嗘瀽',
align: 'center',
- dataIndex: 'faultAnalysis'
+ dataIndex: 'faultAnalysis',
+ scopedSlots: {customRender: 'faultAnalysis'},
},
{
title: '鎺掓晠杩囩▼',
align: 'center',
- dataIndex: 'faultProcess'
+ dataIndex: 'faultProcess',
+ scopedSlots: {customRender: 'faultProcess'},
},
{
title: '棰勯槻鎺柦',
align: 'center',
- dataIndex: 'faultPrevent'
+ dataIndex: 'faultPrevent',
+ scopedSlots: {customRender: 'faultPrevent'},
},
{
title: '鎿嶄綔宸�',
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index c9d41a0..3c7529d 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -15,6 +15,16 @@
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰绫诲瀷">
+ <j-dict-select-tag dict-code="fault_type" placeholder="璇烽�夋嫨鏁呴殰绫诲瀷" v-model="model.faultType"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鎶ヤ慨浜�">
+ <a-input placeholder="璇疯緭鍏ユ姤淇汉" v-model="model.reportPerson"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
<a-form-model-item label="缁翠慨寮�濮嬫椂闂�" prop="actualStartTime">
<a-date-picker show-time v-model="model.actualStartTime" :allowClear="false"
value-format="YYYY-MM-DD HH:mm:ss"
@@ -29,6 +39,11 @@
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰鐜拌薄">
+ <a-textarea placeholder="璇疯緭鍏ユ晠闅滅幇璞�" v-model="model.faultPhenomenon"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
<a-form-model-item label="鏁呴殰鍘熷洜">
<a-textarea placeholder="璇疯緭鍏ユ晠闅滃師鍥�" v-model="model.faultReason"/>
</a-form-model-item>
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 6c5ade3..c3f01a0 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -19,6 +19,16 @@
<a-input v-model="model.repairCode" readOnly/>
</a-form-model-item>
</a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰绫诲瀷">
+ <j-dict-select-tag dict-code="fault_type" v-model="model.faultType" disabled/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鎶ヤ慨浜�">
+ <a-input v-model="model.reportPerson" readOnly/>
+ </a-form-model-item>
+ </a-col>
<a-col :span="12">
<a-form-model-item label="缁翠慨寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.actualStartTime" readOnly/>
@@ -29,6 +39,11 @@
<a-input v-model="model.actualEndTime" readOnly/>
</a-form-model-item>
</a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰鐜拌薄">
+ <a-textarea v-model="model.faultPhenomenon" readOnly/>
+ </a-form-model-item>
+ </a-col>
<a-col :span="24">
<a-form-model-item label="鏁呴殰鍘熷洜">
<a-textarea v-model="model.faultReason" readOnly/>
--
Gitblit v1.9.3