From 96371161395892d2c34ec0623737a854ce61d78c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 20 May 2022 16:36:21 +0800
Subject: [PATCH] fff

---
 .../communityService/measure/index.vue        | 935 ++++++++++--------
 .../modules/communityService/measure/info.vue |  17 +-
 2 files changed, 540 insertions(+), 412 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 21423d29..75cfabff 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1,35 +1,39 @@
 <template>
-  <div v-if="pageLoading"
-       class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
+  <div v-if="pageLoading" class="resi-container">
+    <el-card ref="searchCard" class="search-card">
       <div>
-        <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-option v-for="item in optionsG"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="所属网格" prop="gridId">
+              <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"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="需求分类"
-                          prop="categoryCode">
-              <el-cascader v-model="searchForm.categoryCode"
-                           :options="searchdemandOptions"
-                           :props="{ checkStrictly: true }"
-                           clearable
-                           @change="handleCateCHange"></el-cascader>
+            <el-form-item label="需求分类" prop="categoryCode">
+              <el-cascader
+                v-model="searchForm.categoryCode"
+                :options="searchdemandOptions"
+                :props="{ checkStrictly: true }"
+                clearable
+                @change="handleCateCHange"
+              ></el-cascader>
               <!-- <el-select v-model="searchForm.categoryCode" filterable placeholder="请选择" clearable>
                 <el-option
                   v-for="item in demandOptions"
@@ -39,248 +43,303 @@
                 </el-option>
               </el-select> -->
             </el-form-item>
-            <el-form-item label="需求人"
-                          prop="demandUserName">
-              <el-input v-model="searchForm.demandUserName"
-                        placeholder="请输入内容"
-                        clearable=""></el-input>
+            <el-form-item label="需求人" prop="demandUserName">
+              <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-option v-for="item in statusOptions"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="状态" prop="status">
+              <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"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="上报时间"
-                          prop="reportStartTime">
-              <el-date-picker v-model="reportTime"
-                              type="daterange"
-                              format="yyyy 年 MM 月 dd 日"
-                              value-format="yyyy-MM-dd"
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              clearable="">
+            <el-form-item label="上报时间" prop="reportStartTime">
+              <el-date-picker
+                v-model="reportTime"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                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-option v-for="item in serviceOptions"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+            <el-form-item label="服务类型" prop="serviceType">
+              <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"
+                >
                 </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-option v-for="item in serviceOptiondList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+              <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"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="服务时间"
-                          prop="wantServiceStartTime">
-              <el-date-picker v-model="serviceTime"
-                              type="daterange"
-                              format="yyyy 年 MM 月 dd 日"
-                              value-format="yyyy-MM-dd"
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              clearable>
+            <el-form-item label="服务时间" prop="wantServiceStartTime">
+              <el-date-picker
+                v-model="serviceTime"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                clearable
+              >
               </el-date-picker>
             </el-form-item>
             <el-form-item>
-              <el-button class="diy-button--search"
-                         size="small"
-                         @click="handleSearch">查询</el-button>
+              <el-button
+                class="diy-button--search"
+                size="small"
+                @click="handleSearch"
+                >查询</el-button
+              >
             </el-form-item>
             <el-form-item>
-              <el-button class="diy-button--reset"
-                         size="small"
-                         @click="resetForm('searchForm')">重置</el-button>
+              <el-button
+                class="diy-button--reset"
+                size="small"
+                @click="resetForm('searchForm')"
+                >重置</el-button
+              >
             </el-form-item>
           </div>
         </el-form>
       </div>
     </el-card>
     <el-card class="resi-card-table">
-
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd('add')">新增</el-button>
+        <el-button
+          class="diy-button--add"
+          size="small"
+          @click="handleAdd('add')"
+          >新增</el-button
+        >
       </div>
 
