diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 4c7803184..252ee6529 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -647,6 +647,7 @@ export default { } }, async handleDownQr (row, type) { + let title = row.label + '二维码.png' // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}` const url = '/gov/org/agency/create-qrcode' const _id = type == 'community' ? row.id : row.neighborHoodId @@ -661,10 +662,10 @@ export default { responseType: 'blob' }).then(res => { console.log('res----1r', res) - if (res.headers["content-disposition"]) { - let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) - console.log('filename', fileName) - this.download(res.data, fileName) //释放掉blob对象 + if (res.data) { + // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + // console.log('filename', fileName) + this.download(res.data, title) //释放掉blob对象 } else this.$message.error('下载失败') // this.download(res.data, '1.png') }) diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue index 9be0bccf6..9980607b0 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue @@ -43,12 +43,12 @@ v-model="formData1.idCard"> - @@ -475,12 +475,12 @@ ref="ref_form2" label-width="90px" :rules="dataRule1"> - @@ -1378,6 +1378,10 @@ export default { type: Boolean, default: false }, + reasonTitle: { + type: String, + default: '关注原因' + }, }, }; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue index 08ae1690e..81c0cafbb 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue @@ -49,12 +49,12 @@ v-model="formData.idCard"> --> - @@ -272,7 +272,7 @@
- 关注原因: + {{reasonTitle}}: {{ formData.reason||'--' }}
@@ -574,6 +574,10 @@ export default { type: Boolean, default: false }, + reasonTitle: { + type: String, + default: '关注原因' + }, }, }; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 72d6abd1c..db5c57903 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -34,13 +34,13 @@ placeholder="请输入身份证号或护照号"> - + :placeholder="'请输入'+reasonTitle"> @@ -408,6 +409,7 @@ :fromSource="'focusGroupSpecialAttentionQuarantine'" :view_real_data="btnAuths.focus_groups_view_real_data" :isPanshi="isPanshi" + :reasonTitle="reasonTitle" @dialogCancle="diaClose" @dialogOk="addFormOk"> @@ -480,6 +482,7 @@ export default { tableLoading: false, customerId: '', isPanshi: false, + reasonTitle: '关注原因', selection: [], @@ -557,8 +560,10 @@ export default { //磐石街道:1580460084738760705 this.customerId = localStorage.getItem("customerId"); this.isPanshi = true + this.reasonTitle = '关注原因' if (this.customerId === '1580460084738760705') { this.isPanshi = true + this.reasonTitle = '隔离原因' } console.log('customerId', this.customerId) this.updateBtnAuths(); diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue index 8fb618fde..32d97869a 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue @@ -34,13 +34,13 @@ placeholder="请输入身份证号或护照号"> - + :placeholder="'请输入'+reasonTitle"> @@ -426,6 +427,7 @@ export default { tableLoading: false, customerId: '', isPanshi: false, + reasonTitle: '关注原因', selection: [], @@ -500,8 +502,10 @@ export default { //磐石街道:1580460084738760705 this.customerId = localStorage.getItem("customerId"); this.isPanshi = true + this.reasonTitle = '关注原因' if (this.customerId === '1580460084738760705') { this.isPanshi = true + this.reasonTitle = '隔离原因' } this.updateBtnAuths();