linwei
2024-01-12 b6abcc70dfbba42b228f543b94e01a084776c633
议事管理参与用户优化
2 files modified
115 ■■■■■ changed files
src/views/article/components/deitDiscussion.vue 102 ●●●●● patch | view | raw | blame | history
src/views/propertySupervision/houseHoldSupervision.vue 13 ●●●●● patch | view | raw | blame | history
src/views/article/components/deitDiscussion.vue
@@ -12,8 +12,9 @@
  <div>
    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="50%" :before-close="userHandleClose">
      <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
      <avue-crud :data="userData" @search-change="searchChange" @row-del="rowDel" @search-reset="searchReset"
        :page="userPage" :option="userOption"></avue-crud>
    </el-dialog>
  </div>
</template>
@@ -28,7 +29,8 @@
  } from "@/api/discuss/publicDiscuss"
  import {
    getPage
    getPage,
    remove
  } from "@/api/discuss/userTopics"
@@ -41,7 +43,6 @@
    getDetail,
    add,
    update,
    remove
  } from "@/api/discuss/topics"
  export default {
@@ -56,28 +57,49 @@
        articleId: '',
        userData: [],
        userOption: {
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: false,
          //stripe:true,
          index: true,
          editBtn: false,
          addBtn: false,
          menu: false,
          viewBtn: false,
          selection: true,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
            label: '姓名',
            prop: 'name'
            prop: 'name',
            searchSpan: 4,
            search: true,
          }, {
            label: '头像',
            prop: 'avatar'
          }, {
            label: '签名',
            type: 'upload',
            listType: "picture-img",
            prop: 'signaturePath'
          }, {
            label: '手机',
            prop: 'phone'
            prop: 'phone',
            searchSpan: 4,
            search: true,
          }, {
            label: '小区',
            prop: 'aoiName'
          }, {
            label: '地址',
            prop: 'addressName'
          }, {
            label: '签名',
            type: 'upload',
            listType: "picture-img",
            prop: 'signaturePath'
          }, {
            label: '时间',
            prop: 'createTime'
@@ -96,12 +118,31 @@
    watch: {},
    methods: {
      userHandleClose() {
        this.popupTableUserShow = false
      },
      searchReset() {
        this.query = {}
        this.getUserPage(this.userPage)
      },
      searchChange(params, done) {
        this.query = params
        this.userPage.currentPage = 1
        this.getUserPage(this.userPage, params)
        done()
      },
      initData(newData) {
        this.editFlag = false
        this.popupTableShow = true
        this.articleId = newData.id
        this.onLoad()
        this.query.level = 1
        this.query.articleId = this.articleId
        this.onLoad(this.userPage, this.query)
      },
      handleClose() {
@@ -176,8 +217,7 @@
            return remove(row.id)
          })
          .then(() => {
            this.onLoad()
            this.getUserPage(this.userPage)
            this.$message({
              type: "success",
              message: "操作成功!"
@@ -194,28 +234,10 @@
        this.editFlag = true
      },
      deletes(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(row.id)
          })
          .then(() => {
            this.onLoad()
            this.$message({
              type: "success",
              message: "操作成功!"
            })
          })
      },
      openUser(row, type = 0) {
        this.popupTableUserShow = true
        this.query = {}
        if (type == 0) {
          this.userParams = {
            articleId: row.id
@@ -245,15 +267,9 @@
        })
      },
      onLoad() {
      onLoad(page, params = {}) {
        this.loading = true
        let params = {
          level: 1,
          articleId: this.articleId
        }
        getLists(1, 100, Object.assign(params, this.query)).then(res => {
        getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.data = data
          this.loading = false
src/views/propertySupervision/houseHoldSupervision.vue
@@ -1,7 +1,14 @@
<template>
  <el-row>
    <el-col :span="24">
      <basic-container>
        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
          :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
@@ -18,6 +25,8 @@
            </el-button>
          </template> -->
          <template slot-scope="{row, size}" slot="phone">
            <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')">
              {{ textDispose(row, 'phoneflag', 'phone') }}
@@ -28,6 +37,8 @@
            {{ labelDispose(row.userHouseLabelVOList) }}
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
          <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
@@ -75,6 +86,8 @@
        <el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
          <!-- <householdManager ref="householdManager" /> -->
        </el-dialog>
      </basic-container>
    </el-col>
  </el-row>