From 82ca8fb4542c0645e45115e1d83286fedd6059c8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 4 Aug 2022 16:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/addForm.vue     | 1528 +++++++++--------
 src/views/modules/visual/command/cpts/map.vue |    7 +
 .../modules/visual/command/cpts/popup.vue     |   76 +-
 .../visual/command/cpts/serviceInfo.vue       |   45 +-
 src/views/modules/visual/command/index.vue    |   19 +-
 5 files changed, 896 insertions(+), 779 deletions(-)

diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 2dc0956d8..d3243c35c 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -1,256 +1,304 @@
 <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">
-        <el-form-item label="服务分类"
-                      prop="serviceName"
-                      label-width="150px"
-                      :class="{'form-item':source==='visiual'}"
-                      style="display: block">
-
-          <el-select v-model="formData.serviceCategoryKey"
-                     class="item_width_1"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in categrayArray"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+    <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="服务分类"
+          prop="serviceName"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceCategoryKey"
+            class="item_width_1"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in categrayOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </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="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.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model="formData.serviceOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
-
         </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"
-                       :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"
+            :key="iscascaderShow"
+            :options="casOptions"
+            :props="optionProps"
+            :show-all-levels="false"
+            @change="handleChangeScope"
+          ></el-cascader>
         </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.policyId"
-                       :label="item.title"
-                       :value="item.policyId">
+        <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.policyId"
+              :label="item.title"
+              :value="item.policyId"
+            >
             </el-option>
-
           </el-select>
 
-          <el-button style="margin-left: 10px"
-                     type="primary"
-                     size="small"
-                     @click="handlePersonList">预览</el-button>
-
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @click="handlePersonList"
+            >预览</el-button
+          >
         </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"
-                      :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="data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
-                          :picker-options="endPickerOptions"
-                          class="item_width_2 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 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="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="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">
+      <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-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"
-                      placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
-
+        <el-form
+          ref="ref_form_feedback"
+          :inline="true"
+          :model="feedbackFormData"
+          :rules="feedbackDataRule"
+          class="div_form"
+        >
+          <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"
+              placeholder="请输入服务目标，不超过1000字"
+              v-model="feedbackFormData.serviceGoal"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务效果"
-                        prop="serviceEffect"
-                        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="feedbackFormData.serviceEffect"></el-input>
-
+          <el-form-item
+            label="服务效果"
+            prop="serviceEffect"
+            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="feedbackFormData.serviceEffect"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        :class="{'form-item':source==='visiual'}"
-                        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"
+            :class="{ 'form-item': source === 'visiual' }"
+            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="服务状态"
-                        style="display: block"
-                        label-width="150px"
-                        :class="{'form-item':source==='visiual'}"
-                        prop="serviceStatus">
+          <el-form-item
+            label="服务状态"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="serviceStatus"
+          >
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
@@ -262,80 +310,94 @@
                          :value="item.value">
               </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="address"
-                        :class="{'form-item':source==='visiual'}"
-                        label-width="150px"
-                        style="display: block">
-
-            <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
-
+          <el-form-item
+            label="地址"
+            prop="address"
+            :class="{ 'form-item': source === 'visiual' }"
+            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"
-                        :class="{'form-item':source==='visiual'}"
-                        style="display: block">
-            <div style="width:500px">
-
+          <el-form-item
+            label="地图位置"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
+            <div style="width: 500px">
               <div class="div_map">
-                <div id="map_app">
-
-                </div>
+                <div id="map_app"></div>
                 <div class="div_searchmap">
-                  <el-input maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
+                  <el-input
+                    maxlength="50"
+                    size="mini"
+                    placeholder="请输入关键字"
+                    v-model="keyWords"
+                  >
                   </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
+                  <el-button
+                    style="margin-left: 10px"
+                    type="primary"
+                    size="mini"
+                    @click="handleSearchMap"
+                    >查询</el-button
+                  >
                 </div>
               </div>
-
             </div>
           </el-form-item>
 
