维修基金样式修改

Lou

2024-02-26 fd9fd5a0f0382411f53a23bf2342a78301ee93dc

维修基金样式修改

 src/views/property/components/deitDiscussion.vue

New file
@@ -0,0 +1,475 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-01-04 15:18:13
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-01-04 17:13:22
 * @FilePath: \jczz_web\src\views\article\components\deitDiscussion.vue
 * @Description:
 *
 * Copyright (c) 2024 by shuishen, All Rights Reserved.
-->
<template>
    <div>
      <el-dialog title="" append-to-body :visible.sync="popupTableShow" width="80%" :before-close="handleClose">
        <span slot="title" class="dialog-footer">
          {{ ontitle }}
        </span>
  
        <div id="" v-if="editFlag">
          <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
          </avue-form>
        </div>
  
        <div id="" v-if="!editFlag">
          <avue-crud :table-loading="loading" :option="optionList" :data="data" v-model="form" ref="crud"
            @row-update="rowUpdate" @row-del="rowDel">
            <template slot="menuLeft" v-if="!editFlag">
              <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
              </el-button>
            </template>
            <template #icon="scope">
              <i :class="scope.row.icon" style="font-size:14px"></i>
            </template>
            <template #menu="{ row, size }">
              <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
              <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
              <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
                选择此项人数：{{ row.number }} 详情</el-button>
            </template>
          </avue-crud>
        </div>
      </el-dialog>
  
      <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
        <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
          @search-reset="searchReset"></avue-crud>
      </el-dialog>
    </div>
  </template>
  
  <script>
    import {
      getListPd,
      getDetailPd,
      addPd,
      updatePd,
      removePd
    } from "@/api/discuss/publicDiscuss"
  
    import {
      getPage
    } from "@/api/discuss/userTopics"
  
    import website from '@/config/website'
  
  
    import {
      getLists,
      getList,
      getDetail,
      add,
      update,
      remove
    } from "@/api/discuss/topics"
  
    export default {
      data() {
        return {
          popupTableShow: false,
          popupTableUserShow: false,
  
          loading: true,
  
          ontitle: '编辑议题',
          editFlag: false,
  
          disCussFrom: {
            discussContent: '',
            optionRange: 0,
            sort: 1,
            optionContent: '',
            optionDetail: '',
            number: '',
            createTime: '',
            updateTime: '',
            deleteFlag: '',
            articleId: '',
            parentId: '',
            level: '',
            children: [{
              optionContent: '',
              optionDetail: '',
              number: '',
              createTime: '',
              updateTime: '',
              deleteFlag: '',
              articleId: '',
              parentId: '',
              level: '',
            }]
          },
          optionDiscuss: {
            emptyText: '取消',
            column: [{
                label: '议题',
                prop: 'discussContent',
                type: 'input',
                row: true,
                rules: [{
                  required: true,
                  message: '请输入议题',
                  trigger: 'blur'
                }],
              },
              {
                label: '选项范围',
                prop: 'optionRange',
                type: 'radio',
                value: 0,
                button: true,
                row: true,
                dicData: [{
                  label: '多选',
                  value: 1
                }, {
                  label: '单选',
                  value: 0
                }],
                rules: [{
                  required: true,
                  message: '请选项范围',
                  trigger: 'blur'
                }],
              },
              // {
              //   label: '排序',
              //   prop: 'sort',
              //   controlsPosition: '',
              //   type: 'number'
              // },
              {
                label: '选项内容',
                prop: 'children',
                type: 'dynamic',
                span: 24,
                children: {
                  column: [{
                    label: '选项标题',
                    prop: 'optionContent',
                    type: 'input',
                    rules: [{
                      required: true,
                      message: '请输入选项标题',
                      trigger: 'blur'
                    }]
                  }, {
                    label: '选项说明',
                    prop: 'optionDetail',
                    type: 'input',
                  }]
                }
              },
            ]
          },
  
          // 表单数据
          form: {},
          data: [],
          optionList: {
            headerAlign: 'center',
            align: 'center',
            border: true,
            addBtn: false,
            editBtn: false,
            delBtn: false,
            defaultExpandAll: true,
            rowKey: 'id',
            rowParentKey: 'parentId',
            column: [{
                label: '标题',
                prop: 'discussContent',
              },
              {
                label: '选项内容',
                prop: 'optionContent',
              }
            ]
          },
  
          articleId: '',
  
          userData: [],
          userOption: {
            labelWidth: 96,
            searchLabelWidth: 96,
            searchShow: true,
            searchMenuSpan: 3,
            // menuWidth: 500,
            menu: false,
  
            height: "auto",
            calcHeight: 54,
            dialogWidth: 950,
            tip: false,
            border: true,
            //stripe:true,
            index: true,
            editBtn: false,
            addBtn: false,
            viewBtn: false,
            selection: true,
            delBtn: false,
            excelBtn: true,
            dialogClickModal: false,
            header:false,
            column: [{
              label: '姓名',
              prop: 'name',
              searchSpan: 4,
              search: true,
            }, {
              label: '头像',
              type: 'upload',
              listType: "picture-img",
              prop: 'avatar'
            }, {
              label: '手机',
              prop: 'phone',
              searchSpan: 4,
              search: true,
            }, {
              label: '小区',
              prop: 'aoiName'
            }, {
              label: '地址',
              prop: 'addressName'
            }, {
              label: '签名',
              type: 'upload',
              listType: "picture-img",
              prop: 'signaturePath'
            }, {
              label: '时间',
              prop: 'createTime'
            }]
          },
          // 分页信息
          userPage: {
            pageSize: 10,
            pageSizes: [10, 20, 30, 50, 100],
            currentPage: 1,
            total: 0
          },
          query: {},
          newData: {},
          articleRange: {},
        }
      },
  
      watch: {},
  
      methods: {
  
        userHandleClose() {
  
          this.popupTableUserShow = false
        },
  
        searchReset() {
          if (this.articleRange) {
            this.query.districtId = this.newData.articleRange
          }
          this.query.articleId = this.articleId
          this.userPage.currentPage = 1
          this.getUserPage(this.userPage, this.query)
        },
  
        searchChange(params, done) {
          if (this.articleRange) {
            this.query.districtId = this.newData.articleRange
          }
          this.query = params
          this.query.articleId = this.articleId
          this.userPage.currentPage = 1
          this.getUserPage(this.userPage, this.query)
          done()
        },
        initData(newData) {
          this.editFlag = false
          this.popupTableShow = true
          this.articleId = newData.id
          this.query.level = 1
          this.query.articleId = this.articleId
          this.newData = newData
          this.query.districtId = newData.articleRange
          this.onLoad(this.userPage, this.query)
        },
        // initData(newData) {
        //   this.editFlag = false
        //   this.popupTableShow = true
        //   this.articleId = newData.id
  
        //   this.onLoad()
        // },
  
        handleClose() {
          this.popupTableShow = false
          this.disCussFrom = {}
        },
  
        handleSubmit(form, done) {
          done()
          form.articleId = this.articleId
  
          add(form).then(
            () => {
              this.$message({
                type: "success",
                message: "操作成功!",
              })
              form = {}
              this.editFlag = false
  
              let params = {
                level: 1,
                articleId: this.articleId
              }
  
              getLists(1, 100, Object.assign(params, this.query)).then(res => {
                const data = res.data.data
                this.data = data
              })
            },
            (error) => {
              window.console.log(error)
            }
          )
        },
  
        handleReset() {
          this.editFlag = false
        },
  
        // 提交修改
        rowUpdate(row, index, done, loading) {
          done()
          if (!row.id) {
            addPd(row).then(() => {
              this.onLoad()
  
              this.$message({
                type: "success",
                message: "操作成功!"
              })
            })
          } else {
            updatePd(row).then(() => {
              this.onLoad()
  
              this.$message({
                type: "success",
                message: "操作成功!"
              })
            })
          }
        },
  
        rowDel(row) {
          this.$confirm("确定将选择数据删除?", {
              confirmButtonText: "确定",
              cancelButtonText: "取消",
              type: "warning"
            })
            .then(() => {
              return remove(row.id)
            })
            .then(() => {
              this.getUserPage(this.userPage)
  
              this.$message({
                type: "success",
                message: "操作成功!"
              })
            })
        },
  
        add() {
          this.editFlag = true
        },
  
        edit(row) {
          this.disCussFrom = row
          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,disId) {
          this.popupTableUserShow = true
          this.query = {}
          this.articleId = row.id
          let districtId
          if (type == 0) {
            this.newData = row
            districtId = this.newData.articleRange || disId
            this.userParams = {
              articleId: row.id,
              districtId: JSON.stringify(districtId) 
            }
          } else {
            districtId = this.newData.articleRange || disId
            this.userParams = {
              topicsId: row.id,
              districtId: JSON.stringify(districtId) 
            }
          }
          this.getUserPage(this.userPage, this.userParams)
        },
  
        getUserPage(page, params = {}) {
          getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
            const data = res.data.data
            this.userPage.total = data.total
            this.userData = data.records
            this.userData.forEach(item => {
              if (item.avatar.length > 0) {
                item.avatar = website.minioUrl + item.avatar
              }
              if (item.signaturePath && item.signaturePath.length > 0) {
                item.signaturePath = website.minioUrl + item.signaturePath
                // console.log("=====>", item.signaturePath)
              }
            })
          })
        },
  
        onLoad(page, params = {}) {
          this.loading = true
          getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
            const data = res.data.data
            this.data = data
            this.loading = false
          })
        }
      },
    }
  </script>
  
  <style lang="scss" scoped></style>

 src/views/property/propertyCapitalApply.vue

