From 0c0feba58be8ac32d4cb6cff99b5bdecd177eac7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 18 Oct 2023 10:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E5=8A=A0=E7=9C=81=E5=B8=82=E5=8C=BA=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../residentManagement/oldPeople/oldPeople.vue | 4 ++-- .../satisfactionProvince/followDetail.vue | 13 ++++++++++++- .../satisfactionProvince/formList.vue | 10 ++++++---- .../satisfaction/satisfactionProvince/index.vue | 15 +++++++++++---- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue index 87ad4b8a0..ebb4c294d 100644 --- a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue +++ b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue @@ -585,7 +585,7 @@ await this.$http .post("/actual/base/importExcelData/extractExcelHead", formData) .then((res) => { - const { metaListData, fileCode, msg } = res.data.data; + const { fileCode, msg } = res.data.data; this.dataList = {"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","所属房屋":"所属房屋","本地户籍":"本地户籍","居民姓名":"居民姓名","联系电话":"联系电话","国籍":"国籍","证件类型":"证件类型","证件号":"证件号","民族":"民族","备注":"备注","退休金额":"退休金额","月收入":"月收入","残疾类别":"残疾类别","残疾等级":"残疾等级","残疾证号":"残疾证号","残疾说明":"残疾说明","监护人":"监护人","技能特长":"技能特长","劳动能力":"劳动能力","非义务教育阶段助学":"非义务教育阶段助学","所患大病":"所患大病","大病患病时间":"大病患病时间","所患慢性病":"所患慢性病","慢病患病时间":"慢病患病时间","是否参保":"是否参保","自付金额":"自付金额","救助金额":"救助金额","救助时间":"救助时间","享受救助明细序号":"享受救助明细序号","与户主关系":"与户主关系","居住情况":"居住情况","婚姻状况":"婚姻状况","配偶情况":"配偶情况","该居民有无赡养人":"该居民有无赡养人","该居民与赡养人关系":"该居民与赡养人关系","赡养人联系电话":"赡养人联系电话","高龄补助":"高龄补助"}; this.importCode = fileCode; this.handleComfirmUpload() @@ -594,7 +594,7 @@ console.log("失败", err); file.onError(); //上传失败的文件会从文件列表中删除 // this.$message.error('导入失败') - });// + }); }, async handleComfirmUpload () { this.importLoading = true; diff --git a/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue b/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue index a2be1699c..4b3b9f052 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/followDetail.vue @@ -40,6 +40,15 @@ + + 组织类型： +
+ 省 + 市 + 区 +
+ + 完成时限：
@@ -83,7 +92,9 @@ export default { evaCulturalFacility: 'bad', formData:{ completeTime:'', - remark:'' + remark:'', + orgCategoryCode:'', + completeFlag:"" }, disabled:false }; diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue index 5c07e2295..4cb06e463 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue @@ -71,6 +71,7 @@ export default { agencyId: "", orgIdPath: "", gridId: "", + orgCategoryCode:"" }, pageNo: 0, pageSize: 20, @@ -97,7 +98,8 @@ export default { async mounted() { if (this.satisfactionCategoryStr) { this.formData.scopeId = this.satisfactionCategoryStr - this.formData.periodStart = this.periodStart + this.formData.periodStart = this.formObj.periodStart + this.formData.orgCategoryCode = this.formObj.orgCategoryCode } await this.loadAgency(); await this.getDicts() @@ -217,9 +219,9 @@ export default { type: String, default: '' }, - periodStart: { - type: String, - default: '' + formObj: { + type: Object, + default: () => {} } }, //监听 diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 845f3f6e8..c703863eb 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -29,6 +29,11 @@ 下载模板
+ + 省满意度调查 + 区满意度调查 + 市满意度调查 +
@@ -38,7 +43,7 @@ :close-on-press-escape="false" title="省满意度调查列表" :modal-append-to-body="false" width="820px" top="5vh" class="dialog-h" @closed="showFormList = false"> @@ -66,6 +71,7 @@ export default { showFormList: false, formData: { periodStart: "", + orgCategoryCode:"province" }, multiSelection: [], // 多选结果 @@ -192,9 +198,6 @@ export default { this.myChart.setOption(this.option) let than = this this.myChart.on('click', function (params) { - // console.log(params.name); // 柱子对应的类目名 - // console.log(params.data); // 柱子的数据 - // console.log(params.seriesName); // 对应的系列名称 than.handelClickChart(params.name) }); @@ -223,6 +226,9 @@ export default { this.showProvinceFollowUpDetail = true this.detailObj = row || {} }, + handelChangeCategory(){ + this.getTableData() + }, handleComfirm(form) { this.showProvinceFollowUpDetail = false this.save(form) @@ -337,6 +343,7 @@ export default { }); const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 formData.append("file", file.file); //添加文件对象 + formData.append("orgCategory",than.formData.orgCategoryCode); //添加文件对象 await this.$http .post(`/governance/provinceEvaluationRecord/importDataByExcel`, formData) .then((res) => {