From 49b87991ecf9ee6ca395fb77612016294a298734 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 22 Oct 2024 15:39:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=92=E8=89=B2=E5=81=9A=E6=88=90=E5=8D=95?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/index.vue            |  5 ++---
 src/views/system/fee/index.vue            |  6 +++++-
 src/views/system/reconciliation/index.vue |  2 +-
 src/views/system/user/index.vue           | 12 ++++++++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 4efb598..de22ef1 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -6,17 +6,16 @@
     v-model="areaId"
     placeholder="请选择运营区"
     filterable
-    clearable
     @change="handleAreaChange"
     size="medium"
   >
     <el-option
       v-for="item in areaOptions"
       :key="item.areaId"
-      :label="item.areaName + ' - ' + item.deptName" 
+      :label="item.areaName + ' - ' + item.deptName"
       :value="item.areaId"
     >
-      <div class="option-content" style=" display: flex;justify-content: space-between;"> 
+      <div class="option-content" style=" display: flex;justify-content: space-between;">
         <span class="area-name">{{ item.areaName }}</span>
         <span class="dept-name">{{ item.deptName }}</span>
       </div>
diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue
index 3b1528a..8c64cbe 100644
--- a/src/views/system/fee/index.vue
+++ b/src/views/system/fee/index.vue
@@ -628,7 +628,7 @@ export default {
             return;
           }
           // this.form.rule.push(this.more)
-          // console.log(this.form,'mmmmmmmmmmmmm');
+          console.log(this.form,'mmmmmmmmmmmmm');
           let data = { ...this.form };  // 使用对象扩展运算符确保复制一个新对象，避免直接修改 this.form
 
 
@@ -650,6 +650,10 @@ export default {
           if(this.form.chargingCycle==1){
             data.chargingCycleValue=this.time1
           }else if(this.form.chargingCycle==2){
+            if(!this.time2){
+              this.$modal.msgError('自定义时刻不能为空');
+              return;
+            }
             data.chargingCycleValue=this.time2
           }
           // console.log(data, 'mmmmmmmmmmmmm');
diff --git a/src/views/system/reconciliation/index.vue b/src/views/system/reconciliation/index.vue
index 4d8a23a..ec16d1f 100644
--- a/src/views/system/reconciliation/index.vue
+++ b/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" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="refundList" show-summary="total" @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" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 23289e6..589e9d2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -248,7 +248,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleIds" placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -579,6 +579,10 @@ export default {
         }else if(roleKey == "partner"){
           role = '4';
         }
+      }else{
+        this.$modal.msgError("系统用户未绑定角色");
+        this.open2 = false;
+        return
       }
       console.log("role",role)
       bandSystemUser({userId:this.appUserId,sysUserId:this.form.userId,role:role}).then(response => {
@@ -725,8 +729,10 @@ export default {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
+        // 假设从接口返回的数据为 response
         this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
+        // this.$set(this.form, "roleIds", response.roleIds);
+        this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
@@ -760,6 +766,8 @@ export default {
     submitForm: function() {
       this.form.userName = this.form.phonenumber;
       this.form.userType = '00';
+      this.form.roleIds = [this.form.roleIds];
+      console.log("roleIds"+this.form.roleIds)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {