From 9520029a84be8df133a539968f05f20bf8041750 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 七月 2025 11:31:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index d54b171..6c5ade3 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -10,6 +10,16 @@
               <a-tab-pane tab="鍩虹淇℃伅">
                 <a-row>
                   <a-col :span="12">
+                    <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                      <lx-search-equipment-select v-model="model.equipmentId" disabled/>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item label="宸ュ崟鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                      <a-input v-model="model.repairCode" 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>
@@ -188,7 +198,7 @@
        * 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
        * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
        */
-      async handleDetail(record) {
+      async handleApprove(record) {
         this.spinning = true
         this.activeTabKey = '1'
         this.model = {}
@@ -201,9 +211,9 @@
        * 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
        * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
        */
-      recordDetail(record) {
+      handleDetail(record) {
         this.spinning = true
-        this.activeTabKey = 1
+        this.activeTabKey = '1'
         this.model = Object.assign({}, record)
         this.loadDetail(record.id)
       },

--
Gitblit v1.9.3