-      <el-table :data="tableData"
-                row-key="categoryId"
-                v-loading="tableLoading"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                class="resi-table">
-        <el-table-column label="序号"
-                         type="index"
-                         align="center"
-                         width="50">
+      <el-table
+        :data="tableData"
+        row-key="categoryId"
+        v-loading="tableLoading"
+        border
+        :height="tableHeight"
+        style="width: 100%"
+        class="resi-table"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50">
         </el-table-column>
-        <el-table-column v-for="item in tableHeader"
-                         :key="item.columnName"
-                         :prop="item.columnName"
-                         :label="item.label"
-                         :align="item.align"
-                         :min-width="item.width"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          :align="item.align"
+          :min-width="item.width"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="200">
+        <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <template v-if="filterEdit(scope.row.agencyId)">
-              <el-button v-if="
+              <el-button
+                v-if="
                   scope.row.status === 'pending' ||
                   scope.row.status === 'assigned'
                 "
-                         type="text"
-                         size="small"
-                         @click="handleAppoint(scope.row, 'appoint')">指派</el-button>
+                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="
+              <template
+                v-if="
                   scope.row.reportType == 'self_help' &&
                   scope.row.serviceShowFlag
-                ">
-                <el-button v-if="
+                "
+              >
+                <el-button
+                  v-if="
                     scope.row.serviceType !== 'volunteer' &&
                     scope.row.status !== 'finished'
                   "
-                           type="text"
-                           size="small"
-                           @click="handleFinish(scope.row, 'finish')">完成情况</el-button>
+                  type="text"
+                  size="small"
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</el-button
+                >
               </template>
               <template v-else>
-                <el-button v-if="
+                <el-button
+                  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>
+                  type="text"
+                  size="small"
+                  @click="handleFinish(scope.row, 'finish')"
+                  >完成情况</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>
-                <el-popconfirm title="取消之后无法恢复，确认取消？"
-                               @onConfirm="handleDel(scope.row)">
-                  <el-button v-if="
+                <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'
                     "
-                             slot="reference"
-                             type="text"
-                             size="small"
-                             class="btn-color-del">取消</el-button>
+                    slot="reference"
+                    type="text"
+                    size="small"
+                    class="btn-color-del"
+                    >取消</el-button
+                  >
                 </el-popconfirm>
               </template>
             </template>
-            <el-button @click="handleLook(scope.row, 'look')"
-                       type="text"
-                       size="small"
-                       class="btn-color-look">查看</el-button>
+            <el-button
+              @click="handleLook(scope.row, 'look')"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >查看</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="currentPage"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="currentPage"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
-    <el-dialog title="需求信息"
-               :visible.sync="dialogVisible"
-               width="50%"
-               top="5vh"
-               append-to-body
-               class="dialog-h"
-               :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 dialog-h-content scroll-h">
-        <el-form-item label="所属网格"
-                      prop="gridId">
-          <el-input v-if="disabled"
-                    v-model="form.gridName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
+    <el-dialog
+      title="需求信息"
+      :visible.sync="dialogVisible"
+      width="50%"
+      top="5vh"
+      append-to-body
+      class="dialog-h"
+      :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 dialog-h-content scroll-h"
+      >
+        <el-form-item label="所属网格" prop="gridId">
+          <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-option v-for="item in disabled ? optionsG : optionsEditG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <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"
+              :key="item.value"
+              :label="item.label"
+              :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-cascader v-else
-                       v-model="form.categoryCode"
-                       :options="demandOptions"
-                       :disabled="disabled"
-                       clearable
-                       class="input-width"
-                       @change="handleCateSlect"></el-cascader>
+        <el-form-item label="需求类型" prop="categoryCode">
+          <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"
+            clearable
+            class="input-width"
+            @change="handleCateSlect"
+          ></el-cascader>
           <!-- <el-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
             <el-option
               v-for="item in demandOptions"
@@ -290,222 +349,275 @@
             </el-option>
           </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-option v-for="item in reportOptions"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <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-option
