From e730cdbced1055d0e65b88145be6598be576ce37 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Mon, 3 Jul 2023 19:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=AC=E5=85=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E3=80=81=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82=E3=80=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=89=BE=E4=BA=BA=E3=80=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E6=89=BE=E4=BA=BA=E7=9A=84=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/commonDemand/addForm.vue | 10 +++++-----
 .../modules/communityService/commonDemand/index.vue   |  9 +++------
 .../modules/communityService/fuwuzhaoren/index.vue    |  4 ++--
 .../modules/communityService/policy/policyList.vue    | 11 +++++++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 46b5752fc..152fa7c3f 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -198,7 +198,7 @@
 
         <el-form-item label="指派服务" label-width="150px">
           <el-switch
-            v-model="formData.assignSwitch"
+            v-model="formData.assignFlag"
             @change="handelDisabledRules"
           >
           </el-switch>
@@ -210,7 +210,7 @@
           :class="{ 'form-item': source === 'visiual' }"
           label-width="150px"
           style="display: block"
-          v-if="formData.assignSwitch"
+          v-if="formData.assignFlag"
         >
           <input
             type="text"
@@ -618,7 +618,7 @@ export default {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
         serviceCategoryKey: "",
-        assignSwitch: false,
+        assignFlag: false,
         resiSearchTagId: "", //查找享受服务人员
         resiSearchTagName: "", //享受服务人员名称
         serviceName: "", //服务事项
@@ -1076,10 +1076,10 @@ export default {
       } else {
         this.formData.feedback = null;
       }
-      this.formData.resiSearchTagId = this.assignSwitch
+      this.formData.resiSearchTagId = this.assignFlag
         ? this.formData.resiSearchTagId
         : "";
-      this.formData.resiSearchTagName = this.assignSwitch
+      this.formData.resiSearchTagName = this.assignFlag
         ? this.formData.resiSearchTagName
         : "";
       console.log(this.formData);
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 0c18a0ebe..f6b983038 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -145,10 +145,7 @@
           @click="handleExport"
           type="primary"
           size="small"
-          class="diy-button--white el-button--default"
-        >
-          导出</el-button
-        >
+          class="diy-button--white el-button--default">导出</el-button>
           </div>
 
           <el-table :data="tableData"
@@ -744,7 +741,7 @@
 
       async handleExport () {
         //导出改接口-公共服务
-        // const url = "/gov/project/icEvent/export";
+        const url = "/governance/icServiceRecordV2/export";
         const { pageSize, pageNo, formData } = this;
         axios({
           url: window.SITE_CONFIG["apiURL"] + url,
@@ -761,7 +758,7 @@
               res.headers["content-disposition"].split(";")[1].split("=")[1]
             );
             console.log("filename", fileName);
-            let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+            let blob = new Blob([res.data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" });
             var url = window.URL.createObjectURL(blob);
             var aLink = document.createElement("a");
             aLink.style.display = "none";
diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index e31324f9f..96adf1b4f 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -733,7 +733,7 @@ export default {
 
     async handleExport () {
       //导出改接口-'服务找人'
-      const url = "/gov/project/icEvent/export";
+      const url = "/governance/icServiceRecordV2/searchExport";
       const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -750,7 +750,7 @@ export default {
             res.headers["content-disposition"].split(";")[1].split("=")[1]
           );
           console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          let blob = new Blob([res.data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" });
           var url = window.URL.createObjectURL(blob);
           var aLink = document.createElement("a");
           aLink.style.display = "none";
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index ec8937302..822b85b7a 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -140,6 +140,13 @@
           width="50"
         >
         </el-table-column>
+        <el-table-column
+          prop="policyCategoryName"
+          align="center"
+          min-width="150"
+          label="政策类型"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
         <el-table-column
           prop="title"
           align="center"
@@ -445,7 +452,7 @@ export default {
     },
     async handleChu() {
       //导出改接口-政策找人
-      // const url = "/governance/commonDemand/export";
+      const url = "/governance/policy/policyExport";
       const {pageSize, pageNo, formData} = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -462,7 +469,7 @@ export default {
                 res.headers["content-disposition"].split(";")[1].split("=")[1]
             );
             console.log("filename", fileName);
-            let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
+            let blob = new Blob([res.data], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"});
             var url = window.URL.createObjectURL(blob);
             var aLink = document.createElement("a");
             aLink.style.display = "none";