-          <el-form-item class="block"
-                        label="附件"
-                        :class="{'form-item':source==='visiual'}"
-                        label-width="150px"
-                        prop="attach">
-            <el-upload class="upload-demo"
-                       :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                       :on-success="handleFileSuccess"
-                       :on-remove="handleFileRemove"
-                       :limit="3"
-                       :before-upload="beforeUpload"
-                       :file-list="fileList">
-              <el-button size="small"
-                         :disabled="fileList.length===3"
-                         type="primary">点击上传</el-button>
-              <div slot="tip"
-                   class="el-upload__tip">支持图片、word、pdf</div>
+          <el-form-item
+            class="block"
+            label="附件"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            prop="attach"
+          >
+            <el-upload
+              class="upload-demo"
+              :action="uploadUlr"
+              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+              :on-success="handleFileSuccess"
+              :on-remove="handleFileRemove"
+              :limit="3"
+              :before-upload="beforeUpload"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                :disabled="fileList.length === 3"
+                type="primary"
+                >点击上传</el-button
+              >
+              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -343,64 +405,112 @@
     </div>
 
     <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" @click="handleCancle">取 消</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>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 import personList from "../policy/personList";
+import nextTick from "dai-js/tools/nextTick";
 
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
 
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
+  props: {
+    defaultData: {
+      type: Object,
+      default: null,
+    },
+    serviceRecordId: {
+      type: String,
+      required: "",
+    },
+    serviceCategoryKey: {
+      type: String,
+      required: "",
+    },
+    serviceProjectName: {
+      //服务项目名称
+      type: String,
+      required: false,
+      default: "",
+    },
+    formType: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+      type: String,
+      required: "",
+    },
+    categrayArray: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: "manage",
+    },
+  },
+
+  data() {
+    let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
       if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart)
-        return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
+        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+        return (
+          time.getTime() > nowData ||
+          time.getTime() < serviceTimeStart ||
+          time.getTime() === serviceTimeStart
+        );
       } else {
-        return time.getTime() > nowData
+        return time.getTime() > nowData;
       }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
+    };
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      return time.getTime() > nowData;
+    };
 
     return {
       btnDisable: false,
@@ -410,46 +520,45 @@ export default {
 
       optionProps: {
         multiple: true,
-        value: 'objectId',
-        label: 'objectName',
-        children: 'children',
-        checkStrictly: true
+        value: "objectId",
+        label: "objectName",
+        children: "children",
+        checkStrictly: true,
+        emitPath: false,
       },
 
-      keyWords: '',
+      keyWords: "",
       formData: {
-        serviceCategoryKey: '',
-        serviceName: '',//服务名称	
-        serviceOrgType: '',//服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit	
-        serviceOrgId: '',//服务组织Id	
-        objList: [],//
-        policyId: '',
-        principalName: '',//经办人(责任人)姓名	
-        principalContact: '',//经办人联系方式	
-        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        remark: '',//
-        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
-
+        serviceCategoryKey: "",
+        serviceName: "", //服务名称
+        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+        serviceOrgId: "", //服务组织Id
+        objList: [], //
+        policyId: "",
+        principalName: "", //经办人(责任人)姓名
+        principalContact: "", //经办人联系方式
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        remark: "", //
+        feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
       },
       feedbackFormData: {
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        fileList: [],//	附件列表
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
       },
 
-
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate
+        disabledDate: startDisabledDate,
       },
 
       showFeedback: false,
@@ -458,15 +567,15 @@ export default {
       policyList: [],
 
       fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
 
-      policyId: '',
+      policyId: "",
       showPersonList: false,
       ruleList: [],
 
       firstInitMap: true,
 
-      categrayArray: [],
+      categrayOptions: [],
       statusArray: [
         {
           value: "in_service",
@@ -490,105 +599,155 @@ export default {
           value: "perfect",
           label: "非常满意",
         },
-
       ],
+    };
+  },
 
-    }
+  computed: {
+    dataRule() {
+      return {
+        serviceName: [
+          { required: true, message: "服务名称不能为空", trigger: "change" },
+        ],
+        serviceOrgId: [
+          { required: true, message: "服务组织不能为空", trigger: "change" },
+        ],
+
+        serviceTimeStart: [
+          { required: true, message: "服务时间不能为空", trigger: "change" },
+        ],
+        objList: [
+          { required: true, message: "服务范围不能为空", trigger: "change" },
+        ],
+      };
+    },
+    feedbackDataRule() {
+      return {
+        serviceGoal: [
+          { required: true, message: "服务目标不能为空", trigger: "blur" },
+        ],
+
+        serviceEffect: [
+          { required: true, message: "服务效果不能为空", trigger: "blur" },
+        ],
+        servicePeopleNumber: [
+          { required: true, message: "服务人数不能为空", trigger: "blur" },
+        ],
+        serviceStatus: [
+          { required: true, message: "服务状态不能为空", trigger: "blur" },
+        ],
+        satisfaction: [
+          { required: true, message: "满意度不能为空", trigger: "blur" },
+        ],
+        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+      };
+    },
   },
 
   watch: {
     "formData.serviceTimeEnd": function (val) {
-      if (val && val != '') {
-        let arrayTemp = val.split(' ')
-        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
       }
-
     },
   },