+              v-for="item in reportOptions"
+              :key="item.value"
+              :label="item.label"
+              :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-form-item label="上报人" prop="reportUserName">
+          <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-form-item label="上报人手机号" prop="reportUserMobile">
+          <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 v-model="form.reportTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
+        <el-form-item label="上报时间" prop="reportTime">
+          <el-date-picker
+            v-model="form.reportTime"
+            type="datetime"
+            class="input-width"
+            clearable
+            :disabled="disabled"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            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 v-else
-                     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">
+        <el-form-item label="需求人" prop="demandUserId">
+          <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"
+          >
+            <el-option
+              v-for="item in demandUserList"
+              :key="item.demandUserId"
+              :label="item.label"
+              :value="item"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="服务时间"
-                      prop="wantServiceTime">
-          <el-date-picker v-model="form.wantServiceTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
+        <el-form-item label="服务时间" prop="wantServiceTime">
+          <el-date-picker
+            v-model="form.wantServiceTime"
+            type="datetime"
+            class="input-width"
+            clearable
+            :disabled="disabled"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            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-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-form-item>
-        <el-form-item v-if="
+        <el-form-item
+          v-if="
             addType === 'appoint' ||
             addType == 'finish' ||
             (addType == 'look' && form.serviceShowFlag)
           "
-                      label="服务方"
-                      prop="serviceType">
+          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-option v-for="item in serviceOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+            <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"
+              >
               </el-option>
             </el-select>
             -
-            <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">
+            <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"
+              >
               </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="
+        <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"
-                            class="input-width-min"
-                            clearable
-                            :disabled="disabled && addType != 'finish'"
-                            type="datetimerange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            @change="handelBlurServiceTime">
+          "
+        >
+          <el-form-item label="实际服务时间" prop="serviceStartTime">
+            <el-date-picker
+              v-model="finishServiceTime"
+              class="input-width-min"
+              clearable
+              :disabled="disabled && addType != 'finish'"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              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-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-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-form-item label="评价" prop="score" class="form-score">
+            <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-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-form-item>
         </template>
         <template v-if="addType == 'finish' && form.reportType == 'self_help'">
-          <el-form-item label="实际服务时间"
-                        prop="serviceStartTime">
-            <el-date-picker v-model="finishServiceTime"
-                            class="input-width-min"
-                            clearable
-                            :disabled="disabled && addType != 'finish'"
-                            type="datetimerange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            @change="handelBlurServiceTime">
+          <el-form-item label="实际服务时间" prop="serviceStartTime">
+            <el-date-picker
+              v-model="finishServiceTime"
+              class="input-width-min"
+              clearable
+              :disabled="disabled && addType != 'finish'"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              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">{{
+        <el-button size="small" @click="handlerCancle">{{
           addType != "look" ? "取消" : "关闭"
         }}</el-button>
-        <el-button v-if="addType != 'look'"
-                   type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
+        <el-button
+          v-if="addType != 'look'"
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
       </div>
     </el-dialog>
+
+    <info
+      :addType="infoAddType"
+      :demand-rec-id="currDemandId"
+      v-if="visitableInfo"
+      @close="visitableInfo = false"
+      @success="getTableData"
+    ></info>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
+import info from "./info";
+
 export default {
-  data () {
+  components: { info },
+
+  data() {
     return {
       tableLoading: false,
       btnLoading: false,
@@ -759,17 +871,21 @@ export default {
           { required: true, message: "完成情况不能为空", trigger: "blur" },
         ],
       },
+
+      visitableInfo: false,
+      currDemandId: "",
+      infoAddType: "look",
     };
   },
   computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight () {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
-      return this.$store.state.inIframe ? h : _h
-    }
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh;
+      const _h = this.clientHeight - 280 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
   },
-  async created () {
+  async created() {
     this.customerId = localStorage.getItem("customerId");
 
     this.getTableData();
@@ -781,24 +897,24 @@ export default {
     }, 200);
     this.pageLoading = true;
   },
