From d9499cae4a410ff07025a861ea0d163234069dc5 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 13 Oct 2022 16:38:50 +0800 Subject: [PATCH 1/4] 31096 --- .../apps/AppHealthReport/components/Detail.vue | 12 ++++++++++++ .../apps/AppHomeReport/components/Detail.vue | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/project/pingchang/apps/AppHealthReport/components/Detail.vue b/project/pingchang/apps/AppHealthReport/components/Detail.vue index 325ffa2c..8bf945fd 100644 --- a/project/pingchang/apps/AppHealthReport/components/Detail.vue +++ b/project/pingchang/apps/AppHealthReport/components/Detail.vue @@ -56,6 +56,8 @@ + + @@ -92,6 +94,7 @@ isShow: false, currIndex: 0, isLoading: false, + riskDisposalInfo: {}, tableData: [], colConfigs1: [ {prop: 'createTime', label: '上报日期', align: 'center' }, @@ -133,6 +136,15 @@ this.instance.post(`/app/appepidemicpreventionhealthreportinfo/userDetailById?id=${id}`).then(res => { if (res.code === 0) { this.info = res.data + + console.log(res.data.handleLogs.filter(v => v.riskRelief)) + + if (res.data.handleLogs && res.data.handleLogs.length) { + this.riskDisposalInfo = res.data.handleLogs.filter(v => v.riskRelief).length ? res.data.handleLogs.filter(v => !v.riskRelief)[0] : {} + console.log(this.riskDisposalInfo) + + this.info.handleLogs = res.data.handleLogs.filter(v => !v.riskRelief) + } } this.isLoading = false diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue index 5d25e5a3..fa084093 100644 --- a/project/pingchang/apps/AppHomeReport/components/Detail.vue +++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue @@ -162,8 +162,6 @@ this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { this.info = res.data - this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : [] - this.info.travelTypeNames = res.data.travelType.split(',').map(v => { return this.dict.getLabel('EP_travelType', v) }).join('，') From 0a9ce488809f43218ec8b89dc5dbebfe52200b98 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 13 Oct 2022 17:10:33 +0800 Subject: [PATCH 2/4] 31090 --- .../AppHealthReport/components/Detail.vue | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/project/pingchang/apps/AppHealthReport/components/Detail.vue b/project/pingchang/apps/AppHealthReport/components/Detail.vue index 8bf945fd..1b5d7b68 100644 --- a/project/pingchang/apps/AppHealthReport/components/Detail.vue +++ b/project/pingchang/apps/AppHealthReport/components/Detail.vue @@ -41,6 +41,13 @@ + + + @@ -74,6 +81,52 @@ + + + + + {{ reportInfo.temperature }}℃ + + + {{ $dict.getLabel('epidemicTouchInFourteen', reportInfo.contactPatients) }} + + + {{ reportInfo.healthName }} + + + + + + {{ reportInfo.nucleicAcidDate && reportInfo.nucleicAcidDate.split(' ')[0] }} + + + {{ $dict.getLabel('EP_nucleicAcidResult', reportInfo.nucleicAcidResult) }} + + + {{ $dict.getLabel('EP_jkmType', reportInfo.jkmType) }} + + + {{ $dict.getLabel('EP_vaccinationCount', reportInfo.vaccinationCount) }} + + + + + + +
+ 关闭 +
+ @@ -95,6 +148,7 @@ currIndex: 0, isLoading: false, riskDisposalInfo: {}, + reportInfo: {}, tableData: [], colConfigs1: [ {prop: 'createTime', label: '上报日期', align: 'center' }, @@ -127,7 +181,9 @@ this.isLoading = true if (this.params && this.params.id) { this.id = this.params.id - this.getInfo(this.params.id) + this.dict.load(['EP_vaccinationCount', 'EP_jkmType', 'epidemicTouchInFourteen', 'EP_healthType']).then(() => { + this.getInfo(this.params.id) + }) } }, @@ -137,11 +193,8 @@ if (res.code === 0) { this.info = res.data - console.log(res.data.handleLogs.filter(v => v.riskRelief)) - if (res.data.handleLogs && res.data.handleLogs.length) { this.riskDisposalInfo = res.data.handleLogs.filter(v => v.riskRelief).length ? res.data.handleLogs.filter(v => !v.riskRelief)[0] : {} - console.log(this.riskDisposalInfo) this.info.handleLogs = res.data.handleLogs.filter(v => !v.riskRelief) } @@ -153,6 +206,37 @@ }) }, + toDetail (row) { + this.reportInfo = row + this.isShow = true + let healthName = '' + this.reportInfo.isHealth = false + row.health.split(',').forEach(v => { + if (v > 0) { + this.reportInfo.isHealth = true + } + healthName = healthName + this.dict.getLabel('EP_healthType', v) + }) + this.reportInfo.healthName = healthName + // this.instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => { + // if (res.code === 0) { + // this.reportInfo = res.data + // this.reportInfo.checkPhoto = JSON.parse(res.data.checkPhoto) + // let healthName = '' + // this.reportInfo.isHealth = false + // res.data.health.split(',').forEach(v => { + // if (v > 0) { + // this.reportInfo.isHealth = true + // } + // healthName = healthName + this.dict.getLabel('epidemicRecentHealth', v) + // }) + // this.reportInfo.healthName = healthName + + // this.isShow = true + // } + // }) + }, + cancel () { this.$emit('change', { type: 'List', From 1940a24a05330f2e7bdde9112ca63ec7b968b556 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 13 Oct 2022 17:10:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8D=A2=E5=B1=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/electionAdd.vue | 2 +- .../AppOrganizationChange.vue | 60 +++++ .../AppOrganizationChange/components/List.vue | 205 ++++++++++++++++++ .../components/addChange.vue | 0 .../components/history.vue | 0 .../components/moment.vue | 0 6 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue create mode 100644 project/pingchang/apps/AppOrganizationChange/components/List.vue create mode 100644 project/pingchang/apps/AppOrganizationChange/components/addChange.vue create mode 100644 project/pingchang/apps/AppOrganizationChange/components/history.vue create mode 100644 project/pingchang/apps/AppOrganizationChange/components/moment.vue diff --git a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue index 114bdbff..f0408cba 100644 --- a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue +++ b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue @@ -49,8 +49,8 @@ :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect"> diff --git a/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue new file mode 100644 index 00000000..0db2cedb --- /dev/null +++ b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue new file mode 100644 index 00000000..f07df0f6 --- /dev/null +++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/project/pingchang/apps/AppOrganizationChange/components/addChange.vue b/project/pingchang/apps/AppOrganizationChange/components/addChange.vue new file mode 100644 index 00000000..e69de29b diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue new file mode 100644 index 00000000..e69de29b diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue new file mode 100644 index 00000000..e69de29b From f9411b7278664a67fdf0543740d5eb7331841583 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 13 Oct 2022 17:57:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8D=A2=E5=B1=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppOrganizationChange.vue | 1 - .../AppOrganizationChange/components/List.vue | 52 +++++++------------ .../components/history.vue | 13 +++++ .../components/moment.vue | 13 +++++ 4 files changed, 45 insertions(+), 34 deletions(-) diff --git a/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue index 0db2cedb..f8b5b88b 100644 --- a/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue +++ b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue @@ -48,7 +48,6 @@ export default { created() { let {organizationId: id, organizationName: name} = this.user.info this.selected = {id, name} - // this.dict.load("portalUserStatus", "enterpriseStatus", "userEnterpriseStatus","enterpriseType") } } diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue index f07df0f6..cb6079d5 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/List.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue @@ -16,11 +16,11 @@ @@ -62,27 +62,13 @@ export default { orgName: '', loading: false, total: 0, - colConfigs: [ - {type: 'selection', label: ''}, - {prop: 'name', label: '姓名', align: 'center'}, - {prop: 'sex', label: '性别', align: 'center', dict: 'sex'}, - {prop: 'age', label: '年龄', align: 'center'}, - // { - // prop: 'auditStatus', label: '审核状态', align: 'center', - // render: (h, {row}) => h('span', {class: `audit-${row.auditStatus}`}, this.dict.getLabel('auditStatus', row.auditStatus)) - // }, - {prop: 'partyStatus', label: '党籍状态', align: 'center', dict: 'partyStatus'}, - {prop: 'joinPartyTime', label: '入党日期', align: 'center'}, - {prop: 'partyPosition', label: '党内职务', align: 'center', dict: 'partyPosition'}, - {prop: 'flowStatus', label: '流动状态', align: 'center', dict: 'flowStatus'}, - ], tableData: [], ids: '', tabs: [ {label: '当前届次', name: 'moment', comp: moment, permission: ''}, - {label: '历史届次', name: 'history', comp: history, permission: 'app_appgirdmemberapply_detail'} + {label: '历史届次', name: 'history', comp: history, permission: ''} ], - currIndex: 0 + currIndex: '0' } }, components: { @@ -94,20 +80,20 @@ export default { orgTree() { return this.$refs.tree?.$refs?.partyTree }, - exportQuery() { - let {id: partyOrgId} = this.selected - return { - ids: this.ids ? this.ids.split(',') : [], - ...this.search, partyOrgId - } - }, - isShowAddBtn() { - return this.selected.isLeaf == 1 - } + // exportQuery() { + // let {id: partyOrgId} = this.selected + // return { + // ids: this.ids ? this.ids.split(',') : [], + // ...this.search, partyOrgId + // } + // }, + // isShowAddBtn() { + // return this.selected.isLeaf == 1 + // } }, created() { - this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus') - this.getList() + // this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus') + // this.getList() }, methods: { showNeighbourSetting(id) { diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue index e69de29b..a109a175 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/history.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/history.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue index e69de29b..cf98bad6 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file