From daea06fe6b912c640c87e9a40dc8ead31b87ac3c Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 23 Feb 2024 15:38:12 +0800
Subject: [PATCH] 更新
---
src/views/authority/datascope.vue | 1
src/views/flow/follow.vue | 1
src/views/propertySupervision/houseHoldSupervision.vue | 2
src/views/article/components/discussionManageChild.vue | 30 +++++----
src/views/article/components/deitDiscussion.vue | 1
src/views/property/propertyChargeRecord.vue | 1
src/views/cGovernance/punchCard.vue | 1
src/views/work/send.vue | 1
src/views/publicSecurity/keynotePlaceManage.vue | 2
src/views/work/claim.vue | 1
src/views/article/components/publicSignUpChild.vue | 1
src/views/publicSecurity/positionManage/TransactRegist.vue | 4
src/views/work/done.vue | 1
src/views/property/propertyCapitalApply.vue | 81 +++++++++++++++++---------
src/views/article/rotation.vue | 1
src/views/patrolList/patrolRecord.vue | 1
src/views/work/todo.vue | 1
src/views/authority/apiscope.vue | 1
src/views/propertySupervision/residentSupervision.vue | 2
19 files changed, 86 insertions(+), 48 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index abce4aa..bcdef3c 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -221,6 +221,7 @@
delBtn: false,
excelBtn: true,
dialogClickModal: false,
+ header:false,
column: [{
label: '姓名',
prop: 'name',
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index ad52341..197056a 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -263,6 +263,7 @@
handleSubmit(row, done) {
row.articleId = this.articleId
row.eventType = 1
+ row.userIds = JSON.stringify(row.userIds)
addPd(row).then(
() => {
this.onLoad(this.discussion)
@@ -283,6 +284,7 @@
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)
@@ -308,20 +310,20 @@
- // 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
- // })
- // }
- // })
+ 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
+ })
+ }
+ })
}
}
}
diff --git a/src/views/article/components/publicSignUpChild.vue b/src/views/article/components/publicSignUpChild.vue
index b133a6f..2ddd7f0 100644
--- a/src/views/article/components/publicSignUpChild.vue
+++ b/src/views/article/components/publicSignUpChild.vue
@@ -133,6 +133,7 @@
delBtn: false,
excelBtn: true,
dialogClickModal: false,
+ header:false,
column: [{
label: '姓名',
prop: 'name',
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index 5093bba..04775e6 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -129,6 +129,7 @@
},
{
width: 144,
+ labelWidth:100,
label: "时间",
prop: "createTime",
addDisplay: false,
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index 451d4c2..40e3238 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -91,6 +91,7 @@
delBtn: false,
menuWidth: 150,
dialogClickModal: false,
+ header:false,
column: [
{
label: "菜单名称",
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index 53049d8..cbee1e6 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -94,6 +94,7 @@
delBtn: false,
menuWidth: 150,
dialogClickModal: false,
+ header:false,
column: [
{
label: "菜单名称",
diff --git a/src/views/cGovernance/punchCard.vue b/src/views/cGovernance/punchCard.vue
index 25c86b6..1471279 100644
--- a/src/views/cGovernance/punchCard.vue
+++ b/src/views/cGovernance/punchCard.vue
@@ -47,6 +47,7 @@
viewBtn: true,
excelBtn: true,
dialogClickModal: false,
+ header:false,
column: [
{
width: 110,
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index 2986507..1c25106 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -65,6 +65,7 @@
viewBtn: false,
dialogWidth: 900,
dialogClickModal: false,
+ header:false,
column: [
{
label: "执行id",
diff --git a/src/views/patrolList/patrolRecord.vue b/src/views/patrolList/patrolRecord.vue
index b321b9a..3f16efe 100644
--- a/src/views/patrolList/patrolRecord.vue
+++ b/src/views/patrolList/patrolRecord.vue
@@ -137,6 +137,7 @@
// selection: true,
excelBtn: true,
dialogClickModal: false,
+ header:false,
column: [{
label: "所属街道",
prop: "streetName",
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index b90545f..7a769fe 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -9,8 +9,8 @@
<template slot-scope="{ row, size, index }" slot="menu">
<el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
</el-button>
- <el-button :size="size" type="text" @click="goDetail(row)">查看申请
- </el-button>
+ <!-- <el-button :size="size" type="text" @click="goDetail(row)">查看申请
+ </el-button> -->
<!-- <el-button :size="size" type="text" @click="goDetail(row)">删 除
</el-button> -->
</template>
@@ -31,31 +31,19 @@
</avue-crud>
- <el-dialog title="详情" append-to-body :visible.sync="showDialog" width="80%">
- <avue-crud :option="optionList" ref="crud2" :data="optionData" :span-method="spanMethod">
- </avue-crud>
- </el-dialog>
-
- <!-- <el-dialog title="详情" :visible.sync="showDialog" width="80%" z-index="55555" :before-close="showDialog = false">
- <span>
- 1111
- </span>
- <avue-crud :option="optionList" ref="crud2">
- <template slot="menuLeft" v-if="!editFlag">
- <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
- </el-button>
- </template>
+ <el-dialog title="详情" append-to-body :visible.sync="showDialog" width="80%" >
+ <avue-crud :option="optionList" :data="topictData" ref="crud2">
<template #icon="scope">
<i :class="scope.row.icon" style="font-size:14px"></i>
</template>
- <template #menu="{ row, size }">
+ <!-- <template #menu="{ row, size }">
<el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
<el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
<el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
选择此项人数：{{ row.number }} 详情</el-button>
- </template>
+ </template> -->
</avue-crud>
- </el-dialog> -->
+ </el-dialog>
</basic-container>
@@ -74,6 +62,9 @@
} from "vuex"
import website from '@/config/website'
import func from "@/util/func"
+ import {
+ getLists,
+ } from "@/api/discuss/topics"
export default {
data() {
return {
@@ -105,10 +96,11 @@
//stripe:true,
index: true,
editBtn: false,
- viewBtn: false,
+ viewBtn: true,
delBtn: false,
selection: true,
dialogClickModal: false,
+ viewBtnText:"查看申请",
column: [{
width: 220,
overHidden: true,
@@ -135,6 +127,7 @@
search: false,
type: 'tree',
dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
+ cascader: ['articleId'],
props: {
label: "name",
value: "id"
@@ -314,15 +307,16 @@
value: '0.00'
},
{
+ display:false,
hide: true,
parent: false,
label: "议事标题",
- prop: "",
+ prop: "articleId",
search: false,
type: 'select',
- dicUrl: "",
+ dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtIdList={{districtId}}`,
props: {
- label: "name",
+ label: "title",
value: "id"
},
defaultExpandedKeys: ["361102003"],
@@ -337,6 +331,7 @@
console.log ("val===>", val)
if(val.value){
this.showDialog = true;
+ this.getDetail( val.value,val.articleRange)
}
}
@@ -382,7 +377,7 @@
data: [],
optionList: {
- hander:false,
+ header:false,
menu: false,
headerAlign: 'center',
align: 'center',
@@ -395,15 +390,15 @@
rowParentKey: 'parentId',
column: [{
label: '标题',
- prop: 'title',
+ prop: 'discussContent',
},
{
label: '选项内容',
- prop: 'content',
+ prop: 'optionContent',
},
{
label: '人数',
- prop: 'count',
+ prop: 'number',
}
]
},
@@ -423,8 +418,8 @@
content:"选项",
count:2
},
-
- ]
+ ],
+ topictData:[]
}
},
watch: {
@@ -439,6 +434,17 @@
// immediate: true
// }
+
+ 'form.districtId': {
+ handler(newData) {
+ const column = this.findObject(this.option.column, "articleId")
+ if (newData) {
+ column.display = true;
+ } else {
+ column.display = false
+ }
+ },
+ },
},
computed: {
...mapGetters(["permission", "userInfo"]),
@@ -473,6 +479,12 @@
}
},
methods: {
+
+ rowView(){
+ this.showDialog = false;
+ },
+
+
showStringDispose(row, type) {
row[type] = !row[type]
},
@@ -673,6 +685,17 @@
}
}
}
+ },
+ getDetail(articleId,districtId){
+ let params = {
+ level:1,
+ articleId:articleId,
+ districtId:districtId
+ }
+ getLists(1,10,params).then(res => {
+ const data = res.data.data
+ this.topictData = data
+ })
}
}
diff --git a/src/views/property/propertyChargeRecord.vue b/src/views/property/propertyChargeRecord.vue
index 902727e..796e274 100644
--- a/src/views/property/propertyChargeRecord.vue
+++ b/src/views/property/propertyChargeRecord.vue
@@ -52,6 +52,7 @@
dialogClickModal: false,
addBtn: false,
editBtn: false,
+ header:false,
column: [
{
label: "物业公司",
diff --git a/src/views/propertySupervision/houseHoldSupervision.vue b/src/views/propertySupervision/houseHoldSupervision.vue
index 06f16a8..772f2cb 100644
--- a/src/views/propertySupervision/houseHoldSupervision.vue
+++ b/src/views/propertySupervision/houseHoldSupervision.vue
@@ -224,7 +224,7 @@
viewBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
-
+ header:false,
column: [{
label: "房屋编号",
prop: "houseCode",
diff --git a/src/views/propertySupervision/residentSupervision.vue b/src/views/propertySupervision/residentSupervision.vue
index c5cde9c..eb1c3b3 100644
--- a/src/views/propertySupervision/residentSupervision.vue
+++ b/src/views/propertySupervision/residentSupervision.vue
@@ -216,7 +216,7 @@
editBtn: false,
dialogType: 'drawer',
dialogClickModal: false,
-
+ header:false,
column: [
{
width: 110,
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 33ea191..063412b 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -416,7 +416,7 @@
} else if (data == 4) {
tags = {
type: 'warning',
- text: '待接收'
+ text: '待完成'
}
}
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index d888c4d..e340c51 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -327,7 +327,7 @@
label: '未通过',
value: 3
}, {
- label: '待接收',
+ label: '待完成',
value: 4
}],
align: 'center',
@@ -413,7 +413,7 @@
} else if (data == 4) {
tags = {
type: 'warning',
- text: '待接收'
+ text: '待完成'
}
}
diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue
index f39b0c3..6a548d9 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -63,6 +63,7 @@
delBtn: false,
dialogWidth: 900,
dialogClickModal: false,
+ header:false,
column: [
{
label: "流程分类",
diff --git a/src/views/work/done.vue b/src/views/work/done.vue
index feb7db9..30a7ca1 100644
--- a/src/views/work/done.vue
+++ b/src/views/work/done.vue
@@ -71,6 +71,7 @@
delBtn: false,
dialogWidth: 900,
dialogClickModal: false,
+ header:false,
column: [
{
label: "流程分类",
diff --git a/src/views/work/send.vue b/src/views/work/send.vue
index 89a365d..20295c2 100644
--- a/src/views/work/send.vue
+++ b/src/views/work/send.vue
@@ -64,6 +64,7 @@
delBtn: false,
dialogWidth: 900,
dialogClickModal: false,
+ header:false,
column: [
{
label: "流程分类",
diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue
index 6181cc6..35d0baa 100644
--- a/src/views/work/todo.vue
+++ b/src/views/work/todo.vue
@@ -75,6 +75,7 @@
delBtn: false,
dialogWidth: 900,
dialogClickModal: false,
+ header:false,
column: [
{
label: "流程分类",
--
Gitblit v1.9.3