diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 70c4e5d9..88e617d6 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -37,7 +37,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh);
+    height: calc(88vh - 5px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
diff --git a/src/views/main.vue b/src/views/main.vue
index 9635a5d9..ab5b28bc 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -166,6 +166,7 @@ export default {
         params,
         (data, rspMsg) => {
           this.$store.state.user = { ...data }
+          console.log('user---hahha', this.$store.state.user)
           // this.$store.state.user.id = data.id
           // this.$store.state.user.realName = data.realName
           // this.$store.state.user.superAdmin = data.superAdmin
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 969b6779..4c6e4ba5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -867,7 +867,7 @@ export default {
   ::v-deep .el-table th {
     color: #fff;
     background-color: rgba(33, 149, 254, 1);
-    border-right: 1px solid rgba(33, 149, 254, 1);;
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
 .resi-table {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
new file mode 100644
index 00000000..07c0cf23
--- /dev/null
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -0,0 +1,612 @@
+<template>
+  <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">
+          <el-form-item label="所属网格">
+            <el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
+              <el-option
+                v-for="item in demandOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="党员姓名">
+            <el-select v-model="searchForm.name" filterable placeholder="请选择" clearable>
+              <el-option
+                v-for="item in demandOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="主要事迹">
+            <el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="resi-row-btn">
+        <el-button type="success" @click="handleAdd">新增</el-button>
+        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+        <el-upload
+          ref="upload"
+          class="upload-demo"
+          action="uploadUlr"
+          :limit="1"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-progress="handleProgress"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+          >
+          <el-button type="danger" :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+      </div>
+      
+      <el-table
+        :data="tableData"
+        row-key="categoryId"
+        v-loading="tableLoading"
+        border
+        max-height="800"
+        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"
+          :width="item.width"
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >查看</el-button
+            >
+            <el-button
+                @click="handleEdit(scope.row, 'edit')"
+                type="text"
+                size="small"
+                class="btn-color-edit"
+                >编辑</el-button
+              >
+            <el-popconfirm
+                title="删除之后无法恢复，确认删除？"
+                @onConfirm="handleDel(scope.row)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  class="btn-color-del"
+                  >删除</el-button
+                >
+              </el-popconfirm>
+          </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"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <el-dialog
+      title="居民需求分类"
+      :visible.sync="dialogVisible"
+      width="40%"
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="handlerCancle"
+    >
+      <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-select v-model="form.gridId" filterable placeholder="请选择" class="input-width" clearable>
+              <el-option
+                v-for="item in demandOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="党员姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入" class="input-width" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="主要事迹" prop="mainDeed">
+          <el-input v-model="form.mainDeed" :autosize="{ minRows: 2, maxRows: 10}" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="状态">
+          <el-switch v-model="form.usableFlag"></el-switch>
+        </el-form-item> -->
+        <el-form-item label="照片">
+          <el-input-number v-model="form.awardPoint" :min="0" size="small" label="描述文字"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <div class="resi-btns">
+        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+export default {
+  data() {
+    return {
+      importBtnTitle: '导入人员数据',
+      importLoading: false,
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      dialogVisible: false,
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      tableData: [],
+      addLevel: '1',
+      addType: 'add',
+      value: '',
+      options: [
+        {
+          label: '是',
+          value: 1
+        },{
+          label: '否',
+          value: 2
+        }
+      ],
+      demandOptions: [],
+      tableHeader: [
+        {
+          label: '党员姓名',
+          columnName: 'name',
+          align: 'center',
+          width: '160',
+          options: []
+        }, {
+          label: '所属网格',
+          align: 'center',
+          columnName: 'gridName',
+          width: '300',
+          options: []
+        }, {
+          label: '主要事迹',
+          columnName: 'mainDeed',
+          align: 'center',
+          width: '',
+          options: []
+        }
+      ],
+      customerId: '',
+      searchForm: {
+        gridId: '',
+        agencyId: '',
+        mainDeed: '',
+        name: ''
+      },
+      form: {
+        agencyId: '',
+        gridId: '',
+        name: '',
+        mainDeed: '',
+        imageList: []
+      },
+      rules: {
+        categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  async created() {
+    this.customerId = localStorage.getItem('customerId')
+    this.getTableData()
+    this.getOptions()
+    this.pageLoading = true
+  },
+  mounted() {
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getTableData()
+    },
+    handleFilterSpan(row, item) {
+      let _val = ''
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label
+        })
+      }
+      return _val || row[item.columnName]
+    },
+    // 上传大图标成功
+    handleExcelSuccess (res, file) {
+      if (res.code === 0 && res.msg === 'success') {
+
+        console.log('resss---ppp', res)
+
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    handleProgress(event, file, fileList) {
+      console.log('percentage', file.percentage)
+    },
+    beforeExcelUpload (file) {
+      console.log('file', file)
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      const isLt1M = (file.size / 1024 / 1024) < 10
+      if(!fileType) {
+          this.$message.error('上传文件只能是xls/xlsx格式！')
+      }
+      
+      // if (!isLt1M) {
+      //   this.$message.error('上传图片大小不能超过 10MB!')
+      // }
+      return fileType
+    },
+    uploadHttpRequest(file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
+        method: 'post',
+        data: formData,
+        responseType: 'blob'
+      })
+      .then((res) => {
+        this.importLoading = false
+        this.importBtnTitle = '导入人员数据'
+        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+        let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+        var url = window.URL.createObjectURL(blob)
+        var aLink = document.createElement('a')
+        aLink.style.display = 'none'
+        aLink.href = url
+        aLink.setAttribute('download', fileName)
+        document.body.appendChild(aLink)
+        aLink.click()
+        document.body.removeChild(aLink) //下载完成移除元素
+        window.URL.revokeObjectURL(url) //释放掉blob对象
+        this.getTableData()
+      })
+      .catch( err => {
+          console.log('失败', err)
+          param.onError() //上传失败的文件会从文件列表中删除
+      })
+    },
+    handleExport() {
+      let params = {
+        formCode: 'resi_base_info',
+        conditions: this.conditions
+      }
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
+        // url: 'epmetuser/icresiuser/exportExcel',
+        method: 'post',
+        data: params,
+        responseType: 'blob'
+      })
+        .then(res => {
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    handleSearch(val) {
+      console.log('searchhh--', val)
+      this.currentPage = 1
+      this.getTableData()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleAdd() {
+      this.dialogVisible = true
+    },
+
+    handlerCancle() {
+      this.dialogVisible = false
+    },
+    async handleLook(row) {
+      const params = {
+        categoryId: row.categoryId,
+        usableFlag: !row.usableFlag
+      }
+      this.$http
+        .post('/heart/icresidemanddict/updatestatus', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async handleEdit(row, addType) {
+      
+      this.form = { ...row }
+      this.dialogVisible = true
+    },
+    async addNew() {
+      const _form = {
+        ...this.form
+      }
+      await this.$http
+        .post('/resi/partymember/icpartymemberstyle/save', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dialogVisible = false
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    handleSUbmit() {
+      this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.btnLoading = true
+          this.addNew() 
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+      
+    },
+    handleDel(row) {
+      let params = {
+        id: row.id
+      }
+      console.log('row1', row)
+      this.$http
+        .post('/resi/partymember/icpartymemberstyle/delete', params)
+        .then(({ data: res }) => {
+          console.log('row2', row)
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('row3', row)
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    sortData() {
+      const _data = this.tableData.map((item, index)=> {
+        return {
+          id: item.id,
+          sort: index
+        }
+      })
+      this.$http
+        .post('/oper/customize/resicategorystatsconfig/updatesort', _data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            // this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async getOptions() {
+      const params = {
+        parentCategoryCode: 0
+      }
+      this.$http
+        .post('/heart/icresidemanddict/subcodelist', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.demandOptions = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTableData() {
+      this.tableLoading = true
+      let params = {
+        // formCode: 'resi_base_info',
+        ...this.searchForm,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize
+      }
+      await this.$http
+        .post('/resi/partymember/icpartymemberstyle/list', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data.list
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.tableLoading = false
+    }
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.form-wr {
+  .input-width {
+    width: 260px;
+
+  }
+  .input-width-textarea {
+    width: 400px;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+  .el-button--warning {
+    background: rgba(254, 179, 73, 1);
+  }
+  .el-button--danger {
+    background: rgba(254, 98, 82, 1);
+  }
+}
+.avatar-uploader {
+  ::v-deep
+  .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    width: 70px;
+    height: 70px;
+    display: block;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 70px;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+  }
+}
+  
+  
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
new file mode 100644
index 00000000..47da7883
--- /dev/null
+++ b/src/views/modules/communityService/measure/index.vue
@@ -0,0 +1,1152 @@
+<template>
+  <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">
+          <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-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="需求分类" prop="categoryCode">
+              <el-cascader
+                v-model="searchForm.categoryCode"
+                :options="demandOptions"
+                :props="{ checkStrictly: true }"
+                clearable
+                @change="handleCateCHange"></el-cascader>
+              <!-- <el-select v-model="searchForm.categoryCode" filterable placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in demandOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </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>
+            <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="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="serviceType">
+              <el-select v-model="searchForm.serviceType" filterable placeholder="请选择" clearable @change="handleServiceChange">
+                <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 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-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="handleSearch">查询</el-button>
+            </el-form-item>
+            <el-form-item>
+            <el-button @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"
+        v-loading="tableLoading"
+        border
+        max-height="800"
+        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"
+          :width="item.width"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <template v-if="filterEdit(scope.row.agencyId)">
+              <el-button
+                v-if="scope.row.status === 'pending' || scope.row.status === 'assigned'"
+                type="text"
+                size="small"
+                @click="handleAppoint(scope.row, 'appoint')"
+                >指派</el-button>
+              <el-button
+                v-if="scope.row.status === 'assigned' || scope.row.status === 'have_order'"
+                type="text"
+                size="small"
+                @click="handleFinish(scope.row, 'finish')"
+                >完成情况</el-button>
+              <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
+                >
+              </el-popconfirm>
+            </template>
+            <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"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <el-dialog
+      title="需求信息"
+      :visible.sync="dialogVisible"
+      width="40%"
+      append-to-body
+      :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-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-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-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
+            <el-option
+              v-for="item in demandOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </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-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>
+        <el-form-item label="上报人手机号" prop="reportUserMobile">
+          <el-input v-model="form.reportUserMobile" :disabled="disabled"  
+          placeholder="请输入" class="input-width" 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-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-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-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>
+        <el-form-item 
+        v-if="addType === 'appoint' || addType == 'finish' || addType == 'look'" 
+        label="服务方" prop="serviceType">
+          <template v-if="disabled && addType !== 'appoint'">
+            <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">
+              <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-option>
+            </el-select>
+          </template>
+        </el-form-item>
+        <template v-if="addType == 'finish' || addType == 'look'">
+          <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="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"
+              @blur="handelBlurServiceTime"
+              >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="评价" prop="score" class="form-score">
+              <el-rate v-model="form.score" :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>
+        </template>
+        
+      </el-form>
+      <div class="resi-btns">
+        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      dialogVisible: false,
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      tableData: [],
+      addLevel: '1',
+      addType: 'add',
+      value: '',
+      statusOptions: [
+        {
+          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'
+        }
+      ],
+      serviceOptiondList: [],
+      options: [
+        {
+          label: '是',
+          value: 1
+        },{
+          label: '否',
+          value: 2
+        }
+      ],
+      reportOptions: [],
+      demandOptions: [],
+      demandUserList: [],
+      optionsG: [],
+      optionsEditG: [],
+      tableHeader: [
+        {
+          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',
+          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: '',
+      searchForm: {
+        gridId: '',
+        categoryCode: '',
+        level: '',
+        demandUserName: '',
+        reportStartTime: '',
+        reportEndTime: '',
+        status: '',
+        serviceType: '',
+        serverId: '',
+        wantServiceStartTime: '',
+        wantServiceEndTime: ''
+      },
+      selectDemandUser: '',
+      form: {
+        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' }],
+        finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
+      }
+    }
+  },
+  async created() {
+    this.customerId = localStorage.getItem('customerId')
+    
+    this.getTableData()
+    this.getDemandOptions()
+    this.getDictOptions()
+    setTimeout(() => {
+      this.getGridList('query')
+      this.getGridList('addorupdate')
+    }, 200)
+    this.pageLoading = true
+  },
+  mounted() {
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getTableData()
+    },
+    handleFilterSpan(row, item) {
+      let _val = ''
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label
+        })
+      }
+      return _val || row[item.columnName]
+    },
+    filterEdit(id) {
+      const { user } = this.$store.state
+      return id === user.agencyId
+    },
+    resetForm(formName) {
+      this.searchForm.reportStartTime = ''
+      this.searchForm.reportEndTime = ''
+      this.searchForm.wantServiceStartTime = ''
+      this.searchForm.wantServiceTime = ''
+      this.searchForm.categoryCode = ''
+      this.searchForm.level = ''
+      this.reportTime = ''
+      this.serviceTime = ''
+      this.$refs[formName].resetFields()
+    },
+    handleCateCHange(val) {
+      console.log('val', val)
+      this.searchForm.categoryCode = val[1] || val[0]
+      this.searchForm.level = val.length
+    },
+    handleCateSlect(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]
+      } else {
+        this.form.parentCode = val[0]
+        this.form.categoryCode = val[1]
+      }
+      
+    },
+    handleDemandChange(val) {
+      console.log('val', val)
+      this.form.demandUserName = val.demandUserName
+      this.form.demandUserMobile = val.demandUserMobile
+      this.form.demandUserId = val.demandUserId
+    },
+    handleSearch(val) {
+      console.log('searchhh--', val)
+      this.currentPage = 1
+      if (this.reportTime.length > 0) {
+        this.searchForm.reportStartTime = this.reportTime[0]
+        this.searchForm.reportEndTime = this.reportTime[1]
+      }
+      if (this.serviceTime.length > 0) {
+        this.searchForm.wantServiceStartTime = this.serviceTime[0]
+        this.searchForm.wantServiceTime = this.serviceTime[1]
+      }
+      this.getTableData()
+    },
+    handelBlurServiceTime(val) {
+      console.log('val', val)
+      if (val.value.length > 0) {
+        this.form.serviceStartTime = val.value[0]
+        this.form.serviceEndTime = val.value[1]
+      }
+      
+    },
+    handleServiceChange(val) {
+      this.getServiceuserList(val)
+    },
+    handleGridChange(val) {
+      this.getDemandUserList()
+    },
+    handleAdd(addType) {
+      this.addType = addType
+      this.dialogVisible = true
+    },
+    handlerCancle() {
+      // this.form.categoryCode = ''
+      // this.form.parentCode = ''
+      // this.form.demandUserName = ''
+      // this.form.demandUserMobile = ''
+      // this.form.demandUserId = ''
+      this.$delete(this.form, 'demandRecId')
+      this.selectDemandUser = ''
+      for(const n in this.form) {
+        this.form[n] = ''
+      }
+      this.disabled = false
+      // this.$refs.ruleForm.resetFields()
+      this.dialogVisible = false
+    },
+    async formatRowForm(row, addType, disabled) {
+      this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
+      this.addType = addType
+      
+      if (disabled) {
+        // await this.getGridList('query', row.agencyId)
+        this.disabled = disabled
+      }
+      if (addType == 'look') {
+        this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+      }
+      if (addType == 'appoint' && row.serviceType) {
+        await this.getServiceuserList(row.serviceType)
+      }
+      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
+        })
+      }
+      
+      this.dialogVisible = true
+    },
+    async handleLook(row, type) {
+      await this.formatRowForm(row, type, true)
+    },
+    async handleAppoint(row, type) {
+      await this.formatRowForm(row, type, true)
+    },
+    async handleFinish(row, type) {
+      await this.formatRowForm(row, type, true)
+    },
+    async handleEdit(row, type) {
+      await this.formatRowForm(row, type, false)
+      // this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
+      // this.addType = addType
+      // this.demandOptions.forEach(item => {
+      //   if (item.value === row.categoryCode) this.form.categoryCode = [row.categoryCode]
+      // })
+      // await this.getDemandUserList()
+      // this.demandUserList.forEach(item => {
+      //   if (item.demandUserId == row.demandUserId) this.selectDemandUser = item
+      // })
+      // console.log('selectDemandUser', this.selectDemandUser)
+      // this.dialogVisible = true
+    },
+    async addNew() {
+      const _form = {
+        ...this.form
+      }
+      await this.$http
+        .post('/heart/userdemand/add', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.handlerCancle()
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    async appointAjax() {
+      const _form = {
+        demandRecId: this.form.demandRecId,
+        serviceType: this.form.serviceType,
+        serverId: this.form.serverId
+      }
+      await this.$http
+        .post('/heart/userdemand/assign', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.handlerCancle()
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    async finishAjax() {
+      const _form = {
+        demandRecId: this.form.demandRecId,
+        serviceStartTime: this.form.serviceStartTime,
+        serviceEndTime: this.form.serviceEndTime,
+        finishResult: this.form.finishResult,
+        finishDesc: this.form.finishDesc,
+        serviceId: this.form.serviceId,
+        score: this.form.score
+      }
+      await this.$http
+        .post('/heart/userdemand/finish', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.handlerCancle()
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+        this.btnLoading = false
+    },
+    async editCate() {
+      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]
+        } else {
+          this.form.parentCode = categoryCode[0]
+          this.form.categoryCode = categoryCode[1]
+        }
+      }
+      
+      const _form = {
+        ...this.form
+      }
+      await this.$http
+        .post('/heart/userdemand/update', _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.handlerCancle()
+            this.getTableData()
+          } 
+        })
+        .catch(() => {
+          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()
+          
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+      
+    },
+    handleDel(row) {
+      let params = {
+        demandRecId: row.demandRecId
+      }
+      console.log('row1', row)
+      this.$http
+        .post('/heart/userdemand/cancel', params)
+        .then(({ data: res }) => {
+          console.log('row2', row)
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('row3', row)
+            this.$message.success('取消成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    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)}
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
+    async getGridList(type, agencyId) {
+      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 })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            
+            if (type === 'query') this.optionsG = res.data
+            else this.optionsEditG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getDemandUserList() {
+      const { user } = await this.$store.state
+      console.log('user---ppp', user)
+      const params = {
+        agencyId: user.agencyId,
+        gridId: this.form.gridId,
+        name: ''
+      }
+      // addorupdate
+      await this.$http
+        .post('/epmetuser/icresiuser/demandusers', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.demandUserList = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    async getDemandOptions() {
+      this.$http
+        .post('/heart/icresidemanddict/demandoption')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.demandOptions = this.getTreeData(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getServiceuserList(serviceType) {
+      if (!serviceType) return this.$message.error('服务方不能为空')
+      const params = {
+        serviceName: '',
+        serviceType: serviceType,
+        queryPurpose: ''
+      }
+      await this.$http
+        .post('/heart/userdemand/servicelist', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.serviceOptiondList = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getDictOptions() {
+      this.$http
+        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_status' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.statusOptions = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.$http
+        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_report_type' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.reportOptions = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.$http
+        .post('/sys/dict/data/dictlist', { dictType: 'user_demand_service_type' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.serviceOptions = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTableData() {
+      this.tableLoading = true
+      let params = {
+        ...this.searchForm,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize
+      }
+      await this.$http
+        .post('/heart/userdemand/pagelist', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data.list
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.tableLoading = false
+    }
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin: 0 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.form-wr {
+  .input-width {
+    width: 260px;
+    &-small {
+      width: 160px;
+    }
+    &-middle {
+      width: 200px;
+    }
+    &-min {
+      min-width: 260px;
+    }
+
+  }
+  .input-width-textarea {
+    width: 400px;
+  }
+  .form-score {
+    ::v-deep .el-rate {
+      margin-top: 8px;
+    } 
+    
+  }
+}
+
+</style>
+
+<style lang="scss" scoped>
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
+.avatar-uploader {
+  ::v-deep
+  .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    width: 70px;
+    height: 70px;
+    display: block;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 70px;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+  }
+}
+  
+  
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 50f54367..dbb0a3c4 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -95,264 +95,7 @@ export default {
       selBuildingName: '',
 
       roomLoaded: false,
-      roomArray: [
-        {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }, {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }, {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }
-      ],
+      roomArray: [],
       selHouseId: '',
       selHouseName: '',
       selHouseIndex: 0,
@@ -414,6 +157,7 @@ export default {
     //点击全部成员
     async handleShowAllUser (selIndex) {
       // this.startLoading()
+      await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
 
       this.roomArray.forEach((element, index) => {
         let obj = JSON.parse(JSON.stringify(element))
@@ -422,7 +166,7 @@ export default {
           obj.showAllUser = !obj.showAllUser
           this.$set(this.roomArray, selIndex, obj)
 
-          this.loadUser(element.houseId, selIndex)
+
         } else {
           obj.showAllUser = false
           this.$set(this.roomArray, index, obj)
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index fffed07d..8c0f4a59 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -316,7 +316,7 @@ const vueGis = {
           name: '搜索'
         }
         this.$nextTick(() => {
-          this.$refs.ref_search.loadList();
+          this.$refs.ref_search.reset();
         });
 
       } else {
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index e19d780f..7e44c6d3 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -97,7 +97,10 @@ export default {
       }
 
     },
-
+    reset () {
+      this.searchName = ''
+      this.tableData = []
+    },
     async loadList () {
       if (this.searchName) {
         const url = "/epmetuser/icresiuser/searchbyname"
@@ -130,7 +133,11 @@ export default {
       this.pageNo = val
       this.loadList()
     },
-  }
+  },
+  destroyed () {
+    console.log("我已经离开了！");
+
+  },
 };
 </script>
 
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 7221bb21..e8b665c6 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -122,8 +122,6 @@
 </template>
 
 <script>
-import axios from 'axios'
-import Sortable from 'sortablejs'
 export default {
   data() {
     return {
@@ -433,7 +431,7 @@ export default {
   ::v-deep .el-table th {
     color: #fff;
     background-color: rgba(33, 149, 254, 1);
-    border-right: 1px solid rgba(33, 149, 254, 1);;
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
 .resi-table {
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 32d6becb..f5643218 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -519,7 +519,7 @@ export default {
   ::v-deep .el-table th {
     color: #fff;
     background-color: rgba(33, 149, 254, 1);
-    border-right: 1px solid rgba(33, 149, 254, 1);;
+    // border-right: 1px solid rgba(33, 149, 254, 1);;
   }
 }
 .resi-table {