diff --git a/src/assets/img/modules/visual/box-2.png b/src/assets/img/modules/visual/box-2.png
new file mode 100644
index 000000000..65a54b981
Binary files /dev/null and b/src/assets/img/modules/visual/box-2.png differ
diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index fddee6575..5729b473c 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -378,3 +378,48 @@
     flex: 1;
   }
 }
+
+.div_agency_list {
+  z-index: 1000;
+  position: absolute;
+  top: 50px;
+  right: 600px;
+  box-sizing: border-box;
+  width: 320px;
+  height: 470px;
+
+  color: #fff;
+  background: url('../../../img/modules/visual/box-2.png') no-repeat center;
+  background-size: 100% 100%;
+  padding: 45px 20px 35px 20px;
+  .no-data-img {
+    text-align: center;
+    margin-top: 50px;
+    margin-left: 15px;
+  }
+  .agency_list {
+    .agency_item {
+      height: 50px;
+      font-size: 17px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: 50px;
+      padding-left: 12px;
+    }
+
+    .agency_item_on {
+      background: #08216c;
+      border-radius: 2px;
+    }
+
+    .agency_item:hover {
+      cursor: pointer;
+      background-color: #011168;
+      border-radius: 4px 0 0 4px;
+      border: none;
+      box-shadow: 0 0 10px inset #1a5afd;
+      border-radius: 2px;
+    }
+  }
+}
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 57a6575e8..04312f90b 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -11,7 +11,7 @@
 
         <el-form-item label="服务事项"
                       label-width="150px"
-                      prop="serviceMatter">
+                      prop="serviceMatterList">
 
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
@@ -36,12 +36,12 @@
         </el-form-item>
 
         <el-form-item label="单位名称"
-                      prop="unitId"
+                      prop="unitIdList"
                       label-width="150px"
                       style="display: block">
           <el-checkbox-group class="item_width_1"
                              style="display:flex;flex-wrap:wrap"
-                             v-model="formData.unitList">
+                             v-model="formData.unitIdList">
             <el-checkbox v-for="item in unitList"
                          :key="item.value"
                          :label="item.value">{{item.label}}</el-checkbox>