@@ -6,6 +6,30 @@
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="{ row, size, index }" slot="voteForm">
        <el-table :data="topictData" v-if="topictData.length">
          <el-table-column width="300" property="optionContent" label="选项"></el-table-column>
          <el-table-column width="300" property="number" label="人数">


          </el-table-column>
          <el-table-column width="300">

            <template slot-scope="scope">
              <!-- <span style="margin-right: 10px;">{{scope.row.number}}</span> -->
              <el-button slot="reference" type="primary" size="mini" @click="openUserPopup(scope.row, 1)">详情</el-button>
            </template>
          </el-table-column>

        </el-table>




      </template>



      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
        </el-button>
@@ -35,22 +59,60 @@
      </template>




    </avue-crud>


    <el-dialog title="详情" append-to-body :visible.sync="showDialog" width="80%">
    <el-drawer append-to-body :visible.sync="showDialog" width="80%" :modal="false">

      <span slot="title">{{ topicTitle }}</span>

      <avue-crud :option="optionList" :data="topictData" ref="crud2">
        <template #icon="scope">
        <!-- <template #icon="scope">
          <i :class="scope.row.icon" style="font-size:14px"></i>
        </template> -->

        <template slot-scope="{row}" slot="number">
          <span style="margin-right:10px;">1</span>
          <el-button slot="reference" type="primary" size="mini" @click="openUserPopup(row, 1)">详情</el-button>

          <!-- <el-popover placement="right" width="400" trigger="click">
            <el-table :data="gridData">
              <el-table-column width="150" property="date" label="日期"></el-table-column>
              <el-table-column width="100" property="name" label="姓名"></el-table-column>
              <el-table-column width="300" property="address" label="地址"></el-table-column>
            </el-table>
            <el-button slot="reference" type="primary"  size="mini">详情</el-button>
          </el-popover> -->

        </template>


        <!-- <template #menu="{ row, size }">
            <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
            <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
              选择此项人数：{{ row.number }} 详情</el-button>


          <el-popover placement="right" width="400" trigger="click">
            <el-table :data="gridData">
              <el-table-column width="150" property="date" label="日期"></el-table-column>
              <el-table-column width="100" property="name" label="姓名"></el-table-column>
              <el-table-column width="300" property="address" label="地址"></el-table-column>
            </el-table>
            <el-button slot="reference" type="primary">详情</el-button>
          </el-popover>



          </template> -->
      </avue-crud>
    </el-dialog>
    </el-drawer>

    <deitDiscussion ref="DeitDiscussion">
    </deitDiscussion>


  </basic-container>
