From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/components/discussionManageChild.vue | 776 ++++++++++++++++++----------------------------------------
1 files changed, 245 insertions(+), 531 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 157e556..3adc6a6 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,237 +1,56 @@
<template>
- <basicContainer>
- <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
- :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange"
- :option="option" v-model="form" @selection-change="selectionChange" @row-save="rowSave" @row-del="rowDel"
- @row-update="rowUpdate" @refresh-change="refreshChange">
- <template slot="menuLeft">
- <el-button type="primary" size="small" icon="el-icon-plus" v-if="data.length <= 0"
- @click="$refs.crud.rowAdd()">新增</el-button>
- </template>
-
- <!-- <template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
- </el-button>
- </template> -->
- <template slot-scope="scope" slot="menu">
- <!-- <el-button type="text" icon="el-icon-edit" size="small" @click.stop="openEdit(scope.row,scope.index)">编辑
- </el-button> -->
- <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openDilog(scope.row,scope.index)">编辑议题
- </el-button>
- <el-button type="primary" icon="el-icon-edit" size="small" @click.stop="openUser(scope.row,0)">参与用户
- </el-button>
- </template>
- </avue-crud>
-
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" 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 :option="optionList" :data="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>
+ <div>
+ <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose"
+ @close="handleClose" @open="opens">
+ <avue-form ref="DisCussFrom" :option="option" v-model="froms" @submit="handleSubmit"></avue-form>
</el-dialog>
- <el-dialog title="" append-to-body :visible.sync="dialogVisiblesEdit" width="50%" :before-close="editHandleClose">
- <span slot="title" class="dialog-footer">
- 编辑议题
- </span>
- <div id="">
- <avue-form @submit="handleSubmitEdit" :option="option" v-model="discussForm"></avue-form>
- </div>
- </el-dialog>
+ <userList ref="userList" @selectPersonList="selectPersonList"></userList>
- <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
- <avue-crud :data="userData" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
- </el-dialog>
-
- </basicContainer>
+ </div>
</template>
<script>
+ import {
+ getPersonPublicSelect
+ } from "@/api/public"
+
import {
getListPd,
getDetailPd,
addPd,
updatePd,
removePd
- } from "@/api/discuss/publicDiscuss";
+ } from "@/api/discuss/publicDiscuss"
- import {
- getLists,
- getList,
- getDetail,
- add,
- update,
- remove
- } from "@/api/discuss/topics";
-
- import {
- getPage
- } from "@/api/discuss/userTopics";
-
- import option from "@/option/discuss/publicDiscuss";
+ import option from "@/option/discuss/publicDiscuss"
import {
mapGetters
- } from "vuex";
+ } from "vuex"
import {
getDictionary
} from '@/api/system/dict'
+ import userList from "./userList.vue";
+
+ // import {
+ // getList as getHouseholdList,
+ // getDetatils as getHouseholdDetail
+ // } from "@/api/userHouse/list/houseHold"
+
+ import {
+ getUserlnfoByDistrictlds
+ } from "@/api/system/user"
+
+ let formData = {}
export default {
+ components: {
+ userList
+ },
data() {
return {
- option1: {
- addBtn: false,
- menu: false,
- column: [{
- label: '姓名',
- prop: 'name'
- }, {
- label: '头像',
- prop: 'avatar'
- }, {
- label: '手机',
- prop: 'phone'
- }, {
- label: '小区',
- prop: 'aoiName'
- }, {
- label: '地址',
- prop: 'addressName'
- }, {
- label: '时间',
- prop: 'createTime'
- }]
- },
+ dialogVisibles: false,
userParams: {},
- // 分页信息
- pageUser: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- discussForm: {},
- dialogVisiblesEdit: false,
- dialogVisiblesUser: false,
- editFlag: false,
- 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',
- }
- ]
- },
- optionDiscuss: {
- emptyText: '取消',
- column: [{
- label: '议题',
- prop: 'discussContent',
- type: 'input',
- row: true,
- }, {
- label: '选项范围',
- prop: 'optionRange',
- type: 'radio',
- button: true,
- row: true,
- dicData: [{
- label: '多选',
- value: 1
- }, {
- label: '单选',
- value: 0
- }]
- }, {
- 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',
- }]
- }
- },
- ]
- },
- disCussFrom: {
- discussContent: '',
- optionRange: 0,
- sort: 1,
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- publicDiscussId: '',
- parentId: '',
- level: '',
- children: [{
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- publicDiscussId: '',
- parentId: '',
- level: '',
- }]
- },
- ontitle: '编辑议题',
// 弹框标题
title: '',
// 是否展示弹框
@@ -244,71 +63,26 @@
view: false,
// 查询信息
query: {},
- // 分页信息
- page: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- // 表单数据
- form: {
- title: '',
- openFlag: 0,
- numberRestrictions: 0,
- voteRestrictions: 0,
- userRestrictions: 0,
- endTime: '',
- articleId: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- repeatVote: 0,
- voteNumberPublic: 0,
- appointUser: '',
- userIds: '',
- eventType: 1,
- signatureFlag: 0,
- appointUser: 0
- },
+
// 选择行
selectionList: [],
// 表单配置
option: {
- // selection: true,
height: "auto",
calcHeight: 54,
align: 'center',
menuAlign: 'center',
addBtn: false,
- // editBtn: false,
searchMenuSpan: 3,
- // searchBtn: true,
menuWidth: 500,
column: [{
- label: 'ID',
- prop: 'id',
- searchSpan: 4,
- // search: true,
- display: false,
- },
- {
- label: '标题',
- prop: 'title',
- searchSpan: 4,
- // disabled: true,
- },
- {
- label: '参与人数',
- prop: 'topsCount',
- searchSpan: 4,
- display: false,
- },
- {
label: '开启投票',
prop: 'openFlag',
type: 'radio',
button: true,
+ row: true,
+ span: 12,
+ offset: 8,
value: 0,
dicData: [{
label: '开启',
@@ -327,6 +101,9 @@
prop: 'voteRestrictions',
type: 'radio',
button: true,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '一人一票',
value: 0
@@ -345,6 +122,9 @@
prop: 'signatureFlag',
type: 'radio',
button: true,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '不需要',
value: 0
@@ -358,11 +138,37 @@
trigger: "blur",
}, ],
value: 0
- }, {
+ },
+ {
+ label: '票数公开',
+ prop: 'voteNumberPublic',
+ type: 'radio',
+ button: true,
+ row: true,
+ span: 12,
+ offset: 8,
+ dicData: [{
+ label: '不需要',
+ value: 0
+ }, {
+ label: '需要',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择是否票数公开",
+ trigger: "blur",
+ }, ],
+ value: 0
+ },
+ {
label: '指定用户',
prop: 'appointUser',
type: 'radio',
button: true,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '不限制',
value: 0
@@ -378,11 +184,50 @@
value: 0
},
{
+ display: false,
+ label: "选择用户",
+ prop: "userName",
+ tags: true,
+ type: "input",
+ multiple: true,
+ span: 12,
+ offset: 8,
+ remote: true,
+ hide: true,
+ row: true,
+ // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
+ // props: {
+ // label: 'name',
+ // value: 'id',
+ // },
+ // dicData: [],
+ rules: [{
+ required: true,
+ message: '请输入姓名',
+ trigger: 'blur'
+ }],
+ focus: ({
+ value,
+ column
+ }) => {
+ // this.$message.success('focus事件查看控制台')
+ // console.log('获取焦点', value, column)
+ // this.$refs.userList && this.$refs.userList.resetForm()
+ this.$refs.userList.show(this.discussion.articleRange)
+ },
+ },
+
+ {
label: "截止时间",
+ span: 12,
+ offset: 8,
+ row: true,
prop: "endTime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ // format: "yyyy-MM-dd hh:mm:ss",
+ // valueFormat: "yyyy-MM-dd hh:mm:ss",
rules: [{
required: true,
message: "请选择截止时间",
@@ -392,312 +237,181 @@
]
},
// 表单列表
- data: [],
- userData: [],
- dataTop: [],
+ froms: {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ voteNumberPublic: 1,
+ appointUser: 0,
+
+ },
dialogVisibles: false,
- publicDiscussId: '',
+ articleId: '',
discussion: {},
+ id: "",
+ personList: [],
}
},
+ created() {
+ // this.getUserList()
+ },
+
mounted() {
+ },
+
+ watch: {
+ 'froms.appointUser': {
+ handler(newData) {
+ const column = this.findObject(this.option.column, "userName")
+ if (newData == 1) {
+ column.display = true
+ // this.$refs.userList.show()
+ } else {
+ column.display = false
+ }
+ },
+ },
},
computed: {
...mapGetters(["permission"]),
ids() {
- let ids = [];
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
+ ids.push(ele.id)
+ })
+ return ids.join(",")
}
},
methods: {
- rowSave(row, done, loading) {
- addPd(row).then(
- () => {
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
-
-
- init(data) {
- this.discussion = data
- // let row = {
- // title: data.title
- // }
- this.form.title = data.title
- this.form.articleId = data.id;
- this.onLoad(data)
- },
-
- openUser(row, type) {
- console.table(row)
- this.dialogVisiblesUser = true
- if (type == 0) {
- this.userParams = {
- publicDiscussId: row.id
- }
- } else {
- this.userParams = {
- topicsId: row.id
- }
- }
- this.getUserPage(this.pageUser, this.userParams)
- },
-
- getUserPage(page, params = {}) {
- getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.pageUser.total = data.total;
- this.userData = data.records;
- });
- },
-
- openEdit(row) {
- this.discussForm = row
- let times = new Date(row.endTime).getTime();
- this.discussForm.endTime = times
- this.dialogVisiblesEdit = true
- },
- // 提交修改
- rowUpdate(row, index, done, loading) {
- done()
- if (!row.id) {
- addPd(row).then(() => {
- this.dialogVisiblesEdit = false
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- } else {
- updatePd(row).then(() => {
- this.dialogVisiblesEdit = false
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- })
- }
- },
-
- deletes(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- // this.onLoad(this.page);
- this.dialogVisibles = false
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
-
- handleClose() {
- this.editFlag = false
- this.dialogVisibles = false
- this.disCussFrom = {}
- },
-
- edithandleClose() {
- this.dialogVisiblesEdit = false
- },
-
- edit(row) {
- this.disCussFrom = row
- this.editFlag = true
- },
-
- add() {
- this.editFlag = true
- },
-
- handleReset() {
- this.editFlag = false
- },
-
- openDilog(row, type) {
- this.dialogVisibles = true
- this.loading = true;
- this.publicDiscussId = row.id
- let params = {
- level: 1,
- publicDiscussId: row.id
- }
- getLists(1, 100, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.form = data;
- this.loading = false;
- // this.selectionClear();
+ selectPersonList(personList) {
+ console.log(personList, "++++++++++++")
+ this.personList = personList
+ let nameList = personList.map(e => {
+ return e.name
})
+ this.froms.userName = nameList.join(",")
+ },
+ getuserInfoByDistrictId() {
+ getUserlnfoByDistrictlds(this.discussion.articleRange).then(res => {
+ const column = this.findObject(this.option.column, "userIds")
+ column.dicData = res.data.data.records
+ })
+ },
+ getUserList() {
+ let dicUrl = `/api/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
+ const column = this.findObject(this.option.column, "userIds")
+ column.dicUrl = dicUrl
},
handleSubmit(form, done) {
- done();
- form.publicDiscussId = this.publicDiscussId
- add(form).then(
+ form.articleId = this.articleId
+ form.eventType = 1
+ form.userIds = this.personList.map(e => e.id).join(",")
+ // form.userIds = JSON.stringify(form.userIds)
+ if (form.appointUser == 0) {
+ form.userIds = ''
+ }
+
+ form.id = this.id
+
+ addPd(form).then(
() => {
+ // this.onLoad(this.discussion)
this.$message({
type: "success",
message: "操作成功!",
- });
- form = {}
- this.editFlag = false
- let params = {
- level: 1,
- publicDiscussId: this.publicDiscussId
- }
- getLists(1, 100, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.form = data;
})
+ done()
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ appointUser: 0,
+
+ }
+ this.dialogVisibles = false
},
(error) => {
- window.console.log(error);
- // loading();
+ window.console.log(error)
}
- );
+ )
},
- searchHide() {
- this.search = !this.search;
- },
- searchChange() {
- this.onLoad(this.discussion);
- },
- searchReset() {
- this.query = {};
- this.page.currentPage = 1;
- this.onLoad(this.discussion);
+ init(data) {
+ console.log("===init===", data)
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.dialogVisibles = true
+ this.froms = {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ appointUser: 0,
+ }
+ this.discussion = data
+ this.articleId = data.id
+ this.onLoad(data)
},
- handleAdd() {
- this.title = '新增'
- this.form = {}
- this.box = true
- },
- handleEdit(row) {
- this.title = '编辑'
- this.box = true
- getDetailPd(row.id).then(res => {
- this.form = res.data.data;
- });
- },
- handleView(row) {
- this.title = '查看'
- this.view = true;
- this.box = true;
- getDetailPd(row.id).then(res => {
- this.form = res.data.data;
- });
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ handleClose() {
+ console.log("******handleClose*******")
+ this.dialogVisibles = false
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ appointUser: 0,
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return removePd(this.ids);
- })
- .then(() => {
- this.selectionClear();
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
},
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.discussion);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetailPd(this.form.id).then((res) => {
- let data = res.data.data
- this.form = data;
- });
+
+ opens() {
+ console.log("******opens*******")
+ // this.dialogVisibles = false
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ appointUser: 0,
}
- if (["add"].includes(type)) {
- this.form.title = this.discussion.title;
- this.form.articleId = this.discussion.id;
- }
- done();
},
- beforeClose(done) {
- done()
- this.form = {};
- this.view = false;
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- // this.$refs.table.clearSelection();
- },
- // currentChange(currentPage) {
- // this.page.currentPage = currentPage;
- // this.onLoad(this.page);
- // },
- // sizeChange(pageSize) {
- // this.page.pageSize = pageSize;
- // this.onLoad(this.page);
- // },
- onLoad(data, params = {
+
+ onLoad(row, params = {
eventType: 1,
- articleId: data.id
+ articleId: row.id
}) {
- this.loading = true;
+ // this.loading = true
getListPd(1, 10, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
- }
+ const data = res.data.data
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ if (data.records.length <= 0) {
+ console.log("--------onLoad------------")
+ this.id = ''
+ this.froms = {
+ openFlag: 0,
+ voteRestrictions: 1,
+ signatureFlag: 1,
+ appointUser: 0,
+ }
+ } else {
+ console.log(">>>>>onLoad", data.records[0])
+ this.froms = data.records[0]
+
+ this.id = data.records[0].id
+ formData = data.records[0]
+ if (this.froms && this.froms.userIds) {
+ this.froms.userIds = JSON.parse(this.froms.userIds)
+ }
+ }
+ // this.getuserInfoByDistrictId()
+
+ })
+ },
+
+
}
- };
+ }
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3