From 9a51c9b3a47f76ae136a22eecf0a9b2252d235c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Tue, 9 Sep 2025 10:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E7=89=A9?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/community.js                              |   2 +
 packages/community/index/index.vue            |   1 -
 packages/community/myCommunity/index.vue      |   1 -
 packages/user/index/index.vue                 |   2 +
 packages/workOrderDashboard/guide/index.vue   |   7 +-
 packages/workOrderDashboard/index/index.vue   | 159 +++++++-----------
 .../workOrderDashboard/myCommunity/index.vue  |  14 +-
 pages/index/index.vue                         |   3 +-
 pages/login/login.vue                         |   3 +
 pages/user/index.vue                          |   2 +
 10 files changed, 77 insertions(+), 117 deletions(-)

diff --git a/api/community.js b/api/community.js
index d3c76516..e79d3142 100644
--- a/api/community.js
+++ b/api/community.js
@@ -40,6 +40,8 @@ export const apiArr = {
 
 	communityInfo: "/api/v2/community/get-one",//获取小区信息
 
+	workCommunityList: "/api/v2/wechat/community-worker/work-comm-list",//员工小区列表
+
 	getOrderList:"/api/v2/wechat/community-orders/get-all-list",//获取账单
 	getCommunityRoomList:"/api/v2/wechat/community-room/list", //获取房源列表
 	getUserGovenmentMoney:"/api/v2/wechat/government-housing-fund-flow-crud/user", //获取用户公积金
diff --git a/packages/community/index/index.vue b/packages/community/index/index.vue
index 6c896e46..0841f568 100644
--- a/packages/community/index/index.vue
+++ b/packages/community/index/index.vue
@@ -328,7 +328,6 @@ export default {
       });
       if (!uni.getStorageSync("changeCommData")) {
         uni.setStorageSync("changeCommData", { name: res.rows[0].name, id: res.rows[0].community_id })
-        uni.setStorageSync("isShowNav", res.rows[0].room_owner_list[0].type)
       }
       this.communityList = res.rows;
     });
diff --git a/packages/community/myCommunity/index.vue b/packages/community/myCommunity/index.vue
index cbf0a229..e7df6e55 100644
--- a/packages/community/myCommunity/index.vue
+++ b/packages/community/myCommunity/index.vue
@@ -91,7 +91,6 @@ export default {
 			this.currentCommunity = e
 			uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name });
 			uni.setStorageSync('currentCommunityAddr', e.addr);
-			uni.setStorageSync("isShowNav", e.room_owner_list[0].type)
 			NavgateTo("1")
 		},
 	},