+
   components: { personList },
-  async mounted () {
-    this.startLoading()
 
+  async mounted() {
+    this.startLoading();
+    // 都已经重置了，还放在prop里干嘛，我不理解
+    this.categrayOptions = this.categrayArray;
 
     this.getCategrayList();
     this.getDictOptions();
     this.getPolicyList();
     if (this.showFeedback) {
-      this.initMap()
+      this.initMap();
       this.$refs.ref_form_feedback.resetFields();
     }
 
-    if (this.formType === 'add') {
+    if (this.formType === "add") {
       this.$refs.ref_form.resetFields();
-      await this.loadScopeTree()
+      await this.loadScopeTree();
     } else {
-
-
     }
 
-    this.endLoading()
+    await this.iniDefaultData();
 
+    this.endLoading();
   },
 
-
   methods: {
+    async iniDefaultData() {
+      const { defaultData } = this;
+      console.log("iniDefaultData3", defaultData);
+      if (defaultData) {
+        const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
+        if (serviceOrgType) {
+          this.formData.serviceOrgType = serviceOrgType;
+          await this.getServiceuserList(serviceOrgType, "add_demand");
+        }
+        if (serviceOrgId) {
+          this.formData.serviceOrgId = serviceOrgId;
+        }
+        if (scopeIdArray) {
+          this.scopeIdArray = scopeIdArray;
+          await nextTick();
+          this.handleChangeScope();
+        }
+      }
+    },
 
     //加载组织数据
-    async handlePersonList () {
+    async handlePersonList() {
       if (!this.formData.policyId) {
-        this.$message.info('请先选择政策')
-        return false
+        this.$message.info("请先选择政策");
+        return false;
       }
 
-      this.policyId = this.formData.policyId
-      await this.loadRuleList()
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
       this.showPersonList = true;
     },
 
-    async loadRuleList () {
-
-      const url = "/heart/policy/rulelist/" + this.policyId
+    async loadRuleList() {
+      const url = "/heart/policy/rulelist/" + this.policyId;
 
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.ruleList = data
-
+        this.ruleList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleClose () {
-      this.showPersonList = false
-
-
+    handleClose() {
+      this.showPersonList = false;
     },
-    handleOk () {
-      this.showPersonList = false
-
-
+    handleOk() {
+      this.showPersonList = false;
     },
 
+    async getPolicyList() {
+      const url = "/heart/policy/policyListSelect";
 
-    async getPolicyList () {
-      const url = '/heart/policy/policyListSelect'
-
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.policyList = data
+        this.policyList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
-    async getDictOptions () {
+    async getDictOptions() {
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "user_demand_service_type",
@@ -606,29 +765,29 @@ export default {
     },
 
     // 字典
-    async getCategrayList () {
-      const url = "/sys/dict/data/dictlist"
+    async getCategrayList() {
+      const url = "/sys/dict/data/dictlist";
 
       let params = {
-        dictType: 'ic_service_type'
-      }
+        dictType: "ic_service_type",
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.categrayArray = data
+        this.categrayOptions = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
-    handleServiceChange (type, val) {
+    handleServiceChange(type, val) {
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
         else this.getServiceuserList(val, "query_demand");
       } else this.getServiceuserList(val, "");
     },
 
-    async getServiceuserList (serviceType, query) {
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
 
       const params = {
@@ -642,525 +801,426 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            this.serviceOptiondList = res.data
+            this.serviceOptiondList = res.data;
           }
         })
         .catch(() => {
           return this.$message.error("网络错误");
         });
     },
-    handleChangeFeedback (val) {
-      this.showFeedback = val
+    handleChangeFeedback(val) {
+      this.showFeedback = val;
 
       if (this.firstInitMap) {
         this.$nextTick(() => {
-          this.initMap()
-        })
-
+          this.initMap();
+        });
       }
-
     },
 
-
-
     // 获取服务范围树
-    loadScopeTree () {
-      const url = '/gov/org/icServiceProject/service/serviceScopeTree'
+    async loadScopeTree() {
+      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {}
-      window.app.ajax.post(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          //组织级联数据
-          ++this.iscascaderShow
-          this.casOptions = []
-          this.scopeIdArray = []
-          this.casOptions.push(data)
+      let params = {};
 
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg)
-        }
-      )
+      const { data, code, msg } = await requestPost(url, params);
 
+      if (code === 0) {
+        ++this.iscascaderShow;
+        this.casOptions = [];
+        this.scopeIdArray = [];
+        this.casOptions.push(data);
+      } else {
+        this.$message.error(rspMsg);
+      }
     },
 
-
-    handleChangeScope (value) {
-      this.formData.objList = []
-      let selArray = this.$refs["myCascader"].getCheckedNodes()
-      selArray.forEach(element => {
-
+    handleChangeScope(value) {
+      this.formData.objList = [];
+      let selArray = this.$refs["myCascader"].getCheckedNodes();
+      console.log("handleChangeScope", selArray);
+      selArray.forEach((element) => {
         let obj = {
-          objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
+          objectType:
+            element.data.objectType === "grid"
+              ? "grid"
+              : element.data.objectType === "neighborhood"
+              ? "neighborhood"
+              : "agency",
           objectId: element.data.objectId,
           objectName: element.data.objectName,
-        }
-        this.formData.objList.push(obj)
+        };
+        this.formData.objList.push(obj);
       });
-
     },
 
-
-
-    async handleComfirm () {
-
-      if (this.formType === 'add') {
-        this.handleAdd()
-      } else if (this.formType === 'feedback') {
-        this.handleFeedback()
+    async handleComfirm() {
+      if (this.formType === "add") {
+        this.handleAdd();
+      } else if (this.formType === "feedback") {
+        this.handleFeedback();
       }
     },
 
-    async handleAdd () {
-
-      this.btnDisable = true
+    async handleAdd() {
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
         } else {
           var oDate1 = new Date(this.formData.serviceTimeStart);
           var oDate2 = new Date(this.formData.serviceTimeEnd);
           if (oDate1.getTime() > oDate2.getTime()) {
-            this.$message.error('服务截止时间必须大于服务开始时间')
-            return false
+            this.$message.error("服务截止时间必须大于服务开始时间");
+            return false;
           }
 
-
           if (this.showFeedback) {
-            this.$refs['ref_form_feedback'].validate((valid, messageObj) => {
+            this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
               if (!valid) {
-                app.util.validateRule(messageObj)
-                this.btnDisable = false
+                app.util.validateRule(messageObj);
+                this.btnDisable = false;
               } else {
-                this.formData.feedback = { ...this.feedbackFormData }
-                this.addFuwu()
-
-
+                this.formData.feedback = { ...this.feedbackFormData };
+                this.addFuwu();
               }
-
-            })
+            });
           } else {
-            this.addFuwu()
+            this.addFuwu();
           }
-
         }
-
-      })
-
+      });
     },
 
-    async addFuwu () {
+    async addFuwu() {
       if (this.showFeedback) {
-        this.feedbackFormData.fileList = []
-        this.feedbackFormData.fileList = [...this.fileList]
-        this.formData.feedback = { ... this.feedbackFormData }
+        this.feedbackFormData.fileList = [];
+        this.feedbackFormData.fileList = [...this.fileList];
+        this.formData.feedback = { ...this.feedbackFormData };
       } else {
-        this.formData.feedback = null
+        this.formData.feedback = null;
       }
 
-
-      console.log(this.formData)
+      console.log(this.formData);
       // return false
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
 
-      if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
-        this.btnDisable = false
+      if (
+        this.formData.principalContact &&
+        regPhone.test(this.formData.principalContact) === false
+      ) {
+        this.btnDisable = false;
         this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
+          type: "warning",
+          message: "请输入正确的手机号码",
+        });
         return false;
       }
 
-      if (this.source === 'manage') {
-        this.formData.serviceCategoryKey = this.serviceCategoryKey
+      if (this.source === "manage") {
+        this.formData.serviceCategoryKey = this.serviceCategoryKey;
       }
-      const url = '/heart/icServiceRecordV2/add'
+      const url = "/heart/icServiceRecordV2/add";
       // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
       let params = {
+        ...this.formData,
+      };
 
-        ...this.formData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success('发起成功')
-        this.resetData()
-        this.$emit('handleOk')
+        this.$message.success("发起成功");
+        this.resetData();
+        this.$emit("handleOk");
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    async handleFeedback () {
-
-      this.btnDisable = true
+    async handleFeedback() {
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
+        this.btnDisable = false;
+      }, 10000);
 
-      this.$refs['ref_form_feedback'].validate((valid, messageObj) => {
+      this.$refs["ref_form_feedback"].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
         } else {
-
-          this.addFeecback()
-
+          this.addFeecback();
         }
-
-      })
-
+      });
     },
 
-    async addFeecback () {
+    async addFeecback() {
+      this.feedbackFormData.fileList = [];
+      this.feedbackFormData.fileList = [...this.fileList];
+      this.feedbackFormData.serviceRecordId = this.serviceRecordId;
 
-      this.feedbackFormData.fileList = []
-      this.feedbackFormData.fileList = [...this.fileList]
-      this.feedbackFormData.serviceRecordId = this.serviceRecordId
-
-      console.log(this.feedbackFormData)
+      console.log(this.feedbackFormData);
       // return false
 
-      const url = '/heart/icServiceFeedbackV2/add'
+      const url = "/heart/icServiceFeedbackV2/add";
 
       let params = {
+        ...this.feedbackFormData,
+      };
 
-        ...this.feedbackFormData
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success('反馈成功')
-        this.resetData()
-        this.$emit('handleOk')
+        this.$message.success("反馈成功");
+        this.resetData();
+        this.$emit("handleOk");
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-
-      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+    beforeUpload(file) {
+      const array = file.name.split(".");
+      const extension = array[array.length - 1];
+
+      const formatarray = [
+        "jpg",
+        "png",
+        "jpeg",
+        "bmp",
+        "mp4",
+        "wma",
+        "m4a",
+        "mp3",
+        "doc",
+        "docx",
+        "xls",
+        "xlsx",
+        "pdf",
+      ];
 
       if (formatarray.indexOf(extension) === -1) {
-        this.$message.error('只支持图片、word、pdf')
-        return false
+        this.$message.error("只支持图片、word、pdf");
+        return false;
       }
-
     },
 
-    handleFileRemove (file) {
-
+    handleFileRemove(file) {
       if (file && file.status === "success") {
-        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+        this.fileList.splice(
+          this.fileList.findIndex((item) => item.uid === file.uid),
+          1
+        );
       }
     },
 
-    handleFileSuccess (res, file) {
-
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
+    handleFileSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        const array = file.name.split(".");
+        const fileType = array[array.length - 1];
 
-        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
-        const videoarray = ['mp4', 'wma', 'm4a']
-        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
-        const mp3Array = ['mp3']
+        const picArray = ["jpg", "png", "jpeg", "bmp"];
+        const videoarray = ["mp4", "wma", "m4a"];
+        const docArray = ["doc", "docx", "xls", "xlsx", "pdf"];
+        const mp3Array = ["mp3"];
 
         if (picArray.indexOf(fileType) > -1) {
-          file.format = 'image'
+          file.format = "image";
         } else if (videoarray.indexOf(fileType) > -1) {
-          file.format = 'video'
+          file.format = "video";
         } else if (docArray.indexOf(fileType) > -1) {
-          file.format = 'doc'
+          file.format = "doc";
         } else if (mp3Array.indexOf(fileType) > -1) {
-          file.format = 'voice'
+          file.format = "voice";
         }
 
-        file.url = res.data.url
-        file.type = fileType
+        file.url = res.data.url;
+        file.type = fileType;
 
-        file.name = file.name
-        file.type = file.type
-        file.url = file.url
+        file.name = file.name;
+        file.type = file.type;
+        file.url = file.url;
 
-        this.fileList.push(file)
-        console.log(this.fileList)
-      } else this.$message.error(res.msg)
+        this.fileList.push(file);
+        console.log(this.fileList);
+      } else this.$message.error(res.msg);
     },
 
     //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
+    handleFileDownload(file) {
+      var a = document.createElement("a");
+      var event = new MouseEvent("click");
       a.download = file.name;
-      console.log(a)
+      console.log(a);
       a.href = file.url;
       a.dispatchEvent(event);
-
-
     },
-    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-
+    initMap() {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('map_app'), {
+      map = new window.TMap.Map(document.getElementById("map_app"), {
         center: center, // 设置地图中心点坐标
         zoom: 17.2, // 设置地图缩放级别
         pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
+        rotation: 45, // 设置地图旋转角度
+      });
 
-      search = new window.TMap.service.Search({ pageSize: 10 })
+      search = new window.TMap.service.Search({ pageSize: 10 });
       // 新建一个地点搜索类
       markers = new TMap.MultiMarker({
         map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
+        geometries: [],
+      });
+      infoWindowList = Array(10);
 
       geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
 
       // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+      this.convert();
 
-      this.firstInitMap = false
+      this.firstInitMap = false;
     },
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
+    setMarker(lat, lng) {
+      markers.setGeometries([]);
       markers.add([
         {
-          id: '4',
-          styleId: 'marker',
+          id: "4",
+          styleId: "marker",
           position: new TMap.LatLng(lat, lng),
           properties: {
-            title: 'marker4'
-          }
-        }
-      ])
+            title: "marker4",
+          },
+        },
+      ]);
     },
 
-    handleSearchMap () {
+    handleSearchMap() {
       infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
         .searchRectangle({
           keyword: this.keyWords,
-          bounds: map.getBounds()
+          bounds: map.getBounds(),
         })
         .then((result) => {
-          let { data } = result
+          let { data } = result;
           if (Array.isArray(data) && data.length > 0) {
             const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.feedbackFormData.latitude = lat
-            this.feedbackFormData.longitude = lng
-            this.convert()
+              location: { lat, lng },
+            } = data[0];
+
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.feedbackFormData.latitude = lat;
+            this.feedbackFormData.longitude = lng;
+            this.convert();
           } else {
-            this.$message.error('未检索到相关位置坐标')
+            this.$message.error("未检索到相关位置坐标");
           }
-        })
+        });
     },
 
-    handleMoveCenter () {
+    handleMoveCenter() {
       //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.feedbackFormData.latitude = lat
-      this.feedbackFormData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.feedbackFormData.latitude = lat;
+      this.feedbackFormData.longitude = lng;
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
     },
 
-    convert (lat, lng) {
+    convert(lat, lng) {
       markers.setGeometries([]);
       // var input = document.getElementById('location').value.split(',');
-      let location
+      let location;
       if (lat && lng) {
         location = new TMap.LatLng(lat, lng);
       } else {
-        location = new TMap.LatLng(this.feedbackFormData.latitude, this.feedbackFormData.longitude);
+        location = new TMap.LatLng(
+          this.feedbackFormData.latitude,
+          this.feedbackFormData.longitude
+        );
       }
 
       // map.setCenter(location);
       markers.updateGeometries([
         {
-          id: 'main', // 点标注数据数组
+          id: "main", // 点标注数据数组
           position: location,
         },
       ]);
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-
-          this.feedbackFormData.address = result.result.address
+          this.feedbackFormData.address = result.result.address;
           // 显示搜索到的地址
         });
     },
 
-
-    resetData () {
+    resetData() {
       this.formData = {
-
-        objList: [],//
-        principalName: '',//经办人(责任人)姓名	
-        principalContact: '',//经办人联系方式	
-        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        remark: '',//
-        feedback: {},//反馈。允许发起服务的时候直接填写反馈，完成服务。	
-
-      }
+        objList: [], //
+        principalName: "", //经办人(责任人)姓名
+        principalContact: "", //经办人联系方式
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        remark: "", //
+        feedback: {}, //反馈。允许发起服务的时候直接填写反馈，完成服务。
+      };
       this.feedbackFormData = {
-
-
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        fileList: [],//	附件列表
-      }
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
+      };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-
-
-        serviceName: [
-          { required: true, message: '服务名称不能为空', trigger: 'change' }
-        ],
-        serviceOrgId: [
-          { required: true, message: '服务组织不能为空', trigger: 'change' }
-        ],
-
-        serviceTimeStart: [
-          { required: true, message: '服务时间不能为空', trigger: 'change' }
-        ],
-        objList: [
-          { required: true, message: '服务范围不能为空', trigger: 'change' }
-        ],
-
+        loading.close();
       }
     },