-  mounted () {
+  mounted() {
     this.$nextTick(() => {
-      this.searchH = this.$refs.searchCard.$el.offsetHeight
-      console.log('tableHeight', this.tableHeight)
-    })
+      this.searchH = this.$refs.searchCard.$el.offsetHeight;
+      console.log("tableHeight", this.tableHeight);
+    });
   },
   methods: {
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.currentPage = val;
       this.getTableData();
     },
-    handleFilterSpan (row, item) {
+    handleFilterSpan(row, item) {
       let _val = "";
       if (item.options && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -807,11 +923,11 @@ export default {
       }
       return _val || row[item.columnName];
     },
-    filterEdit (id) {
+    filterEdit(id) {
       const { user } = this.$store.state;
       return id === user.agencyId;
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.searchForm.reportStartTime = "";
       this.searchForm.reportEndTime = "";
       this.searchForm.wantServiceStartTime = "";
@@ -823,12 +939,12 @@ export default {
       this.$refs[formName].resetFields();
       this.handleSearch();
     },
-    handleCateCHange (val) {
+    handleCateCHange(val) {
       console.log("val", val);
       this.searchForm.categoryCode = val[1] || val[0];
       this.searchForm.level = val.length;
     },
-    handleCateSlect (val) {
+    handleCateSlect(val) {
       console.log("val", val);
       if (val.length === 1) {
         this.demandOptions.forEach((item) => {
@@ -840,14 +956,14 @@ export default {
         this.form.categoryCode = val[1];
       }
     },
-    handleDemandChange (val) {
+    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;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log("searchhh--", val);
       this.currentPage = 1;
       if (Array.isArray(this.reportTime) && this.reportTime.length > 0) {
@@ -860,27 +976,27 @@ export default {
       }
       this.getTableData();
     },
-    handelBlurServiceTime (val) {
+    handelBlurServiceTime(val) {
       console.log("val", val);
       if (val.length > 0) {
         this.form.serviceStartTime = val[0];
         this.form.serviceEndTime = val[1];
       }
     },
-    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, "");
     },
-    handleGridChange (val) {
+    handleGridChange(val) {
       this.getDemandUserList();
     },
-    handleAdd (addType) {
+    handleAdd(addType) {
       this.addType = addType;
       this.dialogVisible = true;
     },
-    handlerCancle () {
+    handlerCancle() {
       // this.form.categoryCode = ''
       // this.form.parentCode = ''
       // this.form.demandUserName = ''
@@ -896,7 +1012,7 @@ export default {
       // this.$refs.ruleForm.resetFields()
       this.dialogVisible = false;
     },
-    async formatRowForm (row, addType, disabled) {
+    async formatRowForm(row, addType, disabled) {
       this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] };
       this.addType = addType;
 
@@ -937,17 +1053,17 @@ export default {
 
       this.dialogVisible = true;
     },
-    async handleLook (row, type) {
-      await this.formatRowForm(row, type, true);
+    async handleLook(row, type) {
+      await this.formatRowForm2(row, type, true);
     },
-    async handleAppoint (row, type) {
-      await this.formatRowForm(row, type, true);
+    async handleAppoint(row, type) {
+      await this.formatRowForm2(row, type, true);
     },
-    async handleFinish (row, type) {
-      await this.formatRowForm(row, type, true);
+    async handleFinish(row, type) {
+      await this.formatRowForm2(row, type, true);
     },
-    async handleEdit (row, type) {
-      await this.formatRowForm(row, type, false);
+    async handleEdit(row, type) {
+      await this.formatRowForm2(row, type, false);
       // this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
       // this.addType = addType
       // this.demandOptions.forEach(item => {
@@ -960,7 +1076,12 @@ export default {
       // console.log('selectDemandUser', this.selectDemandUser)
       // this.dialogVisible = true
     },
-    async addNew () {
+    formatRowForm2(row, type) {
+      this.visitableInfo = true;
+      this.currDemandId = row.demandRecId;
+      this.infoAddType = type;
+    },
+    async addNew() {
       const _form = {
         ...this.form,
       };
@@ -979,7 +1100,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    async appointAjax () {
+    async appointAjax() {
       const _form = {
         demandRecId: this.form.demandRecId,
         serviceType: this.form.serviceType,
@@ -1000,7 +1121,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    async finishAjax () {
+    async finishAjax() {
       const { reportType, serviceShowFlag, serviceType } = this.form;
       const _form = {
         demandRecId: this.form.demandRecId,
@@ -1026,7 +1147,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    async editCate () {
+    async editCate() {
       const categoryCode = this.form.categoryCode;
       if (Array.isArray(categoryCode)) {
         if (categoryCode.length === 1) {
@@ -1059,7 +1180,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    handleSUbmit () {
+    handleSUbmit() {
       this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.btnLoading = true;
@@ -1073,7 +1194,7 @@ export default {
         }
       });
     },
-    handleDel (row) {
+    handleDel(row) {
       let params = {
         demandRecId: row.demandRecId,
       };
@@ -1095,7 +1216,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getTreeData (data) {
+    getTreeData(data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -1110,7 +1231,7 @@ export default {
       });
       return arr;
     },
-    getFlagData (data, flag) {
+    getFlagData(data, flag) {
       if (!Array.isArray(data)) return [];
       let arr1 = data.filter((item) => item[flag]);
       let arr2 = arr1.map((item) => {
@@ -1121,7 +1242,7 @@ export default {
       // console.log('arrr-oppp', arr2)
       return arr2;
     },
-    async getGridList (type, agencyId) {
+    async getGridList(type, agencyId) {
       const { user } = await this.$store.state;
       console.log("user---ppp", user);
       // addorupdate  query
@@ -1144,7 +1265,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getDemandUserList () {
+    async getDemandUserList() {
       const { user } = await this.$store.state;
       console.log("user---ppp", user);
       const params = {
@@ -1168,7 +1289,7 @@ export default {
         });
     },
 
-    async getDemandOptions () {
+    async getDemandOptions() {
       this.$http
         .post("/heart/icresidemanddict/demandoption")
         .then(({ data: res }) => {
@@ -1186,7 +1307,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getServiceuserList (serviceType, query) {
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
       const { demandUserId } = this.form;
       const params = {
@@ -1209,7 +1330,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getDictOptions () {
+    async getDictOptions() {
       this.$http
         .post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
         .then(({ data: res }) => {
@@ -1252,7 +1373,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getTableData () {
+    async getTableData() {
       this.tableLoading = true;
       let params = {
         ...this.searchForm,
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index e06a6716..de7a2ca5 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -354,14 +354,15 @@ export default {
       type: String,
       default: "",
     },
+    addType: {
+      type: String,
+      default: "look",
+    },
   },
 
   data() {
     return {
-      addType: "look",
-
       btnLoading: false,
-      disabled: true,
       pageLoading: false,
 
       form: {
@@ -431,6 +432,9 @@ export default {
 
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
+    disabled() {
+      return this.addType != "edit";
+    },
   },
 
   watch: {
@@ -516,8 +520,6 @@ export default {
       this.addType = addType;
       const { form: row } = this;
 
-      this.disabled = addType != "edit";
-
       if (addType == "look") {
         this.finishServiceTime =
           (row.serviceStartTime && [
@@ -566,6 +568,7 @@ export default {
           } else {
             this.handlerClose();
             this.getInfo();
+            this.$emit("success");
             return this.$message.success("指派成功");
           }
         })
@@ -594,6 +597,7 @@ export default {
           } else {
             this.handlerClose();
             this.getInfo();
+            this.$emit("success");
             return this.$message.success("操作成功");
           }
         })
@@ -629,6 +633,7 @@ export default {
           } else {
             this.handlerClose();
             this.getInfo();
+            this.$emit("success");
             return this.$message.success("修改成功");
           }
         })
@@ -666,6 +671,8 @@ export default {
           } else {
             this.$message.success("取消成功");
             this.getInfo();
+            this.handlerClose();
+            this.$emit("success");
           }
         })
         .catch((err) => {