调整收费套餐页面

# Conflicts:
#	src/views/system/device/index.vue

.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 共享电动车管理系统
 ENV = 'development'
 
 # 共享电动车管理系统/开发环境
-VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
 # VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
 
-# VUE_APP_BASE_API = 'http://localhost:8088'
+VUE_APP_BASE_API = 'http://localhost:8088'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.staging

@@ -5,7 +5,7 @@ NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
-# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
+# VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
 # 共享电动车管理系统/测试环境
 # VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/stage-api'

src/views/system/article/index.vue

@@ -236,6 +236,10 @@ export default {
         classify: null,
         title: null,
       },
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 999
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -321,7 +325,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      listArea(this.queryParams).then(response => {
+      listArea(this.queryParams2).then(response => {
         this.areaOptions = response.rows;
         this.open = true;
         this.title = "添加文章";

src/views/system/audit/index.vue

@@ -359,7 +359,7 @@
   import { updateWithdraw } from '@/api/system/withdraw'
   import { MessageBox } from 'element-ui'
  import { listDept2 } from '@/api/system/dept'
- 
+
 
 export default {
   name: "Order",
@@ -495,7 +495,9 @@ export default {
     console.log("当前用户信息：",this.$store.state.user.name)
     this.userName = this.$store.state.user.name;
     this.queryParams.statusList = '7';
-    this.getDeptList()
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
     this.reset();
     this.reset2();
     this.getList();

src/views/system/dept/deptDetail.vue

@@ -50,25 +50,28 @@
                                     <!--                    {{detail.limitRefundReason | defaultValue}}-->
                                     <!--                  </el-descriptions-item>-->
                                     <el-descriptions-item label="服务费">
-                                        {{ detail.platformServiceFee  }}%
+                                        {{ detail.platformServiceFee }}%
                                     </el-descriptions-item>
                                     <el-descriptions-item label="充值手续费">
-                                        {{ detail.handlingCharge  }}%
+                                        {{ detail.handlingCharge }}‰
                                     </el-descriptions-item>
-                                    <el-descriptions-item label="提现手续费">
+                                    <el-descriptions-item label="提现手续费" v-if="detail.handlingChargeType==1">
-                                        {{ detail.withdrawHandlingCharge }}%
+                                        {{ detail.withdrawHandlingCharge }}‰
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="提现手续费"  v-else>
+                                       每笔 {{ detail.withdrawHandlingCharge }}元
                                     </el-descriptions-item>
                                     <el-descriptions-item label="已提现">
-                                        {{ deptInfo.withdraw  }}元
+                                        {{ deptInfo.withdraw }}元
                                     </el-descriptions-item>
                                     <el-descriptions-item label="待结算">
                                         {{ deptInfo.settlementAmount }}
                                     </el-descriptions-item>
                                     <el-descriptions-item label="营收">
-                                        {{ deptInfo.todayIncome  }}元 | {{ deptInfo.totalIncome }}元
+                                        {{ deptInfo.todayIncome }}元 | {{ deptInfo.totalIncome }}元
                                     </el-descriptions-item>
                                     <el-descriptions-item label="订单数">
-                                        {{ deptInfo.todayOrderCount}}元 | {{ deptInfo.totalOrderCount  }}元
+                                        {{ deptInfo.todayOrderCount }}笔 | {{ deptInfo.totalOrderCount }}笔
                                     </el-descriptions-item>
                                     <el-descriptions-item label="订单金额">
                                         {{ deptInfo.todayOrderFee }}元 | {{ deptInfo.totalOrderFee }}元
@@ -83,47 +86,112 @@
 
                             </div>
                             <el-tabs>
-                                <el-tab-pane label="车辆信息">
+                                <el-tab-pane label="车辆信息(单位:辆)">
                                     <el-descriptions :column="3">
-                                        <el-descriptions-item label="车辆">
+                                        <el-descriptions-item label="总数">
-                                            {{ deptInfo.vehicleVo.offlineDevices.length}}辆 | {{ deptInfo.vehicleVo.allNum}}辆
+                                            <span
+                                                :style="{ color: deptInfo.vehicleVo.allOfflineNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.vehicleVo.allOfflineNum }}
+                                            </span> |
+                                            <span >
+                                                {{ deptInfo.vehicleVo.allNum }}
+                                            </span>
                                         </el-descriptions-item>
+
                                         <el-descriptions-item label="仓库">
-                                            {{deptInfo.offlineStatusCount.inStashNum }}辆 | {{ deptInfo.vehicleVo.inStashNum  }}辆
+                                            <span
-                                        </el-descriptions-item>
+                                                :style="{ color: deptInfo.vehicleVo.allOfflineNum-deptInfo.vehicleVo.offlineNum > 0 ? 'red' : 'gray' }">
-                                        <el-descriptions-item label=" 投放"  >
+                                                {{ deptInfo.vehicleVo.allOfflineNum-deptInfo.vehicleVo.offlineNum }}
-                                            <template>
+                                            </span> |
-                                              <!-- <pre></pre> -->
+                                            <span
-                                              <div @click="noline">{{ deptInfo.vehicleVo.offlineDevices.length-deptInfo.offlineStatusCount.inStashNum}}辆 | {{ deptInfo.vehicleVo.inOperation}}辆</div>
+                                               >
-                                            </template>
+                                                {{ deptInfo.vehicleVo.inStashNum }}
-                                            
+                                            </span>
                                         </el-descriptions-item>
 
-
+                                        <el-descriptions-item label="投放">
+                                            <div @click="noline">
+                                                <span
+                                                    :style="{ color: (deptInfo.vehicleVo.offlineDevices.length - deptInfo.offlineStatusCount.inStashNum) > 0 ? 'red' : 'gray' }">
+                                                    {{ deptInfo.vehicleVo.offlineDevices.length -
+                                                    deptInfo.offlineStatusCount.inStashNum }}
+                                                </span> |
+                                                <span
+                                                   >
+                                                    {{ deptInfo.vehicleVo.inOperation }}
+                                                </span>
+                                            </div>
+                                        </el-descriptions-item>
 
                                         <el-descriptions-item label="订单">
-                                            {{ deptInfo.offlineStatusCount.ridingNum +deptInfo.offlineStatusCount.temporarilyLockNum}}辆 | {{deptInfo.vehicleVo.ridingNum+ deptInfo.vehicleVo.temporarilyLockNum}}辆
+                                            <span
+                                                :style="{ color: (deptInfo.offlineStatusCount.ridingNum + deptInfo.offlineStatusCount.temporarilyLockNum) > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.ridingNum +
+                                                deptInfo.offlineStatusCount.temporarilyLockNum }}
+                                            </span> |
+                                            <span
+                                                >
+                                                {{ deptInfo.vehicleVo.ridingNum + deptInfo.vehicleVo.temporarilyLockNum
+                                                }}
+                                            </span>
                                         </el-descriptions-item>
+
                                         <el-descriptions-item label="骑行">
-                                            {{ deptInfo.offlineStatusCount.ridingNum  }}辆 | {{ deptInfo.vehicleVo.ridingNum  }}辆
+                                            <span
+                                                :style="{ color: deptInfo.offlineStatusCount.ridingNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.ridingNum }}
+                                            </span> |
+                                            <span >
+                                                {{ deptInfo.vehicleVo.ridingNum }}
+                                            </span>
                                         </el-descriptions-item>
-                                        <el-descriptions-item label="锁车 ">
+
-                                            {{ deptInfo.offlineStatusCount.temporarilyLockNum }}辆 | {{ deptInfo.vehicleVo.temporarilyLockNum}}辆
+                                        <el-descriptions-item label="锁车">
+                                            <span
+                                                :style="{ color: deptInfo.offlineStatusCount.temporarilyLockNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.temporarilyLockNum }}
+                                            </span> |
+                                            <span
+                                                >
+                                                {{ deptInfo.vehicleVo.temporarilyLockNum }}
+                                            </span>
                                         </el-descriptions-item>
 
                                         <el-descriptions-item label="待租">
-                                            {{ deptInfo.offlineStatusCount.normalNum  }}辆 | {{ deptInfo.vehicleVo.normalNum}}辆
+                                            <span
+                                                :style="{ color: deptInfo.offlineStatusCount.normalNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.normalNum }}
+                                            </span> |
+                                            <span >
+                                                {{ deptInfo.vehicleVo.normalNum }}
+                                            </span>
                                         </el-descriptions-item>
-                                        <el-descriptions-item label=" 预约">
+
-                                            {{ deptInfo.offlineStatusCount.inAppointmentNum  }}辆 | {{ deptInfo.vehicleVo.inAppointmentNum  }}辆
+                                        <el-descriptions-item label="预约">
+                                            <span
+                                                :style="{ color: deptInfo.offlineStatusCount.inAppointmentNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.inAppointmentNum }}
+                                            </span> |
+                                            <span
+                                                >
+                                                {{ deptInfo.vehicleVo.inAppointmentNum }}
+                                            </span>
                                         </el-descriptions-item>
-                                        <el-descriptions-item label="禁用 ">
+
-                                            {{ deptInfo.offlineStatusCount.offlineNum }}辆 | {{ deptInfo.vehicleVo.disabledNum}}辆
+                                        <el-descriptions-item label="禁用">
+                                            <span
+                                                :style="{ color: deptInfo.offlineStatusCount.offlineNum > 0 ? 'red' : 'gray' }">
+                                                {{ deptInfo.offlineStatusCount.offlineNum }}
+                                            </span> |
+                                            <span
+                                               >
+                                                {{ deptInfo.vehicleVo.disabledNum }}
+                                            </span>
                                         </el-descriptions-item>
                                     </el-descriptions>
-
                                 </el-tab-pane>
 
+
                             </el-tabs>
                         </div>
                     </el-card>
@@ -153,7 +221,7 @@
                         <!-- <recharge :query="{deptId: detail.deptId}" :view="views.user"/> -->
                     </el-tab-pane>
                     <el-tab-pane label="车辆列表" lazy name="车辆列表">
-                        <device ref="deviceComponent"  :deptId="detail.deptId" v-if="detail.deptId" />
+                        <device ref="deviceComponent" :deptId="detail.deptId" v-if="detail.deptId" />
                     </el-tab-pane>
                     <el-tab-pane label="订单" lazy>
 
@@ -179,6 +247,9 @@
 
 
                     </el-tab-pane>
+                    <el-tab-pane label="管理员列表" lazy>
+                        <user :deptId="detail.deptId" v-if="detail.deptId" />
+                    </el-tab-pane>
 
                 </el-tabs>
             </el-card>
@@ -186,7 +257,7 @@
         <el-empty v-else description="用户不存在" />
 
         <!--用户设置-->
-        <user-config-dialog :show.sync="showConfigDialog" :deptId="detail.deptId"  v-if="detail.deptId" />
+        <user-config-dialog :show.sync="showConfigDialog" :deptId="detail.deptId" v-if="detail.deptId" />
 
     </div>
 </template>
@@ -224,7 +295,7 @@ import refund from "@/views/system/refund/index";
 import audit from "@/views/system/audit/index";
 import flow from "@/views/system/flow/index";
 import withdraw from "@/views/system/withdrawAudit/index";
-
+import user from "@/views/system/user/index";
 
 //   import Withdraw from '@/views/system/withdraw/index.vue'
 //   import RealName from '@/views/ss/realName/index.vue'
@@ -236,7 +307,7 @@ import withdraw from "@/views/system/withdrawAudit/index";
 export default {
     name: 'User/:deptId',
     mixins: [$view, $serviceType],
-    components: { Area, Fees, Model, device, order, partner, refund, audit, flow, withdraw, BooleanTag, Recharge, UserRechargeReport, UserConfigDialog, UserAccount, UserDevice, LineChart },
+    components: { Area, Fees,user, Model, device, order, partner, refund, audit, flow, withdraw, BooleanTag, Recharge, UserRechargeReport, UserConfigDialog, UserAccount, UserDevice, LineChart },
     dicts: ['sys_normal_disable', 'sys_yes_no'],
     computed: {
         SmUserType() {
@@ -246,7 +317,7 @@ export default {
             return (type) => {
                 return type === '2' ? '元' : '%';
             }
-        } 
+        }
     },
     data() {
         return {
@@ -254,7 +325,7 @@ export default {
             loading: false,
             showConfigDialog: false,
             deptInfo: {},
-            defaultValue:0,
+            defaultValue: 0,
             activeTab: '运营区', // 默认激活的标签页
         }
     },
@@ -283,46 +354,47 @@ export default {
             getDeptInfo(this.$route.params.deptId).then(response => {
                 this.deptInfo = response.data;
 
-        // 初始化离线状态统计对象
+                // 初始化离线状态统计对象
-        this.deptInfo.offlineStatusCount = {
+                this.deptInfo.offlineStatusCount = {
-            inStashNum: 0, // 仓库中
+                    inStashNum: 0, // 仓库中
-            normalNum: 0, // 待租
+                    normalNum: 0, // 待租
-            inAppointmentNum: 0, // 预约中
+                    inAppointmentNum: 0, // 预约中
-            ridingNum: 0, // 骑行中
+                    ridingNum: 0, // 骑行中
-            temporarilyLockNum: 0, // 临时锁车中
+                    temporarilyLockNum: 0, // 临时锁车中
-            dispatchingNum: 0, // 调度中
+                    dispatchingNum: 0, // 调度中
-            offlineNum: 0 // 下线
+                    offlineNum: 0 // 下线
-        };
+                };
 
-        // 根据 status 进行分类统计
+                // 根据 status 进行分类统计
-        this.deptInfo.vehicleVo.offlineDevices.forEach(device => {
+                this.deptInfo.vehicleVo.offlineDevices.forEach(device => {
-            switch (device.status) {
+                    switch (device.status) {
-                case 0:
+                        case '0':
-                    this.deptInfo.offlineStatusCount.inStashNum += 1;
+                            this.deptInfo.offlineStatusCount.inStashNum += 1;
-                    break;
+                            break;
-                case 1:
+                        case '1':
-                    this.deptInfo.offlineStatusCount.normalNum += 1;
+                            this.deptInfo.offlineStatusCount.normalNum += 1;
-                    break;
+                            break;
-                case 2:
+                        case '2':
-                    this.deptInfo.offlineStatusCount.inAppointmentNum += 1;
+                            this.deptInfo.offlineStatusCount.inAppointmentNum += 1;
-                    break;
+                            break;
-                case 3:
+                        case '3':
-                    this.deptInfo.offlineStatusCount.ridingNum += 1;
+                            this.deptInfo.offlineStatusCount.ridingNum += 1;
-                    break;
+                            break;
-                case 4:
+                        case '4':
-                    this.deptInfo.offlineStatusCount.temporarilyLockNum += 1;
+                            this.deptInfo.offlineStatusCount.temporarilyLockNum += 1;
-                    break;
+                            break;
-                case 6:
+                        case '6':
-                    this.deptInfo.offlineStatusCount.dispatchingNum += 1;
+                            this.deptInfo.offlineStatusCount.dispatchingNum += 1;
-                    break;
+                            break;
-                case 8:
+                        case '8':
-                    this.deptInfo.offlineStatusCount.offlineNum += 1;
+                            this.deptInfo.offlineStatusCount.offlineNum += 1;
-                    break;
+                            break;
-            }
+                    }
-        });
+                });
-    }).finally(() => {
+                // console.log(this.deptInfo.vehicleVo,'this.deptInfo.offlineStatusCountthis.deptInfo.offlineStatusCount');
-        // 加载完成后可以进行其他操作
+            }).finally(() => {
-    });
+                // 加载完成后可以进行其他操作
+            });
         },
     }
 }

src/views/system/device/index.vue

@@ -1037,6 +1037,11 @@ export default {
         hardwareVersion: null,
         deptId:this.deptId
       },
+      //不分页
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 999
+      },
       // 列信息
       columns: [
         { key: 0, label: `代理商`, visible: true },
@@ -1117,7 +1122,7 @@ export default {
       listDept2({ status: "0", pageNum: 1, pageSize: 999 }).then((response) => {
         this.deptOptions = response.rows;
       });
-      listArea(this.queryParams).then((response) => {
+      listArea(this.queryParams2).then((response) => {
         this.areaOptions = response.rows;
       });
     }
@@ -1448,7 +1453,7 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-      listModel(this.queryParams).then((response) => {
+      listModel(this.queryParams2).then((response) => {
         this.modelOptions = response.rows;
       });
     },
@@ -1495,10 +1500,10 @@ export default {
         );
       }
       // console.log(33333333333)
-      listModel(this.queryParams).then((response) => {
+      listModel(this.queryParams2).then((response) => {
         this.modelOptions = response.rows;
       });
-      listArea(this.queryParams).then((response) => {
+      listArea(this.queryParams2).then((response) => {
         this.areaOptions = response.rows;
       });
     },
@@ -1513,13 +1518,9 @@ export default {
           }
         );
       }
-      // console.log(88888888888888);
+      listArea(this.queryParams2).then((response) => {
-      // listModel(this.queryParams).then((response) => {
+        this.areaOptions = response.rows;
-      //   this.modelOptions = response.rows;
+      });
-      // });
-      // listArea(this.queryParams).then((response) => {
-      //   this.areaOptions = response.rows;
-      // });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1542,6 +1543,11 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加设备";
+      this.$nextTick(() => {
+        if(this.deptId){
+        this.form.deptId=this.deptId
+      }
+      })
     },
     /** 详情按钮 */
     handleView(row) {
@@ -1607,20 +1613,20 @@ export default {
       const deviceId = row.deviceId || this.ids;
       getDevice(deviceId).then((response) => {
         this.form = response.data;
-        console.log("111111111111111111",this.form)
+        // console.log("111111111111111111",this.form)
-        selectAreaListByDeptId(response.data.deptId).then((response) => {
+        // selectAreaListByDeptId(response.data.deptId).then((response) => {
-          this.areaOptions = response.data.areaList;
+        //   this.areaOptions = response.data.areaList;
-          let areaOptions = response.data.areaList;
+        //   let areaOptions = response.data.areaList;
-          areaOptions.length > 0
+        //   areaOptions.length > 0
-            ? (this.form.areaId = areaOptions[0].areaId)
+        //     ? (this.form.areaId = areaOptions[0].areaId)
-            : (this.form.areaId = null);
+        //     : (this.form.areaId = null);
-          this.modelOptions = response.data.modelList;
+        //   this.modelOptions = response.data.modelList;
-          let modelOptions = response.data.modelList;
+        //   let modelOptions = response.data.modelList;
-          console.log("==============",this.modelOptions.length)
+        //   console.log("==============",this.modelOptions.length)
-          modelOptions.length > 0
+        //   modelOptions.length > 0
-            ? (this.form.modelId = modelOptions[0].modelId)
+        //     ? (this.form.modelId = modelOptions[0].modelId)
-            : (this.form.modelId = null);
+        //     : (this.form.modelId = null);
-        });
+        // });
         this.open = true;
         this.title = "修改设备";
       });

src/views/system/fee/index.vue

@@ -231,7 +231,7 @@
                       <span>在</span>
                     </el-col>
                     <el-col :span="2">
-                      <el-input v-model="interval.start" :placeholder="'请输入'" />
+                      <el-input v-model="interval.start" :placeholder="'请输入'" :disabled="true"/>
                     </el-col>
                     <el-col :span="0.5" style="line-height: 32px;">
                       ~
@@ -267,7 +267,7 @@
                   <span>大于</span>
                 </el-col>
                 <el-col :span="2">
-                  <el-input placeholder="请输入" v-model="more.start" />
+                  <el-input placeholder="请输入" v-model="more.start" disabled/>
                 </el-col>
                 <el-col :span="3" style="line-height: 32px;">
                   {{ timeUnit }} 之后，每
@@ -356,6 +356,23 @@ export default {
     'form.deptId': function(deptId) {
       this.getAreaListByDeptId(deptId);
     },
+    'rule': {
+      handler(newVal) {
+        newVal.forEach((interval, index) => {
+          // 跳过第一条，从第二条开始更新
+          if (index > 0) {
+            interval.start = newVal[index - 1].end || ''; // 动态更新 start
+          }
+        });
+
+        // 更新 more.start 的值为新数组最后一条的 end 值
+        if (newVal.length > 0) {
+          this.more.start = newVal[newVal.length - 1].end || ''; // 设置 more.start
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true // 初始化立即执行
+    }
   },
   props: {
     // 用户id
@@ -387,6 +404,11 @@ export default {
         name: null,
         status: null,
       },
+      //不分页
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 999
+      },
       time1:'24',
       time2:'',
       form: {
@@ -413,7 +435,7 @@ export default {
       startingTime: '1',
       timeoutPrice: '5',
       enablelnterval: false,
-      rule: [{ start: '', end: '', eachUnit: '', fee: '' }],
+      rule: [{ start: '0', end: '', eachUnit: '', fee: '' }],
       more: { start: '', end: '9999', eachUnit: '', fee: '' },
       timeUnit: '分钟',
       rules: {
@@ -462,14 +484,6 @@ export default {
         deptId: [
           { required: true, message: '请选择代理商', trigger: 'change' },
         ]
-        // startingTime: [
-        //   { required: true, message: '请输入起步时间', trigger: 'blur' },
-        //   { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
-        // ],
-        // timeoutTime: [
-        //   { required: true, message: '请输入超时时间', trigger: 'blur' },
-        //   { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
-        // ],
       },
     };
   },
@@ -482,7 +496,7 @@ export default {
         this.deptOptions = response.rows;
       });
     }
-    listArea(this.queryParams).then(response => {
+    listArea(this.queryParams2).then(response => {
       this.areaOptions = response.rows;
     });
   },
@@ -502,7 +516,7 @@ export default {
           }
         });
       }else{
-        listArea(this.queryParams).then(response => {
+        listArea(this.queryParams2).then(response => {
           this.areaOptions = response.rows;
         });
       }
@@ -523,8 +537,105 @@ export default {
         this.addInterval();
       }
     },
+    validateMore() {
+      if(this.form.ridingRule == 2) {
+        const { start, end, eachUnit, fee } = this.more;
+        // 检查开始和结束值是否为空
+        if (start === '' || end === '') {
+          this.$modal.msgError('区间计费：大于分钟数不能为空');
+          return false;
+        }
+
+        // 检查分钟数和金额是否为空
+        if (eachUnit === '') {
+          this.$modal.msgError('区间计费：大于每分钟数不能为空');
+          return false;
+        }
+
+        if (fee === '') {
+          this.$modal.msgError('区间计费：大于分钟之后的金额不能为空');
+          return false;
+        }
+
+        // 检查开始和结束值是否为数值
+        if (isNaN(Number(start)) || isNaN(Number(end))) {
+          this.$modal.msgError('区间计费：大于分钟数必须是数值');
+          return false;
+        }
+
+        // 检查分钟数和金额是否为数值
+        if (isNaN(Number(eachUnit))) {
+          this.$modal.msgError('区间计费：大于每分钟数必须是数值');
+          return false;
+        }
+
+        if (isNaN(Number(fee))) {
+          this.$modal.msgError('区间计费：大于分钟之后的金额必须是数值');
+          return false;
+        }
+        return true; // 校验通过
+      }
+      return true;
+    },
+    validateRules() {
+      if(this.form.ridingRule == 2 && this.rule.length > 0){
+        for (let i = 0; i < this.rule.length; i++) {
+          const { start, end, eachUnit, fee } = this.rule[i];
+          if (start === '' || end === '') {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的开始或结束值不能为空`);
+            return false;
+          }
+
+          if (eachUnit === '') {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的分钟数不能为空`);
+            return false;
+          }
+
+          if (fee === '') {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的金额不能为空`);
+            return false;
+          }
+
+          // 检查开始和结束值是否为数值
+          if (isNaN(Number(start)) || isNaN(Number(end))) {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的开始和结束值必须是数值`);
+            return false;
+          }
+
+          if (isNaN(Number(eachUnit))) {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的分钟数必须是数值`);
+            return false;
+          }
+
+          if (isNaN(Number(fee))) {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的金额必须是数值`);
+            return false;
+          }
+
+          if (parseFloat(start) >= parseFloat(end)) {
+            this.$modal.msgError(`区间计费：第 ${i + 1} 区间的结束值必须小于开始值`);
+            return false;
+          }
+        }
+        return true; // 校验通过
+      }else {
+        return true; // 校验通过
+      }
+    },
     addInterval() {
-      this.rule.push({ start: '', end: '', eachUnit: '', fee: '' });
+      // this.rule.push({ start: '', end: '', eachUnit: '', fee: '' });
+      const lastInterval = this.rule[this.rule.length - 1];
+      const newInterval = { start: '', end: '', eachUnit: '', fee: '' };
+
+      // 如果存在上一条规则，则将新规则的 start 设置为上一条的 end
+      if (lastInterval && lastInterval.end) {
+        newInterval.start = lastInterval.end;
+      }else{
+        this.$modal.msgError('请先设置上一条规则的结束值');
+        return;
+      }
+
+      this.rule.push(newInterval);
     },
     removeInterval(index) {
       this.rule.splice(index, 1);
@@ -558,8 +669,8 @@ export default {
         areaId: null
       }
       this.enablelnterval = false,
-        this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
+      this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
-      this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
+      this.rule = [{ start: '0', end: '', eachUnit: '', fee: '' }],
         this.timeoutTime = '60',
         this.startingPrice = '5',
         this.startingTime = '60',
@@ -583,6 +694,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加收费方式";
+      if(this.deptId){
+        this.form.deptId=this.deptId
+      }
     },
     handleUpdate(row) {
       this.reset();
@@ -625,6 +739,12 @@ export default {
       });
     },
     submitForm() {
+      if(!this.validateRules()){
+        return
+      }
+      if (!this.validateMore()) {
+        return; // 校验未通过，阻止提交
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           // 如何不是整数，弹窗提示
@@ -637,7 +757,7 @@ export default {
             return;
           }
           // this.form.rule.push(this.more)
-          console.log(this.form,'mmmmmmmmmmmmm');
+          console.log(JSON.stringify(this.form),'mmmmmmmmmmmmm');
           let data = { ...this.form };  // 使用对象扩展运算符确保复制一个新对象，避免直接修改 this.form
 
 

src/views/system/flow/index.vue

@@ -114,7 +114,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="flowList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="flowList" show-summary @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="流水id" align="center" prop="flowId" />-->
       <el-table-column label="交易时间" align="center" prop="createTime" width="150">
@@ -131,7 +131,6 @@
           </router-link>
         </template>
       </el-table-column>
-<!--      <el-table-column label="关联订单号" width="180" align="center" prop="orderNo" />-->
       <el-table-column align="center" label="关联订单号" width="180"  prop="orderNo">
         <template slot-scope="scope">
           <router-link :to="'/system/order/index/' + scope.row.orderNo" class="link-type">
@@ -150,22 +149,8 @@
           <dict-tag :options="dict.type.et_business_type" :value="scope.row.busType"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="交易金额" align="center" prop="amount" :formatter="formatAmount"/>-->
-<!--      <el-table-column label="支付手续费" align="center" prop="handlingCharge" :formatter="formatAmount"/>-->
-<!--      <el-table-column label="平台服务费" align="center" prop="platformServiceFee" :formatter="formatAmount"/>-->
       <el-table-column label="账变金额" align="left" prop="operatorDividend" :formatter="formatAmount2"/>
       <el-table-column label="代理商结余" align="center" prop="operatorBalance" :formatter="formatAmount"/>
-<!--      <el-table-column label="合伙人分账" align="center" prop="partnerDividend" :formatter="formatAmount"/>-->
-<!--      <el-table-column label="支付方式" align="center" prop="payType">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="状态" align="center" prop="status">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.et_flow_status" :value="scope.row.status"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="车型" align="center" prop="model" />
     </el-table>
 
@@ -316,7 +301,9 @@ export default {
     this.getList();
     this.getAreaList();
     this.getModelList();
-    this.getDeptList()
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
   },
   methods: {
     getDeptList() {

src/views/system/model/index.vue

@@ -9,7 +9,7 @@
             :label="item.deptName"
             :value="item.deptId"
           ></el-option>
-        </el-select> 
+        </el-select>
       </el-form-item>
       <el-form-item label="车型" prop="model">
         <el-input
@@ -251,6 +251,11 @@ export default {
         operator: this.deptId,
         // operator:,
       },
+      //不分页
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 999
+      },
       // 表单参数
       form: {
         lowBatteryReminderSwitch: false,
@@ -405,7 +410,7 @@ export default {
       listFee(this.queryParams).then(response => {
         this.ruleOptions = response.rows;
       });
-      listArea(this.queryParams).then((response) => {
+      listArea(this.queryParams2).then((response) => {
         this.areaOptions = response.rows;
       });
     },
@@ -439,6 +444,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加车辆型号";
+      if(this.deptId){
+        this.form.operator=this.deptId
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/system/order/index.vue

@@ -1112,13 +1112,39 @@ export default {
     },
     /** 提交退款 */
     submitRefund(){
-      // console.log("=====submitRefund======="+this.form2)
+      console.log("=====submitRefund======="+this.form2)
+      if(!this.refundValidate()){
+        return
+      }
       refund(this.form2).then(response => {
         this.$modal.msgSuccess("退款成功");
         this.open2 = false;
         this.getList();
       });
     },
+    refundValidate(){
+      // 需要校验的字段
+      const fields = [
+        this.form2.appointmentFee,
+        this.form2.ridingFee,
+        this.form2.dispatchFee,
+        this.form2.manageFee
+      ];
+
+      // 计算总和
+      const total = fields.reduce((sum, fee) => sum + (Number(fee) || 0), 0);
+
+      // 调试信息，保留总和
+      console.log('总和:', total);
+
+      // 校验总和是否为 0
+      if (total === 0) {
+        this.$modal.msgError("退款金额不能为0");
+        return false;
+      }
+
+      return true;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/system/partner/index.vue

@@ -402,7 +402,9 @@ export default {
     this.userName = this.$store.state.user.name;
     this.getList();
     this.getDeptTree();
-    this.getDeptList()
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -515,7 +517,11 @@ export default {
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
-        this.areaOptions = response.areas;
+        if (this.deptId) {
+      this.areaOptions = response.areas.filter(area => area.deptId === this.deptId);
+    } else {
+      this.areaOptions = response.areas;
+    }
         this.open = true;
         this.title = "添加合伙人";
         this.form.password = this.initPassword;

src/views/system/recharge/index.vue

@@ -176,7 +176,9 @@ export default {
   created() {
     this.getList();
     this.userName = this.$store.state.user.name;
-    this.getDeptList()
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
   },
   methods: {
     getDeptList() {

src/views/system/reconciliation/index.vue

@@ -42,7 +42,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="refundList" show-summary="total" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="refundList" show-summary @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="时间" align="center" prop="day" />
       <el-table-column label="代理商" align="center" prop="deptName" />

src/views/system/refund/index.vue

@@ -185,10 +185,12 @@ export default {
   created() {
     console.log("当前用户信息：",this.$store.state.user.name)
     this.userName = this.$store.state.user.name;
-    this.getDeptList()
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
     this.getList();
     this.getAreaList();
-   
+
   },
   methods: {
     getDeptList() {

src/views/system/user/index.vue

@@ -265,6 +265,13 @@ export default {
       return this.userName === 'admin' ? 21 : 24;
     }
   },
+  props: {
+    // 用户id
+    deptId: {
+      type: Number,
+      default: null,
+    }
+  },
   data() {
     return {
       options: [],
@@ -333,9 +340,13 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined,
+        deptId: this.deptId,
         typeList: "00,03"
       },
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 999
+      },
       // 列信息
       columns: [
         { key: 0, label: `用户编号`, visible: true },
@@ -403,7 +414,7 @@ export default {
     copy(row) {
       const account = `账号：${row.userName}`; // 获取账号
       const password = `密码：${row.initPassword}`; // 获取密码
-      const fixedUrl = "https://dche.ccttiot.com/"; // 固定网址
+      const fixedUrl = "https://www.baidu.com/"; // 固定网址
 
       // 组合要复制的内容
       const textToCopy = `${fixedUrl}\n${account}\n${password}`;
@@ -510,7 +521,7 @@ export default {
         this.loading = false;
       }
       );
-      listArea(this.queryParams).then(response => {
+      listArea(this.queryParams2).then(response => {
         this.areaOptions = response.rows;
       });
     },
@@ -518,6 +529,7 @@ export default {
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
+
       });
     },
     // 筛选节点
@@ -611,6 +623,10 @@ export default {
         this.open = true;
         this.title = "添加用户";
         this.form.password = this.initPassword;
+        if(this.deptId){
+          this.form.deptId=this.deptId
+        }
+
       });
     },
     /** 修改按钮操作 */

src/views/system/withdrawAudit/index.vue

@@ -285,12 +285,11 @@ export default {
       return `${actual} `;
     }
   },
-  
+
   data() {
     return {
       // 遮罩层
       loading: true,
-      deptOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -376,8 +375,6 @@ export default {
     this.userName = this.$store.state.user.name;
     this.getList();
     this.getAreaList();
-    this.getDeptList()
-
     if(this.userName === 'admin'){
       listDept2({status: '0',pageNum:1,pageSize:999 }).then(response => {
         this.deptOptions = response.rows;