From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 6c5ade3..8c9382e 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -20,6 +20,16 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
+ <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="12">
+ <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/>
</a-form-model-item>
@@ -30,23 +40,28 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
+ <a-form-model-item label="鏁呴殰鐜拌薄">
+ <a-textarea :rows="5" 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/>
+ <a-textarea :rows="5" v-model="model.faultReason" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="鏁呴殰鍒嗘瀽">
- <a-textarea v-model="model.faultAnalysis" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultAnalysis" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="鎺掓晠杩囩▼">
- <a-textarea v-model="model.faultProcess" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultProcess" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="棰勯槻鎺柦">
- <a-textarea v-model="model.faultPrevent" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultPrevent" readOnly/>
</a-form-model-item>
</a-col>
</a-row>
--
Gitblit v1.9.3