@@ -225,10 +225,9 @@ export default {
       activityId: '',
       formData: {
         serviceMatter: '',//服务事项
-
         serviceMatterList: [],
         unitId: '',//单位ID
-        unitList: [],
+        unitIdList: [],
         title: '',//活动标题
         target: '',//活动目标
         content: '',//活动内容
@@ -480,7 +479,7 @@ export default {
         serviceMatter: '',//服务事项
         serviceMatterList: [],
         unitId: '',//单位ID
-        unitList: [],
+        unitIdList: [],
         title: '',//活动标题
         target: '',//活动目标
         content: '',//活动内容
@@ -511,10 +510,10 @@ export default {
   computed: {
     dataRule () {
       return {
-        serviceMatter: [
+        serviceMatterList: [
           { required: true, message: '服务事项不能为空', trigger: 'blur' }
         ],
-        unitId: [
+        unitIdList: [
           { required: true, message: '单位名称不能为空', trigger: 'blur' },
         ],
         title: [
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 509e0d99d..65d05927c 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -2,15 +2,27 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline" label-width="80px">
+        <el-form
+          ref="searchForm"
+          :inline="true"
+          :model="searchForm"
+          class="demo-form-inline"
+          label-width="80px"
+        >
           <div>
             <el-form-item label="所属网格" prop="gridId">
-              <el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
+              <el-select
+                v-model="searchForm.gridId"
+                filterable
+                placeholder="请选择"
+                clearable
+              >
                 <el-option
                   v-for="item in optionsG"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -20,7 +32,8 @@
                 :options="searchdemandOptions"
                 :props="{ checkStrictly: true }"
                 clearable
-                @change="handleCateCHange"></el-cascader>
+                @change="handleCateCHange"
+              ></el-cascader>
               <!-- <el-select v-model="searchForm.categoryCode" filterable placeholder="请选择" clearable>
                 <el-option
                   v-for="item in demandOptions"
@@ -31,18 +44,27 @@
               </el-select> -->
             </el-form-item>
             <el-form-item label="需求人" prop="demandUserName">
-              <el-input v-model="searchForm.demandUserName" placeholder="请输入内容" clearable=""></el-input>
+              <el-input
+                v-model="searchForm.demandUserName"
+                placeholder="请输入内容"
+                clearable=""
+              ></el-input>
             </el-form-item>
-            
           </div>
           <div>
             <el-form-item label="状态" prop="status">
-              <el-select v-model="searchForm.status" filterable placeholder="请选择" clearable>
+              <el-select
+                v-model="searchForm.status"
+                filterable
+                placeholder="请选择"
+                clearable
+              >
                 <el-option
                   v-for="item in statusOptions"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -55,31 +77,43 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                clearable="">
+                clearable=""
+              >
               </el-date-picker>
             </el-form-item>
-            
           </div>
           <div>
-            
             <el-form-item label="服务类型" prop="serviceType">
-              <el-select v-model="searchForm.serviceType" filterable placeholder="请选择" clearable @change="handleServiceChange('query', $event)">
+              <el-select
+                v-model="searchForm.serviceType"
+                filterable
+                placeholder="请选择"
+                clearable
+                @change="handleServiceChange('query', $event)"
+              >
                 <el-option
                   v-for="item in serviceOptions"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item prop="serverId">
-              <el-select v-model="searchForm.serverId" filterable
-              :disabled="searchForm.serviceType ? false : true" placeholder="请选择" clearable>
+              <el-select
+                v-model="searchForm.serverId"
+                filterable
+                :disabled="searchForm.serviceType ? false : true"
+                placeholder="请选择"
+                clearable
+              >
                 <el-option
                   v-for="item in serviceOptiondList"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -92,23 +126,25 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                clearable>
+                clearable
+              >
               </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
             <el-form-item>
-            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
+              <el-button type="yellow" @click="resetForm('searchForm')"
+                >重置</el-button
+              >
+            </el-form-item>
           </div>
-          
         </el-form>
       </div>
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd('add')">新增需求</el-button>
       </div>
-      
+
       <el-table
         :data="tableData"
         row-key="categoryId"
@@ -137,42 +173,64 @@
           <template slot-scope="scope">
             <template v-if="filterEdit(scope.row.agencyId)">
               <el-button
-                v-if="scope.row.status === 'pending' || scope.row.status === 'assigned'"
+                v-if="
+                  scope.row.status === 'pending' ||
+                  scope.row.status === 'assigned'
+                "
                 type="text"
                 size="small"
                 @click="handleAppoint(scope.row, 'appoint')"
-                >指派</el-button>
-                <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
-              <template v-if="(scope.row.reportType == 'self_help' && scope.row.serviceShowFlag)">
+                >指派</el-button
+              >
+              <!-- v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'" -->
+              <template
+                v-if="
+                  scope.row.reportType == 'self_help' &&
+                  scope.row.serviceShowFlag
+                "
+              >
                 <el-button
-                  v-if="scope.row.serviceType !== 'volunteer' && scope.row.status !== 'finished'"
+                  v-if="
+                    scope.row.serviceType !== 'volunteer' &&
+                    scope.row.status !== 'finished'
+                  "
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
-                  >完成情况</el-button>
+                  >完成情况</el-button
+                >
               </template>
               <template v-else>
                 <el-button
-                  v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order' || (scope.row.status == 'finished' && !scope.row.evaluateFlag)"
+                  v-if="
+                    scope.row.status === 'assigned' ||
+                    scope.row.status === 'have_order' ||
+                    (scope.row.status == 'finished' && !scope.row.evaluateFlag)
+                  "
                   type="text"
                   size="small"
                   @click="handleFinish(scope.row, 'finish')"
-                  >完成情况</el-button>
+                  >完成情况</el-button
+                >
               </template>
               <template v-if="scope.row.reportType != 'self_help'">
                 <el-button
-                    v-if="scope.row.status === 'pending'"
-                    @click="handleEdit(scope.row, 'edit')"
-                    type="text"
-                    size="small"
-                    class="btn-color-edit"
-                    >编辑</el-button>
+                  v-if="scope.row.status === 'pending'"
+                  @click="handleEdit(scope.row, 'edit')"
+                  type="text"
+                  size="small"
+                  class="btn-color-edit"
+                  >编辑</el-button
+                >
                 <el-popconfirm
                   title="取消之后无法恢复，确认取消？"
                   @onConfirm="handleDel(scope.row)"
                 >
                   <el-button
-                    v-if="scope.row.status !== 'finished' && scope.row.status !== 'canceled'"
+                    v-if="
+                      scope.row.status !== 'finished' &&
+                      scope.row.status !== 'canceled'
+                    "
                     slot="reference"
                     type="text"
                     size="small"
@@ -189,7 +247,6 @@
               class="btn-color-look"
               >查看</el-button
             >
-            
           </template>
         </el-table-column>
       </el-table>
@@ -215,32 +272,57 @@
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
-      <el-form v-if="dialogVisible" label-width="120px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
+      <el-form
+        v-if="dialogVisible"
+        label-width="120px"
+        :model="form"
+        :rules="rules"
+        ref="ruleForm"
+        class="form-wr"
+      >
         <el-form-item label="所属网格" prop="gridId">
-          <el-input v-if="disabled" v-model="form.gridName" :disabled="disabled"  class="input-width"></el-input>
+          <el-input
+            v-if="disabled"
+            v-model="form.gridName"
+            :disabled="disabled"
+            class="input-width"
+          ></el-input>
           <!-- <span >{{ form.gridName }}</span> -->
-          <el-select v-else v-model="form.gridId" filterable placeholder="请选择" 
-          class="input-width" clearable
-          :disabled="disabled" 
-          @change="handleGridChange">
+          <el-select
+            v-else
+            v-model="form.gridId"
+            filterable
+            placeholder="请选择"
+            class="input-width"
+            clearable
+            :disabled="disabled"
+            @change="handleGridChange"
+          >
             <el-option
-              v-for="item in (disabled ? optionsG : optionsEditG)"
+              v-for="item in disabled ? optionsG : optionsEditG"
               :key="item.value"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="需求类型" prop="categoryCode">
-          <el-input v-if="disabled" v-model="form.categoryName" :disabled="disabled"  class="input-width-min"></el-input>
+          <el-input
+            v-if="disabled"
+            v-model="form.categoryName"
+            :disabled="disabled"
+            class="input-width-min"
+          ></el-input>
           <el-cascader
             v-else
             v-model="form.categoryCode"
             :options="demandOptions"
-            :disabled="disabled" 
+            :disabled="disabled"
             clearable
             class="input-width"
-            @change="handleCateSlect"></el-cascader>
+            @change="handleCateSlect"
+          ></el-cascader>
           <!-- <el-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
             <el-option
               v-for="item in demandOptions"
@@ -251,24 +333,48 @@
           </el-select> -->
         </el-form-item>
         <el-form-item label="上报类型" prop="reportType">
-          <el-input v-if="disabled" v-model="form.reportTypeName" :disabled="disabled"  class="input-width"></el-input>
-          <el-select v-else v-model="form.reportType" filterable class="input-width" placeholder="请选择" clearable
-          :disabled="disabled" >
+          <el-input
+            v-if="disabled"
+            v-model="form.reportTypeName"
+            :disabled="disabled"
+            class="input-width"
+          ></el-input>
+          <el-select
+            v-else
+            v-model="form.reportType"
+            filterable
+            class="input-width"
+            placeholder="请选择"
+            clearable
+            :disabled="disabled"
+          >
             <el-option
               v-for="item in reportOptions"
               :key="item.value"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="上报人" prop="reportUserName">
-          <el-input v-model="form.reportUserName" :disabled="disabled"  
-          placeholder="请输入" class="input-width" clearable></el-input>
+          <el-input
+            v-model="form.reportUserName"
+            :disabled="disabled"
+            placeholder="请输入"
+            class="input-width"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="上报人手机号" prop="reportUserMobile">
-          <el-input v-model="form.reportUserMobile" :disabled="disabled"  
-          placeholder="请输入" class="input-width" maxlength="11" clearable></el-input>
+          <el-input
+            v-model="form.reportUserMobile"
+            :disabled="disabled"
+            placeholder="请输入"
+            class="input-width"
+            maxlength="11"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="上报时间" prop="reportTime">
           <el-date-picker
@@ -276,27 +382,35 @@
             type="datetime"
             class="input-width"
             clearable
-            :disabled="disabled" 
+            :disabled="disabled"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择日期时间">
+            placeholder="选择日期时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="需求人" prop="demandUserId">
-          <el-input v-if="disabled" v-model="form.demandUserName" :disabled="disabled"  class="input-width"></el-input>
-          <el-select 
+          <el-input
+            v-if="disabled"
+            v-model="form.demandUserName"
+            :disabled="disabled"
+            class="input-width"
+          ></el-input>
+          <el-select
             v-else
-            v-model="selectDemandUser" 
-            class="input-width" 
-            filterable 
-            :disabled="disabled" 
-            placeholder="请选择" 
-            clearable 
-            @change="handleDemandChange">
+            v-model="selectDemandUser"
+            class="input-width"
+            filterable
+            :disabled="disabled"
+            placeholder="请选择"
+            clearable
+            @change="handleDemandChange"
+          >
             <el-option
               v-for="item in demandUserList"
               :key="item.demandUserId"
               :label="item.label"
-              :value="item">
+              :value="item"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -306,61 +420,88 @@
             type="datetime"
             class="input-width"
             clearable
-            :disabled="disabled" 
+            :disabled="disabled"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择日期时间">
+            placeholder="选择日期时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="需求内容" prop="content">
-          <el-input v-model="form.content" :autosize="{ minRows: 2, maxRows: 10}" 
-          :disabled="disabled" 
-          type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.content"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+            :disabled="disabled"
+            type="textarea"
+            clearable
+            class="input-width-textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
-        <el-form-item 
-        v-if="addType === 'appoint' || addType == 'finish' || (addType == 'look' && form.serviceShowFlag)" 
-        label="服务方" prop="serviceType">
+        <el-form-item
+          v-if="
+            addType === 'appoint' ||
+            addType == 'finish' ||
+            (addType == 'look' && form.serviceShowFlag)
+          "
+          label="服务方"
+          prop="serviceType"
+        >
           <template v-if="disabled && addType !== 'appoint'">
-            <el-input v-model="form.serviceShowName" :disabled="disabled"  class="input-width"></el-input>
+            <el-input
+              v-model="form.serviceShowName"
+              :disabled="disabled"
+              class="input-width"
+            ></el-input>
           </template>
           <template v-else>
-            <el-select 
-              v-model="form.serviceType" 
-              class="input-width-small" 
-              placeholder="请选择" 
-              clearable 
-              :disabled="disabled && addType !== 'appoint'" 
-              @change="handleServiceChange('add', $event)">
+            <el-select
+              v-model="form.serviceType"
+              class="input-width-small"
+              placeholder="请选择"
+              clearable
+              :disabled="disabled && addType !== 'appoint'"
+              @change="handleServiceChange('add', $event)"
+            >
               <el-option
                 v-for="item in serviceOptions"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
+                :value="item.value"
+              >
               </el-option>
             </el-select>
             -
-            <el-select 
-              v-model="form.serverId" 
-              class="input-width-middle" 
-              filterable 
-              placeholder="请选择" 
-              clearable 
-              :disabled="disabled && addType !== 'appoint'" 
-              >
+            <el-select
+              v-model="form.serverId"
+              class="input-width-middle"
+              filterable
+              placeholder="请选择"
+              clearable
+              :disabled="disabled && addType !== 'appoint'"
+            >
               <el-option
                 v-for="item in serviceOptiondList"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </template>
         </el-form-item>
-        <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
+        <el-form-item
+          v-if="addType == 'look' && form.status == 'canceled'"
+          label="取消时间"
+          prop="cancelTime"
+        >
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
-        <template 
-        v-if="(addType == 'finish' && form.reportType != 'self_help') || (addType == 'look' && form.status == 'finished')">
-          
+        <template
+          v-if="
+            (addType == 'finish' && form.reportType != 'self_help') ||
+            (addType == 'look' && form.status == 'finished')
+          "
+        >
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
@@ -373,27 +514,43 @@
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               @change="handelBlurServiceTime"
-              >
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="完成情况" prop="finishResult">
-            <el-radio v-model="form.finishResult" 
-            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
-            <el-radio v-model="form.finishResult" label="unresolved" 
-            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
+            <el-radio
+              v-model="form.finishResult"
+              label="resolved"
+              :disabled="disabled && addType != 'finish'"
+              >已解决</el-radio
+            >
+            <el-radio
+              v-model="form.finishResult"
+              label="unresolved"
+              :disabled="disabled && addType != 'finish'"
+              >未解决</el-radio
+            >
           </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
-              <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
+            <el-rate
+              v-model="form.score"
+              :allow-half="true"
+              :disabled="disabled && addType != 'finish'"
+            ></el-rate>
           </el-form-item>
           <el-form-item label="备注" prop="finishDesc">
-            <el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}" 
-              :disabled="disabled && addType != 'finish'" 
-              type="textarea" 
-              clearable 
-              class="input-width-textarea" placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="form.finishDesc"
+              :autosize="{ minRows: 2, maxRows: 10 }"
+              :disabled="disabled && addType != 'finish'"
+              type="textarea"
+              clearable
+              class="input-width-textarea"
+              placeholder="请输入内容"
+            ></el-input>
           </el-form-item>
         </template>
-        <template v-if="(addType == 'finish' && form.reportType == 'self_help')">
+        <template v-if="addType == 'finish' && form.reportType == 'self_help'">
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
@@ -406,14 +563,15 @@
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               @change="handelBlurServiceTime"
-              >
+            >
             </el-date-picker>
           </el-form-item>
         </template>
-
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
+        <el-button size="small" @click="handlerCancle">{{
+          addType != "look" ? "取消" : "关闭"
+        }}</el-button>
         <el-button
           v-if="addType != 'look'"
           type="primary"
@@ -424,7 +582,6 @@
         >
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -441,51 +598,59 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      addLevel: '1',
-      addType: 'add',
-      value: '',
+      addLevel: "1",
+      addType: "add",
+      value: "",
       statusOptions: [
         {
-          label: '待处理',
-          value: 'pending'
-        }, {
-          label: '已取消',
-          value: 'canceled'
-        }, {
-          label: '已指派',
-          value: 'assigned'
-        }, {
-          label: '已接单',
-          value: 'have_order'
-        }, {
-          label: '已完成',
-          value: 'finished'
-        }
+          label: "待处理",
+          value: "pending",
+        },
+        {
+          label: "已取消",
+          value: "canceled",
+        },
+        {
+          label: "已指派",
+          value: "assigned",
+        },
+        {
+          label: "已接单",
+          value: "have_order",
+        },
+        {
+          label: "已完成",
+          value: "finished",
+        },
       ],
       serviceOptions: [
         {
-          label: '志愿者',
-          value: 'volunteer'
-        }, {
-          label: '社会组织',
-          value: 'social_org'
-        }, {
-          label: '社区自组织',
-          value: 'community_org'
-        }, {
-          label: '区域党建单位',
-          value: 'party_unit'
-        }
+          label: "志愿者",
+          value: "volunteer",
+        },
+        //  {
+        //   label: '社会组织',
+        //   value: 'social_org'
+        // },
+        {
+          label: "社区自组织",
+          value: "community_org",
+        },
+        {
+          label: "区域党建单位",
+          value: "party_unit",
+        },
       ],
       serviceOptiondList: [],
       options: [
         {
-          label: '是',
-          value: 1
-        },{
-          label: '否',
-          value: 2
-        }
+          label: "是",
+          value: 1,
+        },
+        {
+          label: "否",
+          value: 2,
+        },
       ],
       reportOptions: [],
       demandOptions: [],
@@ -495,257 +660,293 @@ export default {
       optionsEditG: [],
       tableHeader: [
         {
-          label: '状态',
-          align: 'center',
-          columnName: 'statusName',
-          width: '120',
+          label: "状态",
+          align: "center",
+          columnName: "statusName",
+          width: "120",
           options: [
             {
-              label: '待处理',
-              value: 'pending'
-            }, {
-              label: '已取消',
-              value: 'canceled'
-            }, {
-              label: '已派单',
-              value: 'assigned'
-            }, {
-              label: '已接单',
-              value: 'have_order'
-            }, {
-              label: '已完成',
-              value: 'finished'
-            }
-          ]
-        }, {
-          label: '所属网格',
-          columnName: 'gridName',
-          align: 'center',
-          width: '',
-          options: []
-        }, {
-          label: '需求类型',
-          columnName: 'categoryName',
-          align: 'center',
-          width: '',
-          options: []
-        }, {
-          label: '需求内容',
-          columnName: 'content',
-          align: 'center',
-          width: '',
-          options: []
-        }, {
-          label: '上报类型',
-          columnName: 'reportTypeName',
-          align: 'center',
-          width: '120',
+              label: "待处理",
+              value: "pending",
+            },
+            {
+              label: "已取消",
+              value: "canceled",
+            },
+            {
+              label: "已派单",
+              value: "assigned",
+            },
+            {
+              label: "已接单",
+              value: "have_order",
+            },
+            {
+              label: "已完成",
+              value: "finished",
+            },
+          ],
+        },
+        {
+          label: "所属网格",
+          columnName: "gridName",
+          align: "center",
+          width: "",
+          options: [],
+        },
+        {
+          label: "需求类型",
+          columnName: "categoryName",
+          align: "center",
+          width: "",
+          options: [],
+        },
+        {
+          label: "需求内容",
+          columnName: "content",
+          align: "center",
+          width: "",
+          options: [],
+        },
+        {
+          label: "上报类型",
+          columnName: "reportTypeName",
+          align: "center",
+          width: "120",
           options: [
             {
-              label: '社区帮办',
-              value: 'community'
-            }, {
-              label: '楼长帮办',
-              value: 'building_caption'
-            }, {
-              label: '党员帮办',
-              value: 'party'
-            }, {
-              label: '自身上报',
-              value: 'self_help'
-            }
-          ]
-        }, {
-          label: '上报人',
-          columnName: 'reportUserName',
-          align: 'center',
-          width: '120',
-          options: []
-        }, {
-          label: '上报时间',
-          columnName: 'reportTime',
-          align: 'center',
-          width: '180',
-          options: []
-        }, {
-          label: '需求人',
-          columnName: 'demandUserName',
-          align: 'center',
-          width: '80',
-          options: []
-        }, {
-          label: '服务方',
-          columnName: 'serviceShowName',
-          align: 'center',
-          width: '120',
-          options: []
-        }, {
-          label: '服务时间',
-          columnName: 'wantServiceTime',
-          align: 'center',
-          width: '180',
-          options: []
-        }
+              label: "社区帮办",
+              value: "community",
+            },
+            {
+              label: "楼长帮办",
+              value: "building_caption",
+            },
+            {
+              label: "党员帮办",
+              value: "party",
+            },
+            {
+              label: "自身上报",
+              value: "self_help",
+            },
+          ],
+        },
+        {
+          label: "上报人",
+          columnName: "reportUserName",
+          align: "center",
+          width: "120",
+          options: [],
+        },
+        {
+          label: "上报时间",
+          columnName: "reportTime",
+          align: "center",
+          width: "180",
+          options: [],
+        },
+        {
+          label: "需求人",
+          columnName: "demandUserName",
+          align: "center",
+          width: "80",
+          options: [],
+        },
+        {
+          label: "服务方",
+          columnName: "serviceShowName",
+          align: "center",
+          width: "120",
+          options: [],
+        },
+        {
+          label: "服务时间",
+          columnName: "wantServiceTime",
+          align: "center",
+          width: "180",
+          options: [],
+        },
       ],
-      customerId: '',
-      reportTime: '',
-      serviceTime: '',
-      finishServiceTime: '',
+      customerId: "",
+      reportTime: "",
+      serviceTime: "",
+      finishServiceTime: "",
       searchForm: {
-        gridId: '',
-        categoryCode: '',
-        level: '',
-        demandUserName: '',
-        reportStartTime: '',
-        reportEndTime: '',
-        status: '',
-        serviceType: '',
-        serverId: '',
-        wantServiceStartTime: '',
-        wantServiceEndTime: ''
+        gridId: "",
+        categoryCode: "",
+        level: "",
+        demandUserName: "",
+        reportStartTime: "",
+        reportEndTime: "",
+        status: "",
+        serviceType: "",
+        serverId: "",
+        wantServiceStartTime: "",
+        wantServiceEndTime: "",
       },
-      selectDemandUser: '',
+      selectDemandUser: "",
       form: {
-        gridId: '',
-        categoryCode: '',
-        parentCode: '',
-        content: '',
-        reportType: '',
-        reportUserName: '',
-        reportUserMobile: '',
-        reportTime: '',
-        wantServiceTime: '',
-        demandUserId: '',
-        demandUserName: '',
-        demandUserMobile: ''
+        gridId: "",
+        categoryCode: "",
+        parentCode: "",
+        content: "",
+        reportType: "",
+        reportUserName: "",
+        reportUserMobile: "",
+        reportTime: "",
+        wantServiceTime: "",
+        demandUserId: "",
+        demandUserName: "",
+        demandUserMobile: "",
       },
       rules: {
-        gridId: [{ required: true, message: '所属网格不能为空', trigger: 'blur' }],
-        categoryCode: [{ required: true, message: '需求分类不能为空', trigger: 'blur' }],
-        content: [{ required: true, message: '需求内容不能为空', trigger: 'blur' }],
-        reportType: [{ required: true, message: '上报类型不能为空', trigger: 'blur' }],
-        reportUserName: [{ required: true, message: '上报人不能为空', trigger: 'blur' }],
-        reportUserMobile: [{ required: true, message: '上报人手机号不能为空', trigger: 'blur' }],
-        reportTime: [{ required: true, message: '上报时间不能为空', trigger: 'blur' }],
-        demandUserId: [{ required: true, message: '需求人不能为空', trigger: 'blur' }],
-        wantServiceTime: [{ required: true, message: '服务时间不能为空', trigger: 'blur' }],
-        serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }],
-        serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }],
-        score: [{ required: true, message: '评分不能为空', trigger: 'blur' }],
+        gridId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" },
+        ],
+        categoryCode: [
+          { required: true, message: "需求分类不能为空", trigger: "blur" },
+        ],
+        content: [
+          { required: true, message: "需求内容不能为空", trigger: "blur" },
+        ],
+        reportType: [
+          { required: true, message: "上报类型不能为空", trigger: "blur" },
+        ],
+        reportUserName: [
+          { required: true, message: "上报人不能为空", trigger: "blur" },
+        ],
+        reportUserMobile: [
+          { required: true, message: "上报人手机号不能为空", trigger: "blur" },
+        ],
+        reportTime: [
+          { required: true, message: "上报时间不能为空", trigger: "blur" },
+        ],
+        demandUserId: [
+          { required: true, message: "需求人不能为空", trigger: "blur" },
+        ],
+        wantServiceTime: [
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
+        ],
+        serviceType: [
+          { required: true, message: "服务方不能为空", trigger: "blur" },
+        ],
+        serviceStartTime: [
+          { required: true, message: "实际服务时间不能为空", trigger: "blur" },
+        ],
+        score: [{ required: true, message: "评分不能为空", trigger: "blur" }],
         // finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
