From f3316e64fdc2f397356f669318c34161cb375c65 Mon Sep 17 00:00:00 2001
From: zz <2510566342@qq.com>
Date: Thu, 7 Nov 2024 16:51:32 +0800
Subject: [PATCH] =?UTF-8?q?11.7=20bug=20=E4=BF=AE=E6=94=B9=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=88=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accountManagement/fleetAccount/index.vue  | 11 ++-----
 .../individualAccount/index.vue               |  6 ++--
 .../personalFleetAccount/index.vue            |  3 +-
 .../chargingOrder/OutChargeOrderForm.vue      | 11 ++++---
 .../chargingOrder/index.vue                   | 30 +++++++++++++++++--
 .../maintenanceWorkOrder/index.vue            | 16 ++++++++--
 .../components/month/ElectricityDateForm.vue  | 11 +++----
 .../powerChangeOrder/SwapOrderForm.vue        |  3 +-
 .../feetVehicles/fleetDriverAudit/index.vue   | 13 +++++++-
 .../personalVehicle/vehicleAudit/index.vue    | 16 ++++++++--
 .../vehicleAudit/vehicleAuditDetail.vue       | 15 +++++++++-
 .../personalVehicle/vehiclesList/index.vue    | 16 +++++++---
 .../vehiclesList/vehiclesListForm.vue         |  3 +-
 13 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/src/views/system/accountManagement/fleetAccount/index.vue b/src/views/system/accountManagement/fleetAccount/index.vue
index e89702c..ba53e4a 100644
--- a/src/views/system/accountManagement/fleetAccount/index.vue
+++ b/src/views/system/accountManagement/fleetAccount/index.vue
@@ -36,13 +36,7 @@
     >
       <el-table-column label="序号" type="index" align="center" width="80" />
       <el-table-column label="车队编码" align="center" prop="teamCode" />
-      <el-table-column label="车队名称" align="center" prop="teamName" />
-      <el-table-column label="账户类型" align="center" prop="userId" >
-        <template #default="scope">
-       <span v-if="scope.row.userId">车队</span>
-       <span v-else>个人车队</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="车队名称" align="center" prop="teamName" />      
       <el-table-column label="余额(元)" align="center" prop="balance">
         <template #default="scope">
           {{ scope.row.balance / 100 }}
