From 5fbd34d9f83bef49eb2637da3d92e780a7e5b400 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 28 Feb 2025 10:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A0=B7=E5=BC=8F=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8=E5=92=8C=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workBench/components/account/index.js   | 17 +++-
 pages/workBench/components/account/index.wxml | 92 ++++++++++++-------
 pages/workBench/components/account/index.wxss |  8 +-
 pages/workBench/components/record/index.wxml  | 16 ++--
 .../workBench/components/tenement/index.wxml  | 15 ++-
 pages/workBench/index.js                      |  2 +-
 6 files changed, 93 insertions(+), 57 deletions(-)

diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js
index 992b809..c5982f6 100644
--- a/pages/workBench/components/account/index.js
+++ b/pages/workBench/components/account/index.js
@@ -1,8 +1,8 @@
 // pages/workBench/components/account/index.js
 import request from "../../../../utils/request"
 import { getTenementBackInfo, } from "../../../../service/tenement"
-import { getBackApproveList, removeUser } from "../../../../service/user"
-import { alertInfo, alertSuccess } from "../../../../utils/index"
+import { getBackApproveList, removeUser, approveUser } from "../../../../service/user"
+import { alertInfo, alertSuccess, wxModal } from "../../../../utils/index"
 const { OK } = request
 
 Component({
@@ -68,6 +68,19 @@ Component({
           break;
       }
     },
+    async setAdmin(e) {
+      const { id, name } = e.currentTarget.dataset;
+      const { tenement } = this.data;
+      await wxModal({ content: `确认要将${name}设置为管理吗？` })
+      const { code, message } = await approveUser({ userId: id, type: 2, tenement: tenement })
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      alertSuccess("转交成功")
+      this.initUserList();
+      this.getTenementInfo();
+    },
     onCancel() {
       this.setData({
         show: false,
diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml
index 90a4236..a04e003 100644
--- a/pages/workBench/components/account/index.wxml
+++ b/pages/workBench/components/account/index.wxml
@@ -24,26 +24,44 @@
             <van-row>
                 <van-col span="24">
                     <view class="tableTitleRow">
-                        <van-row gutter="5">
-                            <van-col span="8">
-                                <view style="text-align:center;">{{tenementInfo.shortName}}</view>
-                            </van-col>
-                            <van-col span="16">{{tenementInfo.fullName}}</van-col>
-                        </van-row>
+                        <view class="tableTitleRow">
+                            <view class="tbody">
+                                <view class="tr">
+                                    <view class="th" style="width: 200rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
+                                    <view> {{tenementInfo.fullName}} </view>
+                                </view>
+                            </view>
+                        </view>
                     </view>
                 </van-col>
                 <van-col span="24">
                     <view class="tableTitleRow">
-                        <van-row gutter="5">
-                            <van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 
-                                <view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 
-                                <view style="text-align: center;"> 物业代收1 </view> </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 
-                                <view style="text-align: center;"> 物业代收2 </view>  </van-col>
-                            <van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
-                            <van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
-                        </van-row>
+                        <view class="tbody">
+                            <view class="tr">
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 0}}"
+                                > 华昌宝能收费 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 1}}"
+                                > 物业代收1 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 2}}"
+                                > 物业代收2 </view>
+                                <view 
+                                    class="th" 
+                                    style="width: 200rpx;text-align: center;"
+                                    wx:if="{{tenementInfo.feeType === 3}}"
+                                > 物业代收线损 </view>
+                                <view style="margin-left: 26rpx;"> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
+                            </view>
+                        </view>
+                        
                     </view>
                 </van-col>
      
@@ -54,22 +72,34 @@
                 <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
                     <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
                         <view class="tbody">
-                            <view class="tr">
-                                <view class="th" style="width: 70rpx"> {{ itemIndex + 1 }} </view>
-                                <view class="th" style="width: 200rpx"> {{ item.WechatUserName }} </view>
-                                <view class="th" style="width: 300rpx"> {{ item.WechatPhone }} </view>
-                                <view class="th" style="width: 100rpx; display: flex;">
-                               
-                                    <view 
-                                        class="primaryTextBtn" 
-                                        bind:tap="handleDelete" 
-                                        data-id="{{item.WechatUserID}}" 
-                                        data-name="{{item.WechatUserName}}" 
-                                        wx:if="{{!item.Permissions}}"
-                                    >
-                                        移除
+                            <view class="tr tableRow">
+                                <view class="th" style="width: 200rpx;border-right: 1rpx solid #ccc;"> {{ item.WechatUserName }} </view>
+                                <view class="th" style="width: 250rpx;border-right: 1rpx solid #ccc;"> {{ item.WechatPhone }} </view>
+                                <view class="th" style="display: flex;">
+                                    <view style="margin-left: 16rpx;">
+                                        <view wx:if="{{!item.Permissions}}" style="display: inline-block;">
+                                            <view 
+                                                class="primaryTextBtn" 
+                                                bind:tap="handleDelete" 
+                                                data-id="{{item.WechatUserID}}" 
+                                                data-name="{{item.WechatUserName}}" 
+                                            >
+                                                移除
+                                            </view>
+                                            <view 
+                                                class="primaryTextBtn" 
+                                                bind:tap="setAdmin" 
+                                                data-id="{{item.WechatUserID}}" 
+                                                data-name="{{item.WechatUserName}}" 
+                                                style="margin-left: 16rpx;"
+                                            >
+                                                设为管理
+                                            </view>
+                                        </view>
+                   
+                                        <van-tag type="primary" wx:else>管理员</van-tag>
                                     </view>
