From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaCarUseBookWindow.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index e1afa43..41c721b 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -18,7 +18,8 @@
           <div class="list">
             <div class="item" style="width: 100%">
               <div class="label">鐢宠浜�</div>
-              <div class="value">{{ model.memberName || '' }} {{ model.memberPhone || '' }} ({{ model.companyName || '' }})
+              <div class="value">{{ model.memberName || '' }} {{ model.memberPhone || '' }} ({{ model.companyName || ''
+                }})
               </div>
             </div>
             <div class="item">
@@ -27,7 +28,8 @@
             </div>
             <div class="item">
               <div class="label">鍙告満淇℃伅</div>
-              <div class="value" v-if="model.driverId != null">{{ model.driverName || '' }} {{ model.driverPhone || '' }}
+              <div class="value" v-if="model.driverId != null">{{ model.driverName || '' }} {{ model.driverPhone || ''
+                }}
               </div>
               <div class="value" v-if="model.driverId == null">鏈寚娲�</div>
             </div>
@@ -91,7 +93,7 @@
                     <div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
                       锛�<span :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
                         item.statusInfo || ""
-                      }}</span>锛�
+                        }}</span>锛�
                     </div>
                   </div>
                 </div>
@@ -166,6 +168,7 @@
 import { driveList } from '@/api/business/member'
 import { approveDo } from '@/api/business/approve'
 import { mapState } from 'vuex'
+
 export default {
   name: 'OperaCarUseBookWindow',
   components: { GlobalWindow },
@@ -230,6 +233,8 @@
     },
     agreeOpen() {
       this.isShowProblem = true
+      this.$set(this.dealForm, 'driverId', this.model.driverId)
+      
       this.$set(this.dealForm, 'checkInfo', '')
       this.loadMemberList()
     },

--
Gitblit v1.9.3