From 0aef6326c462d6ce291b300764bcafaf73d0cb9c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Jul 2023 20:59:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug#342=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9F=A5=E7=9C=8B=E6=B7=BB=E5=8A=A0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/commonDemand/addForm.vue |   3 +-
 .../commonDemand/detailForm.vue               |  62 ++-
 .../commonDemand/editForm.vue                 | 403 ++++++------------
 3 files changed, 175 insertions(+), 293 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 518564ee6..d16b276bc 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -832,8 +832,7 @@ export default {
     },
     // 如果服务方有选择第一个的话让它更新一下
     handleChangeServiceTypeLevel2() {
-      console.log(this.formData.serviceTypeLevel1Id);
-      console.log(this.formData.serviceTypeLevel2Id);
+      console.log(this.formData.serviceOrgType);
       if (this.formData.serviceOrgType) {
         this.getServiceuserList(this.formData.serviceOrgType);
       } else {
diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
index 3c02e9559..de171c2df 100644
--- a/src/views/modules/communityService/commonDemand/detailForm.vue
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -17,7 +17,10 @@
               <span class="info-title-2">服务范围：</span>
               <span>{{ formData.gridIdListName || "--" }}</span>
             </div>
-
+            <div class="info-prop">
+              <span class="info-title-2">服务类别：</span>
+              <span>{{ serviceTypeLevel1IdText}}</span>
+            </div>
             <div class="info-prop">
               <span class="info-title-2">政策依据：</span>
               <span>{{ formData.policyTitle || "--" }}</span>
@@ -172,6 +175,8 @@
         showPersonList: false,
         ruleList: [],
         policyList: [],
+        serviceTypesLevel1:[],
+        serviceTypesLevel2:[]
       };
     },
     components: { fileList },
@@ -179,6 +184,8 @@
       await this.getPolicyList();
       // if (this.serviceRecordId) {//详情
       await this.loadInfo();
+      this.getserverType()
+      this.handleChangeServiceTypeLevel1()
       this.initLoading = true;
 
       if (
@@ -322,7 +329,42 @@
         this.resetData();
         this.$emit("diaDetailClose");
       },
