From 2907c71775baab81abdae694d65a6cb8bd86c721 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 13 Apr 2024 17:27:16 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/publicSignUp.vue | 9 +-
src/views/article/article.vue | 3
src/views/article/discussionManage.vue | 11 +-
src/views/place/residencePermitApply.vue | 25 +++---
src/views/article/rotation.vue | 141 ++++++++++++++++++++++-------------
src/views/publicSecurity/noExplosionManage.vue | 4
6 files changed, 115 insertions(+), 78 deletions(-)
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 3d7a969..9e7ae0f 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -186,6 +186,7 @@
span: 12,
minRows: 2,
type: "tree",
+ dataType: "string",
multiple: true,
tags: true,
// search: true,
@@ -816,4 +817,4 @@
:deep(.avue-form__menu--center .el-button) {
margin: 0 5px 0 0;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 2415cd1..0d961b0 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -178,6 +178,7 @@
minRows: 2,
tags: true,
type: "tree",
+ dataType: "string",
multiple: true,
dicData: [],
rules: [{
@@ -573,7 +574,7 @@
row.videoUrl = ""
}
row.userid = this.userInfo.user_id
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -603,7 +604,7 @@
)
},
rowUpdate(row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -701,7 +702,7 @@
// })
this.form = {
...data,
- articleList: JSON.parse(data.articleRange)
+ articleList: data.articleRange
}
})
}
@@ -741,7 +742,7 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- item.articleList = JSON.parse(item.articleRange)
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
var names = item.url.split(",")
@@ -844,4 +845,4 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index 4243e17..15e49a3 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -152,6 +152,7 @@
minRows: 2,
type: "tree",
multiple: true,
+ dataType: "string",
tags: true,
dicData: [],
rules: [{
@@ -486,7 +487,7 @@
// row.videoUrl = "";
// }
row.userid = this.userInfo.user_id
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -512,7 +513,7 @@
)
},
rowUpdate(row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -606,7 +607,7 @@
})
data.url = urls.join(",")
}
- data.articleList = JSON.parse(data.articleRange)
+ data.articleList = data.articleRange
this.form = data
})
}
@@ -645,7 +646,7 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- item.articleList = JSON.parse(item.articleRange)
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
var names = item.url.split(",")
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index c5dff7d..9f2219a 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -1,4 +1,4 @@
-<!-- 走访日志 -->
+<!-- 轮播图 -->
<template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
@@ -34,7 +34,7 @@
data() {
return {
form: {
- publicFlag: 1
+ publicFlag: 2
},
query: {},
loading: true,
@@ -94,7 +94,12 @@
label: "综治",
value: 2
}
- ]
+ ],
+ rules: [{
+ required: true,
+ message: "请选择类型",
+ trigger: "blur",
+ }, ],
}, {
width: 110,
labelWidth: 100,
@@ -103,51 +108,54 @@
span: 12,
searchSpan: 4,
type: "select",
- // search: true,
- // cascader: ["communityCode"],
type: "select",
dicData: [{
- label: "不公开",
- value: 1
- },
- {
label: "公开",
value: 2
- }
+ }, {
+ label: "限定公开",
+ value: 1
+ },
+
]
},
- // {
- // width: 156,
- // labelWidth: 100,
- // overHidden: true,
- // label: "所属社区",
- // // parent: false,
- // prop: "communityCode",
- // multiple: true,
- // tags: true,
- // hide: true,
- // dateType: "string",
- // type: "tree",
- // dicUrl: "/api/blade-system/region/tree?deptNature={{type}}",
- // props: {
- // label: "name",
- // value: "id"
- // },
- // rules: [{
- // required: true,
- // message: "请选择所属社区",
- // trigger: "blur",
- // }, ],
- // },
{
- label: "范围",
+ width: 156,
+ labelWidth: 100,
+ overHidden: true,
+ label: "所属社区",
+ // parent: false,
+ prop: "communityCode",
+ multiple: true,
+ tags: true,
+ hide: true,
+ dataType: "string",
+ addDisplay: false,
+ editDisplay: false,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree?deptNature={{type}}",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "公开范围",
prop: "rotationRange",
width: 156,
labelWidth: 100,
tags: true,
type: "tree",
multiple: true,
- // editDisplay: false,
+ // dateType: "string",
+ dataType: "string",
+ editDisplay: false,
+ addDisplay: false,
cascader: ['articleId'],
dicUrl: "/api/blade-district/district/getDistrictTree?filterFlag=1",
rules: [{
@@ -159,7 +167,6 @@
label: "name",
value: 'id'
},
- // hide: true,
},
{
hide: true,
@@ -168,11 +175,12 @@
prop: "articleId",
search: false,
viewDisabled: false,
- // editDisplay: false,
+ editDisplay: false,
+ addDisplay: false,
type: 'select',
dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{rotationRange}}`,
formslot: true,
- cascader: ['vote'],
+ // cascader: ['vote'],
props: {
label: "title",
value: "id"
@@ -237,17 +245,32 @@
const column = this.findObject(this.option.column, "rotationRange")
if (newData == 1) {
column.editDisplay = true
+ column.addDisplay = true
} else {
column.editDisplay = false
+ column.addDisplay = false
}
const column2 = this.findObject(this.option.column, "articleId")
if (newData == 1) {
column2.editDisplay = true
+ column2.addDisplay = true
} else {
column2.editDisplay = false
+ column2.addDisplay = false
}
-
+ },
+ },
+ 'form.type': {
+ handler(newData) {
+ const column = this.findObject(this.option.column, "communityCode")
+ if (newData != 3) {
+ column.editDisplay = true
+ column.addDisplay = true
+ } else {
+ column.editDisplay = false
+ column.addDisplay = false
+ }
},
},
},
@@ -271,12 +294,15 @@
},
methods: {
rowSave(row, done, loading) {
- if (row.rotationRange) {
- row.rotationRange = JSON.stringify(row.rotationRange)
+ // if (row.rotationRange) {
+ // row.rotationRange = JSON.stringify(row.rotationRange)
+ // }
+ if (row.communityCode) {
+ row.communityCode = JSON.stringify(row.communityCode)
}
if (row.publicFlag == 2) {
- row.rotationRange = []
- row.rotationRange = JSON.stringify(row.rotationRange)
+ row.rotationRange = ''
+ // row.rotationRange = JSON.stringify(row.rotationRange)
}
if (row.url.length > 0) {
var urls = []
@@ -303,12 +329,15 @@
)
},
rowUpdate(row, index, done, loading) {
- if (row.rotationRange) {
- row.rotationRange = JSON.stringify(row.rotationRange)
+ // if (row.rotationRange) {
+ // row.rotationRange = JSON.stringify(row.rotationRange)
+ // }
+ if (row.communityCode) {
+ row.communityCode = JSON.stringify(row.communityCode)
}
if (row.publicFlag == 2) {
- row.rotationRange = []
- row.rotationRange = JSON.stringify(row.rotationRange)
+ row.rotationRange = ''
+ // row.rotationRange = JSON.stringify(row.rotationRange)
}
if (row.url.length > 0) {
var urls = []
@@ -394,9 +423,12 @@
if (["edit", "view"].includes(type)) {
getRotation(this.form.id).then((res) => {
this.form = res.data.data
- if (this.form.rotationRange) {
- this.form.rotationRange = JSON.parse(this.form.rotationRange)
- }
+ // if (this.form.rotationRange) {
+ // this.form.rotationRange = JSON.parse(this.form.rotationRange)
+ // }
+ // if (this.form.communityCode) {
+ // this.form.communityCode = JSON.parse(this.form.communityCode)
+ // }
if (this.form.url.length > 0) {
var urls = []
var names = this.form.url.split(",")
@@ -450,9 +482,12 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- if (item.rotationRange) {
- item.rotationRange = JSON.parse(item.rotationRange)
- }
+ // if (item.rotationRange) {
+ // item.rotationRange = JSON.parse(item.rotationRange)
+ // }
+ // if (item.communityCode) {
+ // item.communityCode = JSON.parse(item.communityCode)
+ // }
if (item.url.length > 0) {
var urls = []
var names = item.url.split(",")
diff --git a/src/views/place/residencePermitApply.vue b/src/views/place/residencePermitApply.vue
index ccd4bd1..dc5e1cc 100644
--- a/src/views/place/residencePermitApply.vue
+++ b/src/views/place/residencePermitApply.vue
@@ -25,7 +25,7 @@
<template slot-scope="{row, size}" slot="minors">
<el-tag :size="size">{{
- row.minors == 2?'是':row.minors==1?'否':''
+ row.minors == 2?'是':'否'
}}</el-tag>
</template>
@@ -140,7 +140,7 @@
dialogWidth: 950,
tip: false,
border: true,
- stripe:true,
+ stripe: true,
index: true,
viewBtn: true,
addBtn: false,
@@ -161,7 +161,7 @@
align: 'center',
labelWidth: 110,
},
- {
+ {
width: 120,
span: 12,
label: "联系电话",
@@ -177,7 +177,7 @@
slot: true,
labelWidth: 110,
},
-
+
{
width: 160,
span: 12,
@@ -196,7 +196,7 @@
prop: "address",
align: 'center',
labelWidth: 110,
- overHidden:true,
+ overHidden: true,
},
{
width: 110,
@@ -240,12 +240,11 @@
search: true,
prop: "minors",
type: "select",
- align:"center",
- dicData: [
- {
+ align: "center",
+ dicData: [{
label: "全部",
value: ""
- },{
+ }, {
label: "是",
value: 2
},
@@ -268,10 +267,10 @@
value: 1
}, {
label: '通过',
- value: 3
+ value: 2
}, {
label: '驳回',
- value: 4
+ value: 3
}],
align: 'center',
labelWidth: 110,
@@ -322,12 +321,12 @@
type: 'warning',
text: '待审核'
}
- } else if (data == 3) {
+ } else if (data == 2) {
tags = {
type: 'danger',
text: '通过'
}
- } else if (data == 4) {
+ } else if (data == 3) {
tags = {
type: 'warning',
text: '驳回'
diff --git a/src/views/publicSecurity/noExplosionManage.vue b/src/views/publicSecurity/noExplosionManage.vue
index 255295b..b472c6e 100644
--- a/src/views/publicSecurity/noExplosionManage.vue
+++ b/src/views/publicSecurity/noExplosionManage.vue
@@ -260,8 +260,8 @@
align: 'center'
},
{
- label: "所属网格",
- prop: "gridName",
+ label: "派出所",
+ prop: "pcsName",
span: 24,
row: true,
searchSpan: 4,
--
Gitblit v1.9.3