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/deitDiscussion.vue | 461 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 384 insertions(+), 77 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index cc2ca15..cfa2392 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -1,13 +1,3 @@
-<!--
- * @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">
@@ -40,8 +30,16 @@
</div>
</el-dialog>
- <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">
+ <basic-container>
+ <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
+ @search-reset="searchReset">
+ <template slot-scope="{type,size,row }" slot="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
</el-dialog>
</div>
</template>
@@ -58,6 +56,22 @@
import {
getPage
} from "@/api/discuss/userTopics"
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import Qs from "qs"
+ import {
+ exportBlob
+ } from "@/api/common"
+ import {
+ getToken
+ } from '@/util/auth'
+ import {
+ downloadXls
+ } from "@/util/util"
+ import {
+ dateNow
+ } from "@/util/date"
+ import website from '@/config/website'
import {
@@ -79,7 +93,7 @@
ontitle: '编辑议题',
editFlag: false,
-
+ disCussFromListClone: {},
disCussFrom: {
discussContent: '',
optionRange: 0,
@@ -93,17 +107,7 @@
articleId: '',
parentId: '',
level: '',
- children: [{
- optionContent: '',
- optionDetail: '',
- number: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- articleId: '',
- parentId: '',
- level: '',
- }]
+ children: []
},
optionDiscuss: {
emptyText: '取消',
@@ -112,26 +116,101 @@
prop: 'discussContent',
type: 'input',
row: true,
+ rules: [{
+ required: true,
+ message: '请输入议题',
+ trigger: 'blur'
+ }],
+ },
+ {
+ label: '议题必填',
+ prop: 'mandatoryFlag',
+ type: 'radio',
+ value: 1,
+ button: true,
+ row: true,
+ dicData: [{
+ label: '否',
+ value: 1
+ }, {
+ label: '是',
+ value: 2
+ }],
+ rules: [{
+ required: true,
+ message: '请选择是否必填',
+ trigger: 'blur'
+ }],
},
{
label: '选项范围',
prop: 'optionRange',
type: 'radio',
+ value: 0,
button: true,
row: true,
dicData: [{
- label: '多选',
- value: 1
- }, {
label: '单选',
value: 0
- }]
+ }, {
+ label: '多选',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: '请选项范围',
+ trigger: 'blur'
+ }],
},
{
- label: '排序',
- prop: 'sort',
- controlsPosition: '',
- type: 'number'
+ label: '最少选',
+ prop: 'optionNumberMin',
+ display: false,
+ row: true,
+ min: 1,
+ max: 10,
+ type: 'number',
+ step: 1,
+ value: 1,
+ rules: [{
+ required: true,
+ message: '请输入最少可选择数量',
+ trigger: 'blur'
+ }],
+ span: 3,
+ },
+ {
+ label: '最多选',
+ prop: 'optionNumber',
+ display: false,
+ min: 1,
+ row: true,
+ max: 10,
+ type: 'number',
+ step: 1,
+ value: 1,
+ rules: [{
+ required: true,
+ message: '请输入最多可选择数量',
+ trigger: 'blur'
+ }],
+ span: 3,
+ },
+ {
+ width: 110,
+ labelWidth: 100,
+ label: "附件",
+ prop: "attachment",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-pdfFile",
+ accept: "application/pdf",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
},
{
label: '选项内容',
@@ -139,6 +218,18 @@
type: 'dynamic',
span: 24,
children: {
+ rowAdd: (done) => {
+ // this.$message.success('新增回调' + this.disCussFrom.children.length);
+ this.addC(this.disCussFrom.children.length)
+ done({
+ input: '默认值'
+ });
+ },
+ rowDel: (row, done) => {
+ // this.$message.success('删除回调' + this.disCussFrom.children.length);
+ this.reduceC(this.disCussFrom.children.length)
+ done();
+ },
column: [{
label: '选项标题',
prop: 'optionContent',
@@ -159,7 +250,9 @@
},
// 表单数据
- form: {},
+ form: {
+ optionRange: 0,
+ },
data: [],
optionList: {
headerAlign: 'center',
@@ -186,23 +279,57 @@
userData: [],
userOption: {
- addBtn: false,
+ 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: true,
column: [{
label: '姓名',
- prop: 'name'
+ prop: 'name',
+ searchSpan: 4,
+ search: true,
+ searchLabelWidth: 46,
}, {
label: '头像',
+ type: 'upload',
+ listType: "picture-img",
prop: 'avatar'
}, {
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: 'optionContent'
}, {
label: '时间',
prop: 'createTime'
@@ -215,18 +342,161 @@
currentPage: 1,
total: 0
},
+ query: {},
+ type: '',
+ newData: {},
+ articleRange: {},
+ tops: {},
}
},
- watch: {},
+ watch: {
+ 'disCussFrom.optionRange': {
+ handler(newData) {
+ // console.log('** ** ** ** ** ** **', newData)
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
+ if (newData == 1) {
+ column.display = true
+ columnMin.display = true
+ } else {
+ column.display = false
+ columnMin.display = false
+ }
+ },
+ },
+ },
methods: {
+
+ addC(number) {
+ console.log("******************", number)
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
+ column.max = number + 1
+ columnMin.max = number + 1
+ if (this.disCussFrom.optionNumber > number + 1) {
+ this.disCussFrom.optionNumber = number + 1
+ }
+ if (this.disCussFrom.optionNumberMin > number + 1) {
+ this.disCussFrom.optionNumberMin = number + 1
+ }
+ },
+
+ editC(number) {
+ console.log("******************", number)
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
+ column.max = number
+ columnMin.max = number
+ },
+
+
+ reduceC(number) {
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
+ columnMin.max = number - 1
+ column.max = number - 1
+ if (this.disCussFrom.optionNumber > number - 1) {
+ this.disCussFrom.optionNumber = number - 1
+ }
+ if (this.disCussFrom.optionNumberMin > number - 1) {
+ this.disCussFrom.optionNumberMin = number - 1
+ }
+ },
+
+ handleExport() {
+ this.$confirm("是否导出投票人员数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ this.query = {}
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data)
+ .then(
+ res => {
+ downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+
+ })
+ },
+
+ userHandleClose() {
+
+ this.popupTableUserShow = false
+ },
+
+ searchReset() {
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ this.userPage.currentPage = 1
+ this.getUserPage(this.userPage, this.query)
+ },
+
+ searchChange(params, done) {
+ this.query = params
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ this.userPage.currentPage = 1
+ this.getUserPage(this.userPage, this.query)
+ done()
+ },
+
+ openUser(row, type) {
+ this.type = type
+ this.popupTableUserShow = true
+ this.query = {}
+ this.articleId = row.id
+ let districtId
+ if (type == 0) {
+ this.newData = row
+ districtId = this.newData.articleRange
+ this.userParams = {
+ articleId: row.id,
+ districtId: districtId
+ }
+ } else {
+ districtId = this.newData.articleRange
+ this.tops = row
+ this.userParams = {
+ topicsId: row.id,
+ districtId: districtId
+ }
+ }
+ this.getUserPage(this.userPage, this.userParams)
+ },
+
initData(newData) {
+ console.log("======>", newData);
this.editFlag = false
this.popupTableShow = true
this.articleId = newData.id
-
- this.onLoad()
+ this.query.level = 1
+ this.query.articleId = this.articleId
+ this.newData = newData
+ this.query.districtId = newData.articleRange
+ this.onLoad(this.userPage, this.query)
},
handleClose() {
@@ -237,7 +507,44 @@
handleSubmit(form, done) {
done()
form.articleId = this.articleId
+ console.log("form===>", form);
+
+ if (this.editFlag && Array.isArray(form.attachment)) {
+ if (form.attachment.length > 0) {
+ var urls = []
+ // var split = form.attachment.split(",")
+ form.attachment.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ form.attachment = urls.join(",")
+ } else {
+ form.attachment = "";
+ }
+ } else {
+ if (form.attachment) {
+ var urls = [];
+ var splits = form.attachment.split(",");
+ splits.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ form.attachment = urls.join(",")
+ }
+ }
+
+ if (this.disCussFromListClone.length > 0) {
+ this.disCussFromListClone.forEach(item => {
+ if (form.children.length > 0) {
+ let same = form.children.find(array => array.id === item.id)
+ if (!same) {
+ item.deleteFlag = 1
+ form.children.push(item)
+ }
+ }
+ })
+ }
add(form).then(
() => {
this.$message({
@@ -246,12 +553,10 @@
})
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
@@ -270,6 +575,17 @@
// 提交修改
rowUpdate(row, index, done, loading) {
done()
+
+ if (row.attachment.length > 0) {
+ var urls = []
+ var split = row.attachment.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.attachment = urls.join(",")
+ }
+
if (!row.id) {
addPd(row).then(() => {
this.onLoad()
@@ -301,7 +617,7 @@
return remove(row.id)
})
.then(() => {
- this.onLoad()
+ this.getUserPage(this.userPage)
this.$message({
type: "success",
@@ -311,65 +627,56 @@
},
add() {
+ this.disCussFrom = {}
this.editFlag = true
},
edit(row) {
this.disCussFrom = row
+ this.disCussFromListClone = [].concat(row.children)
this.editFlag = true
+ this.editC(this.disCussFrom.children.length)
},
deletes(row) {
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ return remove(row.id)
+ }).then(() => {
+ let param = {}
+ this.onLoad(this.userPage, param)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
})
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.onLoad()
-
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- })
+ })
},
- openUser(row, type = 0) {
- this.popupTableUserShow = true
- if (type == 0) {
- this.userParams = {
- articleId: row.id
- }
- } else {
- this.userParams = {
- topicsId: row.id
- }
- }
- 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) {
+ item.avatar = website.minioUrl + item.avatar
+ }
+ if (item.signaturePath && item.signaturePath.length > 0) {
+ item.signaturePath = website.minioUrl + item.signaturePath
+ // console.log("=====>", item.signaturePath)
+ }
+ })
})
},
- 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
--
Gitblit v1.9.3