11.7 Bug 修改

2 weeks ago · fff3949ede
parent 56795ec102
commit fff3949ede
8 changed files with 61 additions and 40 deletions
--- a/src/views/system/accountManagement/fleetAccount/index.vue
+++ b/src/views/system/accountManagement/fleetAccount/index.vue
@ -37,6 +37,12 @@
      <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="balance">
        <template #default="scope">
          {{ scope.row.balance / 100 }}
--- a/src/views/system/accountManagement/individualAccount/index.vue
+++ b/src/views/system/accountManagement/individualAccount/index.vue
@ -36,6 +36,13 @@
    >
      <el-table-column label="序号" type="index" align="center" width="80" />
      <el-table-column label="用户昵称" align="center" prop="nickname" />
+      <el-table-column label="账户类型" align="center" prop="userId" >
+        <template #default="scope">
+       <span v-if="scope.row.userId == 1">个人</span>
+       <span v-if="scope.row.userId == 2">个人车队</span>
+        </template>
+      </el-table-column>
+      
      <el-table-column label="用户头像" align="center" prop="avatar">
        <template #default="scope">
          <div style="display: flex; align-items: center; justify-content: center">
--- a/src/views/system/customerManagement/driverManagement/components/checkForm.vue
+++ b/src/views/system/customerManagement/driverManagement/components/checkForm.vue
@ -9,7 +9,7 @@
        label-position="top"
      >
      
-            <el-form-item label="实名认证标志" prop="realNameAuthFlag">
+            <el-form-item label="审核表单" prop="realNameAuthFlag">
              <el-select v-model="formData.realNameAuthFlag" placeholder="请选择" style="width: 100%">
                <el-option
                  v-for="dict in getIntDictOptions(DICT_TYPE.DRIVER_AUDIT_STATUS)"
--- a/src/views/system/offStationCharging/chargingOrder/components/drawer.vue
+++ b/src/views/system/offStationCharging/chargingOrder/components/drawer.vue
@ -32,13 +32,18 @@
          {{ handle_stationNo(check_row.stationNo) }}
        </el-descriptions-item>

-        <el-descriptions-item label="充电订单号:" label-align="right" align="center">
+        <el-descriptions-item label="充电订单号:" label-align="right" align="center" label-class-name="my-label"
+          class-name="my-content"
+          width="150px">
          {{ check_row.chargeOrder == null ? '--' : check_row.chargeOrder }}
        </el-descriptions-item>

        <el-descriptions-item label="充电流水号:" label-align="right" align="center">
          {{ check_row.chargeSeriaNumber == null ? '--' : check_row.chargeSeriaNumber }}
        </el-descriptions-item>
+        <el-descriptions-item label="订单状态:" label-align="right" align="center">
+          <dict-tag :type="DICT_TYPE.ORDERSTATUS" :value="check_row.orderStatus" />
+        </el-descriptions-item>
        <el-descriptions-item label="开始时间:" label-align="right" align="center">
          {{ check_row.startTime == null ? '--' : check_row.startTime }}
        </el-descriptions-item>
@ -57,11 +62,9 @@
        <el-descriptions-item label="充电时长(min):" label-align="right" align="center">
          {{ check_row.chargingTime == null ? '--' : check_row.chargingTime }}
        </el-descriptions-item>
-        <el-descriptions-item label="订单状态:" label-align="right" align="center">
-          <dict-tag :type="DICT_TYPE.ORDERSTATUS" :value="check_row.orderStatus" />
-        </el-descriptions-item>
+        
        <el-descriptions-item label="总费用:" label-align="right" align="center">
-          {{ check_row.totalFee == null ? '--' : check_row.totalFee }}
+          {{ check_row.totalFee/100 == null ? '--' : check_row.totalFee/100 }}
        </el-descriptions-item>
        <el-descriptions-item label="实际支付金额(元):" label-align="right" align="center">
          {{ check_row.actualPay/100 == null ? '--' : check_row.actualPay/100 }}
