页面新添功能和bug修改 9.10

src/api/mall/promotion/bargain/bargainActivity.ts

@@ -12,7 +12,7 @@ export interface BargainActivityVO {
   totalLimitCount?: number // 最大购买次数
   spuId: number
   skuId: number
-  bargainFirstPrice: number // 砍价起始价格，单位分
+  bargainFirstPrice: number // 砍价起始价格(分)
   bargainMinPrice: number // 砍价底价
   stock: number // 活动库存
   randomMinPrice?: number // 用户每次砍价的最小金额，单位：分
@@ -23,7 +23,7 @@ export interface BargainActivityVO {
 export interface BargainProductVO {
   spuId: number
   skuId: number
-  bargainFirstPrice: number // 砍价起始价格，单位分
+  bargainFirstPrice: number // 砍价起始价格(分)
   bargainMinPrice: number // 砍价底价
   stock: number // 活动库存
 }

src/api/mall/statistics/pay.ts

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 /** 支付统计 */
 export interface PaySummaryRespVO {
-  /** 充值金额，单位分 */
+  /** 充值金额(分) */
   rechargePrice: number
 }
 

src/api/pay/wallet/account/index.ts

@@ -12,13 +12,13 @@ export interface WalletVO {
   bindId: number
   // 1;用户 2:车队
   bindType: number
-  // 余额，单位分
+  // 余额(分)
   balance: number
-  // 累计支出，单位分
+  // 累计支出(分)
   totalExpense: number
-  // 累计充值，单位分
+  // 累计充值(分)
   totalRecharge: number
-  // 冻结金额，单位分
+  // 冻结金额(分)
   freezePrice: number
 }
 

src/utils/dict.ts

@@ -119,26 +119,27 @@ export enum DICT_TYPE {
   MODEL_TIME_STATUS = 'model_time_status',//0启 1 禁
   BATTERIES_BATTERY_RACK = 'batteries_battery_rack',//电池架上是否有电池 0：未知1：有电池2：无电池
   STATE_ELECTRICALCO_NNECTOR = 'state_electricalco_nnector',
-   WORKING_STATUS_CHARGER = 'working_status_charger',
+  WORKING_STATUS_CHARGER = 'working_status_charger',
   STATE_FAILURE = 'state_failure',
-   STATE_ALARM = 'state_alarm',
+  STATE_ALARM = 'state_alarm',
   WATER_COOLED_STATE = 'water_cooled_state',
   RESERVATION_STATUS = 'reservation_status',// 
   STATISTICAL_TIME_TYPE = 'statistical_time_type',
   MAINTENANCE_STATUS = 'maintenance_status',//0未保养，1已保养
-DRIVER_AUDIT_STATUS = 'driver_audit_status',
-CHARGER_TYPE = 'charger_type',
-CHARGER_TYPE_OUT = 'charger_type_out',
+  DRIVER_AUDIT_STATUS = 'driver_audit_status',
+  CHARGER_TYPE = 'charger_type',
+  CHARGER_TYPE_OUT = 'charger_type_out',
 
-GUNSTATUS = 'gunstatus',
-REFUND_STATUS = 'refund_status',
-REFUND_STATUS_two =  'refund_status_two',
-AFTER_SALE_MODE = 'after_sale_mode',
-REFUND_TYPE = 'refund_type',
-ELECTRICITYSOURCE_OUT = 'electricitySourceOut',
-ELECTERICITYPRICEMODEL = 'electricityPriceModel',
+  GUNSTATUS = 'gunstatus',
+  REFUND_STATUS = 'refund_status',
+  REFUND_STATUS_two =  'refund_status_two',
+  AFTER_SALE_MODE = 'after_sale_mode',
+  REFUND_TYPE = 'refund_type',
+  ELECTRICITYSOURCE_OUT = 'electricitySourceOut',
+  ELECTERICITYPRICEMODEL = 'electricityPriceModel',
   TOP_UP_STATUS = 'top_up_status',
- ENABLE_STATUS = 'enable_status',
+  TOP_UP_STATUS_TWO = 'top_up_status_two',
+  ENABLE_STATUS = 'enable_status',
  
   PACKAGE_TYPE = 'package_type',//zz
 PACKAGE_STATUS = 'package_status',

src/views/mall/promotion/bargain/activity/BargainActivityForm.vue

@@ -173,7 +173,7 @@ const open = async (type: string, id?: number) => {
           {
             spuId: data.spuId!,
             skuId: data.skuId,
-            bargainFirstPrice: data.bargainFirstPrice, // 砍价起始价格，单位分
+            bargainFirstPrice: data.bargainFirstPrice, // 砍价起始价格(分)
             bargainMinPrice: data.bargainMinPrice, // 砍价底价
             stock: data.stock // 活动库存
           }

src/views/system/accountManagement/fleetAccount/WalletForm.vue

@@ -28,17 +28,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="余额，单位分" prop="balance">
-        <el-input v-model="formData.balance" placeholder="请输入余额，单位分" />
+      <el-form-item label="余额(分)" prop="balance">
+        <el-input v-model="formData.balance" placeholder="请输入余额(分)" />
       </el-form-item>
-      <el-form-item label="累计支出，单位分" prop="totalExpense">
-        <el-input v-model="formData.totalExpense" placeholder="请输入累计支出，单位分" />
+      <el-form-item label="累计支出(分)" prop="totalExpense">
+        <el-input v-model="formData.totalExpense" placeholder="请输入累计支出(分)" />
       </el-form-item>
-      <el-form-item label="累计充值，单位分" prop="totalRecharge">
-        <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值，单位分" />
+      <el-form-item label="累计充值(分)" prop="totalRecharge">
+        <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值(分)" />
       </el-form-item>
-      <el-form-item label="冻结金额，单位分" prop="freezePrice">
-        <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额，单位分" />
+      <el-form-item label="冻结金额(分)" prop="freezePrice">
+        <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额(分)" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -77,10 +77,10 @@ const formRules = reactive({
   userType: [{ required: true, message: '用户类型不能为空', trigger: 'change' }],
   bindId: [{ required: true, message: '绑定用户id或车队id	不能为空', trigger: 'blur' }],
   bindType: [{ required: true, message: '1;用户 2:车队不能为空', trigger: 'change' }],
-  balance: [{ required: true, message: '余额，单位分不能为空', trigger: 'blur' }],
-  totalExpense: [{ required: true, message: '累计支出，单位分不能为空', trigger: 'blur' }],
-  totalRecharge: [{ required: true, message: '累计充值，单位分不能为空', trigger: 'blur' }],
-  freezePrice: [{ required: true, message: '冻结金额，单位分不能为空', trigger: 'blur' }],
+  balance: [{ required: true, message: '余额(分)不能为空', trigger: 'blur' }],
+  totalExpense: [{ required: true, message: '累计支出(分)不能为空', trigger: 'blur' }],
+  totalRecharge: [{ required: true, message: '累计充值(分)不能为空', trigger: 'blur' }],
+  freezePrice: [{ required: true, message: '冻结金额(分)不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 

src/views/system/accountManagement/fleetAccount/components/WalletTransactionForm.vue

@@ -21,10 +21,10 @@
       <el-form-item label="流水标题" prop="title">
         <el-input v-model="formData.title" placeholder="请输入流水标题" />
       </el-form-item>
-      <el-form-item label="交易金额, 单位分" prop="price">
+      <el-form-item label="交易金额(分)" prop="price">
         <el-input v-model="formData.price" placeholder="请输入交易金额, 单位分" />
       </el-form-item>
-      <el-form-item label="余额, 单位分" prop="balance">
+      <el-form-item label="余额(分)" prop="balance">
         <el-input v-model="formData.balance" placeholder="请输入余额, 单位分" />
       </el-form-item>
     </el-form>
@@ -60,8 +60,8 @@ const formRules = reactive({
   bizId: [{ required: true, message: '关联业务编号不能为空', trigger: 'blur' }],
   no: [{ required: true, message: '流水号不能为空', trigger: 'blur' }],
   title: [{ required: true, message: '流水标题不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '交易金额, 单位分不能为空', trigger: 'blur' }],
-  balance: [{ required: true, message: '余额, 单位分不能为空', trigger: 'blur' }],
+  price: [{ required: true, message: '交易金额(分)不能为空', trigger: 'blur' }],
+  balance: [{ required: true, message: '余额(分)不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 

src/views/system/accountManagement/individualAccount/WalletForm.vue

@@ -28,17 +28,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="余额，单位分" prop="balance">
-        <el-input v-model="formData.balance" placeholder="请输入余额，单位分" />
+      <el-form-item label="余额(分)" prop="balance">
+        <el-input v-model="formData.balance" placeholder="请输入余额(分)" />
       </el-form-item>
-      <el-form-item label="累计支出，单位分" prop="totalExpense">
-        <el-input v-model="formData.totalExpense" placeholder="请输入累计支出，单位分" />
+      <el-form-item label="累计支出(分)" prop="totalExpense">
+        <el-input v-model="formData.totalExpense" placeholder="请输入累计支出(分)" />
       </el-form-item>
-      <el-form-item label="累计充值，单位分" prop="totalRecharge">
-        <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值，单位分" />
+      <el-form-item label="累计充值(分)" prop="totalRecharge">
+        <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值(分)" />
       </el-form-item>
-      <el-form-item label="冻结金额，单位分" prop="freezePrice">
-        <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额，单位分" />
+      <el-form-item label="冻结金额(分)" prop="freezePrice">
+        <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额(分)" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -77,10 +77,10 @@ const formRules = reactive({
   userType: [{ required: true, message: '用户类型不能为空', trigger: 'change' }],
   bindId: [{ required: true, message: '绑定用户id或车队id	不能为空', trigger: 'blur' }],
   bindType: [{ required: true, message: '1;用户 2:车队不能为空', trigger: 'change' }],
-  balance: [{ required: true, message: '余额，单位分不能为空', trigger: 'blur' }],
-  totalExpense: [{ required: true, message: '累计支出，单位分不能为空', trigger: 'blur' }],
-  totalRecharge: [{ required: true, message: '累计充值，单位分不能为空', trigger: 'blur' }],
-  freezePrice: [{ required: true, message: '冻结金额，单位分不能为空', trigger: 'blur' }],
+  balance: [{ required: true, message: '余额(分)不能为空', trigger: 'blur' }],
+  totalExpense: [{ required: true, message: '累计支出(分)不能为空', trigger: 'blur' }],
+  totalRecharge: [{ required: true, message: '累计充值(分)不能为空', trigger: 'blur' }],
+  freezePrice: [{ required: true, message: '冻结金额(分)不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 

src/views/system/marketingManagement/packageManagement/SetMealRecordsForm.vue

@@ -30,7 +30,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="支付金额" prop="payPrice">
+          <el-form-item label="支付金额(分)" prop="payPrice">
             <el-input v-model="formData.payPrice" placeholder="请输入支付金额" />
           </el-form-item>
         </el-col>

src/views/system/marketingManagement/packageManagement/index.vue

@@ -89,7 +89,7 @@
       <el-table-column label="用户id" align="center" prop="userId" />
       <!-- <el-table-column label="套餐id" align="center" prop="setMealId" /> -->
       <el-table-column label="套餐名" align="center" prop="name" />
-      <el-table-column label="支付金额(元)" align="center" prop="payPrice" />
+      <el-table-column label="支付金额(分)" align="center" prop="payPrice" />
       <el-table-column label="支付订单编号" align="center" prop="payOrder" />
       <el-table-column label="有效月份" align="center" prop="effective" />
       <el-table-column label="套餐次数" align="center" prop="frequency" />

src/views/system/marketingManagement/resetGift/index.vue

@@ -27,7 +27,7 @@
               style="width: 100%"
             >
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.TOP_UP_STATUS)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.TOP_UP_STATUS_TWO)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -72,7 +72,7 @@
       <el-table-column label="赠送金额" align="center" prop="bonusPrice" />
       <el-table-column label="状态" align="center" prop="status" >
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.TOP_UP_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.TOP_UP_STATUS_TWO" :value="scope.row.status" />
         </template>
       
       </el-table-column>

src/views/system/offStationCharging/chargingOrder/index.vue

@@ -71,13 +71,13 @@
     >
       <el-table-column label="序号" align="center" type="index" width="80" />
       <!-- <el-table-column label="换电站编码" align="center" prop="stationNo" width="120" /> -->
-      <el-table-column label="换电站名称" align="center" prop="stationNo">
+      <el-table-column label="换电站名称" align="center" prop="stationNo" width="120">
         <template #default="scope">
           {{ handle_stationNo(scope.row.stationNo) }}
         </template>
       </el-table-column>
       <!-- <el-table-column label="充电流水号" align="center" prop="chargeSeriaNumber" width="120" /> -->
-      <el-table-column label="充电订单号" align="center" prop="chargeOrder" />
+      <el-table-column label="充电订单号" align="center" prop="chargeOrder" 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
@@ -99,7 +99,7 @@
       <!-- <el-table-column label="开始SOE" align="center" prop="startSoe" width="120" /> -->
       <!-- <el-table-column label="结束SOE" align="center" prop="endSoe" width="120" /> -->
       <el-table-column label="充电电量" align="center" prop="chargingCapacity" />
-      <el-table-column label="充电时长(min)" align="center" prop="chargingTime" />
+      <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">
         <template #default="scope">
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
       <el-table-column label="总费用" align="center" prop="totalFee" />
-      <el-table-column label="实际支付金额(元)" align="center" prop="actualPay">
+      <el-table-column label="实际支付金额(元)" align="center" prop="actualPay" width="150">
         <template #default="scope">
           {{ scope.row.actualPay / 100 }}
         </template>

src/views/system/substation/binManagement/BinInfoForm.vue

@@ -29,6 +29,47 @@
         </el-col>
       </el-row>
 
+      <el-row type="flex" justify="space-around">
+        <el-col :span="11">
+          <el-form-item label="电池编号" prop="nbatteryNoo">
+            <el-input v-model="formData.batteryNo" placeholder="请输入电池编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="在位状态" prop="existsFlag">
+            <el-select v-model="formData.existsFlag" placeholder="请选择" style="width: 100%">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.EXISTS_FLAG)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row type="flex" justify="space-around">
+        <el-col :span="11">
+          <el-form-item label="预约锁定" prop="amtLock">
+            <el-select v-model="formData.amtLock" placeholder="请选择" style="width: 100%">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.AMT_LOCK)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="soc" prop="soc">
+            <el-input v-model="formData.soc" placeholder="请输入soc" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
       <el-row type="flex" justify="space-around">
         <el-col :span="11">
           <el-form-item label="仓位名称" prop="name">

src/views/system/substation/binManagement/index.vue

@@ -74,6 +74,18 @@
       <!-- <el-table-column label="仓位编码" align="center" prop="code" /> -->
       <el-table-column label="仓位名称" align="center" prop="name" />
       <el-table-column label="仓位编号" align="center" prop="no" />
+      <el-table-column label="电池编号" align="center" prop="batteryNo" />
+      <el-table-column label="在位状态" align="center" prop="existsFlag" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.EXISTS_FLAG" :value="scope.row.existsFlag" />
+        </template>
+      </el-table-column>
+      <el-table-column label="预约锁定" align="center" prop="amtLock" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AMT_LOCK" :value="scope.row.amtLock" />
+        </template>
+      </el-table-column>
+      <el-table-column label="soc" align="center" prop="soc" />
       <el-table-column label="换电站名称" align="center" prop="stationNo">
         <template #default="scope">
           {{ handle_stationNo(scope.row.stationNo) }}

src/views/system/substation/fleetManagement/components/drawer.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-drawer
-      title="司机详情"
+      title="基本信息"
       :close-on-click-modal="false"
       v-model="drawer"
       direction="rtl"

src/views/system/substation/fleetManagement/index.vue

@@ -45,7 +45,8 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否开启" prop="openFlag">
+   
+      <!-- <el-form-item label="是否开启" prop="openFlag">
         <el-select
           v-model="queryParams.openFlag"
           placeholder="请选择是否开启"
@@ -59,7 +60,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -106,12 +107,17 @@
           <dict-tag :type="DICT_TYPE.ROUNDINGMODE" :value="scope.row.roundingMode" />
         </template>
       </el-table-column> -->
+      <el-table-column label="车队账户" align="center" prop="openFlag">
+        <template #default="scope">
+          <el-button link type="primary" @click="opencarteamlist(scope.row.teamCode)"> 详情 </el-button>
 
-      <el-table-column label="是否开启" align="center" prop="openFlag">
+        </template>
+      </el-table-column> 
+      <!-- <el-table-column label="是否开启" align="center" prop="openFlag">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.OPENFLAG" :value="scope.row.openFlag" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" fixed="right" width="250">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row.id)">
@@ -155,6 +161,8 @@
     </el-tabs>
   </ContentWrap> -->
   <drawer ref="drawerRef" />
+  <!-- 车队账户详情 -->
+  <drawer2 ref="carteamlistRef" />
 </template>
 
 <script setup lang="ts">
@@ -165,6 +173,7 @@ import { TeamApi, TeamVO } from '@/api/biz/team'
 import TeamForm from './TeamForm.vue'
 import TeamVehicleList from './components/TeamVehicleList.vue'
 import drawer from './components/drawer.vue'
+import drawer2 from '@/views/system/accountManagement/fleetAccount/components/drawer.vue'
 import { StationInfoApi, StationInfoVO } from '@/api/share/stationinfo'
 
 /** 车队 列表 */
@@ -293,6 +302,11 @@ const drawerRef = ref()
 const open_drawer = (row: any) => {
   drawerRef.value.open(row)
 }
+// 车队账户详情
+const carteamlistRef = ref()
+const opencarteamlist = (row: any) => {
+  carteamlistRef.value.open(row)
+}
 
 /** 初始化 **/
 onMounted(() => {