-    feedbackDataRule () {
-      return {
-
-
-        serviceGoal: [
-          { required: true, message: '服务目标不能为空', trigger: 'blur' }
-        ],
-
-        serviceEffect: [
-          { required: true, message: '服务效果不能为空', trigger: 'blur' }
-        ],
-        servicePeopleNumber: [
-          { required: true, message: '服务人数不能为空', trigger: 'blur' }
-        ],
-        serviceStatus: [
-          { required: true, message: '服务状态不能为空', trigger: 'blur' }
-        ],
-        satisfaction: [
-          { required: true, message: '满意度不能为空', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: '地址不能为空', trigger: 'blur' }
-        ]
-      }
-    },
-
   },
-  props: {
-
-    serviceRecordId: {
-      type: String,
-      required: ''
-    },
-    serviceCategoryKey: {
-      type: String,
-      required: ''
-    },
-    serviceProjectName: {//服务项目名称
-      type: String,
-      required: false,
-      default: ''
-    },
-    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
-      type: String,
-      required: ''
-    },
-    categrayArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-
-  }
-}
+};
 </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";
 
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 675c056fd..d96b991a5 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -825,6 +825,13 @@ export default {
   border-radius: 10px;
   overflow: hidden;
 
+  /deep/ .l7-popup-content {
+    background: rgba(#020340, 0.58);
+  }
+  /deep/ .l7-popup-close-button {
+    color: #fff;
+  }
+
   #app {
     width: 100%;
     height: 100%;
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index a655c49f9..256896460 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="m-pop" v-show="!hidden">
     <div class="info">
-      <div v-if="placeType === 'resi' || placeType === 'special_resi'">
+      <div
+        v-if="
+          placeType === 'resi' ||
+          placeType === 'special_resi' ||
+          placeType === 'volunteer'
+        "
+      >
         <div class="info-title">居民信息</div>
         <div class="item">
           姓名：
@@ -47,13 +53,25 @@
         </div>
         <div class="operate">
           <div @click="handleClickBtn('watch-resi')" class="btn">查看更多</div>
+
           <div
             @click="handleClickBtn('create-demand')"
             v-if="info.agencyId == $store.state.user.agencyId"
-            class="btn"
+            class="btn z-blue"
           >
             发布需求
           </div>
+
+          <div
+            v-if="
+              info.agencyId == $store.state.user.agencyId &&
+              placeType === 'volunteer'
+            "
+            @click="handleClickBtn('create-service')"
+            class="btn z-yellow"
+          >
+            发起服务
+          </div>
         </div>
       </div>
 
@@ -239,6 +257,14 @@
           创建时间：
           <span>{{ info.organizationCreatedTime || "--" }}</span>
         </div>
+
+        <div
+          v-if="info.agencyId == $store.state.user.agencyId"
+          @click="handleClickBtn('create-service')"
+          class="btn z-yellow"
+        >
+          发起服务
+        </div>
       </div>
 
       <div v-if="placeType === 'group_rent'">
@@ -350,11 +376,19 @@
           地理位置：
           <span>{{ info.address || "--" }}</span>
         </div>
+
+        <div
+          v-if="info.agencyId == $store.state.user.agencyId"
+          @click="handleClickBtn('create-service')"
+          class="btn z-yellow"
+        >
+          发起服务
+        </div>
       </div>
 
       <div v-if="placeType === 'grid'">
         <div class="operate">
-          <div @click="handleClickBtn('create-service')" class="btn">
+          <div @click="handleClickBtn('create-service')" class="btn z-yellow">
             发起服务
           </div>
         </div>
@@ -394,6 +428,7 @@ export default {
     return {
       hidden: true,
       placeType: "",
+      srcItem: {},
       info: {},
       list: [],
     };
@@ -406,7 +441,11 @@ export default {
 
   methods: {
     handleClickBtn(type) {
-      this.$emit("operate", type, this.info);
+      this.$emit("operate", type, {
+        placeType: this.placeType,
+        id: this.srcItem.id,
+        ...this.info,
+      });
     },
 
     handleClickListItem(item) {
@@ -415,7 +454,7 @@ export default {
     },
 
     async show(item) {
-      console.log("-----------------show");
+      console.log("-----------------show:", item);
       const { placeType, latitude, longitude } = item;
       if (!placeType) {
         return false;
@@ -429,7 +468,15 @@ export default {
         this.list = item.dataList;
       }
 
-      if (placeType === "resi" || placeType === "special_resi") {
+      if (placeType === "grid") {
+        this.info = { ...item };
+      }
+
+      if (
+        placeType === "resi" ||
+        placeType === "special_resi" ||
+        placeType === "volunteer"
+      ) {
         await this.loadResi(item);
       }
       if (placeType === "public_service") {
@@ -477,6 +524,7 @@ export default {
         await this.loadEnterprisePartrol(item);
       }
       this.placeType = item.placeType;
+      this.srcItem = item;
       this.hidden = false;
       return true;
     },
@@ -795,7 +843,7 @@ export default {
 .m-pop {
   @include scrollBar2;
   max-width: 380px;
-  color: #333;
+  color: #fff;
   font-size: 14px;
   line-height: 20px;
   max-height: 600px;
@@ -831,10 +879,20 @@ export default {
   .btn {
     margin-top: 20px;
     margin-right: 20px;
-    width: 100px;
-    line-height: 30px;
+    width: 80px;
+    line-height: 24px;
     border: 1px solid #eee;
     text-align: center;
+    font-size: 14px;
+    border-radius: 2px;
+    &.z-blue {
+      background: #09a5ff;
+      border-color: #09a5ff;
+    }
+    &.z-yellow {
+      background: #fe6b53;
+      border-color: #fe6b53;
+    }
   }
 }
 </style>
diff --git a/src/views/modules/visual/command/cpts/serviceInfo.vue b/src/views/modules/visual/command/cpts/serviceInfo.vue
index 4fe108cad..b3c55bcb1 100644
--- a/src/views/modules/visual/command/cpts/serviceInfo.vue
+++ b/src/views/modules/visual/command/cpts/serviceInfo.vue
@@ -15,6 +15,7 @@
           ref="demandEditForm"
           :source="'visiual'"
           :formType="'add'"
+          :defaultData="defaultData"
           @close="handleClose"
           @handleClose="handleClose"
           @handleOk="handleOk"
@@ -27,14 +28,17 @@
 
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-
-import { requestPost } from "@/js/dai/request";
-
 import addForm from "@/views/modules/communityService/fuwujilu/addForm";
 
 export default {
   name: "dialogInfo",
-  props: {},
+
+  props: {
+    defaultData: {
+      type: Object,
+      default: null,
+    },
+  },
 
   components: {
     cptCard,
@@ -42,47 +46,18 @@ export default {
   },
 
   data() {
-    return {
-      loading: false,
-
-      pageType: "dispose",
-      eventId: "1529724450524061698",
-      eventDetailData: {},
-    };
+    return {};
   },
 
   async mounted() {
-    this.loading = false;
-    await this.handleSearch();
-    this.loading = true;
+    console.log('初始化serviceInfo', this.defaultData)
   },
 
   methods: {
-    async handleSearch() {
-      const url = "/gov/project/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
-        this.eventDetailData = { ...data };
-        this.pageType = "dispose";
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
     handleClose() {
-      this.pageType = "";
       this.$emit("handleClose");
-      // this.eventId = ""
     },
     handleOk() {
-      this.pageType = "";
-      // this.eventId = ""
-      this.pageNo = 1;
       this.handleClose();
     },
 
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 299e8364e..60de244ed 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -188,6 +188,7 @@
     <service-info
       v-if="pageType === 'create-service'"
       ref="ref_service"
+      :default-data="serviceDefaultData"
       @handleClose="handleClose"
     />
 
@@ -430,6 +431,7 @@ export default {
       selGridId: "",
       eventId: "",
       enterpriseId: "",
+      serviceDefaultData: null,
     };
   },
 
@@ -455,9 +457,23 @@ export default {
 
   methods: {
     handleClickDotBtn(type, info) {
-      this.pageType = type;
       if (type == "create-service") {
         // 点击网格发起服务
+        if (
+          info.placeType == "volunteer" ||
+          info.placeType == "community_org" ||
+          info.placeType == "party_unit"
+        ) {
+          this.serviceDefaultData = {
+            serviceOrgType:
+              info.placeType == "ic_user_volunteer" ? "" : info.placeType,
+            serviceOrgId: info.id,
+          };
+        } else if (info.placeType == "grid") {
+          this.serviceDefaultData = {
+            scopeIdArray: [info.id],
+          };
+        }
       } else if (type == "watch-resi") {
         this.toSubAgency("people", info.icResiUserId);
         this.icResiUserId = info.icResiUserId;
@@ -472,6 +488,7 @@ export default {
       } else if (type == "watch-xuncha") {
         this.enterpriseId = info.enterpriseId;
       }
+      this.pageType = type;
     },
 
     handleClose() {