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 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

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