From a6cabbfd238128b89fe19ea6a2533335a4b56b5b Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 22 Feb 2024 18:24:09 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/components/discussionManageChild.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 8e3f361..ad52341 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -36,7 +36,7 @@
getDetatils as getHouseholdDetail
} from "@/api/userHouse/list/houseHold"
-
+ import { getUserlnfoByDistrictlds } from "@/api/system/user"
export default {
data() {
@@ -92,7 +92,7 @@
type: 'radio',
button: true,
row: true,
- span: 6,
+ span: 12,
offset: 8,
value: 0,
dicData: [{
@@ -134,7 +134,7 @@
type: 'radio',
button: true,
row: true,
- span: 6,
+ span: 12,
offset: 8,
dicData: [{
label: '不需要',
@@ -172,18 +172,19 @@
}, ],
value: 0
},
-
{
display: false,
label: "选择用户",
prop: "userIds",
- type: 'select',
- span: 6,
+ tags: true,
+ type: "tree",
+ multiple: true,
+ span: 12,
offset: 8,
remote: true,
hide: true,
row: true,
- dicUrl: "",
+ // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
props: {
label: 'name',
value: 'id',
@@ -198,13 +199,13 @@
{
label: "截止时间",
- span: 6,
+ span: 12,
offset: 8,
row: true,
prop: "endTime",
type: "datetime",
- 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",
// format: "yyyy-MM-dd hh:mm:ss",
// valueFormat: "yyyy-MM-dd hh:mm:ss",
rules: [{
@@ -278,6 +279,7 @@
)
},
init(data) {
+ console.log("====>",data);
this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
this.dialogVisibles = true
this.disCussFrom = {}
@@ -298,20 +300,28 @@
articleId: data.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) {
- getPersonPublicSelect({
- id: this.disCussFrom.userIds
- }).then(res => {
+ getUserlnfoByDistrictlds( data.articleRange).then(res=>{
+ console.log(res);
const column = this.findObject(this.option.column, "userIds")
column.dicData = res.data.data
- this.loading = false
- })
- }
})
+
+
+
+ // 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) {
+ // getPersonPublicSelect({
+ // id: this.disCussFrom.userIds
+ // }).then(res => {
+ // const column = this.findObject(this.option.column, "userIds")
+ // column.dicData = res.data.data
+ // this.loading = false
+ // })
+ // }
+ // })
}
}
}
--
Gitblit v1.9.3