From 47da3431e83b716ec9e82623b30a80be962e87c2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 11:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/components/deitDiscussion.vue | 957 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 520 insertions(+), 437 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index a706041..0489a82 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -45,59 +45,69 @@
</template>
<script>
- import {
- getListPd,
- getDetailPd,
- addPd,
- updatePd,
- removePd
- } from "@/api/discuss/publicDiscuss"
+import {
+ getListPd,
+ getDetailPd,
+ addPd,
+ updatePd,
+ removePd
+} from "@/api/discuss/publicDiscuss"
- 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 {
+ 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 {
- getLists,
- getList,
- getDetail,
- add,
- update,
- remove
- } from "@/api/discuss/topics"
+import {
+ getLists,
+ getList,
+ getDetail,
+ add,
+ update,
+ remove
+} from "@/api/discuss/topics"
- export default {
- data() {
- return {
- popupTableShow: false,
- popupTableUserShow: false,
+export default {
+ data() {
+ return {
+ popupTableShow: false,
+ popupTableUserShow: false,
- loading: true,
+ loading: true,
- ontitle: '编辑议题',
- editFlag: false,
- disCussFromListClone: {},
- disCussFrom: {
- discussContent: '',
- optionRange: 0,
- sort: 1,
+ ontitle: '编辑议题',
+ editFlag: false,
+ disCussFromListClone: {},
+ disCussFrom: {
+ discussContent: '',
+ optionRange: 0,
+ sort: 1,
+ optionContent: '',
+ optionDetail: '',
+ number: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ articleId: '',
+ parentId: '',
+ level: '',
+ children: [{
optionContent: '',
optionDetail: '',
number: '',
@@ -107,438 +117,511 @@
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'
+ }],
},
- 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: 'optionNumber',
- display: false,
- min: 1,
- type: 'number',
- step: 1,
- value: 1
- },
- {
- 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',
- }]
- }
- },
- ]
+ {
+ 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: 0
+ }, {
+ label: '多选',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: '请选项范围',
+ trigger: 'blur'
+ }],
},
- // 表单数据
- form: {
- optionRange: 0,
+ {
+ label: '最多可选',
+ prop: 'optionNumber',
+ display: false,
+ min: 1,
+ type: 'number',
+ step: 1,
+ value: 1,
+ rules: [{
+ required: true,
+ message: '请输入最多可选择数量',
+ trigger: 'blur'
+ }],
+ span: 4,
},
- 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: '选项内容',
+
+ {
+ 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: '选项内容',
+ prop: 'children',
+ type: 'dynamic',
+ span: 24,
+ children: {
+ column: [{
+ 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: true,
- column: [{
- label: '姓名',
- prop: 'name',
- searchSpan: 4,
- search: true,
- searchLabelWidth: 46,
- }, {
- 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: 'optionContent'
- }, {
- label: '时间',
- prop: 'createTime'
- }]
- },
- // 分页信息
- userPage: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- query: {},
- type: '',
- newData: {},
- articleRange: {},
- tops: {},
- }
- },
-
- watch: {
- 'disCussFrom.optionRange': {
- handler(newData) {
- // console.log('** ** ** ** ** ** **', newData)
- const column = this.findObject(this.optionDiscuss.column, "optionNumber")
- if (newData == 1) {
- column.display = true
- } else {
- column.display = false
+ type: 'input',
+ rules: [{
+ required: true,
+ message: '请输入选项标题',
+ trigger: 'blur'
+ }]
+ }, {
+ label: '选项说明',
+ prop: 'optionDetail',
+ type: 'input',
+ }]
}
},
+ ]
+ },
+
+ // 表单数据
+ form: {
+ optionRange: 0,
+ },
+ 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: true,
+ column: [{
+ label: '姓名',
+ prop: 'name',
+ searchSpan: 4,
+ search: true,
+ searchLabelWidth: 46,
+ }, {
+ 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: 'optionContent'
+ }, {
+ label: '时间',
+ prop: 'createTime'
+ }]
+ },
+ // 分页信息
+ userPage: {
+ pageSize: 10,
+ pageSizes: [10, 20, 30, 50, 100],
+ currentPage: 1,
+ total: 0
+ },
+ query: {},
+ type: '',
+ newData: {},
+ articleRange: {},
+ tops: {},
+ }
+ },
+
+ watch: {
+ 'disCussFrom.optionRange': {
+ handler(newData) {
+ // console.log('** ** ** ** ** ** **', newData)
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ if (newData == 1) {
+ column.display = true
+ } else {
+ column.display = false
+ }
},
},
+ },
- methods: {
+ methods: {
- 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(
+ 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() {
+ userHandleClose() {
- this.popupTableUserShow = false
- },
+ 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 = 0) {
- 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) {
- this.editFlag = false
- this.popupTableShow = true
- this.articleId = newData.id
- this.query.level = 1
+ searchReset() {
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
this.query.articleId = this.articleId
- this.newData = newData
- this.query.districtId = newData.articleRange
- this.onLoad(this.userPage, this.query)
- },
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ this.userPage.currentPage = 1
+ this.getUserPage(this.userPage, this.query)
+ },
- handleClose() {
- this.popupTableShow = false
- this.disCussFrom = {}
- },
+ 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()
+ },
- handleSubmit(form, done) {
- done()
- form.articleId = this.articleId
- 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)
- }
- }
- })
+ openUser(row, type = 0) {
+ 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
}
- add(form).then(
- () => {
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- form = {}
- this.editFlag = false
- let params = {
- level: 1,
- articleId: this.articleId
+ } 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.query.level = 1
+ this.query.articleId = this.articleId
+ this.newData = newData
+ this.query.districtId = newData.articleRange
+ this.onLoad(this.userPage, this.query)
+ },
+
+ handleClose() {
+ this.popupTableShow = false
+ this.disCussFrom = {}
+ },
+
+ 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)
}
- 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: "操作成功!"
- })
+ })
+ }
+ add(form).then(
+ () => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
})
- } else {
- updatePd(row).then(() => {
- this.onLoad()
-
- 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)
}
- },
+ )
+ },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.getUserPage(this.userPage)
+ handleReset() {
+ this.editFlag = false
+ },
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- })
- },
+ // 提交修改
+ rowUpdate(row, index, done, loading) {
+ done()
- add() {
- this.editFlag = true
- },
+ 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(",")
+ }
- edit(row) {
- this.disCussFrom = row
- this.disCussFromListClone = [].concat(row.children)
- this.editFlag = true
- },
+ if (!row.id) {
+ addPd(row).then(() => {
+ this.onLoad()
- deletes(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- return remove(row.id)
- }).then(() => {
- let param = {}
- this.onLoad(this.userPage, param)
this.$message({
type: "success",
message: "操作成功!"
})
})
- },
+ } else {
+ updatePd(row).then(() => {
+ this.onLoad()
-
-
- 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)
- }
+ this.$message({
+ type: "success",
+ message: "操作成功!"
})
- })
- },
-
- 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
})
}
},
- }
+
+ 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.disCussFromListClone = [].concat(row.children)
+ this.editFlag = true
+ },
+
+ deletes(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ return remove(row.id)
+ }).then(() => {
+ let param = {}
+ this.onLoad(this.userPage, param)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+
+
+
+ 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>
\ No newline at end of file
--
Gitblit v1.9.3