--- a/src/views/system/offStationCharging/chargingOrder/index.vue
+++ b/src/views/system/offStationCharging/chargingOrder/index.vue
@ -108,12 +108,16 @@
      <el-table-column label="充电电量" align="center" prop="chargingCapacity" />
      <el-table-column label="充电时长(min)" align="center" prop="chargingTime" width="120"/>
      <!-- <el-table-column label="车架号" align="center" prop="vin" /> -->
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
+      <el-table-column label="订单状态" align="center" prop="orderStatus" width="120">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.ORDERSTATUS" :value="scope.row.orderStatus" />
        </template>
      </el-table-column>
-      <el-table-column label="总费用" align="center" prop="totalFee" />
+      <el-table-column label="总费用" align="center" prop="totalFee" >
+        <template #default="scope">
+          {{ scope.row.totalFee / 100 }}
+        </template>
+      </el-table-column>
      <el-table-column label="实际支付金额(元)" align="center" prop="actualPay" width="150">
        <template #default="scope">
          {{ scope.row.actualPay / 100 }}
--- a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue
+++ b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue
@ -58,23 +58,7 @@
           />
          </el-select>
        </el-form-item></el-col> -->
-      <el-col :span="12">
-        <el-form-item label="是否启用" prop="status">
-        <el-radio-group v-model="formData.status">
-			    <el-radio
-			      v-for="dict in getIntDictOptions(DICT_TYPE.MODEL_TIME_STATUS )"
-			      :key="dict.value"
-			      :label="dict.value"
-			    >
-			      {{ dict.label }}
-			    </el-radio>
-			  </el-radio-group>
-        </el-form-item>
-        <!-- 
-         
-        -->
-      </el-col>
-      <el-col :span="12">
+        <el-col :span="12">
      <el-form-item label="时间范围" prop="Time">
        <el-time-picker
      v-model="formData.Time"
@ -114,6 +98,23 @@
        /> -->
      </el-form-item>
    </el-col>
+      <el-col :span="12">
+        <el-form-item label="是否启用" prop="status">
+        <el-radio-group v-model="formData.status">
+			    <el-radio
+			      v-for="dict in getIntDictOptions(DICT_TYPE.MODEL_TIME_STATUS )"
+			      :key="dict.value"
+			      :label="dict.value"
+			    >
+			      {{ dict.label }}
+			    </el-radio>
+			  </el-radio-group>
+        </el-form-item>
+        <!-- 
+         
+        -->
+      </el-col>
+      
      <!-- <el-col :span="12">
        <el-form-item label="计费模型id" prop="billingModelId">
          <el-input v-model="formData.billingModelId" placeholder="请输入计费模型id" />
--- a/src/views/system/operationsManagement/billingModel/components/month/modelDateForm.vue
+++ b/src/views/system/operationsManagement/billingModel/components/month/modelDateForm.vue
@ -25,19 +25,7 @@
      </el-form-item>
      </el-col>
  
-      <el-col :span="12">
-        <el-form-item label="是否启用" prop="status">
-        <el-radio-group v-model="formData.status">
-			    <el-radio
-			      v-for="dict in getIntDictOptions(DICT_TYPE.MODEL_TIME_STATUS )"
-			      :key="dict.value"
-			      :label="dict.value"
-			    >
-			      {{ dict.label }}
-			    </el-radio>
-			  </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="请输入备注" />
@ -66,7 +54,19 @@
          />
        </el-form-item>
      </el-col>
-     
+      <el-col :span="12">
+        <el-form-item label="是否启用" prop="status">
+        <el-radio-group v-model="formData.status">
+			    <el-radio
+			      v-for="dict in getIntDictOptions(DICT_TYPE.MODEL_TIME_STATUS )"
+			      :key="dict.value"
+			      :label="dict.value"
+			    >
+			      {{ dict.label }}
+			    </el-radio>
+			  </el-radio-group>
+        </el-form-item>
+      </el-col>
      
     
    </el-row>