From 210c28f024e008cff8a3c89ea45a0910526a669d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 08 Jan 2024 15:45:49 +0800
Subject: [PATCH] 走访日志和议事管理，选择用户，完善
---
src/views/article/components/discussionManageChild.vue | 28 +++++++++-------------------
src/views/cGovernance/gridWorkLog.vue | 25 +++++++++++++------------
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 84fcfae..6aabc20 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -189,10 +189,6 @@
value: 'id',
},
dicData: [],
- formatter: (row) => {
- console.log(row, 1212213)
- return row.name
- },
rules: [
{
required: true,
@@ -235,20 +231,6 @@
},
watch: {
- "disCussFrom.userIds": {
- handler (val) {
- if (val) {
-
- getPersonPublicSelect({
- id: val
- }).then(res => {
- const column = this.findObject(this.option.column, "userIds")
- column.dicData = res.data.data
- })
-
- }
- }
- },
'disCussFrom.appointUser': {
handler (newData) {
const column = this.findObject(this.option.column, "userIds")
@@ -320,7 +302,15 @@
const data = res.data.data
this.page.total = data.total
this.disCussFrom = data.records[0]
- this.loading = false
+
+ getPersonPublicSelect({
+ id: this.disCussFrom.userIds
+ }).then(res => {
+ const column = this.findObject(this.option.column, "userIds")
+ column.dicData = res.data.data
+
+ this.loading = false
+ })
})
}
}
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 3b37650..9d46550 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -21,6 +21,7 @@
<script>
import { getPersonPublicSelect } from "@/api/public"
+import { getDetatils as householdDetail } from "@/api/userHouse/list/houseHold"
import { getList, remove, update, add, getGridWorkLog } from "@/api/grid/gridWorkLog"
import { getList as getHouseholdList, getDetatils as getHouseholdDetail } from "@/api/userHouse/list/houseHold"
import { mapGetters } from "vuex"
@@ -127,11 +128,6 @@
value: 'id',
},
dicData: [],
- formatter: (row) => {
- console.log(row, 1111)
-
- return row.name
- },
rules: [
{
required: true,
@@ -150,6 +146,7 @@
searchSpan: 4,
search: true,
},
+
{
width: 156,
overHidden: true,
@@ -260,14 +257,11 @@
handler (val) {
if (val) {
- getPersonPublicSelect({
- id: val
- }).then(res => {
- const column = this.findObject(this.option.column, "householdId")
- column.dicData = res.data.data
+ householdDetail(val).then(res => {
+ let data = res.data.data
- this.form.phone = res.data.data[0].phoneNumber
- this.form.address = res.data.data[0].currentAddress
+ this.form.phone = data.phoneNumber
+ this.form.address = data.currentAddress
})
}
@@ -470,6 +464,13 @@
})
this.form.url = urls.join(",")
}
+
+ getPersonPublicSelect({
+ id: this.form.householdId
+ }).then(res => {
+ const column = this.findObject(this.option.column, "householdId")
+ column.dicData = res.data.data
+ })
})
}
// con
--
Gitblit v1.9.3