@@ -71,8 +133,16 @@
  import func from "@/util/func"
  import {
    getLists,
  getPage
  } from "@/api/discuss/topics"

import deitDiscussion from "./components/deitDiscussion"


  export default {
  components: {
    deitDiscussion
  },
    data() {
      return {
        showDialog: false,
@@ -326,6 +396,9 @@
              viewDisabled: false,
              type: 'select',
              dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtIdList={{districtId}}`,
          // slot: true,
          formslot: true,
          cascader: ['vote'],
              props: {
                label: "title",
                value: "id"
@@ -342,11 +415,21 @@
                console.log("val===>", val)
                // console.log("form===>",this.form)
                if (val.value && !this.form.id) {
                  this.showDialog = true;
                  this.getDetail(val.value, val.articleRange)
              this.articleRange = val.articleRange;
              // this.showDialog = true;
              // this.getDetail(val.value, val.articleRange)
                }

              }
        },

        {
          display: false,
          span: 24,
          hide: true,
          prop: "vote",
          formslot: true,
          label: "议事选项"
            },

            {
@@ -400,10 +483,7 @@
          defaultExpandAll: true,
          rowKey: 'id',
          rowParentKey: 'parentId',
          column: [{
              label: '标题',
              prop: 'discussContent',
            },
        column: [
            {
              label: '选项内容',
              prop: 'optionContent',
@@ -411,26 +491,13 @@
            {
              label: '人数',
              prop: 'number',
            slot: true,
            }
          ]
        },
        optionData: [{
            title: "测试",
            content: "选项1",
            count: 1
          },
          {
            title: "测试",
            content: "选项2",
            count: 2
          },
          {
            title: "测试",
            content: "选项",
            count: 2
          },
        ],
        topictData: []
      topictData: [],
      topicTitle: "",
      articleRange: ""
      }
    },
    watch: {
@@ -454,7 +521,19 @@
          } else {
            column.display = false
          }
      }
        },
    'form.articleId': {
      handler(newData) {
        console.log("data===>", newData)
        this.getDetail(this.form.articleId, this.articleRange)
        const column = this.findObject(this.option.column, "vote")
        if (newData) {
          column.display = true;
        } else {
          column.display = false
        }
      }
      },
    },
    computed: {
@@ -682,26 +761,7 @@
          this.selectionClear()
        })
      },
      spanMethod({
        row,
        column,
        rowIndex,
        columnIndex
      }) {
        if (columnIndex === 0) {
          if (rowIndex % 2 === 0) {
            return {
              rowspan: 2,
              colspan: 1
            }
          } else {
            return {
              rowspan: 0,
              colspan: 0
            }
          }
        }
      },

      getDetail(articleId, districtId) {
        let params = {
          level: 1,
@@ -710,9 +770,17 @@
        }
        getLists(1, 10, params).then(res => {
          const data = res.data.data
          this.topictData = data
        })
        if (data.length) {
          this.topictData = data[0].children;
          this.topicTitle = data[0].discussContent;
      }
      })
    },

    openUserPopup(row) {
      this.$refs.DeitDiscussion.openUser(row, 1, [this.form.districtId])
    },

    }

  }

 vue.config.js

@@ -38,8 +38,8 @@
        proxy: {
            "/api": {
                //本地服务接口地址
                target:"http://192.168.2.109:9528",
                // target: "https://srgdjczzxtpt.com:2080/api",
                // target:"http://192.168.2.109:9528",
                target: "https://srgdjczzxtpt.com:2080/api",
                // target: "https://kt39592615.goho.co",
                // target: "http://z4042833u6.wicp.vip",
                // target: "http://localhost:9528",