From ab701df859cd79ae036f8cc86268137d2c8da8ee Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Thu, 22 Feb 2024 18:00:56 +0800
Subject: [PATCH] 消防自查导出、消防自查和场所检查增加场所类别字段
---
src/views/property/oiae.vue | 417 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 230 insertions(+), 187 deletions(-)
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index d0a8f1e..735e361 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -37,9 +37,10 @@
</el-tag>
</template>
- <template slot-scope="{ row, size }" slot="iscomment">
- <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
- </el-tag>
+ <template slot-scope="{ row }" slot="iscomment">
+ <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
+ :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
+ </el-switch>
</template>
</avue-crud>
@@ -133,196 +134,222 @@
calcHeight: 54,
dialogWidth: 950,
tip: false,
- border: false,
+ border: true,
//stripe:true,
index: true,
viewBtn: true,
selection: true,
excelBtn: true,
dialogClickModal: false,
- column: [
- {
- label: "收支标题",
- prop: "title",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- rules: [{
- required: true,
- message: "请输入收支标题",
- trigger: "blur",
- }],
- },
+ column: [{
+ label: "收支标题",
+ prop: "title",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ searchLabelWidth: 76,
+ rules: [{
+ required: true,
+ message: "请输入收支标题",
+ trigger: "blur",
+ }],
+ },
+ {
+ width: 110,
+ label: "缩略图",
+ prop: "url",
+ // align:'center',
+ type: "upload",
+ listType: "picture-img",
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ url: "link",
+ },
+ // hide: true,
+ span: 24,
+ },
+
+ // {
+ // label: "收支来源",
+ // prop: "sourceName",
+ // search: true,
+ // searchSpan: 4,
+ // span: 24,
+ // rules: [{
+ // required: true,
+ // message: "请输入收支类型",
+ // trigger: "blur",
+ // }, ],
+ // },
+
+ {
+ hide: true,
+ parent: false,
+ label: "收支范围",
+ prop: "articleList",
+ type: 'tree',
+ dicData: [],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请选择收支范围",
+ trigger: "blur",
+ },],
+
+ },
+ {
+ label: "收支类型",
+ prop: "type",
+ width: 80,
+ value: 1,
+ slot: true,
+ searchSpan: 4,
+ search: true,
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择收支类型",
+ trigger: "blur",
+ },],
+ dicData: [{
+ label: "经营性收支",
+ value: 1,
+ }],
+ },
+
+ {
+ label: "发布时间",
+ prop: "dateTime",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchSpan: 6,
+ searchRange: true,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择发布时间",
+ trigger: "blur",
+ },],
+ },
+
+ {
+ width: 100,
+ label: "发布时间",
+ prop: "createTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ width: 110,
+ label: "所属街道",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "streetName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "communityName",
+ search: true,
+ searchSpan: 4
+ },
+ {
+ width: 100,
+ label: "发布状态",
+ prop: "publish",
+ value: "0",
+ slot: true,
+ searchSpan: 4,
+ search: true,
+ searchLabelWidth: 76,
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择发布状态",
+ trigger: "blur",
+ },],
+ dicData: [{
+ label: "未发布",
+ value: "0",
+ },
{
- width: 110,
- label: "缩略图",
- prop: "url",
- // align:'center',
- type: "upload",
- listType: "picture-img",
+ label: "已发布",
+ value: "1",
+ }
+ ],
+ },
+ {
+ width: 100,
+ label: "评论区",
+ prop: "iscomment",
+ slot: true,
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
+ dicData: [{
+ label: "关闭",
+ value: "0",
+ },
+ {
+ label: "开启",
+ value: "1",
+ }
+ ],
+ },
+ {
+ label: "视频",
+ prop: "videoUrl",
+ type: "upload",
+ accept: "video/mp4",
+ display: false,
+ hide: true,
+ span: 24,
+ listType: "picture-img",
+ action: "/api/depl/put-depl",
+ propsHttp: {
+ url: "data",
+ },
+ },
+ {
+ label: "收支内容",
+ prop: "content",
+ component: "AvueUeditor",
+ options: {
action: "/api/blade-resource/oss/endpoint/put-file",
- propsHttp: {
+ // customConfig: {
+ // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+ // },//wangEditor编辑的配置
+ props: {
res: "data",
url: "link",
},
- // hide: true,
- span: 24,
},
-
- // {
- // label: "收支来源",
- // prop: "sourceName",
- // search: true,
- // searchSpan: 4,
- // span: 24,
- // rules: [{
- // required: true,
- // message: "请输入收支类型",
- // trigger: "blur",
- // }, ],
- // },
-
- {
- hide: true,
- parent: false,
- label: "收支范围",
- prop: "articleList",
- type: 'tree',
- dicData: [],
- props: {
- label: "name",
- value: 'id'
- },
- span: 12,
- rules: [{
- required: true,
- message: "请选择收支范围",
- trigger: "blur",
- },],
-
- },
- {
- label: "收支类型",
- prop: "type",
- width: 80,
- value: 1,
- slot: true,
- searchSpan: 4,
- search: true,
- type: "select",
- rules: [{
- required: true,
- message: "请选择收支类型",
- trigger: "blur",
- },],
- dicData: [{
- label: "经营性收支",
- value: 1,
- }],
- },
-
- {
- label: "发布时间",
- prop: "dateTime",
- type: "daterange",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 6,
- searchRange: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [{
- required: true,
- message: "请选择发布时间",
- trigger: "blur",
- },],
- },
-
- {
- width: 100,
- label: "发布时间",
- prop: "createTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- width: 100,
- label: "发布状态",
- prop: "publish",
- value: "0",
- slot: true,
- searchSpan: 4,
- search: true,
- type: "select",
- rules: [{
- required: true,
- message: "请选择发布状态",
- trigger: "blur",
- },],
- dicData: [{
- label: "未发布",
- value: "0",
- },
- {
- label: "已发布",
- value: "1",
- }
- ],
- },
- {
- width: 100,
- label: "评论区",
- prop: "iscomment",
- slot: true,
- type: "select",
- dicData: [{
- label: "关闭",
- value: "0",
- },
- {
- label: "开启",
- value: "1",
- }
- ],
- },
- {
- label: "视频",
- prop: "videoUrl",
- type: "upload",
- accept: "video/mp4",
- display: false,
- hide: true,
- span: 24,
- listType: "picture-img",
- action: "/api/depl/put-depl",
- propsHttp: {
- url: "data",
- },
- },
- {
- label: "收支内容",
- prop: "content",
- component: "AvueUeditor",
- options: {
- action: "/api/blade-resource/oss/endpoint/put-file",
- // customConfig: {
- // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
- // },//wangEditor编辑的配置
- props: {
- res: "data",
- url: "link",
- },
- },
- hide: true,
- minRows: 6,
- span: 24,
- },
+ hide: true,
+ minRows: 6,
+ span: 24,
+ },
],
},
data: [],
@@ -476,6 +503,14 @@
}
},
methods: {
+ iscommentInput (e, data) {
+ upcomment(data.id, e).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
openDilog (row, type) {
this.dialogVisibles = true
@@ -520,6 +555,7 @@
row.videoUrl = ""
}
row.userid = this.userInfo.user_id
+ console.log(row)
row.articleRange = JSON.stringify(row.articleList)
if (row.url.length > 0) {
var urls = []
@@ -530,7 +566,10 @@
})
row.url = urls.join(",")
}
- add(row).then(
+ add({
+ ...row,
+ districtId: row.articleList
+ }).then(
() => {
this.onLoad(this.page)
this.$message({
@@ -557,7 +596,10 @@
row.url = urls.join(",")
}
- update(row).then(
+ update({
+ ...row,
+ district_id: row.articleList
+ }).then(
() => {
this.onLoad(this.page)
this.$message({
@@ -666,8 +708,8 @@
if (dateTime) {
values = {
...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
+ startTime: dateTime[0] + ' 00:00:01',
+ endTime: dateTime[1] + ' 23:59:59',
...this.query,
}
values.dateTime = null
@@ -691,7 +733,9 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree(params = {}).then((res) => {
+ getDistrictTree({
+ filterFlag: 1
+ }).then((res) => {
const data = res.data.data
this.districtTree = data
const column = this.findObject(this.option.column, "articleList")
@@ -778,5 +822,4 @@
<style>
.avue-upload__icon {
line-height: 6;
-}
-</style>
+}</style>
\ No newline at end of file
--
Gitblit v1.9.3