diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue index 9b78085..7900d43 100644 --- a/components/districtSelector/districtSelectorTow.vue +++ b/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); + }); }) }, } diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index ddaed78..c39e5ad 100644 --- a/components/task/taskItem.vue +++ b/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(''); } } diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue index e286574..4d10e5d 100644 --- a/subpkg/captain/captain.vue +++ b/subpkg/captain/captain.vue @@ -25,12 +25,15 @@ :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> --> + @click="navTo(`/subpkg/archives/archives?id=${item.id}&task_id=${task_id}`)"> 最后更新: {{item.informationg_update_time.split(' ')[0]}} - {{'管理户数: '+item.informationg_count+" 户"}}{{'管理户数: '+item.informationg_count+" 户"}} + {{'更新户数: '+item.informationg_update_count+" 户"}} @@ -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" diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index 1c24799..73a4d34 100644 --- a/subpkg/finance/finance.vue +++ b/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; + } }