From f37ea219d986a7c785a4132cd281ebccb0ff2903 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 01 Mar 2024 11:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/article/components/discussionManageChild.vue | 122 ++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 60 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 11312cf..ff314b1 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,7 +1,8 @@
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
- <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
+ <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>
</div>
</template>
@@ -19,10 +20,6 @@
removePd
} from "@/api/discuss/publicDiscuss"
- import {
- getPage
- } from "@/api/discuss/userTopics"
-
import option from "@/option/discuss/publicDiscuss"
import {
mapGetters
@@ -31,32 +28,21 @@
getDictionary
} from '@/api/system/dict'
- import {
- getList as getHouseholdList,
- getDetatils as getHouseholdDetail
- } from "@/api/userHouse/list/houseHold"
+ // import {
+ // getList as getHouseholdList,
+ // getDetatils as getHouseholdDetail
+ // } from "@/api/userHouse/list/houseHold"
import {
getUserlnfoByDistrictlds
} from "@/api/system/user"
+ let formData = {}
export default {
data() {
return {
dialogVisibles: false,
userParams: {},
- // 分页信息
- pageUser: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
- discussForm: {},
- dialogVisiblesEdit: false,
- dialogVisiblesUser: false,
- editFlag: false,
- ontitle: '编辑议题',
// 弹框标题
title: '',
// 是否展示弹框
@@ -69,13 +55,6 @@
view: false,
// 查询信息
query: {},
- // 分页信息
- page: {
- pageSize: 10,
- pageSizes: [10, 20, 30, 50, 100],
- currentPage: 1,
- total: 0
- },
// 选择行
selectionList: [],
@@ -219,10 +198,11 @@
]
},
// 表单列表
- disCussFrom: {},
+ froms: {},
dialogVisibles: false,
articleId: '',
discussion: {},
+ id: ""
}
},
created() {
@@ -234,7 +214,7 @@
},
watch: {
- 'disCussFrom.appointUser': {
+ 'froms.appointUser': {
handler(newData) {
const column = this.findObject(this.option.column, "userIds")
if (newData == 1) {
@@ -256,24 +236,39 @@
}
},
methods: {
+ getuserInfoByDistrictId() {
+ getUserlnfoByDistrictlds(this.discussion.articleRange).then(res => {
+ const column = this.findObject(this.option.column, "userIds")
+ column.dicData = res.data.data
+ })
+ },
getUserList() {
let dicUrl = `/api/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
const column = this.findObject(this.option.column, "userIds")
column.dicUrl = dicUrl
},
- handleSubmit(row, done) {
- row.articleId = this.articleId
- row.eventType = 1
- row.userIds = JSON.stringify(row.userIds)
- addPd(row).then(
+ handleSubmit(form, done) {
+ console.log("**********" + JSON.stringify(form))
+ form.articleId = this.articleId
+ form.eventType = 1
+ form.userIds = JSON.stringify(form.userIds)
+ if (form.appointUser == 0) {
+ form.userIds = ''
+ }
+ console.log("===>", JSON.stringify(this.froms))
+ form.id = this.id;
+ console.log("formData====>", JSON.stringify(formData))
+ addPd(form).then(
() => {
- this.onLoad(this.discussion)
+ // this.onLoad(this.discussion)
this.$message({
type: "success",
message: "操作成功!",
})
done()
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {}
this.dialogVisibles = false
},
(error) => {
@@ -282,20 +277,30 @@
)
},
init(data) {
- console.log("====>", data);
+ // console.log("====>", data);
this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
this.dialogVisibles = true
- this.disCussFrom = {}
- // this.disCussFrom = data;
+ this.froms = {}
this.discussion = data
this.articleId = data.id
this.onLoad(data)
},
handleClose() {
+ console.log("**********************************************************************************")
this.dialogVisibles = false
this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {};
+ console.log("^^^^^", this.froms)
+ console.log(this.$refs, 90999)
+ },
+ opens() {
+ console.log("***************************************opens*******************************************")
+ // this.dialogVisibles = false
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ this.froms = {};
+ console.log("^^^^^", this.froms)
console.log(this.$refs, 90999)
},
@@ -304,30 +309,27 @@
articleId: row.id
}) {
this.loading = true
-
-
-
getListPd(1, 10, Object.assign(params, this.query)).then(res => {
const data = res.data.data
- this.page.total = data.total
- this.disCussFrom = data.records[0]
- if (this.disCussFrom.userIds) {
- this.disCussFrom.userIds = JSON.parse(this.disCussFrom.userIds)
- // getPersonPublicSelect({
- // id: this.disCussFrom.userIds
- // }).then(res => {
- // const column = this.findObject(this.option.column, "userIds")
- // column.dicData = res.data.data
- // this.loading = false
- // })
- getUserlnfoByDistrictlds(row.articleRange).then(res => {
- console.log(res);
- const column = this.findObject(this.option.column, "userIds")
- column.dicData = res.data.data
- })
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ if (data.records.length <= 0) {
+ console.log("----------------------------------")
+ this.froms = {}
+ } else {
+ console.log(">>>>>", 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>
--
Gitblit v1.9.3