-        finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
-      }
-    }
+        finishResult: [
+          { required: true, message: "完成情况不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   async created() {
-    this.customerId = localStorage.getItem('customerId')
-    
-    this.getTableData()
-    this.getDemandOptions()
-    this.getDictOptions()
+    this.customerId = localStorage.getItem("customerId");
+
+    this.getTableData();
+    this.getDemandOptions();
+    this.getDictOptions();
     setTimeout(() => {
-      this.getGridList('query')
-      this.getGridList('addorupdate')
-    }, 200)
-    this.pageLoading = true
-  },
-  mounted() {
+      this.getGridList("query");
+      this.getGridList("addorupdate");
+    }, 200);
+    this.pageLoading = true;
   },
+  mounted() {},
   methods: {
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getTableData()
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableData();
     },
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
-      this.currentPage = val
-      this.getTableData()
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+      this.getTableData();
     },
     handleFilterSpan(row, item) {
-      let _val = ''
+      let _val = "";
       if (item.options && item.options.length > 0) {
         item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label
-        })
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
       }
-      return _val || row[item.columnName]
+      return _val || row[item.columnName];
     },
     filterEdit(id) {
-      const { user } = this.$store.state
-      return id === user.agencyId
+      const { user } = this.$store.state;
+      return id === user.agencyId;
     },
     resetForm(formName) {
-      this.searchForm.reportStartTime = ''
-      this.searchForm.reportEndTime = ''
-      this.searchForm.wantServiceStartTime = ''
-      this.searchForm.wantServiceEndTime = ''
-      this.searchForm.categoryCode = ''
-      this.searchForm.level = ''
-      this.reportTime = ''
-      this.serviceTime = ''
-      this.$refs[formName].resetFields()
-      this.handleSearch()
+      this.searchForm.reportStartTime = "";
+      this.searchForm.reportEndTime = "";
+      this.searchForm.wantServiceStartTime = "";
+      this.searchForm.wantServiceEndTime = "";
+      this.searchForm.categoryCode = "";
+      this.searchForm.level = "";
+      this.reportTime = "";
+      this.serviceTime = "";
+      this.$refs[formName].resetFields();
+      this.handleSearch();
     },
     handleCateCHange(val) {
-      console.log('val', val)
-      this.searchForm.categoryCode = val[1] || val[0]
-      this.searchForm.level = val.length
+      console.log("val", val);
+      this.searchForm.categoryCode = val[1] || val[0];
+      this.searchForm.level = val.length;
     },
     handleCateSlect(val) {
-      console.log('val', val)
+      console.log("val", val);
       if (val.length === 1) {
-        this.demandOptions.forEach(item => {
-          if (item.value == val[0]) this.form.parentCode = item.pvalue
-        })
-        this.form.categoryCode = val[0]
+        this.demandOptions.forEach((item) => {
+          if (item.value == val[0]) this.form.parentCode = item.pvalue;
+        });
+        this.form.categoryCode = val[0];
       } else {
-        this.form.parentCode = val[0]
-        this.form.categoryCode = val[1]
+        this.form.parentCode = val[0];
+        this.form.categoryCode = val[1];
       }
-      
     },
     handleDemandChange(val) {
-      console.log('val', val, this.selectDemandUser)
-      this.selectDemandUser = val.label
-      this.form.demandUserName = val.demandUserName
-      this.form.demandUserMobile = val.demandUserMobile
-      this.form.demandUserId = val.demandUserId
+      console.log("val", val, this.selectDemandUser);
+      this.selectDemandUser = val.label;
+      this.form.demandUserName = val.demandUserName;
+      this.form.demandUserMobile = val.demandUserMobile;
+      this.form.demandUserId = val.demandUserId;
     },
     handleSearch(val) {
-      console.log('searchhh--', val)
-      this.currentPage = 1
+      console.log("searchhh--", val);
+      this.currentPage = 1;
       if (Array.isArray(this.reportTime) && this.reportTime.length > 0) {
-        this.searchForm.reportStartTime = this.reportTime[0]
-        this.searchForm.reportEndTime = this.reportTime[1]
+        this.searchForm.reportStartTime = this.reportTime[0];
+        this.searchForm.reportEndTime = this.reportTime[1];
       }
       if (Array.isArray(this.serviceTime) && this.serviceTime.length > 0) {
-        this.searchForm.wantServiceStartTime = this.serviceTime[0]
-        this.searchForm.wantServiceEndTime = this.serviceTime[1]
+        this.searchForm.wantServiceStartTime = this.serviceTime[0];
+        this.searchForm.wantServiceEndTime = this.serviceTime[1];
       }
-      this.getTableData()
+      this.getTableData();
     },
     handelBlurServiceTime(val) {
-      console.log('val', val)
+      console.log("val", val);
       if (val.length > 0) {
-        this.form.serviceStartTime = val[0]
-        this.form.serviceEndTime = val[1]
+        this.form.serviceStartTime = val[0];
+        this.form.serviceEndTime = val[1];
       }
-      
     },
     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, '')