-
+      getserverType() {
+      this.$http
+        .get("/governance/commonServiceType/selectList/0")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel1 = res.data;
+            console.log(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      // this.formData.serviceTypeLevel2Id = "";
+      console.log(this.formData);
+      let str = this.formData.serviceTypeLevel1Id
+      this.$http
+        .get(
+          "/governance/commonServiceType/selectList/" +
+          str
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
       // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
       initMap() {
         let { latitude, longitude } = this.feedbackFormData;
@@ -372,15 +414,13 @@
           ],
         };
       },
-      // resiSearchTagNameText(){
-      //   let text = ""
-      //   if(this.resiSearchTagName){
-      //     text = this.resiSearchTagName
-      //   }else {
-      //     text = '--'
-      //   }
-      //   return text
-      // },
+  
+      serviceTypeLevel1IdText() {
+          const item = this.serviceTypesLevel1.find(entry => entry.id === this.formData.serviceTypeLevel1Id);
+          const item2 = this.serviceTypesLevel2.find(entry => entry.id === this.formData.serviceTypeLevel2Id);
+          return item2 ? item.name +'-' + item2.name : '--'; // 返回对应的 label，如果找不到则返回空字符串
+        }
+
     },
     props: {
       serviceRecordId: {
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index a1e42694e..e0bb35c20 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -1,19 +1,8 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-        <el-form-item
-          label="服务名称"
-          prop="serviceName"
-          label-width="150px"
-          style="display: block"
-        >
+      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="div_form">
+        <el-form-item label="服务名称" prop="serviceName" label-width="150px" style="display: block">
           <span>{{ formData.serviceName }}</span>
           <!-- <el-select class="item_width_1"
                        v-model="formData.serviceProjectId"
@@ -28,12 +17,7 @@
               </el-option>
             </el-select> -->
         </el-form-item>
-        <el-form-item
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" style="display: block">
           <span>{{ serviceOrgName }}</span>
           <!-- <el-select class="item_width_1"
                        v-model="formData.serviceOrgId"
@@ -48,12 +32,7 @@
             </el-select> -->
         </el-form-item>
 
-        <el-form-item
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item label="服务范围" prop="gridIdList" label-width="150px" style="display: block">
           <div v-for="item in formData.gridIdList" :key="item.objectId">
             <div>{{ item.objectName }}</div>
           </div>
@@ -66,26 +45,23 @@
                          :show-all-levels="false"
                          @change="handleChangeScope"></el-cascader> -->
         </el-form-item>
-
-        <el-form-item
-          label="政策依据"
-          prop="policyId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            :disabled="formType === 'detail'"
-            v-model="formData.policyId"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in policyList"
-              :key="item.id"
-              :label="item.title"
-              :value="item.id"
-            >
+        <el-form-item label="服务类别" style="display: block" label-width="150px" prop="serviceTypeLevel2Id">
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel1Id" placeholder="请选择"
+            clearable @change="handleChangeServiceTypeLevel1">
+            <el-option v-for="item in serviceTypesLevel1" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+          -
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel2Id" placeholder="请选择"
+            clearable>
+            <el-option v-for="item in serviceTypesLevel2" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="政策依据" prop="policyId" label-width="150px" style="display: block">
+          <el-select :disabled="formType === 'detail'" v-model="formData.policyId" class="input-width-small"
+            placeholder="请选择" clearable>
+            <el-option v-for="item in policyList" :key="item.id" :label="item.title" :value="item.id">
             </el-option>
           </el-select>
           <!-- 
@@ -95,50 +71,23 @@
                        @click="handlePersonList">预览</el-button> -->
         </el-form-item>
 
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            placeholder="请输入经办人姓名"
-            v-model="formData.principalName"
-          >
+        <el-form-item label="经办人" prop="principalName" label-width="150px" style="display: block">
+          <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入经办人姓名"
+            v-model="formData.principalName">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            placeholder="请输入联系方式"
-            v-model="formData.principalContact"
-          >
+        <el-form-item label="联系方式" prop="principalContact" label-width="150px" style="display: block">
+          <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入联系方式"
+            v-model="formData.principalContact">
           </el-input>
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
           <el-switch v-model="formData.assignFlag"> </el-switch>
         </el-form-item>
 
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          label-width="150px"
-          style="display: block"
-          v-if="this.formData.assignFlag"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
+        <el-form-item label="查找享受服务人员" prop="resiSearchTagId" label-width="150px" style="display: block"
+          v-if="this.formData.assignFlag">
+          <input type="text" v-model="formData.resiSearchTagId" v-show="false" />
           <template v-if="this.resiSearchTagName">
             <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
               {{ this.resiSearchTagName }}
@@ -149,121 +98,44 @@
             <span> <i class="el-icon-plus"></i> 按标签查找 </span>
           </el-button>
         </el-form-item>
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          prop="serviceTimeStart"
-          style="display: block"
-        >
-          <el-date-picker
-            :disabled="formType === 'detail'"
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
+        <el-form-item label="服务时间" label-width="150px" prop="serviceTimeStart" style="display: block">
+          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeStart"
+            :picker-options="startPickerOptions" class="item_width_2" type="date" value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd" placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker
-            :disabled="formType === 'detail'"
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
+          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeEnd"
+            :picker-options="endPickerOptions" class="item_width_2 u-data-tag" type="date" value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd" placeholder="结束时间">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            type="textarea"
-            maxlength="500"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入服务内容，不超过500字"
-            v-model="formData.remark"
-          ></el-input>
+        <el-form-item label="服务内容" prop="remark" label-width="150px" style="display: block">
+          <el-input :disabled="formType === 'detail'" class="item_width_1" type="textarea" maxlength="500" show-word-limit
+            :rows="3" placeholder="请输入服务内容，不超过500字" v-model="formData.remark"></el-input>
         </el-form-item>
       </el-form>
 
       <div v-show="formData.serviceStatus === 'completed'">
         <h3 class="d-h3">反馈内容</h3>
 
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :disabled="true"
-          :model="feedbackFormData"
-          class="div_form"
-        >
-          <el-form-item
-            label="服务目标"
-            prop="serviceGoal"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务目标，不超过1000字"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
+        <el-form ref="ref_form_feedback" :inline="true" :disabled="true" :model="feedbackFormData" class="div_form">
+          <el-form-item label="服务目标" prop="serviceGoal" label-width="150px" style="display: block">
+            <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+              placeholder="请输入服务目标，不超过1000字" v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
-          <el-form-item
-            label="服务效果"
-            prop="serviceEffect"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务效果，不超过1000字"
-              v-model="feedbackFormData.serviceEffect"
-            ></el-input>
+          <el-form-item label="服务效果" prop="serviceEffect" label-width="150px" style="display: block">
+            <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+              placeholder="请输入服务效果，不超过1000字" v-model="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
-          <el-form-item
-            label="服务人数"
-            style="display: block"
-            prop="servicePeopleNumber"
-            label-width="150px"
-          >
-            <el-input-number
-              class="item_width_2"
-              v-model="feedbackFormData.servicePeopleNumber"
-              :min="0"
-              :max="9999"
-              label="服务人数"
-            ></el-input-number>
+          <el-form-item label="服务人数" style="display: block" prop="servicePeopleNumber" label-width="150px">
+            <el-input-number class="item_width_2" v-model="feedbackFormData.servicePeopleNumber" :min="0" :max="9999"
+              label="服务人数"></el-input-number>
           </el-form-item>
 
-          <el-form-item
-            label="服务状态"
-            label-width="150px"
-            style="display: block"
-            prop="serviceStatus"
-          >
+          <el-form-item label="服务状态" label-width="150px" style="display: block" prop="serviceStatus">
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                          v-model="feedbackFormData.serviceStatus"
@@ -276,37 +148,14 @@
                 </el-option>
               </el-select> -->
           </el-form-item>
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="满意度" style="display: block" label-width="150px" prop="satisfaction">
+            <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
+              <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="地址"
-            prop="address"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              v-model="feedbackFormData.address"
-            ></el-input>
+          <el-form-item label="地址" prop="address" label-width="150px" style="display: block">
+            <el-input class="item_width_1" v-model="feedbackFormData.address"></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -333,12 +182,7 @@
               </div>
             </el-form-item> -->
 
-          <el-form-item
-            class="block"
-            label="附件"
-            label-width="150px"
-            prop="attach"
-          >
+          <el-form-item class="block" label="附件" label-width="150px" prop="attach">
             <!-- <el-upload :headers="$getElUploadHeaders()"  v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
                          class="upload-demo"
                          :on-preview="handleFileDownload"
@@ -347,19 +191,10 @@
                          :file-list="fileList">
 
               </el-upload> -->
-            <div
-              v-if="
-                feedbackFormData.fileList &&
-                feedbackFormData.fileList.length > 0
-              "
-              class="attachement-list"
-            >
-              <a
-                :href="att.url"
-                target="_blank"
-                :key="att.url"
-                v-for="att in feedbackFormData.fileList"
-              >
+            <div v-if="feedbackFormData.fileList &&
+              feedbackFormData.fileList.length > 0
+              " class="attachement-list">
+              <a :href="att.url" target="_blank" :key="att.url" v-for="att in feedbackFormData.fileList">
                 <i class="el-icon-folder-opened"></i>
                 {{ att.name }}
               </a>
@@ -372,56 +207,22 @@
 
     <div class="div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        v-if="formType != 'detail'"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+      <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+        定</el-button>
     </div>
 
-    <el-dialog
-      v-if="showPersonList"
-      :visible.sync="showPersonList"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签查找'"
-      width="1150px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showPersonList = false"
-    >
-      <person-list
-        ref="ref_detail_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @handleOk="handleOk"
-        @handleClose="handleClose"
-      >
+    <el-dialog v-if="showPersonList" :visible.sync="showPersonList" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'标签查找'" width="1150px" top="5vh" class="dialog-h"
+      @closed="showPersonList = false">
+      <person-list ref="ref_detail_form" :policyId="policyId" :ruleList="ruleList" @handleOk="handleOk"
+        @handleClose="handleClose">
       </person-list>
     </el-dialog>
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="900px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
+    <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'标签配置'" width="900px" top="5vh" class="dialog-h"
+      @closed="showLabelForm = false">
+      <label-form ref="ref_label_form" :policyId="policyId" :ruleList="ruleList" @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk">
         <!--    @handleOk="handleOk"
         @handleClose="handleClose" -->
       </label-form>
@@ -429,7 +230,7 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
@@ -485,8 +286,10 @@ export default {
         latitude: "", //	维度
         address: "",
         fileList: [], //	附件列表
+        serviceTypeLevel1Id: '',
+        serviceTypeLevel2Id: ''
+
       },
-      serviceList: [], //服务list
 
       endPickerOptions: {
         disabledDate: endDisabledDate,
@@ -502,14 +305,20 @@ export default {
       policyId: "",
       showPersonList: false,
       ruleList: [],
+
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: [],
     };
   },
   components: { labelForm },
-  mounted() {
+  async mounted() {
     this.getPolicyList();
+    this.getserverType()
+
     if (this.serviceRecordId) {
       //详情
-      this.loadInfo();
+      await this.loadInfo();
+      this.handleChangeServiceTypeLevel1()
     }
     // this.initMap()
   },
@@ -567,16 +376,49 @@ export default {
         this.$message.error(msg);
       }
     },
+    getserverType() {
+      this.$http
+        .get("/governance/commonServiceType/selectList/0")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel1 = res.data;
+            console.log(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      // this.formData.serviceTypeLevel2Id = "";
+      console.log(this.formData);
+      let str = this.formData.serviceTypeLevel1Id
+      this.$http
+        .get(
+          "/governance/commonServiceType/selectList/" +
+          str
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
     //加载组织
     async loadInfo() {
       const url = "/governance/icServiceRecordV2/detail";
-
       let params = {
         serviceRecordId: this.serviceRecordId,
       };
-
       const { data, code, msg } = await requestPost(url, params);
-
       if (code === 0) {
         this.formData = { ...data };
         this.formData.serviceRecordId = this.serviceRecordId;
@@ -874,10 +716,11 @@ export default {
 </script>
 
 
-  <style lang="scss" scoped >
+<style lang="scss" scoped >
 @import "@/assets/scss/modules/management/form-main.scss";
 
 .attachement-list {
+
   // padding-left: 20px;
   a {
     display: block;

From 07072581b878befda2a3a8b41a9ee5d150650b84 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Jul 2023 21:00:14 +0800
Subject: [PATCH 2/4] 1

---
 .../communityService/commonDemand/addForm.vue | 387 ++--------
 .../commonDemand/detailForm.vue               | 689 +++++++++---------
 2 files changed, 415 insertions(+), 661 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index d16b276bc..e6c2664dc 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -1,160 +1,57 @@
 <template>
   <div>
-    <div
-      class="dialog-h-content scroll-h"
-      :class="{ 'visiual-form': source === 'visiual' }"
-    >
-      <el-form
-        v-if="formType === 'add'"
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
+    <div class="dialog-h-content scroll-h" :class="{ 'visiual-form': source === 'visiual' }">
+      <el-form v-if="formType === 'add'" ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
+        class="div_form">
         <!-- 服务类别 -->
-        <el-form-item
-          label="服务类别"
-          style="display: block"
-          label-width="150px"
-          prop="serviceTypeLevel2Id"
-        >
-          <el-select
-            class="u-item-width-communitycascader"
-            v-model="formData.serviceTypeLevel1Id"
-            placeholder="请选择"
-            clearable
-            @change="handleChangeServiceTypeLevel1"
-          >
-            <el-option
-              v-for="item in serviceTypesLevel1"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
+        <el-form-item label="服务类别" style="display: block" label-width="150px" prop="serviceTypeLevel2Id">
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel1Id" placeholder="请选择"
+            clearable @change="handleChangeServiceTypeLevel1">
+            <el-option v-for="item in serviceTypesLevel1" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
           -
-          <el-select
-            class="u-item-width-communitycascader"
-            v-model="formData.serviceTypeLevel2Id"
-            placeholder="请选择"
-            @change="handleChangeServiceTypeLevel2"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceTypesLevel2"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel2Id" placeholder="请选择"
+            @change="handleChangeServiceTypeLevel2" clearable>
+            <el-option v-for="item in serviceTypesLevel2" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="服务事项"
-          prop="serviceName"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入服务事项"
-            v-model="formData.serviceName"
-          >
+        <el-form-item label="服务事项" prop="serviceName" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-input class="item_width_1" placeholder="请输入服务事项" v-model="formData.serviceName">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="服务内容"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入服务内容，不超过1000字"
-            v-model="formData.remark"
-          ></el-input>
+        <el-form-item label="服务内容" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+            placeholder="请输入服务内容，不超过1000字" v-model="formData.remark"></el-input>
         </el-form-item>
 
-        <el-form-item
-          label="服务范围"
-          prop="objList"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-cascader
-            class="item_width_1"
-            ref="myCascader"
-            v-model="scopeIdArray"
-            collapse-tags
-            :key="iscascaderShow"
-            :options="casOptions"
-            :props="optionProps"
-            :show-all-levels="false"
-            @change="handleChangeScope"
-          ></el-cascader>
+        <el-form-item label="服务范围" prop="objList" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-cascader class="item_width_1" ref="myCascader" v-model="scopeIdArray" collapse-tags :key="iscascaderShow"
+            :options="casOptions" :props="optionProps" :show-all-levels="false" @change="handleChangeScope"></el-cascader>
         </el-form-item>
 
-        <el-form-item
-          label="服务时间"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          prop="serviceTimeStart"
-        >
-          <el-date-picker
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
+        <el-form-item label="服务时间" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          prop="serviceTimeStart">
+          <el-date-picker v-model="formData.serviceTimeStart" :picker-options="startPickerOptions" class="item_width_2"
+            style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker
-            v-model="formData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            style="width: 220px"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
+          <el-date-picker v-model="formData.serviceTimeEnd" :picker-options="endPickerOptions"
+            class="item_width_2 u-data-tag" style="width: 220px" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd" placeholder="结束时间">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="政策依据"
-          prop="policyId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.policyId"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in policyList"
-              :key="item.id"
-              :label="item.title"
-              :value="item.id"
-            >
+        <el-form-item label="政策依据" prop="policyId" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-select v-model="formData.policyId" class="input-width-small" placeholder="请选择" clearable>
+            <el-option v-for="item in policyList" :key="item.id" :label="item.title" :value="item.id">
             </el-option>
           </el-select>
 
@@ -167,56 +64,25 @@
           > -->
         </el-form-item>
 
-        <el-form-item
-          label="经办人"
-          prop="principalName"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人姓名"
-            v-model="formData.principalName"
-          >
+        <el-form-item label="经办人" prop="principalName" :class="{ 'form-item': source === 'visiual' }" label-width="150px"
+          style="display: block">
+          <el-input class="item_width_1" placeholder="请输入联系人姓名" v-model="formData.principalName">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="联系方式"
-          prop="principalContact"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入联系人电话"
-            v-model="formData.principalContact"
-          >
+        <el-form-item label="联系方式" prop="principalContact" :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px" style="display: block">
+          <el-input class="item_width_1" placeholder="请输入联系人电话" v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch
-            v-model="formData.assignFlag"
-            @change="handelDisabledRules"
-          >
+          <el-switch v-model="formData.assignFlag" @change="handelDisabledRules">
           </el-switch>
         </el-form-item>
 
-        <el-form-item
-          label="查找享受服务人员"
-          prop="resiSearchTagId"
-          :class="{ 'form-item': source === 'visiual' }"
-          label-width="150px"
-          style="display: block"
-          v-if="formData.assignFlag"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
+        <el-form-item label="查找享受服务人员" prop="resiSearchTagId" :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px" style="display: block" v-if="formData.assignFlag">
+          <input type="text" v-model="formData.resiSearchTagId" v-show="false" />
           <template v-if="formData.resiSearchTagName">
             <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
               {{ formData.resiSearchTagName }}
@@ -228,70 +94,30 @@
           </el-button>
         </el-form-item>
 
-        <el-form-item
-          label="服务方"
-          prop="serviceOrgId"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.serviceOrgType"
-            class="input-width-small"
-            placeholder="请选择"
-            clearable
-            @change="handleServiceChange('add', $event)"
-          >
-            <el-option
-              v-for="item in serviceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="服务方" prop="serviceOrgId" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-select v-model="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
+            @change="handleServiceChange('add', $event)">
+            <el-option v-for="item in serviceOptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
           -
-          <el-select
-            v-model="formData.serviceOrgId"
-            class="input-width-middle"
-            filterable
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in serviceOptiondList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
+          <el-select v-model="formData.serviceOrgId" class="input-width-middle" filterable placeholder="请选择" clearable>
+            <el-option v-for="item in serviceOptiondList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="直接反馈"
-          prop="remark"
-          label-width="150px"
-          :class="{ 'form-item': source === 'visiual' }"
-          style="display: block"
-        >
-          <el-checkbox
-            :label="'是'"
-            v-model="showFeedback"
-            @change="handleChangeFeedback"
-          ></el-checkbox>
+        <el-form-item label="直接反馈" prop="remark" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+          style="display: block">
+          <el-checkbox :label="'是'" v-model="showFeedback" @change="handleChangeFeedback"></el-checkbox>
         </el-form-item>
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->
 
-        <el-form
-          ref="ref_form_feedback"
-          :inline="true"
-          :model="feedbackFormData"
-          :rules="feedbackDataRule"
-          class="div_form"
-        >
+        <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
+          class="div_form">
           <!-- <el-form-item
             label="服务目标"
             prop="serviceGoal"
@@ -363,43 +189,17 @@
                 </el-option>
               </el-select> -->
           <!-- </el-form-item> -->
-          <el-form-item
-            label="满意度"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="满意度" style="display: block" label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
+            <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
+              <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
+          <el-form-item label="备注" prop="serviceGoal" :class="{ 'form-item': source === 'visiual' }" label-width="150px"
+            style="display: block">
+            <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
+              v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
           <!-- <el-form-item label="详细位置" label-width="150px">
              <el-input
@@ -468,55 +268,21 @@
 
     <div class="div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+      <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
     </div>
 
-    <el-dialog
-      v-if="showPersonList"
-      :visible.sync="showPersonList"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'政策预览'"
-      width="1150px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showPersonList = false"
-    >
-      <person-list
-        ref="ref_detail_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @handleOk="handleOk"
-        @handleClose="handleClose"
-      >
+    <el-dialog v-if="showPersonList" :visible.sync="showPersonList" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'政策预览'" width="1150px" top="5vh" class="dialog-h"
+      @closed="showPersonList = false">
+      <person-list ref="ref_detail_form" :policyId="policyId" :ruleList="ruleList" @handleOk="handleOk"
+        @handleClose="handleClose">
       </person-list>
     </el-dialog>
-    <el-dialog
-      v-if="showLabelForm"
-      :visible.sync="showLabelForm"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="900px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
+    <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'标签配置'" width="900px" top="5vh" class="dialog-h"
+      @closed="showLabelForm = false">
+      <label-form ref="ref_label_form" :policyId="policyId" :ruleList="ruleList" @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk">
         <!--    @handleOk="handleOk"
         @handleClose="handleClose" -->
       </label-form>
@@ -524,7 +290,7 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -817,7 +583,7 @@ export default {
       this.$http
         .get(
           "/governance/commonServiceType/selectList/" +
-            this.formData.serviceTypeLevel1Id
+          this.formData.serviceTypeLevel1Id
         )
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -1333,13 +1099,14 @@ export default {
 };
 </script>
 
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 
 .form-item::v-deep .el-form-item__label {
   color: #fff;
 }
+
 .form-item {
   .el-radio {
     color: #fff;
diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
index de171c2df..fea3436d5 100644
--- a/src/views/modules/communityService/commonDemand/detailForm.vue
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -1,30 +1,30 @@
 <template>
-    <div>
-      <div class="dialog-h-content scroll-h">
-        <div v-if="initLoading" class="m-row">
-          <div class="m-info">
-            <div class="info-prop">
-              <span class="info-title-2">服务名称：</span>
-              <span>{{ formData.serviceName || "--" }}</span>
-            </div>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading" class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">服务名称：</span>
+            <span>{{ formData.serviceName || "--" }}</span>
+          </div>
 
-            <div class="info-prop">
-              <span class="info-title-2">服务组织：</span>
-              <span>{{ serviceOrgName || "--" }}</span>
-            </div>
+          <div class="info-prop">
+            <span class="info-title-2">服务组织：</span>
+            <span>{{ serviceOrgName || "--" }}</span>
+          </div>
 
-            <div class="info-prop">
-              <span class="info-title-2">服务范围：</span>
-              <span>{{ formData.gridIdListName || "--" }}</span>
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">服务类别：</span>
-              <span>{{ serviceTypeLevel1IdText}}</span>
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">政策依据：</span>
-              <span>{{ formData.policyTitle || "--" }}</span>
-              <!-- <el-button
+          <div class="info-prop">
+            <span class="info-title-2">服务范围：</span>
+            <span>{{ formData.gridIdListName || "--" }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">服务类别：</span>
+            <span>{{ serviceTypeLevel1IdText }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">政策依据：</span>
+            <span>{{ formData.policyTitle || "--" }}</span>
+            <!-- <el-button
                 v-if="formData.policyId"
                 style="margin-left: 10px"
                 type="primary"
@@ -32,69 +32,68 @@
                 @click="handlePersonList"
                 >预览</el-button
               > -->
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">经办人：</span>
-              <span>{{ formData.principalName || "--" }}</span>
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">联系方式：</span>
-              <span>{{ formData.principalContact || "--" }}</span>
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">服务时间：</span>
-              <span>{{ formData.serviceTimeStart || "--" }}</span
-              >至
-              <span>{{ formData.serviceTimeEnd || "--" }}</span>
-            </div>
-            <div class="info-prop">
-              <span class="info-title-2">享受服务人员: </span>
-              <span>{{ resiSearchTagName }}</span>
-            </div>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">经办人：</span>
+            <span>{{ formData.principalName || "--" }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">联系方式：</span>
+            <span>{{ formData.principalContact || "--" }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">服务时间：</span>
+            <span>{{ formData.serviceTimeStart || "--" }}</span>至
+            <span>{{ formData.serviceTimeEnd || "--" }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">享受服务人员: </span>
+            <span>{{ resiSearchTagName }}</span>
+          </div>
 
-            <div class="info-prop">
-              <span class="info-title-2">服务内容：</span>
-              <span>{{ formData.remark || "--" }}</span>
-            </div>
+          <div class="info-prop">
+            <span class="info-title-2">服务内容：</span>
+            <span>{{ formData.remark || "--" }}</span>
+          </div>
 
-            <div v-show="formData.serviceStatus === 'completed'">
-              <h3 class="d-h3">反馈内容</h3>
+          <div v-show="formData.serviceStatus === 'completed'">
+            <h3 class="d-h3">反馈内容</h3>
 
-              <div class="info-prop">
-                <span class="info-title-2">备注：</span>
-                <span>{{ feedbackFormData.serviceGoal || "--" }}</span>
-              </div>
-              <!-- <div class="info-prop">
+            <div class="info-prop">
+              <span class="info-title-2">备注：</span>
+              <span>{{ feedbackFormData.serviceGoal || "--" }}</span>
+            </div>
+            <!-- <div class="info-prop">
                 <span class="info-title-2">服务效果：</span>
                 <span>{{ feedbackFormData.serviceEffect || "--" }}</span>
               </div> -->
-              <!-- <div class="info-prop">
+            <!-- <div class="info-prop">
                 <span class="info-title-2">服务人数：</span>
                 <span>{{ feedbackFormData.servicePeopleNumber || 0 }}</span>
               </div> -->
 
-              <div class="info-prop">
-                <span class="info-title-2">服务状态：</span>
-                <span>{{ feedbackFormData.serviceStatusShow || "--" }}</span>
-              </div>
-              <div class="info-prop">
-                <span class="info-title-2">满意度：</span>
-                <span>{{ feedbackFormData.satisfactionShow || "--" }}</span>
-              </div>
+            <div class="info-prop">
+              <span class="info-title-2">服务状态：</span>
+              <span>{{ feedbackFormData.serviceStatusShow || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">满意度：</span>
+              <span>{{ feedbackFormData.satisfactionShow || "--" }}</span>
+            </div>
 
-              <!-- <div class="info-prop">
+            <!-- <div class="info-prop">
                 <span class="info-title-2">地理位置：</span>
                 <span>{{ feedbackFormData.address || "--" }}</span>
               </div> -->
 
-              <!-- <div class="info-prop">
+            <!-- <div class="info-prop">
                 <span class="info-title-2">地图位置：</span>
                 <div class="div_map">
                   <div id="app_detail"></div>
                 </div>
               </div> -->
 
-              <!-- <div class="info-prop">
+            <!-- <div class="info-prop">
                 <span class="info-title-2">附件：</span>
                 <file-list
                   v-if="fileList.length > 0"
@@ -102,234 +101,220 @@
                 ></file-list>
                 <span v-else>--</span>
               </div> -->
-            </div>
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="div-btn">
-      </div>
-      <el-row type="flex" justify="right">
-          <el-col :span="24"  align="right">
-           <el-button size="small" @click="handleCancle" style="margin-right:16px;">关 闭</el-button>
-          </el-col>
-      </el-row>
-      <el-dialog
-        v-if="showPersonList"
-        :visible.sync="showPersonList"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :title="'政策预览'"
-        width="1150px"
-        top="5vh"
-        class="dialog-h"
-        @closed="showPersonList = false"
-      >
-        <person-list
-          ref="ref_detail_form"
-          :policyId="policyId"
-          :ruleList="ruleList"
-          @handleOk="handleOk"
-          @handleClose="handleClose"
-        >
-        </person-list>
-      </el-dialog>
+    <div class="div-btn">
     </div>
-  </template>
+    <el-row type="flex" justify="right">
+      <el-col :span="24" align="right">
+        <el-button size="small" @click="handleCancle" style="margin-right:16px;">关 闭</el-button>
+      </el-col>
+    </el-row>
+    <el-dialog v-if="showPersonList" :visible.sync="showPersonList" :append-to-body="true" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'政策预览'" width="1150px" top="5vh" class="dialog-h"
+      @closed="showPersonList = false">
+      <person-list ref="ref_detail_form" :policyId="policyId" :ruleList="ruleList" @handleOk="handleOk"
+        @handleClose="handleClose">
+      </person-list>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+// import personList from "../policy/oldPersonList.vue";
+import fileList from "@/views/components/fileList";
+import daiMap from "@/utils/dai-map";
+
+var map;
+let loading; // 加载动画
+
+export default {
+  data() {
+    return {
+      initLoading: false,
+
+      keyWords: "",
+      formData: {},
+      resiSearchTagName: "",
+      feedbackFormData: {
+        serviceProjectId: "", //	服务项目id
+        serviceName: "",
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
+      },
 
-  <script>
-  import { mapGetters } from "vuex";
-  import { Loading } from "element-ui"; // 引入Loading服务
-  import { requestPost } from "@/js/dai/request";
-  // import personList from "../policy/oldPersonList.vue";
-  import fileList from "@/views/components/fileList";
-  import daiMap from "@/utils/dai-map";
+      policyId: "",
+      showPersonList: false,
+      ruleList: [],
+      policyList: [],
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: []
+    };
+  },
+  components: { fileList },
+  async mounted() {
+    await this.getPolicyList();
+    // if (this.serviceRecordId) {//详情
+    await this.loadInfo();
+    this.getserverType()
+    this.handleChangeServiceTypeLevel1()
+    this.initLoading = true;
+
+    if (
+      this.formData.serviceStatus === "completed" &&
+      this.feedbackFormData.latitude
+    ) {
+      this.$nextTick(() => {
+        this.initMap();
+      });
+    }
+  },
+
+  methods: {
+    diaDestroy() { },
+
+    //加载组织数据
+    async handlePersonList() {
+      if (!this.formData.policyId) {
+        this.$message.info("请先选择政策");
+        return false;
+      }
 
-  var map;
-  let loading; // 加载动画
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
-  export default {
-    data() {
-      return {
-        initLoading: false,
-
-        keyWords: "",
-        formData: {},
-        resiSearchTagName:"",
-        feedbackFormData: {
-          serviceProjectId: "", //	服务项目id
-          serviceName: "",
-          serviceGoal: "", //	服务目标
-          serviceEffect: "", //	服务效果
-          servicePeopleNumber: null, //	服务人数
-          serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
-          satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
-          longitude: "", //	经度
-          latitude: "", //	维度
-          address: "",
-          fileList: [], //	附件列表
-        },
-
-        policyId: "",
-        showPersonList: false,
-        ruleList: [],
-        policyList: [],
-        serviceTypesLevel1:[],
-        serviceTypesLevel2:[]
-      };
-    },
-    components: { fileList },
-    async mounted() {
-      await this.getPolicyList();
-      // if (this.serviceRecordId) {//详情
-      await this.loadInfo();
-      this.getserverType()
-      this.handleChangeServiceTypeLevel1()
-      this.initLoading = true;
-
-      if (
-        this.formData.serviceStatus === "completed" &&
-        this.feedbackFormData.latitude
-      ) {
-        this.$nextTick(() => {
-          this.initMap();
-        });
-      }
+      this.showPersonList = true;
     },
 
-    methods: {
-      diaDestroy() {},
+    async loadRuleList() {
+      const url = "/governance/policy/rulelist/" + this.policyId;
 
-      //加载组织数据
-      async handlePersonList() {
-        if (!this.formData.policyId) {
-          this.$message.info("请先选择政策");
-          return false;
-        }
+      let params = {};
 
-        this.policyId = this.formData.policyId;
-        await this.loadRuleList();
+      const { data, code, msg } = await requestPost(url, params);
 
-        this.showPersonList = true;
-      },
-
-      async loadRuleList() {
-        const url = "/governance/policy/rulelist/" + this.policyId;
+      if (code === 0) {
+        this.ruleList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
 
-        let params = {};
+    handleClose() {
+      this.showPersonList = false;
+    },
 
-        const { data, code, msg } = await requestPost(url, params);
+    async getPolicyList() {
+      const url = "/governance/policy/policyList";
 
-        if (code === 0) {
-          this.ruleList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
+      let params = {};
 
-      handleClose() {
-        this.showPersonList = false;
-      },
+      const { data, code, msg } = await requestPost(url, params);
 
-      async getPolicyList() {
-        const url = "/governance/policy/policyList";
+      if (code === 0) {
+        this.policyList = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //加载组织
+    async loadInfo() {
+      const url = "/governance/icServiceRecordV2/detail";
 
-        let params = {};
+      let params = {
+        serviceRecordId: this.serviceRecordId,
+      };
 
-        const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.formData = { ...data };
+        this.formData.serviceRecordId = this.serviceRecordId;
+        this.feedbackFormData = { ...data.feedback };
+        this.formData.policyName = "";
+        this.formData.gridIdListName = "";
+        this.feedbackFormData.serviceStatusShow = "";
+        this.feedbackFormData.satisfactionShow = "";
+        await this.getTagName()
+        let arr = [];
+        this.formData.gridIdList.forEach((element) => {
+          arr.push(element.objectName);
+        });
+        this.formData.gridIdListName = arr.join(",");
+        this.statusArray.forEach((element) => {
+          if (this.formData.serviceStatus === element.value) {
+            this.feedbackFormData.serviceStatusShow = element.label;
+          }
+        });
+        this.satisfyArray.forEach((element) => {
+          if (this.feedbackFormData.satisfaction === element.value) {
+            this.feedbackFormData.satisfactionShow = element.label;
+          }
+        });
+        this.policyList.forEach((element) => {
+          if (this.formData.id === element.id) {
+            this.formData.policyName = element.title;
+          }
+        });
 
-        if (code === 0) {
-          this.policyList = data.list;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      //加载组织
-      async loadInfo() {
-        const url = "/governance/icServiceRecordV2/detail";
-
-        let params = {
-          serviceRecordId: this.serviceRecordId,
-        };
-
-        const { data, code, msg } = await requestPost(url, params);
-
-        if (code === 0) {
-          this.formData = { ...data };
-          this.formData.serviceRecordId = this.serviceRecordId;
-          this.feedbackFormData = { ...data.feedback };
-          this.formData.policyName = "";
-          this.formData.gridIdListName = "";
-          this.feedbackFormData.serviceStatusShow = "";
-          this.feedbackFormData.satisfactionShow = "";
-          await this.getTagName()
-          let arr = [];
-          this.formData.gridIdList.forEach((element) => {
-            arr.push(element.objectName);
-          });
-          this.formData.gridIdListName = arr.join(",");
-          this.statusArray.forEach((element) => {
-            if (this.formData.serviceStatus === element.value) {
-              this.feedbackFormData.serviceStatusShow = element.label;
-            }
-          });
-          this.satisfyArray.forEach((element) => {
-            if (this.feedbackFormData.satisfaction === element.value) {
-              this.feedbackFormData.satisfactionShow = element.label;
-            }
+        this.fileList = [];
+        if (
+          data.feedback &&
+          data.feedback.fileList &&
+          data.feedback.fileList.length > 0
+        ) {
+          data.feedback.fileList.forEach((element) => {
+            let obj = {
+              name: element.name,
+              format: element.format,
+              url: element.url,
+              type: element.type,
+            };
+            this.fileList.push(obj);
           });
-          this.policyList.forEach((element) => {
-            if (this.formData.id === element.id) {
-              this.formData.policyName = element.title;
-            }
-          });
-
-          this.fileList = [];
-          if (
-            data.feedback &&
-            data.feedback.fileList &&
-            data.feedback.fileList.length > 0
-          ) {
-            data.feedback.fileList.forEach((element) => {
-              let obj = {
-                name: element.name,
-                format: element.format,
-                url: element.url,
-                type: element.type,
-              };
-              this.fileList.push(obj);
-            });
-          }
-        } else {
-          this.$message.error(msg);
         }
-      },
-      async getTagName() {
-        const url = "/governance/resiSearchTag/listResiSearchTags";
-        let params = {
-          pageSize: 99,
-        };
-        let { data, msg, code } = await requestPost(url, params);
-        if (code == 0) {
-          let showAddProduct = data.list.filter(item=>{
-             return [this.formData.resiSearchTagId].includes(item.tagId)
-            })
-          if(this.formData.resiSearchTagId){
-            this.resiSearchTagName = showAddProduct[0].tagName
-          }else{
-           this.resiSearchTagName = '--'
-          }
-         
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getTagName() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageSize: 99,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      if (code == 0) {
+        let showAddProduct = data.list.filter(item => {
+          return [this.formData.resiSearchTagId].includes(item.tagId)
+        })
+        if (this.formData.resiSearchTagId) {
+          this.resiSearchTagName = showAddProduct[0].tagName
         } else {
-          this.$message.error(msg);
+          this.resiSearchTagName = '--'
         }
-      },
-      handleCancle() {
-        this.resetData();
-        this.$emit("diaDetailClose");
-      },
-      getserverType() {
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    handleCancle() {
+      this.resetData();
+      this.$emit("diaDetailClose");
+    },
+    getserverType() {
       this.$http
         .get("/governance/commonServiceType/selectList/0")
         .then(({ data: res }) => {
@@ -365,95 +350,97 @@
           return this.$message.error("网络错误");
         });
     },
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap() {
-        let { latitude, longitude } = this.feedbackFormData;
-
-        map = new daiMap(
-          document.getElementById("app_detail"),
-          { latitude, longitude },
-          {
-            zoom: 16.2, // 设置地图缩放级别
-            pitch: 43.5, // 设置俯仰角
-            rotation: 45, // 设置地图旋转角度
-          }
-        );
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      let { latitude, longitude } = this.feedbackFormData;
+
+      map = new daiMap(
+        document.getElementById("app_detail"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
-        map.setCenter(latitude, longitude);
-        map.setMarker(latitude, longitude);
-      },
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
+    },
 
-      handleOk() {
-        this.showPersonList = false;
-      },
+    handleOk() {
+      this.showPersonList = false;
+    },
 
-      resetData() {
-        this.formData = {};
-      },
-      // 开启加载动画
-      startLoading() {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: "正在加载……", // 加载中需要显示的文字
-          background: "rgba(0,0,0,.7)", // 背景颜色
-        });
-      },
-      // 结束加载动画
-      endLoading() {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close();
-        }
-      },
+    resetData() {
+      this.formData = {};
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {
+    dataRule() {
+      return {
+        serviceTimeStart: [
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
+        ],
+      };
     },
-    computed: {
-      dataRule() {
-        return {
-          serviceTimeStart: [
-            { required: true, message: "服务时间不能为空", trigger: "blur" },
-          ],
-        };
-      },
-  
-      serviceTypeLevel1IdText() {
-          const item = this.serviceTypesLevel1.find(entry => entry.id === this.formData.serviceTypeLevel1Id);
-          const item2 = this.serviceTypesLevel2.find(entry => entry.id === this.formData.serviceTypeLevel2Id);
-          return item2 ? item.name +'-' + item2.name : '--'; // 返回对应的 label，如果找不到则返回空字符串
-        }
 
+    serviceTypeLevel1IdText() {
+      const item = this.serviceTypesLevel1.find(entry => entry.id === this.formData.serviceTypeLevel1Id);
+      const item2 = this.serviceTypesLevel2.find(entry => entry.id === this.formData.serviceTypeLevel2Id);
+      return item2 ? item.name + '-' + item2.name : '--'; // 返回对应的 label，如果找不到则返回空字符串
+    }
+
+  },
+  props: {
+    serviceRecordId: {
+      type: String,
+      required: true,
+    },
+    serviceOrgName: {
+      type: String,
+      required: true,
     },
-    props: {
-      serviceRecordId: {
-        type: String,
-        required: true,
-      },
-      serviceOrgName: {
-        type: String,
-        required: true,
-      },
 
-      satisfyArray: {
-        type: Array,
-        default() {
-          return [];
-        },
+    satisfyArray: {
+      type: Array,
+      default() {
+        return [];
       },
-      statusArray: {
-        type: Array,
-        default() {
-          return [];
-        },
+    },
+    statusArray: {
+      type: Array,
+      default() {
+        return [];
       },
     },
-  };
-  </script>
-
-  <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/detail-main.scss";
-  .info-prop{
-    margin-top: 29px;
-  }
-  .scroll-h{
-    padding: 0 90px !important;
-  }
-  </style>
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.info-prop {
+  margin-top: 29px;
+}
+
+.scroll-h {
+  padding: 0 90px !important;
+}
+</style>

From 7f7c8d30878fcdd8c545e208806a05c4913869e7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 18 Jul 2023 09:07:33 +0800
Subject: [PATCH 3/4] bug

---
 .../modules/communityService/commonDemand/detailForm.vue     | 5 +++--
 src/views/modules/communityService/commonDemand/index.vue    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
index fea3436d5..8dbfa231f 100644
--- a/src/views/modules/communityService/commonDemand/detailForm.vue
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -169,7 +169,6 @@ export default {
     await this.getPolicyList();
     // if (this.serviceRecordId) {//详情
     await this.loadInfo();
-    this.getserverType()
     this.handleChangeServiceTypeLevel1()
     this.initLoading = true;
 
@@ -182,7 +181,9 @@ export default {
       });
     }
   },
-
+  created(){
+    this.getserverType()
+  },
   methods: {
     diaDestroy() { },
 
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 6541f57f2..42348fc1b 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -171,7 +171,7 @@
             <el-table-column prop="serviceTypeName"
                             align="center"
                             min-width="150"
-                            label="服务类型"
+                            label="服务类别"
                             :show-overflow-tooltip="true">
 
             </el-table-column>

From bd4da68f9f67af36ae46f75e1eaf8c52a9e24c57 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 18 Jul 2023 10:05:55 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug#383=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?,=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 .../scss/modules/management/detail-main.scss  |  6 ++---
 .../scss/modules/management/edit-main.scss    |  2 ++
 .../modules/base/community/buildForm.vue      | 10 ++++++--
 .../modules/base/community/buildTable.vue     |  3 +++
 .../modules/base/community/community.vue      |  3 +++
 .../modules/base/community/communityForm.vue  | 11 ++++-----
 .../modules/base/community/communityTable.vue |  4 ++++
 .../modules/base/community/roomDetail.vue     | 23 ++++++++++---------
 .../modules/base/community/roomTable.vue      |  4 ++++
 10 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 26f72c928..fa8c1ec7e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -155,7 +155,7 @@ export default {
     position: relative;
     max-height: 83vh;
     box-sizing: border-box;
-    padding: 0 0 16px !important;
+    padding: 0 0 16px ;
     .dialog-h-content {
       max-height: calc(83vh - 80px);
       box-sizing: border-box;
diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index cf7cc4fd6..9da31f665 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -104,11 +104,11 @@
 
 
 .m-detail-btn{
-  margin-top:30px;
-  margin-right:16px;
-  // margin-bottom:20px;
   display: flex;
   justify-content: flex-end;
+  padding-right: 16px;
+  height: 50px;
+  align-items: center;
 
   .item_btn {
     font-size: 14px;
diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index ad12366ec..79904ea6c 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -43,6 +43,8 @@
   display: flex;
   justify-content: flex-end;
   padding-right: 16px;
+  height: 50px;
+  align-items: center;
 }
 //取消按钮
 ::v-deep .el-button--default {
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index e0f733997..ee695991a 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -163,10 +163,16 @@ export default {
         this.dataForm.longitude = longitude
       }
       this.$nextTick(() => {
-        this.initMap(this.dataForm.latitude||latitude, this.dataForm.longitude||longitude);
+        const latitudeParam = this.dataForm.latitude !== undefined && this.dataForm.latitude != 0
+        ? this.dataForm.latitude
+        : latitude;
+        const longitudeParam = this.dataForm.longitude !== undefined && this.dataForm.longitude != 0
+        ? this.dataForm.longitude
+        : longitude;
+        this.initMap(latitudeParam, longitudeParam);
+
       })
     },
-
     async handleComfirm() {
       this.btnDisable = true
       setTimeout(() => {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 2d511101a..b038502e5 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -991,4 +991,7 @@ export default {
   padding-left: 0px;
   padding-right: 0px;
 }
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index da2f0835e..3d68a2f7f 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1113,4 +1113,7 @@ export default {
   // flex: 1;
   width: calc(100% - 300px);
 }
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index d8eee2ba3..63e963450 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -279,12 +279,12 @@ export default {
         this.dataForm.latitude = latitude
         this.dataForm.longitude = longitude
       }
-      if (!map) {
+      // if (!map) {
         this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-      } else {
-        map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-        map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-      }
+      // } else {
+      //   map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+      //   map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+      // }
       await this.loadAgency()
       await this.loadGrid()
       await this.loadProperty()
@@ -294,7 +294,6 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap (latitude, longitude) {
-
       map = new daiMap(
         document.getElementById("app_community"),
         { latitude, longitude },
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 5b798401a..2f7661ee0 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1372,4 +1372,8 @@ export default {
 .el-message.is-closable .el-message__content {
 	line-height: 20px;
 }
+
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index a6b8bcada..dac59ed75 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -42,11 +42,11 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-80">联系电话：</span>
             <span class="info-mingan">{{
-              dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--"
+              dataForm.ownerPhone ? dataForm.ownerPhone : "--"
             }}</span>
-            <img v-show="showFlagMobileBtn &&dataForm.showOwnerPhone"  src="../../../../assets/img/yanjing1.png" alt=""  style="margin-left: 10px">
+            <img v-show="showFlagMobileBtn &&dataForm.ownerPhone"  src="../../../../assets/img/yanjing1.png" alt=""  style="margin-left: 10px">
             <img v-show="!showFlagMobileBtn" src="../../../../assets/img/yanjing2.png" alt=""  style="margin-left: 10px">
-            <el-button v-if="view_real_data && dataForm.showOwnerPhone"
+            <el-button v-if="view_real_data && dataForm.ownerPhone"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
@@ -55,11 +55,11 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-80">证件号：</span>
             <span class="info-mingan">{{
-              dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--"
+              dataForm.ownerIdCard ? dataForm.ownerIdCard : "--"
             }}</span>
-             <img v-show="showFlagIdCardBtn &&dataForm.showOwnerIdCard" src="../../../../assets/img/yanjing1.png" alt="" width="14px"  style="margin-left: 10px">
+             <img v-show="showFlagIdCardBtn &&dataForm.ownerIdCard" src="../../../../assets/img/yanjing1.png" alt="" width="14px"  style="margin-left: 10px">
                 <img v-show="!showFlagIdCardBtn" src="../../../../assets/img/yanjing2.png" alt="" width="14px"  style="margin-left: 10px">
-            <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
+            <el-button v-if="view_real_data && dataForm.ownerIdCard"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
@@ -161,23 +161,24 @@ export default {
     },
 
     async handleTuomin (type) {
-      const url = `/actual/base/communityHouse/getHouseInfoById/${this.houseId}`;
+      const url = `/actual/base/communityHouse/getClearHouseDeatilById/${this.houseId}`;
 
       const { data, code, msg } = await requestPost(url);
 
       if (code === 0) {
+        console.log(data);
         if (type === "phone") {
-          this.$set(this.dataForm, "showOwnerPhone", data.showOwnerPhone);
+          this.$set(this.dataForm, "ownerPhone", data.ownerPhone);
           this.showFlagMobileBtn = !this.showFlagMobileBtn
           if(this.showFlagMobileBtn){
-              this.$set(this.dataForm, 'showOwnerPhone', data.showOwnerPhone.substr(0,3) +'****'+ data.showOwnerPhone.substr(7,4) )
+              this.$set(this.dataForm, 'ownerPhone', data.ownerPhone.substr(0,3) +'****'+ data.ownerPhone.substr(7,4) )
             }
         }
         if (type === "idcard") {
-          this.$set(this.dataForm, "showOwnerIdCard", data.showOwnerIdCard);
+          this.$set(this.dataForm, "ownerIdCard", data.ownerIdCard);
           this.showFlagIdCardBtn = !this.showFlagIdCardBtn
           if(this.showFlagIdCardBtn){
-              this.$set(this.dataForm, 'showOwnerIdCard', data.showOwnerIdCard.substr(0,11) +'****'+ data.showOwnerIdCard.substr(16,2) )
+              this.$set(this.dataForm, 'ownerIdCard', data.ownerIdCard.substr(0,11) +'****'+ data.ownerIdCard.substr(16,2) )
             }
         }
       } else {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 42ec69417..8791bdff9 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1080,4 +1080,8 @@ export default {
   padding-left: 0px;
   padding-right: 0px;
 }
+
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>