From 488730772f651f2304f726ede92899d5d198aef0 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sat, 6 Sep 2025 15:58:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FilterQueryModel/index.vue | 10 ++++++---- .../attendance-manage/attendance-count/config.js | 8 ++++---- .../contract-witness/config.js | 4 ++-- .../dataOverviewProject/components/item-four.vue | 3 +-- .../dataOverviewProject/components/item-two.vue | 5 +++++ .../components/person-list.vue | 16 ++++++++++++++++ .../components/personPresence/index.vue | 2 +- 7 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/components/FilterQueryModel/index.vue b/src/components/FilterQueryModel/index.vue index d55d2ae..dcb477a 100644 --- a/src/components/FilterQueryModel/index.vue +++ b/src/components/FilterQueryModel/index.vue @@ -453,14 +453,16 @@ export default { subComId: '', } - if (query.lightStatus == 3) { - this.$set(query, 'lightStatusSeven', 7) - } this.filterQueryList.forEach((item) => { query[item.queryKey] = item.value }) - console.log('query9966996---', query) + // if (query.lightStatus == 3) { + // this.$set(query, 'lightStatusSeven', 7) + // query.lightStatus = 1 + // } + + // console.log('query9966996---', query) // 传递给父组件使用 this.$emit('handelSettingQuery', query) diff --git a/src/views/construction-person/attendance-manage/attendance-count/config.js b/src/views/construction-person/attendance-manage/attendance-count/config.js index 06dccf7..8437a3b 100644 --- a/src/views/construction-person/attendance-manage/attendance-count/config.js +++ b/src/views/construction-person/attendance-manage/attendance-count/config.js @@ -69,14 +69,14 @@ export const projectDialogConfig = { // 分包班组弹框内列表所需要的字段 export const subTeamFormLabel = [ { - f_label: '姓名', - f_model: 'name', + f_label: '工程名称', + f_model: 'proName', f_type: 'ipt', isShow: false, // 是否展示label }, { - f_label: '人员身份证', - f_model: 'idNumber', + f_label: '分包名称', + f_model: 'subName', f_type: 'ipt', isShow: false, // 是否展示label }, diff --git a/src/views/construction-person/red-green-light-mange/contract-witness/config.js b/src/views/construction-person/red-green-light-mange/contract-witness/config.js index feb3b9f..2398fa7 100644 --- a/src/views/construction-person/red-green-light-mange/contract-witness/config.js +++ b/src/views/construction-person/red-green-light-mange/contract-witness/config.js @@ -46,7 +46,7 @@ export const formLabel = [ }, { f_label: '状态', - f_model: 'einStatus', + f_model: 'isSign', f_type: 'sel', f_width: '180px', isShow: false, // 是否展示label @@ -57,7 +57,7 @@ export const formLabel = [ }, { label: '未签订', - value: '2', + value: '0', }, ], // 状态列表 }, diff --git a/src/views/home-index/components/dataOverviewProject/components/item-four.vue b/src/views/home-index/components/dataOverviewProject/components/item-four.vue index eef3a2a..c42566f 100644 --- a/src/views/home-index/components/dataOverviewProject/components/item-four.vue +++ b/src/views/home-index/components/dataOverviewProject/components/item-four.vue @@ -288,9 +288,8 @@ export default { this.queryParams.sex = sex this.queryParams.isAtt = isAtt this.queryParams.postId = postId - console.log('lightStatus9966996--+++', lightStatus) + if (lightStatus == 3) { - console.log('lightStatus9966996', lightStatus) this.$set(this.queryParams, 'lightStatusSeven', 7) this.queryParams.lightStatus = 1 } diff --git a/src/views/home-index/components/dataOverviewProject/components/item-two.vue b/src/views/home-index/components/dataOverviewProject/components/item-two.vue index 0331d50..0cc3c01 100644 --- a/src/views/home-index/components/dataOverviewProject/components/item-two.vue +++ b/src/views/home-index/components/dataOverviewProject/components/item-two.vue @@ -476,6 +476,11 @@ export default { handelSettingQuery(query) { console.log('筛选条件', query) this.queryParams = query + + if (query.lightStatus == 3) { + this.$set(this.queryParams, 'lightStatusSeven', 7) + this.queryParams.lightStatus = 1 + } }, // 获取筛选条件 查询工程 diff --git a/src/views/home-index/components/dataOverviewProject/components/person-list.vue b/src/views/home-index/components/dataOverviewProject/components/person-list.vue index d57a6ce..6b3c1e7 100644 --- a/src/views/home-index/components/dataOverviewProject/components/person-list.vue +++ b/src/views/home-index/components/dataOverviewProject/components/person-list.vue @@ -223,6 +223,11 @@ export default { this.queryParams.sex = sex this.queryParams.isAtt = isAtt this.queryParams.postId = postId + + if (query.lightStatus == 3) { + this.$set(this.queryParams, 'lightStatusSeven', 7) + this.queryParams.lightStatus = 1 + } }, }, @@ -234,6 +239,17 @@ export default { }, deep: true, }, + + lightStatus: { + handler(newValue) { + if (newValue == 3) { + this.queryParams.lightStatus = 1 + this.$set(this.queryParams, 'lightStatusSeven', 7) + } + }, + deep: true, + immediate: true, + }, }, } diff --git a/src/views/home-index/components/personPresence/index.vue b/src/views/home-index/components/personPresence/index.vue index 5b3013b..1e386e3 100644 --- a/src/views/home-index/components/personPresence/index.vue +++ b/src/views/home-index/components/personPresence/index.vue @@ -216,7 +216,7 @@ export default { async getPersonPresence() { const { data: res } = await getPersonPresenceAPI({ - companyId: this.selectCompany, + subComId: this.selectCompany, }) const { feMailNum, mailNum, postMsg, greenNum, yellowNum } = res