-      
+      if (val === "social_org") {
+        if (type === "add") this.getServiceuserList(val, "add_demand");
+        else this.getServiceuserList(val, "query_demand");
+      } else this.getServiceuserList(val, "");
     },
     handleGridChange(val) {
-      this.getDemandUserList()
+      this.getDemandUserList();
     },
     handleAdd(addType) {
-      this.addType = addType
-      this.dialogVisible = true
+      this.addType = addType;
+      this.dialogVisible = true;
     },
     handlerCancle() {
       // this.form.categoryCode = ''
@@ -753,60 +954,68 @@ export default {
       // this.form.demandUserName = ''
       // this.form.demandUserMobile = ''
       // this.form.demandUserId = ''
-      this.$delete(this.form, 'demandRecId')
-      this.selectDemandUser = ''
-      this.finishServiceTime = ''
-      for(const n in this.form) {
-        this.form[n] = ''
+      this.$delete(this.form, "demandRecId");
+      this.selectDemandUser = "";
+      this.finishServiceTime = "";
+      for (const n in this.form) {
+        this.form[n] = "";
       }
-      this.disabled = false
+      this.disabled = false;
       // this.$refs.ruleForm.resetFields()
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     async formatRowForm(row, addType, disabled) {
-      this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
-      this.addType = addType
-      
+      this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] };
+      this.addType = addType;
+
       if (disabled) {
         // await this.getGridList('query', row.agencyId)
-        this.disabled = disabled
+        this.disabled = disabled;
       }
-      if (addType == 'look') {
-        this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
+      if (addType == "look") {
+        this.finishServiceTime =
+          (row.serviceStartTime && [
+            row.serviceStartTime,
+            row.serviceEndTime,
+          ]) ||
+          "";
       }
-      if (addType == 'finish') {
-        if (row.serviceStartTime) this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
-        
-        this.form.finishResult = 'resolved'
-        this.form.score = 5
+      if (addType == "finish") {
+        if (row.serviceStartTime)
+          this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
+
+        this.form.finishResult = "resolved";
+        this.form.score = 5;
       }
-      if (addType == 'appoint' && row.serviceType) {
-        const type = row.serviceType == 'social_org' ? 'add_demand' : ''
-        await this.getServiceuserList(row.serviceType, type)
+      if (addType == "appoint" && row.serviceType) {
+        const type = row.serviceType == "social_org" ? "add_demand" : "";
+        await this.getServiceuserList(row.serviceType, type);
       }
-      if (addType == 'edit') {
-        await this.getDemandUserList()
-        this.demandOptions.forEach(item => {
-        if (item.value === row.categoryCode) this.form.categoryCode = [row.categoryCode]
-      })
-        this.demandUserList.forEach(item => {
-          if (item.demandUserId == row.demandUserId) this.selectDemandUser = item.label
-        })
+      if (addType == "edit") {
+        await this.getDemandUserList();
+        this.demandOptions.forEach((item) => {
+          if (item.value === row.categoryCode)
+            this.form.categoryCode = [row.categoryCode];
+        });
+        this.demandUserList.forEach((item) => {
+          if (item.demandUserId == row.demandUserId)
+            this.selectDemandUser = item.label;
+        });
       }
-      
-      this.dialogVisible = true
+
+      this.dialogVisible = true;
     },
     async handleLook(row, type) {
-      await this.formatRowForm(row, type, true)
+      await this.formatRowForm(row, type, true);
     },
     async handleAppoint(row, type) {
-      await this.formatRowForm(row, type, true)
+      await this.formatRowForm(row, type, true);
     },
     async handleFinish(row, type) {
-      await this.formatRowForm(row, type, true)
+      await this.formatRowForm(row, type, true);
     },
     async handleEdit(row, type) {
-      await this.formatRowForm(row, type, false)
+      await this.formatRowForm(row, type, false);
       // this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
       // this.addType = addType
       // this.demandOptions.forEach(item => {
@@ -821,307 +1030,320 @@ export default {
     },
     async addNew() {
       const _form = {
-        ...this.form
-      }
+        ...this.form,
+      };
       await this.$http
-        .post('/heart/userdemand/add', _form)
+        .post("/heart/userdemand/add", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.handlerCancle()
-            this.getTableData()
-          } 
+            this.handlerCancle();
+            this.getTableData();
+          }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-        this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
     async appointAjax() {
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceType: this.form.serviceType,
-        serverId: this.form.serverId
-      }
+        serverId: this.form.serverId,
+      };
       await this.$http
-        .post('/heart/userdemand/assign', _form)
+        .post("/heart/userdemand/assign", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.handlerCancle()
-            this.getTableData()
-          } 
+            this.handlerCancle();
+            this.getTableData();
+          }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-        this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
     async finishAjax() {
-      const { reportType, serviceShowFlag, serviceType } = this.form
+      const { reportType, serviceShowFlag, serviceType } = this.form;
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceStartTime: this.form.serviceStartTime,
         serviceEndTime: this.form.serviceEndTime,
-        finishResult: reportType == 'self_help' ? '' : this.form.finishResult,
-        finishDesc: reportType == 'self_help' ? '' : this.form.finishDesc,
+        finishResult: reportType == "self_help" ? "" : this.form.finishResult,
+        finishDesc: reportType == "self_help" ? "" : this.form.finishDesc,
         serviceId: this.form.serviceId,
-        score: reportType == 'self_help' ? 0 : this.form.score
-      }
+        score: reportType == "self_help" ? 0 : this.form.score,
+      };
       await this.$http
-        .post('/heart/userdemand/finish', _form)
+        .post("/heart/userdemand/finish", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.handlerCancle()
-            this.getTableData()
-          } 
+            this.handlerCancle();
+            this.getTableData();
+          }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-        this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
     async editCate() {
-      const categoryCode = this.form.categoryCode
+      const categoryCode = this.form.categoryCode;
       if (Array.isArray(categoryCode)) {
         if (categoryCode.length === 1) {
-          this.demandOptions.forEach(item => {
-            if (item.value == categoryCode[0]) this.form.parentCode = item.pvalue
-          })
-          this.form.categoryCode = categoryCode[0]
+          this.demandOptions.forEach((item) => {
+            if (item.value == categoryCode[0])
+              this.form.parentCode = item.pvalue;
+          });
+          this.form.categoryCode = categoryCode[0];
         } else {
-          this.form.parentCode = categoryCode[0]
-          this.form.categoryCode = categoryCode[1]
+          this.form.parentCode = categoryCode[0];
+          this.form.categoryCode = categoryCode[1];
         }
       }
-      
+
       const _form = {
-        ...this.form
-      }
+        ...this.form,
+      };
       await this.$http
-        .post('/heart/userdemand/update', _form)
+        .post("/heart/userdemand/update", _form)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.handlerCancle()
-            this.getTableData()
-          } 
+            this.handlerCancle();
+            this.getTableData();
+          }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-        this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
     handleSUbmit() {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
-          this.btnLoading = true
-          if (this.addType == 'add') this.addNew()
-          else if (this.addType == 'edit') this.editCate()
-          else if (this.addType == 'appoint') this.appointAjax()
-          else if (this.addType == 'finish') this.finishAjax()
-          
+          this.btnLoading = true;
+          if (this.addType == "add") this.addNew();
+          else if (this.addType == "edit") this.editCate();
+          else if (this.addType == "appoint") this.appointAjax();
+          else if (this.addType == "finish") this.finishAjax();
         } else {
-          console.log('error submit!!');
+          console.log("error submit!!");
           return false;
         }
       });