@@ -184,7 +178,8 @@ const setbalance = async (row) => {
     // 重置的二次确认
     const result = await message.prompt(
       '请输入"' + row.teamName + '"的需要修改余额',
-      t('common.reminder')
+      // t('common.reminder'),
+      {inputType:'number',}
     )
     const balance = result.value
     // 发起重置
diff --git a/src/views/system/accountManagement/individualAccount/index.vue b/src/views/system/accountManagement/individualAccount/index.vue
index faf3157..a2f0bcc 100644
--- a/src/views/system/accountManagement/individualAccount/index.vue
+++ b/src/views/system/accountManagement/individualAccount/index.vue
@@ -45,9 +45,10 @@
       
       <el-table-column label="用户头像" align="center" prop="avatar">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center">
+          <div style="display: flex; align-items: center; justify-content: center" v-if="scope.row.avatar">
             <el-image :src="scope.row.avatar" style="width: 160px; height: 90px" />
           </div>
+          <div v-else>暂无用户头像</div>
         </template>
       </el-table-column>
       <el-table-column label="余额(分)" align="center" prop="balance" />
@@ -174,7 +175,8 @@ const setbalance = async (row) => {
     // 重置的二次确认
     const result = await message.prompt(
       '请输入"' + row.nickname + '"的需要修改余额',
-      t('common.reminder')
+      {inputType:'number',}
+     
     )
     const balance = result.value
     // 发起重置
diff --git a/src/views/system/accountManagement/personalFleetAccount/index.vue b/src/views/system/accountManagement/personalFleetAccount/index.vue
index c103135..dc4041e 100644
--- a/src/views/system/accountManagement/personalFleetAccount/index.vue
+++ b/src/views/system/accountManagement/personalFleetAccount/index.vue
@@ -38,9 +38,10 @@
       <el-table-column label="用户昵称" align="center" prop="nickname" />
       <el-table-column label="用户头像" align="center" prop="avatar">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center">
+          <div style="display: flex; align-items: center; justify-content: center" v-if="scope.row.avatar">
             <el-image :src="scope.row.avatar" style="width: 160px; height: 90px" />
           </div>
+          <div v-else>暂无用户头像</div>
         </template>
       </el-table-column>
       <el-table-column label="余额(分)" align="center" prop="balance" />
diff --git a/src/views/system/offStationCharging/chargingOrder/OutChargeOrderForm.vue b/src/views/system/offStationCharging/chargingOrder/OutChargeOrderForm.vue
index 82af075..f0a75e5 100644
--- a/src/views/system/offStationCharging/chargingOrder/OutChargeOrderForm.vue
+++ b/src/views/system/offStationCharging/chargingOrder/OutChargeOrderForm.vue
@@ -27,7 +27,7 @@
               v-model="formData.chargerGunNo"
               placeholder="请输入"
             /> </el-form-item
-        ></el-col>
+        ></el-col>     
 
         <el-col :span="11"
           ><el-form-item label="开始SOC" prop="startSoc">
@@ -133,10 +133,11 @@ const formData = ref({
   dateId: undefined,
   timeId: undefined,
   userId: undefined,
-  batteryNo: undefined
+  batteryNo: undefined,
+
 })
 const formRules = reactive({
-  // stationNo: [{ required: true, message: '不能为空', trigger: 'blur' }],
+
   stationNo: [{ required: true, message: '不能为空', trigger: 'blur' }],
   chargeSeriaNumber: [{ required: true, message: '不能为空', trigger: 'blur' }],
   chargeOrder: [{ required: true, message: '不能为空', trigger: 'blur' }],
@@ -293,7 +294,9 @@ const resetForm = () => {
     replenishmentFlag: undefined,
     priceId: undefined,
     dateId: undefined,
-    timeId: undefined
+    timeId: undefined,
+   
+    
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/system/offStationCharging/chargingOrder/index.vue b/src/views/system/offStationCharging/chargingOrder/index.vue
index 1f358c3..4c9f0bb 100644
--- a/src/views/system/offStationCharging/chargingOrder/index.vue
+++ b/src/views/system/offStationCharging/chargingOrder/index.vue
@@ -44,6 +44,24 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
+      </el-form-item><el-form-item label="司机" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入司机"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehicleNo">   
+       
+        <el-input
+          v-model="queryParams.vehicleNo"
+          placeholder="请输入车牌号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
       </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
@@ -85,6 +103,8 @@
           <dict-tag :type="DICT_TYPE.GUN_LIST" :value="scope.row.chargerGunNo" />
         </template>
       </el-table-column>
+      <el-table-column label="司机" align="center" prop="nickName" width="120" />
+      <el-table-column label="车牌号" align="center" prop="vehicleNo" width="120" />
       <!-- <el-table-column label="充电枪编号" align="center" prop="chargerGunNo" width="120" /> -->
       <!-- <el-table-column label="电池序列号" align="center" prop="batteryId" width="120" /> -->
       <!-- <el-table-column
@@ -158,7 +178,8 @@
           <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
           <el-button link type="primary" @click="open_drawer(scope.row)"> 详情 </el-button>
 
-          <el-button link type="primary" @click="handle_Offline(scope.row)"> 线下结算 </el-button>
+          <!-- <el-button link type="primary" @click="handle_Offline(scope.row) " > 线下结算 </el-button> -->
+          <el-button link type="primary" @click="handle_Offline(scope.row) " v-if="scope.row.orderStatus == 6"> 线下结算 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -177,7 +198,7 @@
   <el-dialog v-model="dialogFormVisible" title="填写结算金额" width="500">
     <el-form :model="actualPay_form">
       <el-form-item label="金额(元)" label-width="100">
-        <el-input v-model="actualPay_form.actualPay" autocomplete="off" />
+        <el-input v-model.number="actualPay_form.actualPay" autocomplete="off"  />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -264,7 +285,9 @@ const queryParams = reactive({
   createTime: [],
   priceId: undefined,
   dateId: undefined,
-  timeId: undefined
+  timeId: undefined,
+  vehicleNo:undefined,
+  nickName:undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -288,6 +311,7 @@ const handle_Offline = async (scope) => {
   actualPay_form.value.actualPay = scope.actualPay / 100
   check_actualpay_id.value = scope.id
   dialogFormVisible.value = true
+
   // let params = {
   //   orderId: scope.id,
   //   actualPay: scope.actualPay
diff --git a/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue b/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
index 49a9ad1..e1b9027 100644
--- a/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
+++ b/src/views/system/operationMaintenanceManagement/maintenanceWorkOrder/index.vue
@@ -77,13 +77,23 @@
       <el-table-column label="设备名称" align="center" prop="eqmName" />
       <el-table-column label="保养内容" align="center" prop="mtnContent" />
       <el-table-column label="保养照片地址" align="center" prop="mtnPicPath" width="120">
-        <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.mtnPicPath" :key="item.index">
+        <!-- <template #default="scope"> -->
+          <!-- <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.mtnPicPath" :key="item.index">
             <el-image :src="item" style="width: 160px; height: 90px" />
-          </div>
+          </div> -->
           <!-- <div style="display: flex; align-items: center; justify-content: center">
             <el-image  :src="scope.row.mtnPicPath" style="width: 160px; height: 90px" />
           </div> -->
+        <!-- </template> -->
+        <template #default="scope">
+        <div v-if="Array.isArray(scope.row.mtnPicPath)">        
+          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.mtnPicPath" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div>
+        </div> 
+        <div v-else style="display: flex; align-items: center; justify-content: center">
+            <el-image :src="scope.row.mtnPicPath" style="width: 160px; height: 90px" />
+          </div>
         </template>
       </el-table-column>   
       <el-table-column label="是否普通保养" align="center" prop="mtnIsNormal" width="110">
diff --git a/src/views/system/operationsManagement/electricityPriceModel/components/month/ElectricityDateForm.vue b/src/views/system/operationsManagement/electricityPriceModel/components/month/ElectricityDateForm.vue
index a6c3101..b7a6ea5 100644
--- a/src/views/system/operationsManagement/electricityPriceModel/components/month/ElectricityDateForm.vue
+++ b/src/views/system/operationsManagement/electricityPriceModel/components/month/ElectricityDateForm.vue
@@ -18,6 +18,11 @@
           <el-input v-model="formData.name" placeholder="请输入电价模型名称" />
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-col>
       <!-- <el-col :span="12">
           <el-form-item label="时段数量" prop="periodsAmount">
             <el-input v-model="formData.periodsAmount" placeholder="请输入时段数量" />
@@ -90,11 +95,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="formData.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-col>
+      
       <!-- <el-col :span="12">
           <el-form-item label="数据来源:0:云平台;1;三方运营商" prop="source">
             <el-input
diff --git a/src/views/system/orderManagement/powerChangeOrder/SwapOrderForm.vue b/src/views/system/orderManagement/powerChangeOrder/SwapOrderForm.vue
index c493485..009781b 100644
--- a/src/views/system/orderManagement/powerChangeOrder/SwapOrderForm.vue
+++ b/src/views/system/orderManagement/powerChangeOrder/SwapOrderForm.vue
@@ -189,9 +189,10 @@
         <el-table-column label="手机号" align="center" prop="mobile" />
         <el-table-column label="用户头像" align="center" prop="avatar" >
           <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center">
+          <div style="display: flex; align-items: center; justify-content: center" v-if="scope.row.avatar">
             <el-image :src="scope.row.avatar" style="width: 160px; height: 90px" />
           </div>
+          <div v-else>暂无用户头像</div>
         </template>
         </el-table-column>
   
diff --git a/src/views/system/vehicleManagement/feetVehicles/fleetDriverAudit/index.vue b/src/views/system/vehicleManagement/feetVehicles/fleetDriverAudit/index.vue
index 9118508..b4d94d9 100644
--- a/src/views/system/vehicleManagement/feetVehicles/fleetDriverAudit/index.vue
+++ b/src/views/system/vehicleManagement/feetVehicles/fleetDriverAudit/index.vue
@@ -86,10 +86,21 @@
       <el-table-column label="车牌号" align="center" prop="vehicleNo" />
       <el-table-column label="vin码" align="center" prop="vin" />
       <el-table-column label="行驶证图片" align="center" prop="vehicleLicense" width="200">
-        <template #default="{ row }">
+        <!-- <template #default="{ row }">
+          
           <div style="display: flex; align-items: center; justify-content: center">
             <el-image :src="row.vehicleLicense" style="width: 160px; height: 90px" />
           </div>
+        </template> -->
+        <template #default="scope"> 
+          <div v-if="Array.isArray(scope.row.vehicleLicense)">        
+          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.vehicleLicense" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div>
+        </div> 
+        <div v-else style="display: flex; align-items: center; justify-content: center">
+            <el-image :src="scope.row.vehicleLicense" style="width: 160px; height: 90px" />
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="电动机编号" align="center" prop="engineNo"  width="100"/>
diff --git a/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/index.vue b/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/index.vue
index 6284906..eab5517 100644
--- a/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/index.vue
+++ b/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/index.vue
@@ -86,11 +86,23 @@
       <el-table-column label="车牌号" align="center" prop="vehicleNo" />
       <el-table-column label="vin" align="center" prop="vin" />
       <el-table-column label="行驶证图片" align="center" prop="vehicleLicense">
-        <template #default="{ row }">
+        <template #default="scope">
+        <div v-if="Array.isArray(scope.row.vehicleLicense)">        
+          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.vehicleLicense" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div>
+        </div> 
+        <div v-else style="display: flex; align-items: center; justify-content: center">
+            <el-image :src="scope.row.vehicleLicense" style="width: 160px; height: 90px" />
+          </div>
+        </template>
+        <!-- <template #default="{ row }">
+          
           <div style="display: flex; align-items: center; justify-content: center">
             <el-image :src="row.vehicleLicense" style="width: 160px; height: 90px" />
           </div>
-        </template>
+        </template> -->
+       
       </el-table-column>
       <!-- <el-table-column label="mac地址" align="center" prop="mac"  width="120"/> -->
       <el-table-column label="电动机编号" align="center" prop="engineNo" />
diff --git a/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/vehicleAuditDetail.vue b/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/vehicleAuditDetail.vue
index a5acbff..931a597 100644
--- a/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/vehicleAuditDetail.vue
+++ b/src/views/system/vehicleManagement/personalVehicle/vehicleAudit/vehicleAuditDetail.vue
@@ -16,7 +16,20 @@
         {{ formData.vehicleVin || '--' }}
       </el-descriptions-item>
       <el-descriptions-item label="行驶证图片">
-        <el-image :src="formData.vehicleLicense" style="width: 160px; height: 90px" />
+        <!-- <el-image :src="formData.vehicleLicense" style="width: 160px; height: 90px" /> -->
+        <!-- <div style="display: flex; align-items: center; justify-content: center"  v-for="item in formData.vehicleLicense" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div> -->
+
+
+          <div v-if="Array.isArray(formData.vehicleLicense)">        
+          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in formData.vehicleLicense" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div>
+        </div> 
+        <div v-else style="display: flex; align-items: center; justify-content: center">
+            <el-image :src="formData.vehicleLicense" style="width: 160px; height: 90px" />
+          </div>
         <!-- {{ formData.vehicleLicense || '--' }} -->
       </el-descriptions-item>
       <el-descriptions-item label="审核状态">
diff --git a/src/views/system/vehicleManagement/personalVehicle/vehiclesList/index.vue b/src/views/system/vehicleManagement/personalVehicle/vehiclesList/index.vue
index 14dd7c4..70bfd65 100644
--- a/src/views/system/vehicleManagement/personalVehicle/vehiclesList/index.vue
+++ b/src/views/system/vehicleManagement/personalVehicle/vehiclesList/index.vue
@@ -114,13 +114,21 @@
         </template>
       </el-table-column>
       <el-table-column label="车辆外观	" align="center" prop="vehicleApc" >
-        <template #default="scope">
+        <!-- <template #default="scope">
        <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.vehicleApc" :key="item.index">
             <el-image :src="item" style="width: 160px; height: 90px" />
           </div> 
-          <!-- <div style="display: flex; align-items: center; justify-content: center"> 
-            <el-image  :src="scope.row.vehicleApc" style="width: 160px; height: 90px" />
-          </div>  -->
+        
+        </template> -->
+        <template #default="scope">
+        <div v-if="Array.isArray(scope.row.vehicleApc)">        
+          <div style="display: flex; align-items: center; justify-content: center"  v-for="item in scope.row.vehicleApc" :key="item.index">
+            <el-image :src="item" style="width: 160px; height: 90px" />
+          </div>
+        </div> 
+        <div v-else style="display: flex; align-items: center; justify-content: center">
+            <el-image :src="scope.row.vehicleApc" style="width: 160px; height: 90px" />
+          </div>
         </template>
       </el-table-column>
       <!-- <el-table-column label="营业开始时间" align="center" prop="startTime" width="150"/>
diff --git a/src/views/system/vehicleManagement/personalVehicle/vehiclesList/vehiclesListForm.vue b/src/views/system/vehicleManagement/personalVehicle/vehiclesList/vehiclesListForm.vue
index 00e9a10..914bf6c 100644
--- a/src/views/system/vehicleManagement/personalVehicle/vehiclesList/vehiclesListForm.vue
+++ b/src/views/system/vehicleManagement/personalVehicle/vehiclesList/vehiclesListForm.vue
@@ -158,9 +158,10 @@
         <el-table-column label="手机号" align="center" prop="mobile" />
         <el-table-column label="用户头像" align="center" prop="avatar" >
           <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center">
+          <div style="display: flex; align-items: center; justify-content: center" v-if="scope.row.avatar">
             <el-image :src="scope.row.avatar" style="width: 160px; height: 90px" />
           </div>
+        <div v-else>暂无用户头像</div>
         </template>
         </el-table-column>