-                                    <van-tag type="primary" wx:else>管理员</van-tag>
+                                   
                                 </view>
                             </view>
                         </view>
diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss
index e5f7686..007d999 100644
--- a/pages/workBench/components/account/index.wxss
+++ b/pages/workBench/components/account/index.wxss
@@ -28,13 +28,8 @@
 
 }
 
-.tbody {
-    width: 890rpx;
-}
 
-.tbody .tr {
-    padding: 20rpx;
-    border-bottom: 1rpx solid #EEEEEE;
+.tr {
     display: flex;
     align-items: center;
     flex-wrap: nowrap;
@@ -46,6 +41,7 @@
 }
 .primaryTextBtn {
     color: #1989fa;
+    display: inline-block;
 }
 
 .customTable {
diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml
index daa0e92..9773ff1 100644
--- a/pages/workBench/components/record/index.wxml
+++ b/pages/workBench/components/record/index.wxml
@@ -35,7 +35,7 @@
                         <van-col span="8">
                             <view style="text-align: center;"> {{item.tenement.shortName}} </view>
                         </van-col>
-                        <van-col span="16">{{item.tenement.name}}</van-col>
+                        <van-col span="16"><view style="margin-left: 16rpx;">{{item.tenement.name}}</view> </van-col>
                     </van-row>
                 </view>
                 <view class="customTableContent">
@@ -44,11 +44,11 @@
                             <view class="tableRow">
                                 <van-row gutter="5">
                                     <van-col span="8" wx:if="{{item.type === 0}}">
-                                        <view style="text-align: center;"> 商户电表 </view></van-col>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;"> 商户电表 </view></van-col>
                                     <van-col span="8" wx:elif="{{item.type === 2}}">
-                                        <view style="text-align: center;"> 公摊电表 </view></van-col>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;"> 公摊电表 </view></van-col>
                                     <van-col span="8" wx:else>
-                                        <view style="text-align: center;"> 园区电表 </view></van-col>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;"> 园区电表 </view></van-col>
                                     <van-col span="16">表号：{{item.meterNo}}</van-col>
                                 </van-row>
                             </view>
@@ -57,7 +57,7 @@
                             <view class="tableRow">
                                 <van-row gutter="5">
                                     <van-col span="8">
-                                        <view style="text-align: center;"> {{item.address}} </view>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;"> {{item.address}} </view>
                                     </van-col>
                                     <van-col span="16">SN：{{item.meterSn}}</van-col>
                                 </van-row>
@@ -67,7 +67,7 @@
                             <view class="tableRow">
                                 <van-row gutter="5">
                                     <van-col span="8">
-                                        <view style="text-align: center;"> 表字：{{item.amount}} </view>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;"> 表字：{{item.amount}} </view>
                                     </van-col>
                                     <van-col span="16">余额：{{item.money}}</van-col>
                                 </van-row>
@@ -77,8 +77,8 @@
                             <view class="tableRow">
                                 <van-row gutter="5">
                                     <van-col span="8" wx:if="{{item.onPosition === 0}}">
-                                        <view style="text-align: center;">合闸</view> </van-col>
-                                    <van-col span="8" wx:else><view style="text-align: center;">拉闸</view> </van-col>
+                                        <view style="text-align: center;border-right: 1rpx solid #ccc;">合闸</view> </van-col>
+                                    <van-col span="8" wx:else><view style="text-align: center;border-right: 1rpx solid #ccc;">拉闸</view> </van-col>
                                     <van-col span="8" wx:if="{{item.canConnect}}"><view style="text-align: center;">在线</view> </van-col>
                                     <van-col span="8" wx:else><view style="text-align: center;">失联</view> </van-col>
                                 </van-row>
diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml
index ae1df4d..618c7d3 100644
--- a/pages/workBench/components/tenement/index.wxml
+++ b/pages/workBench/components/tenement/index.wxml
@@ -39,15 +39,9 @@
                     <view class="tableTitleRow">
                         <view class="tbody">
                             <view class="tr">
-                                <view class="th" style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
+                                <view style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
                                 <view> {{tenementInfo.fullName}} </view>
                             </view>
-                        </view>
-                    </view>
-                </van-col>
-                <van-col span="24">
-                    <view class="tableTitleRow">
-                        <view class="tbody">
                             <view class="tr">
                                 <view wx:if="{{tenementInfo.feeType === 0}}" class="th" style="width: 250rpx;text-align: center;"> 华昌宝能收费 </view>
                                 <view wx:if="{{tenementInfo.feeType === 1}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收1 </view>
@@ -56,6 +50,10 @@
                                 <view> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
                             </view>
                         </view>
+                    </view>
+                </van-col>
+               
+
                         <!-- <van-row gutter="5">
                             <van-col span="8"> 
                                 <view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
@@ -66,8 +64,7 @@
                             <van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
                             <van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
                         </van-row> -->
-                    </view>
-                </van-col>
+            
      
             </van-row>
         </view>
diff --git a/pages/workBench/index.js b/pages/workBench/index.js
index d596302..7f64b91 100644
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active: 1,
+    active: 0,
   },
 
   /**