省满意度调查加省市区入参

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;

src/views/modules/satisfaction/satisfactionProvince/followDetail.vue

@@ -40,6 +40,15 @@
                 </div>
             </el-col>
         </el-row>
+        <el-row type="flex" justify="" class="f-top24">
+            <el-col :span="24" class="f-flex f-align_item"><span class="label">组织类型：</span>
+                <div class="f-flex1">
+                   <el-radio v-model="formData.orgCategoryCode" label="province" :disabled="disabled">省</el-radio>
+                   <el-radio v-model="formData.orgCategoryCode" label="city" :disabled="disabled">市</el-radio>
+                   <el-radio v-model="formData.orgCategoryCode" label="district" :disabled="disabled">区</el-radio>
+                </div>
+            </el-col>
+        </el-row>
         <el-row type="flex" justify="" class="f-top24">
             <el-col :span="24" class="f-flex f-align_item"><span class="label">完成时限：</span>
                 <div class="f-flex1">
@@ -83,7 +92,9 @@ export default {
             evaCulturalFacility: 'bad',
             formData:{
                 completeTime:'',
-                remark:''
+                remark:'',
+                orgCategoryCode:'',
+                completeFlag:""
             },
             disabled:false
         };

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: {
+        formObj: {
-            type: String,
+            type: Object,
-            default: ''
+            default: () => {}
         }
     },
     //监听

src/views/modules/satisfaction/satisfactionProvince/index.vue

@@ -29,6 +29,11 @@
                     <el-button type="primary" style="margin-left:10px" size="small"
                         class="diy-button--white el-button--default" @click="handleExportModule">下载模板</el-button>
                 </div>
+                <el-radio-group v-model="formData.orgCategoryCode" @change="handelChangeCategory" style="margin: 20px 0 0;">
+                    <el-radio-button label="province">省满意度调查</el-radio-button>
+                    <el-radio-button label="city">区满意度调查</el-radio-button>
+                    <el-radio-button label="district">市满意度调查</el-radio-button>
+                </el-radio-group>
                 <div class="m-table-item" :style="{ height: maxTableHeight + 'px', width: '100%' }">
                     <div id="myCharts"></div>
                 </div>
@@ -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">
             <form-list ref="ref_form_list" @handleClose="handleClose" :satisfactionCategoryStr="satisfactionCategoryStr"
-                :periodStart="formData.periodStart" @handelClickDetail="handelClickDetail"
+                :formObj="formData" @handelClickDetail="handelClickDetail"
                 @handelClickEdit="handelClickEdit"></form-list>
             <el-dialog width="820px" class="dialog-h" title="省满意度调查详情" :close-on-click-modal="false"
                 v-if="showProvinceFollowUpDetail" :visible.sync="showProvinceFollowUpDetail" append-to-body>
@@ -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) => {