From c2ff939de206554ca4706619a9bedadecc6e00e1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 8 Jun 2023 15:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88/=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E6=A0=87=E7=AD=BE=E5=8E=BB=E9=99=A4=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?/=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82bug=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?/=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA/=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=9D=9E=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/commonDemand/addForm.vue | 11 +++--
 .../communityService/commonDemand/index.vue   |  5 +--
 .../modules/communityService/gxxq/addForm.vue | 22 ---------
 .../communityService/gxxq/detailForm.vue      |  4 +-
 .../modules/communityService/gxxq/index.vue   | 45 +++++++++++++++++++
 .../communityService/labelConfig/addForm.vue  |  6 +--
 6 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 6e86aba97..4f872a2f3 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -391,12 +391,15 @@
               :rows="3"
               v-model="feedbackFormData.serviceGoal"
             ></el-input>
-            <!-- <el-input
+           
+          </el-form-item>
+          <el-form-item label="详细位置" label-width="150px">
+             <el-input
               class="item_width_1"
               v-model="feedbackFormData.address"
-            ></el-input> -->
+            ></el-input>
           </el-form-item>
-          <!-- <el-form-item
+          <el-form-item
             label="地图位置"
             label-width="150px"
             :class="{ 'form-item': source === 'visiual' }"
@@ -422,7 +425,7 @@
                 </div>
               </div>
             </div>
-          </el-form-item> -->
+          </el-form-item>
 
           <!-- <el-form-item
             class="block"
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 17171b3e1..2a0137af8 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -230,11 +230,11 @@
                            size="small"
                            >编辑</el-button>
                            <!-- 临时去掉人员名单与反馈 -->
-                <!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
+                <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleFeedback(scope.row)"
                            type="text"
                            size="small"
-                           >反馈</el-button> -->
+                           >反馈</el-button>
                 <!-- <el-button v-if="scope.row.policyId"
                            @click="handlePersonList(scope.row)"
                            type="text"
@@ -622,7 +622,6 @@
 
       //加载组织数据
       async handleFeedback (row) {
-
         this.serviceRecordId = row.serviceRecordId
         this.serviceName = row.serviceName
         this.addDiaTitle = '服务反馈'
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index 0c8431830..0558cc899 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -94,7 +94,6 @@
           prop="resiSearchTagId"
           :class="{ 'form-item': source === 'visiual' }"
           label-width="150px"
-          :required="true"
           style="display: block"
         >
           <template v-if="formData.resiSearchTagName">
@@ -370,9 +369,6 @@ export default {
           { required: true, message: "服务名称不能为空", trigger: "bulr" },
         ],
 
-        resiSearchTagId: [
-          { required: true, message: "符合条件人员不能为空", trigger: "bulr" },
-        ],
         content: [
           { required: true, message: "详细说明不能为空", trigger: "bulr" },
           { max: 1000, message: "不能超出1000个字符", trigger: "blur" },
@@ -725,23 +721,6 @@ export default {
           arr.push(item);
         }
       });
-      //   选中的数据中有不是网格或者小区或者楼栋的就停止它
-   
-      // arr.forEach((item) => {
-      //   if (
-      //     item.objectType == "neighborhood" ||
-      //     item.objectType == "agency" ||
-      //     item.objectType == "grid"
-      //   ) {
-      //     isOk = true;
-      //   } else {
-      //     isOk = false
-      //     this.newArr = [];
-      //     this.newFormData.serviceScopeList = []
-      //     arr = []
-      //     this.$message.error("请选择正确的网格,社区,楼栋!");
-      //   }
-      // });
      for(let i in arr){
           if(arr[i].objectType == "neighborhood" ||
             arr[i].objectType == "agency" ||
@@ -749,7 +728,6 @@ export default {
             isOk = true;
           }else{
             isOk = false;
-            console.log( this.newArr,'没有清空?');
             this.$message.error("请选择正确的网格,社区,楼栋!");
             return
           }
diff --git a/src/views/modules/communityService/gxxq/detailForm.vue b/src/views/modules/communityService/gxxq/detailForm.vue
index 3ed3c1031..cf4efe681 100644
--- a/src/views/modules/communityService/gxxq/detailForm.vue
+++ b/src/views/modules/communityService/gxxq/detailForm.vue
@@ -24,7 +24,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-2">享受服务人员: </span>
-            <span>{{ resiSearchTagName }}</span>
+            <span>{{ resiSearchTagName}}</span>
           </div>
 
           <template v-if="formData.assignFlag == '1'">
@@ -183,7 +183,7 @@ export default {
         let showAddProduct = data.list.filter((item) => {
           return [this.formData.resiSearchTagId].includes(item.tagId);
         });
-        if (this.formData.resiSearchTagId) {
+        if (this.formData.resiSearchTagId &&showAddProduct[0]) {
           this.resiSearchTagName = showAddProduct[0].tagName;
         } else {
           this.resiSearchTagName = "--";
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 694d4cb69..fe7561fb2 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -130,6 +130,14 @@
         >
           添加需求</el-button
         >
+        <el-button
+          @click="handleChu"
+          type="primary"
+          size="small"
+          class="diy-button--white el-button--default"
+        >
+          导出</el-button
+        >
       </div>
       <el-table
         ref="gxxq_table"
@@ -270,6 +278,7 @@ import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 import addForm from "./addForm.vue";
 import detailForm from "./detailForm.vue";
+import axios from "axios";
 export default {
   data() {
     let endDisabledDate = (time) => {
@@ -394,6 +403,40 @@ export default {
       this.commonServiceTypeName = row.commonServiceTypeName;
       this.formEditShow = true;
     },
+    async handleChu() {
+      const url = "/governance/commonDemand/export";
+      const {pageSize, pageNo, formData} = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...formData,
+        },
+        responseType: "blob",
+      })
+          .then((res) => {
+            let fileName = window.decodeURI(
+                res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          })
+          .catch((err) => {
+            console.log("获取导出情失败", err);
+            return this.$message.error("网络错误");
+          });
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
@@ -549,5 +592,7 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 .div_btn {
   margin-bottom: 12px;
+  display: flex;
+  justify-content: space-between;
 }
 </style>
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 24d4694a3..297b2e215 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -112,7 +112,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="对应值" align="center" width="155">
+      <el-table-column label="对应值" align="center" >
         <template slot-scope="scope">
           <template v-for="item in scope.row.correspondingOpction">
             <el-select
@@ -199,7 +199,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="120">
+      <el-table-column fixed="right" label="操作" align="center" width="120" v-if="!infoType">
         <template slot-scope="scope">
           <!-- <img
             src="@/assets/img/icon-del.png"
@@ -212,7 +212,6 @@
             @click="handleClickAddRow"
             v-if="scope.$index == tableData.length - 1"
             size="small"
-            :disabled="infoType"
             icon="el-icon-plus"
             circle
           ></el-button>
@@ -222,7 +221,6 @@
             @click="handleClickDelete(scope.$index)"
             v-if="scope.$index != tableData.length - 1||(tableData.length - 1>=1&&scope.$index !='0' )"
             size="small"
-            :disabled="infoType"
             icon="el-icon-minus"
             circle
           > </el-button>