更新功能

components/districtSelector/districtSelectorTow.vue

@@ -229,7 +229,10 @@
 				commonBrigade({
 					brigade: code
 				}).then(res => {
-					this.brigadeList = res.data;
+          let f_arr = this.$store.state.app.userInfo.company?.responsible_area?.split(',')||[];
+					this.brigadeList = res.data.filter(item=>{
+            return f_arr.find(t=>item.id==t);
+          });
 				})
 			},
 		}

components/task/taskItem.vue

@@ -127,7 +127,8 @@
 				}
 				if (this.$props.datas.type == 31) {
 					// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
-					this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`)
+					if(this.$store.state.app.userInfo.admin_id)this.navTo(`/subpkg/captain/captain?task_id=${this.$props.datas?.id}`);
+          else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`);
 				} else this.navTo('');
 			}
 		}

subpkg/captain/captain.vue

@@ -25,12 +25,15 @@
       :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
 		<view class="personnel_list">
 			<view class="card" v-for="(item, index) in list" :key="item.id"
-				@click="navTo('/subpkg/archives/archives?id='+item.id)">
+				@click="navTo(`/subpkg/archives/archives?id=${item.id}&task_id=${task_id}`)">
 				<view class="card_head">
 					<text style="font-size: 34rpx;">最后更新: {{item.informationg_update_time.split(' ')[0]}}</text>
-					<text>{{'管理户数: '+item.informationg_count+" 户"}}<u-icon
+					<text v-if="task_id<=0">{{'管理户数: '+item.informationg_count+" 户"}}<u-icon
 							style="display: inline-block;margin-left: 10rpx;" color="white"
 							name="arrow-right"></u-icon></text>
+          <text v-else>{{'更新户数: '+item.informationg_update_count+" 户"}}<u-icon
+          		style="display: inline-block;margin-left: 10rpx;" color="white"
+          		name="arrow-right"></u-icon></text>
 				</view>
 				<view class="card_content">
 					<view class="left">
@@ -138,9 +141,16 @@
 					nomoreText: '我也是有底线的~~',
 					status: 'loadmore'
 				},
+        task_id: -1
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+      if(options.task_id){
+        this.task_id = options.task_id;
+        uni.setNavigationBarTitle({
+          title:'任务:队长列表'
+        })
+      }
 			this.initLoad()
 		},
 		onShow() {},
@@ -164,12 +174,14 @@
 			async loadList() {
 				if (this.loadConfig.status == "nomore") return;
 				this.loadConfig.status = "loading";
-				let res = await companyUser({
+        let queryPramas = {
 					page: this.loadConfig.page,
 					limit: this.loadConfig.limit,
 					company_id: this.$store.state.app.userInfo.company_id,
-					is_captain: 1
-				})
+					is_captain: 1,
+				};
+        this.task_id>0?queryPramas.task_id=this.task_id:null;
+				let res = await companyUser(queryPramas)
 				this.loadConfig.status = "loadmore"
 				if (res.data.data.length < this.loadConfig.limit) {
 					this.loadConfig.status = "nomore"

subpkg/finance/finance.vue

@@ -299,8 +299,10 @@
 				// background-color: red;
 				display: flex;
 				justify-content: space-between;
-				width: 24vw;
 				line-height: 44px;
+        .name{
+          margin-left: 20rpx;
+        }
 			}