From 34dbf82112e28c111ffb2efdf2653ee42df80b21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 14:15:49 +0800
Subject: [PATCH] 街道管理员查询不出物业公司（物业公司加一列）
---
src/views/article/components/discussionManageChild.vue | 244 +++++++++++++++---------------------------------
1 files changed, 79 insertions(+), 165 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 13f60e1..5a2ab3b 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,12 +1,16 @@
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
+ <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>
</div>
</template>
<script>
+ import {
+ getPersonPublicSelect
+ } from "@/api/public"
+
import {
getListPd,
getDetailPd,
@@ -27,12 +31,14 @@
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"
-
-
+ getUserlnfoByDistrictlds
+ } from "@/api/system/user"
export default {
data() {
@@ -83,24 +89,13 @@
searchMenuSpan: 3,
menuWidth: 500,
column: [{
- label: '标题',
- prop: 'title',
- searchSpan: 4,
- span: 6,
- },
- {
- label: '参与人数',
- prop: 'topsCount',
- searchSpan: 4,
- display: false,
- span: 6,
- },
- {
label: '开启投票',
prop: 'openFlag',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
value: 0,
dicData: [{
label: '开启',
@@ -119,7 +114,9 @@
prop: 'voteRestrictions',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '一人一票',
value: 0
@@ -138,7 +135,9 @@
prop: 'signatureFlag',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '不需要',
value: 0
@@ -152,12 +151,15 @@
trigger: "blur",
}, ],
value: 0
- }, {
+ },
+ {
label: '指定用户',
prop: 'appointUser',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '不限制',
value: 0
@@ -173,140 +175,39 @@
value: 0
},
{
+ display: false,
label: "选择用户",
prop: "userIds",
+ tags: true,
+ type: "tree",
+ multiple: true,
+ span: 12,
+ offset: 8,
+ remote: true,
hide: true,
- type: "table",
- display: false,
- span: 6,
- // labelWidth: 120,
- searchSpan: 4,
- search: true,
- children: {
- border: true,
- height: 400,
- searchShow: true,
- searchMenuSpan: 6,
- submitText: "确定",
- selection: true,
- column: [{
- label: "社区",
- prop: "neiName",
- search: true,
- searchSpan: 4,
- }, {
- label: "姓名",
- prop: "name",
- search: true,
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入姓名",
- trigger: "blur",
- }, ],
- },
- {
- label: "小区",
- prop: "aoiCode",
- searchSpan: 5,
- type: 'tree',
- search: true,
- parent: false,
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "aoiCode"
- },
- // defaultExpandedKeys: ["361102003"],
- span: 12,
- labelWidth: 120,
- width: 220,
- // overHidden: true,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- }, ],
- // disabled: true
- display: true,
- hide: true,
- },
-
- {
- label: "楼栋",
- prop: "building",
- search: true,
- searchSpan: 4,
- },
- {
- label: "单元",
- prop: "unit",
- search: true,
- searchSpan: 4,
- },
- {
- label: "地址",
- search: true,
- searchSpan: 8,
- prop: "currentAddress",
- display: false
- },
- ],
- },
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- formatter: (row) => {
- // this.form.phoneNumber = row.phoneNumber
- return row.name
- },
- onLoad: ({
- page,
- value,
- data
- }, callback) => {
- //首次加载去查询对应的值
- if (value) {
- getHouseholdDetail(value).then(res => {
- var resData = res.data.data
- // 查询对应行数据
- callback(resData)
- return
- })
- }
- if (page) {
- this.loading = true
- var params = {
- ...data,
- // townStreetCode: "361102005"
- }
- getHouseholdList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
- const resData = res.data.data
- var total = resData.total
- var data = resData.records
- this.loading = false
- //分页查询信息
- callback({
- total: total,
- data: data
- })
- })
- }
- },
+ row: true,
+ // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
props: {
label: 'name',
- value: 'id'
- }
+ value: 'id',
+ },
+ dicData: [],
+ rules: [{
+ required: true,
+ message: '请输入姓名',
+ trigger: 'blur'
+ }],
},
+
{
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: [{
@@ -324,9 +225,14 @@
discussion: {},
}
},
+ created() {
+ this.getUserList()
+ },
+
mounted() {
},
+
watch: {
'disCussFrom.appointUser': {
handler(newData) {
@@ -337,20 +243,6 @@
column.display = false
}
},
- },
- "disCussFrom.userIds": {
- // form是表单或者表格绑定的数据集，v-model='form'
- handler(val) {
- this.$nextTick(() => {
- console.log(this.$refs, 66666)
- // getHouseholdDetail(val).then(res => {
- // const data = res.data.data
- // this.form.phoneNumber = data.phoneNumber
- // this.form.currentAddress = data.currentAddress
- // })
- })
- },
- immediate: true,
},
},
computed: {
@@ -364,9 +256,25 @@
}
},
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)
+ if (row.appointUser == 0) {
+ row.userIds = ''
+ }
addPd(row).then(
() => {
this.onLoad(this.discussion)
@@ -383,8 +291,11 @@
)
},
init(data) {
+ console.log("====>", data);
+ this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
this.dialogVisibles = true
this.disCussFrom = {}
+ // this.disCussFrom = data;
this.discussion = data
this.articleId = data.id
this.onLoad(data)
@@ -397,16 +308,19 @@
console.log(this.$refs, 90999)
},
- onLoad(data, params = {
+ onLoad(row, params = {
eventType: 1,
- articleId: data.id
+ 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]
- this.loading = false
+ if (this.disCussFrom && this.disCussFrom.userIds) {
+ this.disCussFrom.userIds = JSON.parse(this.disCussFrom.userIds)
+ }
+ this.getuserInfoByDistrictId()
})
}
}
--
Gitblit v1.9.3