diff --git a/packages/user/index/index.vue b/packages/user/index/index.vue
index f22d8bb9..1ad9fe29 100644
--- a/packages/user/index/index.vue
+++ b/packages/user/index/index.vue
@@ -120,6 +120,7 @@ export default {
 			uni.removeStorageSync('is_deal');
 			uni.removeStorageSync('is_dev');
 			uni.removeStorageSync('is_shop');
+			uni.removeStorageSync('is_worker');
 			uni.removeStorageSync('shopId');
 			uni.removeStorageSync('order_dispatch_permission');
 			uni.removeStorageSync('work_order_permission');
@@ -146,6 +147,7 @@ export default {
 						uni.setStorageSync('is_deal', loginRes.is_deal);
 						uni.setStorageSync('is_dev', loginRes.is_dev);
 						uni.setStorageSync('is_shop', loginRes.is_shop);
+						uni.setStorageSync('is_worker', loginRes.is_worker);
 
 
 						// 获取用户信息
diff --git a/packages/workOrderDashboard/guide/index.vue b/packages/workOrderDashboard/guide/index.vue
index a3307426..bae03059 100644
--- a/packages/workOrderDashboard/guide/index.vue
+++ b/packages/workOrderDashboard/guide/index.vue
@@ -11,11 +11,6 @@
         <!-- 背景图片区域 -->
         <view class="bg-image-container">
             <image class="bg-image" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/test.png" mode="aspectFill"></image>
-            <!-- <input class="search-box" placeholder='输入工单号进入工单' confirm-type='search' @input="searchInput"
-            @confirm="searchInput" :value="selectKeyWord" /> -->
-            <!-- <view class="search-box">
-                <text class="search-placeholder">输入工单号进入工单</text>
-            </view> -->
         </view>
         <view class="work-order-section">
             <view v-for="(item, index) in 9" :key="index">
@@ -69,7 +64,7 @@ export default {
         // 跳转到工单台
         navigateToWorkOrderDashboard() {
             uni.navigateTo({
-                url: '/packages/workOrderDashboard/index/index'
+                url: '/packages/workOrderDashboard/index/index?communityId=' + uni.getStorageSync('changeCommData').id
             });
         }
     }
diff --git a/packages/workOrderDashboard/index/index.vue b/packages/workOrderDashboard/index/index.vue
index d4b2c288..844425ab 100644
--- a/packages/workOrderDashboard/index/index.vue
+++ b/packages/workOrderDashboard/index/index.vue
@@ -1,43 +1,31 @@
 <template>
-	<view class="box">
-		<view class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
-			<view class="searchBox_add">
-				<view class="searchBox_left">
-					<u-icon bold color="#000" size="40" name="arrow-left" @click="headerBackClick"></u-icon>
-				</view>
-				<view class="searchBox_mid">工单台</view>
-				<view class="searchBox_right"></view>
-			</view>
-		</view>
+  <view class="box">
+    <view class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
+      <view class="searchBox_add">
+        <view class="searchBox_left">
+          <u-icon bold color="#000" size="40" name="arrow-left" @click="headerBackClick"></u-icon>
+        </view>
+        <view class="searchBox_mid">工单台</view>
+        <view class="searchBox_right"></view>
+      </view>
+    </view>
 
     <view class="tabList">
-      <view
-        :class="active == 1 ? 'tab active' : 'tab'"
-        @click="headerTabsClick(1)"
-      >
-        待指派 <span>({{awaitingNumb}})</span>
+      <view :class="active == 1 ? 'tab active' : 'tab'" @click="headerTabsClick(1)">
+        待指派 <span>({{ awaitingNumb }})</span>
       </view>
-      <view
-        :class="active == 2 ? 'tab active' : 'tab'"
-        @click="headerTabsClick(2)"
-      >
+      <view :class="active == 2 ? 'tab active' : 'tab'" @click="headerTabsClick(2)">
         进行中 <span>({{ underwayNum }})</span>
       </view>
-      <view
-        :class="active == 4 ? 'tab active' : 'tab'"
-        @click="headerTabsClick(4)"
-      >
+      <view :class="active == 4 ? 'tab active' : 'tab'" @click="headerTabsClick(4)">
         已作废 <span>({{ discardNum }})</span>
       </view>
-      <view
-        :class="active == 3 ? 'tab active' : 'tab'"
-        @click="headerTabsClick(3)"
-      >
+      <view :class="active == 3 ? 'tab active' : 'tab'" @click="headerTabsClick(3)">
         已完成 <span>({{ doneNum }})</span>
       </view>
     </view>
 
-		<view class="orderList" v-for="(item, index) in list" :key="index">
+    <view class="orderList" v-for="(item, index) in list" :key="index">
       <view class="orderItem" @click="handlerDetailClick(item.id)">
         <view :class="['orderItemTit', statusType[item.status].style]">
           <view class="orderItemTit_left">工单编号：{{ item.order_code }}</view>
@@ -81,27 +69,28 @@
       </view>
     </view>
 
-	</view>
-</template> 
+  </view>
+</template>
 
 <script>
 import { request, NavgateTo, menuButtonInfo } from '../../../utils';
 import { apiArr } from '../../../api/v2Community';
 export default {
-	data() {
-		return {
-			top: "",
-			localHeight: "",
-			active: 1,
-			page_num: 1,
+  data() {
+    return {
+      top: "",
+      localHeight: "",
+      active: 1,
+      page_num: 1,
       page_size: 10,
       flag: false, // 是否下拉请求接口
       list: [], // 列表数组
-			awaitingNumb: '', // 待维修工单数量
-			underwayNum: '', // 进行中工单数量
-			doneNum: '', // 已完成工单数量
-			discardNum: '', // 已废弃工单数量
-			// 状态枚举类型
+      awaitingNumb: '', // 待维修工单数量
+      underwayNum: '', // 进行中工单数量
+      doneNum: '', // 已完成工单数量
+      discardNum: '', // 已废弃工单数量
+      communityId: '',//小区id
+      // 状态枚举类型
       statusType: {
         1: {
           desc: "待指派",
@@ -124,10 +113,10 @@ export default {
           color: "orderItem_row_state4"
         },
       },
-		}
-	},
-	methods: {
-		handlerDetailClick(id) {
+    }
+  },
+  methods: {
+    handlerDetailClick(id) {
       NavgateTo(`../detail/index?id=${id}`);
     },
     headerTabsClick(e) {
@@ -138,20 +127,21 @@ export default {
       this.page_num = 1;
       this.getTabsList();
     },
-		async init() {
-			const [awaitingNumb, underwayNum, doneNum, discardNum] = await Promise.all([
-				this.awaitingRes(),
-				this.underwayRes(),
-				this.doneRes(),
-				this.discardRes(),
-			]);
-			this.awaitingNumb = awaitingNumb;
-			this.underwayNum = underwayNum;
-			this.discardNum = discardNum;
-			this.doneNum = doneNum;
-		},
+    async init() {
+      const [awaitingNumb, underwayNum, doneNum, discardNum] = await Promise.all([
+        this.awaitingRes(1),
+        this.awaitingRes(2),
+        this.awaitingRes(3),
+        this.awaitingRes(4),
+      ]);
+      this.awaitingNumb = awaitingNumb;
+      this.underwayNum = underwayNum;
+      this.discardNum = discardNum;
+      this.doneNum = doneNum;
+    },
     async getTabsList() {
       const res = await request(apiArr.getWorkOrderCrudList, "POST", {
+        community_id: this.communityId,
         status: this.active,
         page_num: this.page_num,
         page_size: this.page_size,
@@ -169,60 +159,35 @@ export default {
         this.page_num = this.page_num + 1;
       }
     },
-		// 待维修工单数量
-		async awaitingRes() {
-			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 1,
+    // 待维修工单数量
+    async awaitingRes(status) {
+      const res = await request(apiArr.getWorkOrderCrudList, "POST", {
+        community_id: this.communityId,
+        status: status,
         page_num: this.page_num,
         page_size: this.page_size,
       });
-			return res.total;
-		},
-		// 进行中工单数量
-		async underwayRes() {
-			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 2,
-        page_num: this.page_num,
-        page_size: this.page_size,
-      });
-			return res.total;
-		},
-		// 已废弃工单数量
-		async discardRes() {
-			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 4,
-        page_num: this.page_num,
-        page_size: this.page_size,
-      });
-			return res.total;
-		},
-		// 已完成工单数量
-		async doneRes() {
-			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 3,
-        page_num: this.page_num,
-        page_size: this.page_size,
-      });
-			return res.total;
-		},
+      return res.total;
+    },
 
-		headerBackClick() {
-			uni.navigateBack({
-				delta: 1
-			});
-		},
-	},
+    headerBackClick() {
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+  },
 
   onLoad(options) {
     const meun = menuButtonInfo();
     this.top = meun.top;
     this.localHeight = meun.height;
+    this.communityId = JSON.parse(options.communityId);
   },
   onShow() {
     this.page_num = 1;
     this.list = [];
     this.init();
-		this.getTabsList();
+    this.getTabsList();
   },
   onReachBottom() {
     if (this.flag) {
diff --git a/packages/workOrderDashboard/myCommunity/index.vue b/packages/workOrderDashboard/myCommunity/index.vue
index 97105557..a478b6a3 100644
--- a/packages/workOrderDashboard/myCommunity/index.vue
+++ b/packages/workOrderDashboard/myCommunity/index.vue
@@ -3,7 +3,7 @@
 		<view class="empty" v-if="communityList.length == 0">
 			<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_newEmpty.png"
 				alt="" />
-			没有添加任何房产
+			暂无数据
 
 		</view>
 
@@ -15,8 +15,7 @@
 						<image :src="item.pic" mode="aspectFill"></image>
 					</div>
 					<div class="communityItem_left_msg">
-						<div class="communityItem_left_msg_tit">{{ item.name }}<span>（ {{ item.room_owner_list.length }}
-								）</span></div>
+						<div class="communityItem_left_msg_tit">{{ item.name }}</div>
 						<div class="communityItem_left_msg_msg">{{ item.addr }}</div>
 					</div>
 				</div>
@@ -57,17 +56,13 @@ export default {
 			NavgateTo("/packages/community/addCommunity/index")
 		},
 		async getList() {
-			await request(apiArr.commInfo, "POST", {
+			await request(apiArr.workCommunityList, "POST", {
 				user_id: uni.getStorageSync('userId'),
-				longitude: uni.getStorageSync('location').lng,
-				latitude: uni.getStorageSync('location').lat,
-				page_num: this.page_num,
-				page_size: this.page_size
 			}).then(res => {
 				res.rows.forEach(item => {
 					item.pic = item.pic.startsWith('http') ? item.pic : picUrl + item.pic
 				});
-				this.communityList = res.rows.filter(item => item.front_end_display !== 1)
+				this.communityList = res.rows
 			})
 		},
 		// toUpview(item) {
@@ -79,7 +74,6 @@ export default {
 			this.currentCommunity = e
 			uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name });
 			uni.setStorageSync('currentCommunityAddr',e.addr);
-			uni.setStorageSync("isShowNav", e.room_owner_list[0].type)
 			NavgateTo("1")
 		},
 	},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b16de2db..a0d7fa28 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1063,8 +1063,7 @@ export default {
     }
   },
   onShow() {
-    this.showNav = uni.getStorageSync("isShowNav") ?
-      (uni.getStorageSync("isShowNav") == 1 ? false : true) : false
+    this.showNav = uni.getStorageSync("is_worker")
     this.flag = false
     this.bottomPageNum = 1
     console.log('当前页面展示的城市信息', this.currentCity)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1728d9a3..c6467f27 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -78,6 +78,7 @@ export default {
 						uni.setStorageSync('is_deal', loginRes.is_deal);
 						uni.setStorageSync('is_dev', loginRes.is_dev);
 						uni.setStorageSync('is_shop', loginRes.is_shop);
+						uni.setStorageSync('is_worker', loginRes.is_worker);
 
 
 						// 获取用户信息
@@ -146,6 +147,7 @@ export default {
 				uni.removeStorageSync('is_deal');
 				uni.removeStorageSync('is_dev');
 				uni.removeStorageSync('is_shop');
+				uni.removeStorageSync('is_worker');
 				uni.removeStorageSync('shopId');
 				uni.removeStorageSync('order_dispatch_permission');
 				uni.removeStorageSync('work_order_permission');
@@ -194,6 +196,7 @@ export default {
 				uni.setStorageSync('is_deal', loginRes.is_deal);
 				uni.setStorageSync('is_dev', loginRes.is_dev);
 				uni.setStorageSync('is_shop', loginRes.is_shop);
+				uni.setStorageSync('is_worker', loginRes.is_worker);
 
 				// 获取用户信息
 				const loginInfoRes = await request(apiArr.loginInfo, 'POST', {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 98810d97..f34feac4 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -269,6 +269,7 @@ export default {
 			uni.removeStorageSync('is_deal');
 			uni.removeStorageSync('is_dev');
 			uni.removeStorageSync('is_shop');
+			uni.removeStorageSync('is_worker');
 			uni.removeStorageSync('shopId');
 			uni.removeStorageSync('order_dispatch_permission');
 			uni.removeStorageSync('work_order_permission');
@@ -295,6 +296,7 @@ export default {
 						uni.setStorageSync('is_deal', loginRes.is_deal);
 						uni.setStorageSync('is_dev', loginRes.is_dev);
 						uni.setStorageSync('is_shop', loginRes.is_shop);
+						uni.setStorageSync('is_worker', loginRes.is_worker);
 
 
 						// 获取用户信息