-      
     },
     handleDel(row) {
       let params = {
-        demandRecId: row.demandRecId
-      }
-      console.log('row1', row)
+        demandRecId: row.demandRecId,
+      };
+      console.log("row1", row);
       this.$http
-        .post('/heart/userdemand/cancel', params)
+        .post("/heart/userdemand/cancel", params)
         .then(({ data: res }) => {
-          console.log('row2', row)
+          console.log("row2", row);
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('row3', row)
-            this.$message.success('取消成功')
-            this.getTableData()
+            console.log("row3", row);
+            this.$message.success("取消成功");
+            this.getTableData();
           }
         })
         .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
     },
-    getTreeData(data){
-      if (!Array.isArray(data)) return []
-      let arr = data.map(item => {
-        let _item = {}
+    getTreeData(data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
         if (item.children) {
-          if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children)}
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else _item = { ...item, children: this.getTreeData(item.children) };
         } else {
-          _item = { ...item }
+          _item = { ...item };
         }
-        return _item
-      })
-      return arr
+        return _item;
+      });
+      return arr;
     },
     getFlagData(data, flag) {
-      if (!Array.isArray(data)) return []
-      let arr1 = data.filter(item => item[flag])
-      let arr2 = arr1.map(item => {
-        if (item.children) return { ...item, children: this.getFlagData(item.children, flag) }
-        else return item
-      })
+      if (!Array.isArray(data)) return [];
+      let arr1 = data.filter((item) => item[flag]);
+      let arr2 = arr1.map((item) => {
+        if (item.children)
+          return { ...item, children: this.getFlagData(item.children, flag) };
+        else return item;
+      });
       // console.log('arrr-oppp', arr2)
-      return arr2
+      return arr2;
     },
     async getGridList(type, agencyId) {
-      const { user } = await this.$store.state
-      console.log('user---ppp', user)
+      const { user } = await this.$store.state;
+      console.log("user---ppp", user);
       // addorupdate  query
       await this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: agencyId || user.agencyId,
+          purpose: type,
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            
-            if (type === 'query') this.optionsG = res.data
-            else this.optionsEditG = res.data
+            console.log("获取查询详情成功", res.data);
+
+            if (type === "query") this.optionsG = res.data;
+            else this.optionsEditG = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     async getDemandUserList() {
-      const { user } = await this.$store.state
-      console.log('user---ppp', user)
+      const { user } = await this.$store.state;
+      console.log("user---ppp", user);
       const params = {
         agencyId: user.agencyId,
         gridId: this.form.gridId,
-        name: ''
-      }
+        name: "",
+      };
       // addorupdate
       await this.$http
-        .post('/epmetuser/icresiuser/demandusers', params)
+        .post("/epmetuser/icresiuser/demandusers", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.demandUserList = res.data
+            console.log("获取查询详情成功", res.data);
+            this.demandUserList = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
 
     async getDemandOptions() {
       this.$http
-        .post('/heart/icresidemanddict/demandoption')
+        .post("/heart/icresidemanddict/demandoption")
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.searchdemandOptions = this.getTreeData(res.data)
-            this.demandOptions = this.getFlagData(this.getTreeData(res.data), 'usableFlag')
+            this.searchdemandOptions = this.getTreeData(res.data);
+            this.demandOptions = this.getFlagData(
+              this.getTreeData(res.data),
+              "usableFlag"
+            );
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     async getServiceuserList(serviceType, query) {
-      if (!serviceType) return false
-      const { demandUserId } = this.form
+      if (!serviceType) return false;
+      const { demandUserId } = this.form;
       const params = {
-        serviceName: '',
+        serviceName: "",
         serviceType: serviceType,
-        queryPurpose: query
-      }
+        queryPurpose: query,
+      };
       await this.$http
-        .post('/heart/userdemand/servicelist', params)
+        .post("/heart/userdemand/servicelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.serviceOptiondList = res.data.filter(item => item.value != demandUserId)
+            this.serviceOptiondList = res.data.filter(
+              (item) => item.value != demandUserId
+            );
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     async getDictOptions() {
       this.$http
-        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_status' })
+        .post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.statusOptions = res.data
+            this.statusOptions = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
       this.$http
-        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_report_type' })
+        .post("/sys/dict/data/dictlist", {
+          dictType: "user_demand_report_type",
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.reportOptions = res.data && res.data.filter(item => item.value != 'self_help')
+            this.reportOptions =
+              res.data && res.data.filter((item) => item.value != "self_help");
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
       this.$http
-        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_service_type' })
+        .post("/sys/dict/data/dictlist", {
+          dictType: "user_demand_service_type",
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.serviceOptions = res.data
+            this.serviceOptions = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     async getTableData() {
-      this.tableLoading = true
+      this.tableLoading = true;
       let params = {
         ...this.searchForm,
         pageNo: this.currentPage,
-        pageSize: this.pageSize
-      }
+        pageSize: this.pageSize,
+      };
       await this.$http
-        .post('/heart/userdemand/pagelist', params)
+        .post("/heart/userdemand/pagelist", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.tableData = res.data.list
-            this.total = res.data.total
+            this.tableData = res.data.list;
+            this.total = res.data.total;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.tableLoading = false
-    }
-    
-  }
-}
+          return this.$message.error("网络错误");
+        });
+      this.tableLoading = false;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -1158,7 +1380,6 @@ export default {
     &-min {
       min-width: 260px;
     }
-
   }
   .input-width-textarea {
     width: 400px;
@@ -1166,11 +1387,9 @@ export default {
   .form-score {
     ::v-deep .el-rate {
       margin-top: 8px;
-    } 
-    
+    }
   }
 }
-
 </style>
 
 <style lang="scss" scoped>
@@ -1189,14 +1408,13 @@ export default {
   }
 }
 .avatar-uploader {
-  ::v-deep
-  .el-upload {
+  ::v-deep .el-upload {
     cursor: pointer;
     position: relative;
     overflow: hidden;
   }
   .el-upload:hover {
-    border-color: #409EFF;
+    border-color: #409eff;
   }
   .avatar {
     width: 70px;
@@ -1214,8 +1432,6 @@ export default {
     text-align: center;
   }
 }
-  
-  
 
 .resi-btns {
   margin-top: 20px;
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
new file mode 100644
index 000000000..d0ae9e9ad
--- /dev/null
+++ b/src/views/modules/importRecord/index.vue
@@ -0,0 +1,291 @@
+<template>
+  <div>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <h2 type="success" size="small">导入记录</h2>
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :max-height="maxTableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column prop="originFileName" label="文件名">
+        </el-table-column>
+        <el-table-column prop="startTime" label="导入时间"> </el-table-column>
+        <el-table-column label="导入状态" align="center" width="180">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.processStatus == 'processing'"
+              >导入中</span
+            >
+            <span
+              v-else-if="scope.row.processStatus == 'finished'"
+              >已完成</span
+            >
+            <a target="_blank"
+              :href="scope.row.resultDescFile"
+              style="color: #00a7a9"
+              v-else-if="scope.row.processStatus == 'finished_fail'"
+              >下载失败说明</a
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+
+export default {
+  components: {},
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [
+        // {
+        //   originFileName: '某某某.xls',
+        //   processStatus: 'finished_fail',
+        //   startTime: '2022-02-22',
+        //   resultDescFile: 'http://www.baidu.com',
+        // }
+      ],
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 450;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {},
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    async handleAdd() {
+      this.formShow = true;
+      await nextTick();
+      console.log(this.$refs);
+      this.$refs.eleEditForm.initForm("add");
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url = "/heart/societyorg/del";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        societyId: tableData[rowIndex].societyId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async getTableData() {
+      const url = "/commonservice/import-task/page";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tabs-other-info {
+  .el-tabs__item {
+    // width: 50px;
+    height: 20px;
+    box-sizing: border-box;
+    margin-right: 7px;
+    padding: 0 10px !important;
+    font-size: 8px;
+    font-weight: 500;
+    color: #666666;
+    line-height: 20px;
+    background: #ebecf1;
+    border-radius: 2px;
+  }
+  .el-tabs__nav-wrap::after,
+  .el-tabs__active-bar {
+    display: none;
+  }
+  .el-tabs__nav-next,
+  .el-tabs__nav-prev {
+    line-height: 20px;
+  }
+}
+
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.resi-other {
+  width: 100%;
+  display: flex;
+  .resi-other-title {
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+  }
+  .tabs-other-info {
+    // padding-left: 60px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
+}
+.resi-row-box {
+  height: 104px;
+  overflow: hidden;
+  transition: height 0.5s;
+}
+.resi-row-more {
+  height: max-content;
+  transition: height 0.5s;
+}
+.resi-row {
+  margin-bottom: 20px;
+}
+.resi-search {
+  .el-col {
+    text-align: right;
+  }
+}
+.resi-cell {
+  display: flex;
+  align-items: center;
+  .resi-cell-label {
+    width: 70px;
+    box-sizing: border-box;
+    margin-right: 15px;
+    text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 180px;
+  }
+  .resi-cell-select {
+    width: 180px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index b3fcc0dc8..18b13ef6b 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -14,6 +14,32 @@
       </div>
     </div>
 
+    <!-- 组织列表 -->
+
+    <div v-show="orgLevel!=='neighborHood'"
+         class="div_agency_list">
+      <el-scrollbar style="height:98%"
+                    wrap-style="overflow-x:hidden">
+
+        <div v-if="subAgencyArray.length>0"
+             class="agency_list">
+          <div v-for="(item,index) in subAgencyArray"
+               :key="index"
+               @click="clickAgencyItem(item,index)"
+               :class="['agency_item',{'agency_item_on':index%2 ==0}]">
+            <div>{{item.name}}</div>
+
+          </div>
+        </div>
+        <div v-else>
+          <img src="@/assets/img/modules/visual/noData.png"
+               alt=""
+               srcset=""
+               class="no-data-img" />
+        </div>
+      </el-scrollbar>
+    </div>
+
     <people-search v-show="orgLevel==='search'"
                    @toSubAgency="toSubAgency"
                    ref="ref_search"></people-search>
@@ -277,7 +303,6 @@ const vueGis = {
   methods: {
 
     handleSearch () {
-
       this.toSubAgency('search')
     },
 
@@ -325,10 +350,23 @@ const vueGis = {
       this.level = ''
     },
 
+    //点击组织列表数据
+    clickAgencyItem (item, index) {
+
+      let e = {
+        selected: []
+      }
+      let one = {
+        values_: item
+      }
+      e.selected.push(one)
+
+      this.toSubAgency('polygon', e)
+    },
+
     //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）   search 点击搜索  people 点击详情
     async toSubAgency (type, e, searchName) {
 
-
       //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
       if (type === 'people') {
         this.runNum++
@@ -358,6 +396,7 @@ const vueGis = {
         });
 
       } else {
+
         if (!e) {
           return false
         }
@@ -940,4 +979,9 @@ export default vueGis;
     overflow-x: hidden !important;
   }
 }
+.div_agency_list {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 3e7b55977..67aead486 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -144,7 +144,7 @@ export default {
       headerList: [
         { title: "序号", coulmn: 'index' },
         { title: "活动标题", coulmn: 'title' },
-        { title: "区域化党建单位名称", coulmn: 'unitName' },
+        { title: "单位名称", coulmn: 'unitName' },
         { title: "活动地址", coulmn: 'address' },
         { title: "服务事项", coulmn: 'serviceMatterName' },
         { title: "服务人数", coulmn: 'peopleCount' },
@@ -388,6 +388,8 @@ export default {
 
       if (code === 0) {
         this.detailInfo = data
+        this.detailInfo.serviceMatterNameShow = data.serviceMatterNameList.join(',')
+        this.detailInfo.unitNameShow = data.unitNameList.join(',')
       } else {
         this.$message.error(msg)
       }
@@ -756,11 +758,6 @@ export default {
   }
   .box-right {
     flex: 1;
-    // width: calc(100% - 400px);
-    overflow: hidden;
-    .pagination {
-      margin-top: 0;
-    }
     .box-map {
       height: 400px;
       // border: 1px solid #2865fa;
diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue
index 4a5212900..60db4c68c 100644
--- a/src/views/modules/visual/communityParty/dialogInfo.vue
+++ b/src/views/modules/visual/communityParty/dialogInfo.vue
@@ -19,11 +19,11 @@
             </div> -->
             <div class="item">
               <span class="item-field">服务事项：</span>
-              <span>{{ info.serviceMatterName }}</span>
+              <span>{{ info.serviceMatterNameShow }}</span>
             </div>
             <div class="item">
               <span class="item-field">单位名称：</span>
-              <span>{{ info.unitName }}</span>
+              <span>{{ info.unitNameShow }}</span>
             </div>
             <div class="item">
               <span class="item-field">活动标题：</span>