From 821672dbbd1a7f2be98d5e87a5f39c648ae721a7 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 22 Feb 2024 18:23:57 +0800
Subject: [PATCH] 更新
---
src/views/publicSecurity/keynotePlaceManage.vue | 619 +++++++++---
src/views/article/discussionManage.vue | 1464 +++++++++++++++---------------
src/api/system/user.js | 10
src/api/task/task.js | 81 +
src/views/publicSecurity/ninePlaceManage/patrolRecord.vue | 18
vue.config.js | 3
src/views/property/propertyCapitalApply.vue | 4
src/views/article/components/discussionManageChild.vue | 38
src/views/propertySupervision/propertyCapitalManage.vue | 450 ++++----
src/views/publicSecurity/ninePlaceManage/situationRectification.vue | 44
src/views/article/components/deitDiscussion.vue | 19
src/views/property/companyManage.vue | 55
12 files changed, 1,580 insertions(+), 1,225 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index b58f2d4..91dfe34 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -137,4 +137,14 @@
districtId,
}
})
+}
+
+export const getUserlnfoByDistrictlds = (districtIds) => {
+ return request({
+ url: '/api/blade-system/user/getUserInfoByDistrictIds',
+ method: 'get',
+ params: {
+ districtIds,
+ }
+ })
}
\ No newline at end of file
diff --git a/src/api/task/task.js b/src/api/task/task.js
index 99d85a7..7fa382e 100644
--- a/src/api/task/task.js
+++ b/src/api/task/task.js
@@ -1,48 +1,61 @@
-import request from '@/router/axios';
+import request from '@/router/axios'
export const getList = (current, size, params) => {
- return request({
- url: '/api/blade-task/task/page',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-task/task/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
+
+export const getTaskPlaceSelfCheckList = (current, size, params) => {
+ return request({
+ url: '/api/blade-taskPlaceSelfCheck/taskPlaceSelfCheck/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const getBailReportingPage = (current, size, params) => {
- return request({
- url: '/api/blade-task/task/getBailReportingPage',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-task/task/getBailReportingPage',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
export const removeTask = (row) => {
- return request({
- url: '/api/blade-task/task/removeTask',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-task/task/removeTask',
+ method: 'post',
+ data: row
+ })
}
export const add = (row) => {
- return request({
- url: '/api/blade-task/task/save',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-task/task/save',
+ method: 'post',
+ data: row
+ })
}
export const update = (row) => {
- return request({
- url: '/api/blade-task/task/update',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-task/task/update',
+ method: 'post',
+ data: row
+ })
}
\ No newline at end of file
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 8e43bb7..abce4aa 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -261,6 +261,7 @@
},
query: {},
newData: {},
+ articleRange: {},
}
},
@@ -274,12 +275,18 @@
},
searchReset() {
+ if (this.articleRange) {
+ this.query.districtId = this.newData.articleRange
+ }
this.query.articleId = this.articleId
this.userPage.currentPage = 1
this.getUserPage(this.userPage, this.query)
},
searchChange(params, done) {
+ if (this.articleRange) {
+ this.query.districtId = this.newData.articleRange
+ }
this.query = params
this.query.articleId = this.articleId
this.userPage.currentPage = 1
@@ -292,6 +299,8 @@
this.articleId = newData.id
this.query.level = 1
this.query.articleId = this.articleId
+ this.newData = newData
+ this.query.districtId = newData.articleRange
this.onLoad(this.userPage, this.query)
},
// initData(newData) {
@@ -415,13 +424,19 @@
this.popupTableUserShow = true
this.query = {}
this.articleId = row.id
+ let districtId
if (type == 0) {
+ this.newData = row
+ districtId = this.newData.articleRange
this.userParams = {
- articleId: row.id
+ articleId: row.id,
+ districtId: districtId
}
} else {
+ districtId = this.newData.articleRange
this.userParams = {
- topicsId: row.id
+ topicsId: row.id,
+ districtId: districtId
}
}
this.getUserPage(this.userPage, this.userParams)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 5e893b5..ad52341 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -36,7 +36,7 @@
getDetatils as getHouseholdDetail
} from "@/api/userHouse/list/houseHold"
-
+ import { getUserlnfoByDistrictlds } from "@/api/system/user"
export default {
data() {
@@ -176,13 +176,15 @@
display: false,
label: "选择用户",
prop: "userIds",
- type: 'select',
+ tags: true,
+ type: "tree",
+ multiple: true,
span: 12,
offset: 8,
remote: true,
hide: true,
row: true,
- dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds=`,
+ // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
props: {
label: 'name',
value: 'id',
@@ -298,20 +300,28 @@
articleId: data.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]
- if (this.disCussFrom.userIds) {
- getPersonPublicSelect({
- id: this.disCussFrom.userIds
- }).then(res => {
+ getUserlnfoByDistrictlds( data.articleRange).then(res=>{
+ console.log(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/discussionManage.vue b/src/views/article/discussionManage.vue
index a875374..0929836 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -1,787 +1,789 @@
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
- v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
- :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
- @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
- 除
- </el-button>
- </template>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+ 除
+ </el-button>
+ </template>
- <template slot-scope="{type,size,row }" slot="menu">
- <el-button icon="el-icon-s-tools" :size="size" :type="type" @click.stop="openDilog(row, 1)">
- 设置
- </el-button>
+ <template slot-scope="{type,size,row }" slot="menu">
+ <el-button icon="el-icon-s-tools" :size="size" :type="type" @click.stop="openDilog(row, 1)">
+ 设置
+ </el-button>
- <el-button icon="el-icon-edit" :size="size" :type="type" @click.stop="openEditPopup(row, 1)">
- 编辑议题
- </el-button>
+ <el-button icon="el-icon-edit" :size="size" :type="type" @click.stop="openEditPopup(row, 1)">
+ 编辑议题
+ </el-button>
- <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
- 参与用户
- </el-button>
+ <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
+ 参与用户
+ </el-button>
- <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
- @click.stop="updateFb(row)">
- 撤销
- </el-button>
+ <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+ 撤销
+ </el-button>
- <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
- @click.stop="updateFb(row)">
- 发布
- </el-button>
- </template>
+ <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+ 发布
+ </el-button>
+ </template>
- <template slot-scope="{ row, size }" slot="publish">
- <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
- </el-tag>
- </template>
+ <template slot-scope="{ row, size }" slot="publish">
+ <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
+ </el-tag>
+ </template>
- <template slot-scope="{ row, size }" 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>
+ <template slot-scope="{ row, size }" 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>
- <deitDiscussion ref="DeitDiscussion">
- </deitDiscussion>
+ <deitDiscussion ref="DeitDiscussion">
+ </deitDiscussion>
- <discussionManageChild ref="discussionManageChild" />
+ <discussionManageChild ref="discussionManageChild" />
- </basic-container>
+ </basic-container>
</template>
<script>
-import {
+ import {
getList,
remove,
update,
add,
getNotice,
upcomment
-} from "@/api/article/article"
+ } from "@/api/article/article"
-import {
+ import {
getListPd,
removePd,
updatePd,
addPd,
getNoticePd,
upcommentPd
-} from "@/api/discuss/publicDiscuss"
-import website from '@/config/website'
-import {
+ } from "@/api/discuss/publicDiscuss"
+ import website from '@/config/website'
+ import {
getDistrictTree
-} from "@/api/district/index"
-import {
+ } from "@/api/district/index"
+ import {
mapGetters
-} from "vuex"
-import deitDiscussion from "./components/deitDiscussion"
-import discussionManageChild from "./components/discussionManageChild"
+ } from "vuex"
+ import deitDiscussion from "./components/deitDiscussion"
+ import discussionManageChild from "./components/discussionManageChild"
-export default {
+ export default {
components: {
- deitDiscussion,
- discussionManageChild,
+ deitDiscussion,
+ discussionManageChild,
},
- data () {
- return {
- discussForm: {
- ontitle: '',
- title: '',
- openFlag: 0,
- numberRestrictions: 0,
- voteRestrictions: 0,
- userRestrictions: 0,
- signatureFlag: 0,
- endTime: '',
- articleId: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- repeatVote: 0,
- voteNumberPublic: 0,
- appointUser: 0,
- userIds: '',
- eventType: 1,
- },
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- datetime: "",
- selectionList: [],
- option: {
- labelWidth: 96,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 500,
+ data() {
+ return {
+ discussForm: {
+ ontitle: '',
+ title: '',
+ openFlag: 0,
+ numberRestrictions: 0,
+ voteRestrictions: 0,
+ userRestrictions: 0,
+ signatureFlag: 0,
+ endTime: '',
+ articleId: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ repeatVote: 0,
+ voteNumberPublic: 0,
+ appointUser: 0,
+ userIds: '',
+ eventType: 1,
+ },
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 500,
- height: "auto",
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- border: true,
- //stripe:true,
- index: true,
- viewBtn: false,
- selection: true,
- excelBtn: true,
- dialogClickModal: false,
- column: [{
- overHidden: true,
- label: "议事标题",
- prop: "title",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- searchLabelWidth: 76,
- rules: [{
- required: true,
- message: "请输入议事标题",
- trigger: "blur",
- },],
- },
- {
- label: "范围",
- prop: "articleList",
- span: 24,
- minRows: 2,
- tags: true,
- type: "tree",
- multiple: true,
- dicData: [],
- rules: [{
- required: true,
- message: "请选择范围",
- trigger: "blur",
- },],
- props: {
- label: "name",
- value: 'id'
- },
- hide: true,
- },
- {
- 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,
- },
- {
- width: 110,
- label: "文章类型",
- prop: "articleType",
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- searchSpan: 4,
- checkStrictly: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- search: true,
- type: "tree",
- rules: [{
- required: true,
- message: "请选择文章类型",
- trigger: "blur",
- },],
- },
- {
- 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",
- searchSpan: 4,
- value: "0",
- slot: true,
- search: true,
- type: "select",
- rules: [{
- required: true,
- message: "请选择发布状态",
- trigger: "blur",
- },],
- dicData: [{
- label: "未发布",
- value: "0",
- },
- {
- label: "已发布",
- value: "1",
- }
- ],
- },
- {
- span: 24,
- label: "评论区",
- prop: "iscomment",
- width: 80,
- 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",
- // customConfig: {
- // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
- // },//wangEditor编辑的配置
- props: {
- res: "data",
- url: "link",
- },
- },
- hide: true,
- minRows: 6,
- span: 24,
- },
- ],
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ border: true,
+ //stripe:true,
+ index: true,
+ viewBtn: false,
+ selection: true,
+ excelBtn: true,
+ dialogClickModal: false,
+ column: [{
+ overHidden: true,
+ label: "议事标题",
+ prop: "title",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ searchLabelWidth: 76,
+ rules: [{
+ required: true,
+ message: "请输入议事标题",
+ trigger: "blur",
+ }, ],
},
- data: [],
- optionDiscuss: {
- column: [{
- label: "",
- type: 'title',
- prop: "title",
- span: 24,
- row: true,
- offset: 2,
- styles: {
- fontSize: '24px'
- }
- }, {
- labelWidth: 100,
- label: '开启投票',
- prop: 'openFlag',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择开启状态",
- trigger: "blur",
- },],
- }, {
- labelWidth: 100,
- label: '投票限制',
- prop: 'voteRestrictions',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '一人一票',
- value: 0
- }, {
- label: '一户一票',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择投票限制",
- trigger: "blur",
- },],
- }, {
- labelWidth: 100,
- label: '签名',
- prop: 'signatureFlag',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '不需要',
- value: 0
- }, {
- label: '需要',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否签名",
- trigger: "blur",
- },],
- }, {
- labelWidth: 100,
- label: '指定用户',
- prop: 'appointUser',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '指定用户',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否指定用户",
- trigger: "blur",
- },],
+ {
+ label: "范围",
+ prop: "articleList",
+ span: 24,
+ minRows: 2,
+ tags: true,
+ type: "tree",
+ multiple: true,
+ dicData: [],
+ rules: [{
+ required: true,
+ message: "请选择范围",
+ trigger: "blur",
+ }, ],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ hide: true,
+ },
+ {
+ 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,
+ },
+ {
+ width: 110,
+ label: "议事类型",
+ prop: "articleType",
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ searchSpan: 4,
+ checkStrictly: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ search: true,
+ type: "tree",
+ rules: [{
+ required: true,
+ message: "请选择议事类型",
+ trigger: "blur",
+ }, ],
+ },
+ // {
+ // 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",
+ search: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ width: 100,
+ label: "发布状态",
+ prop: "publish",
+ searchSpan: 4,
+ value: "0",
+ slot: true,
+ search: true,
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择发布状态",
+ trigger: "blur",
+ }, ],
+ dicData: [{
+ label: "未发布",
+ value: "0",
},
{
- label: "截止时间",
- row: true,
- offset: 6,
- prop: "endTime",
- type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- rules: [{
- required: true,
- message: "请选择截止时间",
- trigger: "blur",
- },],
- },
- ]
+ label: "已发布",
+ value: "1",
+ }
+ ],
},
- districtTree: [],
- }
+ {
+ span: 24,
+ label: "评论区",
+ prop: "iscomment",
+ width: 80,
+ 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",
+ // customConfig: {
+ // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+ // },//wangEditor编辑的配置
+ props: {
+ res: "data",
+ url: "link",
+ },
+ },
+ hide: true,
+ minRows: 6,
+ span: 24,
+ },
+ ],
+ },
+ data: [],
+ optionDiscuss: {
+ column: [{
+ label: "",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ row: true,
+ offset: 2,
+ styles: {
+ fontSize: '24px'
+ }
+ }, {
+ labelWidth: 100,
+ label: '开启投票',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择开启状态",
+ trigger: "blur",
+ }, ],
+ }, {
+ labelWidth: 100,
+ label: '投票限制',
+ prop: 'voteRestrictions',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '一人一票',
+ value: 0
+ }, {
+ label: '一户一票',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择投票限制",
+ trigger: "blur",
+ }, ],
+ }, {
+ labelWidth: 100,
+ label: '签名',
+ prop: 'signatureFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '不需要',
+ value: 0
+ }, {
+ label: '需要',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择是否签名",
+ trigger: "blur",
+ }, ],
+ }, {
+ labelWidth: 100,
+ label: '指定用户',
+ prop: 'appointUser',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '不限制',
+ value: 0
+ }, {
+ label: '指定用户',
+ value: 1
+ }],
+ rules: [{
+ required: true,
+ message: "请选择是否指定用户",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "截止时间",
+ row: true,
+ offset: 6,
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ rules: [{
+ required: true,
+ message: "请选择截止时间",
+ trigger: "blur",
+ }, ],
+ },
+ ]
+ },
+ districtTree: [],
+ }
},
watch: {
- "form.articleType": {
- handler (val) {
- if (val) {
- var videoUrl = this.findObject(this.option.column, "videoUrl")
- var content = this.findObject(this.option.column, "content")
- if (val.indexOf('ksp') != -1) {
- videoUrl.display = true
- content.display = false
- videoUrl.rules = [{
- required: false,
- message: "请选择视频",
- trigger: "blur",
- },]
- } else {
- videoUrl.display = false
- content.display = true
- videoUrl.rules = ""
- }
- }
- },
- immediate: true,
- }
+ "form.articleType": {
+ handler(val) {
+ if (val) {
+ var videoUrl = this.findObject(this.option.column, "videoUrl")
+ var content = this.findObject(this.option.column, "content")
+ if (val.indexOf('ksp') != -1) {
+ videoUrl.display = true
+ content.display = false
+ videoUrl.rules = [{
+ required: false,
+ message: "请选择视频",
+ trigger: "blur",
+ }, ]
+ } else {
+ videoUrl.display = false
+ content.display = true
+ videoUrl.rules = ""
+ }
+ }
+ },
+ immediate: true,
+ }
},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList () {
- return {
- addBtn: this.vaildData(this.permission.article_add, true),
- viewBtn: this.vaildData(this.permission.article_view, true),
- delBtn: this.vaildData(this.permission.article_delete, true),
- editBtn: this.vaildData(this.permission.article_edit, true),
- }
- },
-
- ids () {
- let ids = []
- this.selectionList.forEach((ele) => {
- ids.push(ele.id)
- })
- return ids.join(",")
- },
-
- showStatus () {
- return (data, type) => {
- if (data == 0) {
- return {
- text: type == 1 ? '未发布' : '关闭',
- type: 'info'
- }
- } else if (data == 1) {
- return {
- text: type == 1 ? '已发布' : '开启',
- type: 'success'
- }
- }
- }
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.article_add, true),
+ viewBtn: this.vaildData(this.permission.article_view, true),
+ delBtn: this.vaildData(this.permission.article_delete, true),
+ editBtn: this.vaildData(this.permission.article_edit, true),
}
+ },
+
+ ids() {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
+
+ showStatus() {
+ return (data, type) => {
+ if (data == 0) {
+ return {
+ text: type == 1 ? '未发布' : '关闭',
+ type: 'info'
+ }
+ } else if (data == 1) {
+ return {
+ text: type == 1 ? '已发布' : '开启',
+ type: 'success'
+ }
+ }
+ }
+ }
},
methods: {
- iscommentInput (e, data) {
- upcomment(data.id, e).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- })
- },
+ iscommentInput(e, data) {
+ upcomment(data.id, e).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
- openEditPopup (row) {
- this.$refs.DeitDiscussion.initData(row)
- },
+ openEditPopup(row) {
+ this.$refs.DeitDiscussion.initData(row)
+ },
- openUserPopup (row) {
- this.$refs.DeitDiscussion.openUser(row)
- },
+ openUserPopup(row) {
+ this.$refs.DeitDiscussion.openUser(row)
+ },
- openDilog (row, type) {
- var that = this
- this.$nextTick(() => {
- that.$refs.discussionManageChild.init(row)
- })
- },
+ openDilog(row, type) {
+ var that = this
+ this.$nextTick(() => {
+ that.$refs.discussionManageChild.init(row)
+ })
+ },
- rowSave (row, done, loading) {
- if (row.videoUrl.length == 0) {
- row.videoUrl = ""
- }
- row.userid = this.userInfo.user_id
- row.articleRange = JSON.stringify(row.articleList)
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
- // 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
- row.type = 4
- row.publish = 1
-
- add(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
- rowUpdate (row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
-
- update(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
- rowDel (row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- })
- },
- searchReset () {
- this.query = {}
- this.onLoad(this.page)
- },
- searchChange (params, done) {
- this.query = params
- this.page.currentPage = 1
- this.onLoad(this.page, params)
- done()
- },
- selectionChange (list) {
- this.selectionList = list
- },
- selectionClear () {
- this.selectionList = []
- this.$refs.crud.toggleSelection()
- },
- handleDelete () {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
- }
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(this.ids)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.$refs.crud.toggleSelection()
- })
- },
- beforeOpen (done, type) {
- if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
- let data = res.data.data
- // data.forEach(item=>{
- if (data.url.length > 0) {
- var urls = []
- var names = data.url.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- data.url = urls.join(",")
- }
- // })
- this.form = {
- ...data,
- articleList: JSON.parse(data.articleRange)
- }
- })
- }
- // con
- done()
- },
- currentChange (currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange (pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange () {
- this.onLoad(this.page, this.query)
- },
- onLoad (page, params = {}) {
- const {
- dateTime
- } = this.query
- let values = {
- ...params,
- }
- if (dateTime) {
- values = {
- ...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
- ...this.query,
- }
- values.dateTime = null
- }
- values.type = 4
- this.loading = true
- console.log(values)
- getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.data.forEach(item => {
- if (item.url.length > 0) {
- var urls = []
- var names = item.url.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.url = urls.join(",")
- }
- })
- this.loading = false
- this.selectionClear()
- })
- getDistrictTree(params = {}).then((res) => {
- const data = res.data.data
- this.districtTree = data
- const column = this.findObject(this.option.column, "articleList")
- column.dicData = res.data.data
- this.loading = false
- })
- },
- updateFb (row) {
- if (row.publish == "0") {
- row.publish = "1"
- } else {
- row.publish = "0"
- }
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
- update(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
- kqcomment () {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
- }
- this.$confirm("确定将选择数据开启评论?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }).then(() => {
- return upcomment(this.ids, "1")
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.$refs.crud.toggleSelection()
- })
- },
- gbcomment () {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
- }
- this.$confirm("确定将选择数据开启评论?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }).then(() => {
- return upcomment(this.ids, "0")
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.$refs.crud.toggleSelection()
- })
+ rowSave(row, done, loading) {
+ if (row.videoUrl.length == 0) {
+ row.videoUrl = ""
}
+ row.userid = this.userInfo.user_id
+ row.articleRange = JSON.stringify(row.articleList)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+ // 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
+ row.type = 4
+ // row.publish = 1
+
+ add(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowUpdate(row, index, done, loading) {
+ row.articleRange = JSON.stringify(row.articleList)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+ searchReset() {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange(params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange(list) {
+ this.selectionList = list
+ },
+ selectionClear() {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getNotice(this.form.id).then((res) => {
+ let data = res.data.data
+ // data.forEach(item=>{
+ if (data.url.length > 0) {
+ var urls = []
+ var names = data.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ data.url = urls.join(",")
+ }
+ // })
+ this.form = {
+ ...data,
+ articleList: JSON.parse(data.articleRange)
+ }
+ })
+ }
+ // con
+ done()
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad(page, params = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ if (dateTime) {
+ values = {
+ ...params,
+ startTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ }
+ values.dateTime = null
+ }
+ values.type = 4
+ this.loading = true
+ console.log(values)
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ // item.articleRange = JSON.parse(item.articleRange)
+ if (item.url.length > 0) {
+ var urls = []
+ var names = item.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.url = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ getDistrictTree(params = {}).then((res) => {
+ const data = res.data.data
+ this.districtTree = data
+ const column = this.findObject(this.option.column, "articleList")
+ column.dicData = res.data.data
+ this.loading = false
+ })
+ },
+ updateFb(row) {
+ if (row.publish == "0") {
+ row.publish = "1"
+ } else {
+ row.publish = "0"
+ }
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ kqcomment() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据开启评论?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ return upcomment(this.ids, "1")
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ gbcomment() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据开启评论?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ return upcomment(this.ids, "0")
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ }
},
-}
+ }
</script>
<style>
-.avue-upload__icon {
+ .avue-upload__icon {
line-height: 6;
-}
+ }
</style>
\ No newline at end of file
diff --git a/src/views/property/companyManage.vue b/src/views/property/companyManage.vue
index a5f339b..a157fb0 100644
--- a/src/views/property/companyManage.vue
+++ b/src/views/property/companyManage.vue
@@ -1,11 +1,9 @@
<!-- 物业公司管理 -->
<template>
- <basic-container>
- <div class="basic-info">
- <avue-form :option="wyOption" v-model="wyForm"></avue-form>
- </div>
+ <basic-container class="basic-container-box">
<div class="detail-container">
<el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="公司管理" name="info0"></el-tab-pane>
<el-tab-pane label="基础信息" name="info1"></el-tab-pane>
<el-tab-pane label="经营信息" name="info2"></el-tab-pane>
<el-tab-pane label="纳税信息" name="info3"></el-tab-pane>
@@ -14,7 +12,10 @@
<el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
<el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>
</el-tabs>
- <div class="answer">
+ <div class="basic-info" v-show="activeName == 'info0'">
+ <avue-form :option="wyOption" v-model="wyForm"></avue-form>
+ </div>
+ <div class="answer" v-show="activeName != 'info0'">
<div class="topic-item" v-for="(item, index) in questionBankData" :key="index">
<div class="topic-title">
{{ index + 1 }} .{{ item.subjectName }}
@@ -129,7 +130,7 @@
}]
},
wyForm: {},
- activeName: 'info1',
+ activeName: 'info0',
questionBankData: [],
page: {
pageSize: 20,
@@ -188,18 +189,18 @@
})
},
- // 保持题目
+ // 保存题目
saveQuestionBank () {
+ let isChoose = false
+ this.questionBankData.forEach(item => {
+ if (item.chooseId) {
+ isChoose = true
+ }
+ })
+ if (isChoose == false) return
save(this.questionBankData).then(
() => {
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // })
- // this.questionBankOnLoad(this.page, param = {
- // subclassName: this.activeName,
- // propertyId: this.wyForm.id
- // })
+ // 取消提示避免重复
},
(error) => {
window.console.log(error)
@@ -209,6 +210,7 @@
// 点击tab切换
handleClick (tab) {
+ if (tab.label == '公司管理') return
let param = {
subclassName: tab.label,
propertyId: this.wyForm.id
@@ -224,18 +226,36 @@
this.saveBasicInfo()
// 保持考试信息
this.saveQuestionBank()
- },
+ }
}
}
</script>
<style lang="scss" scoped>
+.basic-container-box {
+ height: 100%;
+
+ :deep(.basic-container__card),
+ :deep(.el-card__body) {
+ height: 98%;
+ }
+
+ .detail-container {
+ height: calc(100% - 100px);
+ }
+}
+
+
:deep(.answer) {
+ height: calc(100% - 60px);
+ overflow-y: scroll;
+
.topic-item {
margin-bottom: 20px;
.topic-title {
margin-bottom: 10px;
+ font-size: 14px;
}
.topic-options {
@@ -253,6 +273,7 @@
display: flex;
align-items: center;
margin-right: 6px;
+ font-size: 14px;
}
}
}
@@ -262,6 +283,6 @@
.submit-btn {
display: flex;
justify-content: center;
- margin-bottom: 30px;
+ margin: 20px;
}
</style>
\ No newline at end of file
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index 07cc7f5..b90545f 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -317,10 +317,10 @@
hide: true,
parent: false,
label: "议事标题",
- prop: "districtId",
+ prop: "",
search: false,
type: 'select',
- dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
+ dicUrl: "",
props: {
label: "name",
value: "id"
diff --git a/src/views/propertySupervision/propertyCapitalManage.vue b/src/views/propertySupervision/propertyCapitalManage.vue
index 32f0bc1..e926832 100644
--- a/src/views/propertySupervision/propertyCapitalManage.vue
+++ b/src/views/propertySupervision/propertyCapitalManage.vue
@@ -1,247 +1,247 @@
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
- @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
- @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot-scope="{row, size, index}" slot="menu">
- <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
- @click.stop="handleWork(row)">处理
- </el-button>
- <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
- @click.stop="handleDetail(row)">详情
- </el-button>
- <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
- @click.stop="handleImage(row, index)">流程图
- </el-button>
- </template>
- <template slot-scope="{row, size}" slot="processDefinitionVersion">
- <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
- </template>
- <template slot-scope="{row, size}" slot="linkPhone">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
- v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
- </el-button>
- </template>
- </avue-crud>
- <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
- </basic-container>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot-scope="{row, size, index}" slot="menu">
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.work_todo_handle"
+ @click.stop="handleWork(row)">处理
+ </el-button>
+ <el-button type="text" :size="size" icon="el-icon-info" v-if="permission.work_todo_detail"
+ @click.stop="handleDetail(row)">详情
+ </el-button>
+ <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.work_todo_follow"
+ @click.stop="handleImage(row, index)">流程图
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="processDefinitionVersion">
+ <el-tag :size="size">v{{ row.processDefinitionVersion }}</el-tag>
+ </template>
+ <template slot-scope="{row, size}" slot="linkPhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'linkPhoneflag')"
+ v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
+ </el-button>
+ </template>
+ </avue-crud>
+ <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
+ </basic-container>
</template>
<script>
-import {
+ import {
mapGetters
-} from "vuex"
-import {
+ } from "vuex"
+ import {
todoList
-} from "@/api/work/work"
-import {
+ } from "@/api/work/work"
+ import {
flowCategory,
flowRoute
-} from "@/util/flow"
+ } from "@/util/flow"
-export default {
- data () {
- return {
- form: {},
- selectionId: '',
- selectionList: [],
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- processInstanceId: '',
- flowBox: false,
- workBox: false,
- option: {
- labelWidth: 120,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 210,
+ export default {
+ data() {
+ return {
+ form: {},
+ selectionId: '',
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ processInstanceId: '',
+ flowBox: false,
+ workBox: false,
+ option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
- height: 'auto',
- calcHeight: 30,
- tip: false,
- simplePage: true,
- border: true,
- index: true,
- // selection: true,
- editBtn: false,
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- dialogWidth: 900,
- dialogClickModal: false,
- column: [{
- label: "流程分类",
- type: "select",
- row: true,
- dicUrl: "/api/blade-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- // search: true,
- hide: true,
- width: 100,
- },
- {
- width: 100,
- label: '申请类型',
- prop: 'categoryName',
- // search: true,
- },
- {
- width: 220,
- overHidden: true,
- label: "小区",
- prop: "districtId",
- // search: true,
- type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "id"
- },
- defaultExpandedKeys: ["361102003"],
- searchSpan: 5,
- span: 12,
- },
- {
- width: 110,
- label: '联系人',
- prop: 'linkman',
- // search: true,
- },
- {
- width: 120,
- label: '联系电话',
- prop: 'linkPhone',
- // search: true,
- slot: true
- },
- {
- label: '项目名称',
- prop: 'name',
- // search: true,
- },
- {
- label: '当前步骤',
- prop: 'taskName',
- },
- // {
- // label: '流程版本',
- // prop: 'processDefinitionVersion',
- // // slot: true,
- // width: 80,
- // },
- {
- width: 144,
- label: '申请时间',
- prop: 'createTime',
- },
- ]
+ height: 'auto',
+ calcHeight: 30,
+ tip: false,
+ simplePage: true,
+ border: true,
+ index: true,
+ // selection: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ dialogWidth: 900,
+ dialogClickModal: false,
+ column: [{
+ label: "流程分类",
+ type: "select",
+ row: true,
+ dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ prop: "category",
+ // search: true,
+ hide: true,
+ width: 100,
},
- data: []
- }
+ {
+ width: 100,
+ label: '申请类型',
+ prop: 'categoryName',
+ // search: true,
+ },
+ {
+ width: 220,
+ overHidden: true,
+ label: "小区",
+ prop: "districtId",
+ // search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ searchSpan: 5,
+ span: 12,
+ },
+ {
+ width: 110,
+ label: '联系人',
+ prop: 'linkman',
+ // search: true,
+ },
+ {
+ width: 120,
+ label: '联系电话',
+ prop: 'linkPhone',
+ // search: true,
+ slot: true
+ },
+ {
+ label: '项目名称',
+ prop: 'name',
+ // search: true,
+ },
+ {
+ label: '当前步骤',
+ prop: 'taskName',
+ },
+ // {
+ // label: '流程版本',
+ // prop: 'processDefinitionVersion',
+ // // slot: true,
+ // width: 80,
+ // },
+ {
+ width: 144,
+ label: '申请时间',
+ prop: 'createTime',
+ },
+ ]
+ },
+ data: []
+ }
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
- ids () {
- let ids = []
- this.selectionList.forEach(ele => {
- ids.push(ele.id)
- })
- return ids.join(",")
- },
+ ...mapGetters(["permission", "flowRoutes"]),
+ ids() {
+ let ids = []
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
- textDispose () {
- return (row, flag, type) => {
- if (row[flag] || row[type] == null) {
- return row[type]
- } else {
- if (type == 'principalIdCard') {
- return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
- } else {
- return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
- }
- }
+ textDispose() {
+ return (row, flag, type) => {
+ if (row[flag] || row[type] == null) {
+ return row[type]
+ } else {
+ if (type == 'principalIdCard') {
+ return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+ } else {
+ return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
}
+ }
}
+ }
},
methods: {
- showStringDispose (row, type) {
- row[type] = !row[type]
- },
+ showStringDispose(row, type) {
+ row[type] = !row[type]
+ },
- searchReset () {
- this.query = {}
- this.onLoad(this.page)
- },
- searchChange (params, done) {
- this.query = params
- this.page.currentPage = 1
- this.onLoad(this.page, params)
- done()
- },
- selectionChange (list) {
- this.selectionList = list
- },
- selectionClear () {
- this.selectionList = []
- this.$refs.crud.toggleSelection()
- },
- handleWork (row) {
- this.$router.push({
- path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
- })
- },
- handleDetail (row) {
- this.$router.push({
- path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
- })
- },
- handleImage (row) {
- this.processInstanceId = row.processInstanceId
- this.flowBox = true
- },
- currentChange (currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange (pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange () {
- this.onLoad(this.page, this.query)
- },
- onLoad (page, params = {}) {
- const query = {
- ...this.query,
- category: (params.category) ? flowCategory(params.category) : null
- }
- this.loading = true
- todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
- const data = {
- ...res.data.data,
- records: res.data.data.records.map(item => {
- return {
- ...item,
- 'linkPhoneflag': false
- }
- })
- }
- this.page.total = data.total
- this.data = data.records
- this.loading = false
- this.selectionClear()
- })
+ searchReset() {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange(params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange(list) {
+ this.selectionList = list
+ },
+ selectionClear() {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
+ },
+ handleWork(row) {
+ this.$router.push({
+ path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
+ })
+ },
+ handleDetail(row) {
+ this.$router.push({
+ path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
+ })
+ },
+ handleImage(row) {
+ this.processInstanceId = row.processInstanceId
+ this.flowBox = true
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad(page, params = {}) {
+ const query = {
+ ...this.query,
+ category: (params.category) ? flowCategory(params.category) : null
}
+ this.loading = true
+ todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ const data = {
+ ...res.data.data,
+ records: res.data.data.records.map(item => {
+ return {
+ ...item,
+ 'linkPhoneflag': false
+ }
+ })
+ }
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
+ }
}
-}
+ }
</script>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 4be0bfd..6737da4 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -7,15 +7,18 @@
@refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="{row, size}" slot="menu">
- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
+ <!-- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
@click="lookDetail(row, 0)">查 看
+ </el-button> -->
+ <el-button type="text" :size="size" plain @click.stop="getDetail(row)">
+ 详情
</el-button>
- <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
- plain @click=" goAudit(row)">审 核
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check"
+ :disabled="row.status != 1" plain @click=" goAudit(row)">审 核
</el-button>
- <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
+ <!-- <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
@click="rowDel(row)">删 除
- </el-button>
+ </el-button> -->
</template>
<template slot="status" slot-scope="{row, size}">
@@ -24,9 +27,13 @@
</el-tag>
</template>
- <template slot-scope="{row, size}" slot="phone">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
- v-text="textDispose(row, 'phoneflag', 'phone')">
+ <template slot-scope="{row, size}" slot="principalPhone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+ v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
</avue-crud>
@@ -40,14 +47,97 @@
<el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
custom-class="flow-design-dialog" :before-close="handleClose">
- <audit-base @handleSubmit="submitAudit" @handleReset="submitAudit"></audit-base>
+ <audit-base @handleSubmit="submitAudit"></audit-base>
</el-dialog>
+ <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
+ <div class="title">
+ <div class="icon">{{ refreshNum }}</div>
+ 基础信息
+ </div>
+ <div class="basic-info">
+ <div class="info-item">
+ <div class="info-name">场所名称</div>
+ <div class="info-value">{{ rowDetail.placeName }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-name">场所类型</div>
+ <div class="info-value">{{ rowDetail.nineTypeName }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-name">检查人</div>
+ <div class="info-value">{{ rowDetail.name }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-name">检查时间</div>
+ <div class="info-value">{{ rowDetail.createTime }}</div>
+ </div>
+ </div>
+ <div class="title">
+ <div class="icon"></div>
+ 检查记录
+ </div>
+
+ <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'>
+ <div class="question-type" @click="flodQL(tIndex)">
+ <div class="type-name">
+ {{ CNNum[tIndex] }}、{{ tItem.questionName }}
+ </div>
+ <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i
+ class="el-icon-arrow-up" v-show="!tItem.isShowQList"></i></div>
+ </div>
+ <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index'
+ v-show="tItem.isShowQList">
+ <div class="question-name">
+ <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
+ <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
+ <el-radio v-model="radio" label="2" disabled>不存在</el-radio>
+ </div>
+ </div>
+ <div class="yh-pic-box">
+ <div class="yh-pic-name">
+ 隐患图片
+ </div>
+ <div class="yh-pic-list">
+ <div class="pic-item" v-for="pic in item.imageUrlsList">
+ <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
+ </div>
+ </div>
+ </div>
+ <div class="yh-remark">
+ <div class="yh-remark-name">
+ 隐患描述
+ </div>
+ <div class="yh-remark-value">
+ {{ item.remark }}
+ </div>
+ </div>
+ <div class="yh-pic-box">
+ <div class="yh-pic-name">
+ 整改后图片
+ </div>
+ <div class="yh-pic-list">
+ <div class="pic-item" v-for="pic in item.rectificationImageUrlsList">
+ <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
+ </div>
+ </div>
+ </div>
+ <div class="yh-remark">
+ <div class="yh-remark-name">
+ 整改后描述
+ </div>
+ <div class="yh-remark-value">
+ {{ item.rectificationRemark }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </el-drawer>
</basic-container>
</template>
<script>
import {
- getList,
+ getTaskPlaceSelfCheckList,
removeTask,
update,
add,
@@ -60,6 +150,21 @@
applyTaskExamine
} from "@/api/publicSecurity/keynoteManage"
import website from '@/config/website'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import Qs from "qs"
+import {
+ exportBlob
+} from "@/api/common"
+import {
+ getToken
+} from '@/util/auth'
+import {
+ downloadXls
+} from "@/util/util"
+import {
+ dateNow
+} from "@/util/date"
import campusReporting from './components/campusReporting'
import hotelReporting from './components/hotelReporting'
import labelReporting from './components/labelReporting'
@@ -79,6 +184,9 @@
}
return {
+ isDetail: false,
+ refreshNum: 1,
+ rowDetail: [],
auditRules: {
status: [{ required: true, message: "必填" }],
remark: [{ required: true, message: "必填" }],
@@ -97,154 +205,139 @@
currentPage: 1,
total: 0,
},
- datetime: "",
selectionList: [],
option: {
- labelWidth: 96,
+ labelWidth: 120,
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
- menuWidth: 190,
+ menuWidth: 200,
+ // menu: false,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- // menu: false,
border: true,
+ addBtn: false,
+ delBtn: false,
//stripe:true,
index: true,
- // viewBtn: true,
editBtn: false,
- delBtn: false,
- selection: true,
- header: false,
+ viewBtn: false,
+ // selection: true,
+ excelBtn: false,
+ refreshBtn: false,
+ searchShowBtn: false,
+ columnBtn: false,
dialogClickModal: false,
- column: [{
- span: 12,
- label: "社区",
- prop: "communityName",
- searchSpan: 4,
- searchLabelWidth: 46,
- search: true,
- hide: true,
- align: 'center'
- },
- {
- width: 110,
- span: 12,
- label: "场所负责人",
- prop: "realName",
- searchSpan: 4,
- searchLabelWidth: 100,
- search: true,
- align: 'center'
- }, {
- width: 120,
- span: 12,
- label: "联系方式",
- prop: "phone",
- searchSpan: 4,
- search: true,
- slot: true,
- rules: [{
- validator: validatorPhone,
- trigger: 'blur'
- }],
- align: 'center'
- }, {
- overHidee: true,
- span: 12,
- label: "地址",
- prop: "addressName",
- searchSpan: 4,
- // search: true,
- rules: [{
- required: true,
- message: "请输入地址",
- trigger: "blur",
- },],
- align: 'center'
- }, {
- width: 110,
- label: "所属街道",
- // hide: true,
- // search: true,
- parent: false,
- searchSpan: 4,
- prop: "streetCode",
- type: "tree",
- dicUrl: "/api/blade-system/region/getTownTree",
- props: {
- label: "name",
- value: "id"
+ column: [
+ {
+ label: "场所名称",
+ prop: "placeName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
},
- rules: [{
- required: true,
- message: "请选择所属街道",
- trigger: "blur",
- },],
- align: 'center'
- }, {
- width: 156,
- // hide: true,
- parent: false,
- searchSpan: 4,
- label: "所属社区",
- prop: "neiCode",
- // search: false,
- type: "tree",
- dicUrl: "/api/blade-system/region/tree",
- props: {
- label: "name",
- value: "id",
+ {
+ label: "场所地址",
+ prop: "location",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ overHidden: true,
+ align: 'center'
+ }, {
+ label: "所属街道",
+ prop: "streetName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
},
- rules: [{
- required: true,
- message: "请选择所属社区",
- trigger: "blur",
- },],
- align: 'center'
- }, {
- label: "九小场所类型",
- prop: "nineType",
- dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
- props: {
- label: "title",
- value: "key",
+ {
+ label: "所属社区",
+ prop: "communityName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ width: 160,
+ overHidden: true,
+ align: 'center'
},
- // type: 'select',
- // search: true,
- align: 'center',
- width: 120,
- },
- {
- width: 100,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: '审核状态',
- prop: 'status',
- type: 'radio',
- slot: true,
- dicData: [{
- label: '待审核',
- value: 1
- }, {
- label: '已审核',
- value: 2
- }, {
- label: '未通过',
- value: 3
- }, {
- label: '待接收',
- value: 4
- }],
- align: 'center'
- }],
+ {
+ label: "所属网格",
+ prop: "gridName",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
+ },
+ {
+ label: "场所隐患",
+ prop: "remark",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ align: 'center'
+ },
+ {
+ label: "场所负责人",
+ prop: "principal",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ align: 'center'
+ },
+ {
+ label: "场所负责人电话",
+ prop: "principalPhone",
+ span: 24,
+ row: true,
+ slot: true,
+ searchSpan: 4,
+ align: 'center'
+ },
+ {
+ width: 110,
+ label: "签名",
+ prop: "signaturePath",
+ type: "upload",
+ listType: "picture-img",
+ span: 24,
+ align: 'center'
+ },
+ {
+ width: 110,
+ label: "审核状态",
+ prop: "status",
+ span: 24,
+ align: 'center',
+ slot: true,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ searchLabelWidth: 46,
+ align: 'center'
+ },
+ ],
},
data: [],
auditBasePopup: false,
+ questionTypeList: [],
+ CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
+ nineTypeList: []
}
},
@@ -323,6 +416,91 @@
}
},
methods: {
+ // 点击展开收缩
+ flodQL (index) {
+ this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
+ this.refreshNum += 1
+ },
+
+ // 对数组按属性分组
+ groupBy (arr, key) {
+ return arr.reduce((acc, curr) => {
+ (acc[curr[key]] = acc[curr[key]] || []).push(curr)
+ return acc
+ }, {})
+ },
+
+ // 九小类型转换
+ switchNineType (type) {
+ return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
+ },
+
+ getDetail (row) {
+ if (row.patrolRecordVOList) {
+ row.patrolRecordVOList.forEach(item => {
+ item.imageUrlsList = []
+ item.rectificationImageUrlsList = []
+ if (item.imageUrls) {
+ item.imageUrlsList = item.imageUrls.split(',').map(ele => {
+ return website.minioUrl + ele
+ })
+
+ }
+ if (item.rectificationImageUrls) {
+ item.rectificationImageUrlsList = item.rectificationImageUrls.split(',').map(ele => {
+ return website.minioUrl + ele
+ })
+ }
+ // 查询问题类型
+ this.questionTypeList.forEach(qItem => {
+ qItem.children.forEach(qChild => {
+ if (qChild.id == item.itemId) {
+ item.qType = qItem.title
+ item.itemsNameTitle = qChild.title
+ }
+ })
+ })
+ })
+ }
+ if (row.patrolRecordVOList) {
+ // 把相同类型问题分组
+ let obj = this.groupBy(row.patrolRecordVOList, 'qType')
+ let arr = Object.entries(obj)
+ let newArr = []
+ arr.forEach(part => {
+ newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
+ })
+ row.qTypeList = newArr
+ }
+ // 九小类型转换
+ row.nineTypeName = this.switchNineType(row.nineType)
+ this.rowDetail = row
+ this.isDetail = true
+ },
+
+ handleExport () {
+ this.$message.warning('正在开发中..')
+ // this.$confirm("是否导出场所检查数据?", "提示", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning"
+ // }).then(() => {
+ // NProgress.start()
+ // var data = {
+ // ...this.query
+ // }
+ // // data.isNine = 1
+ // data = Qs.stringify(data)
+ // exportBlob(
+ // `/api/blade-placeCheck/placeCheck/export-placeCheck?${this.website.tokenHeader}=${getToken()}&` + data
+ // ).then(res => {
+ // console.log('exportBlob', res)
+ // downloadXls(res.data, `场所检查${dateNow()}.xlsx`)
+ // NProgress.done()
+ // })
+ // })
+ },
+
showStringDispose (row, type) {
row[type] = !row[type]
},
@@ -340,9 +518,11 @@
// 确认提交审核
submitAudit (form) {
let auditForm = {
- status: form.status == 1 ? 2 : 3,
- remark: form.confirmNotion
+ status: form.status == '1' ? '2' : '3',
+ remark: form.confirmNotion,
+ reportType: 2
}
+
applyTaskExamine(Object.assign(this.auditParams, auditForm)).then(res => {
if (res.data.code == 200) {
this.$message.warning("审核成功")
@@ -355,7 +535,7 @@
// 审核按钮
goAudit (row) {
this.auditParams = {
- id: row.id,
+ id: row.taskId,
reportType: row.reportType
}
this.visible = true
@@ -579,37 +759,35 @@
},
onLoad (page, params = {}) {
const {
- dateTime
} = this.query
let values = {
...params,
}
- // if (dateTime) {
- // values = {
- // ...params,
- // startTime: dateTime[0],
- // endTime: dateTime[1],
- // ...this.query,
- // }
- // values.dateTime = null
- // }
- values.reportType = 2
+
this.loading = true
- getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.data.forEach(item => {
- this.$set(item, 'phoneflag', false)
- if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
+ getTaskPlaceSelfCheckList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = {
+ ...res.data.data,
+ records: res.data.data.records.map(item => {
+ return {
+ ...item,
+ 'createTime': item.createTime.slice(0, 16),
+ 'principalPhoneflag': false,
+ }
+ })
+ }
+ data.records.forEach(item => {
+ if (item.signaturePath.length > 0) {
var urls = []
- var names = item.imageUrls.split(",").filter(item => item != '')
+ var names = item.signaturePath.split(",")
names.forEach(name => {
urls.push(website.minioUrl + name)
})
- item.imageUrls = urls.join(",")
+ item.signaturePath = urls.join(",")
}
})
+ this.page.total = data.total
+ this.data = data.records
this.loading = false
this.selectionClear()
})
@@ -621,6 +799,11 @@
<style lang="scss" scoped>
:deep(.cur-container-box) {
padding: 0;
+}
+
+:deep(.el-button--text) {
+ border: 0;
+ background: transparent !important;
}
.avue-upload__icon {
@@ -649,4 +832,120 @@
justify-content: center;
}
}
+
+.title {
+ margin: 10px;
+ height: 40px;
+ background-color: #eee;
+ display: flex;
+ align-items: center;
+
+ .icon {
+ width: 4px;
+ height: 18px;
+ background-color: #409dfe;
+ margin: 0 10px;
+ color: transparent;
+ }
+}
+
+.basic-info {
+ padding: 0 20px;
+ font-size: 14px;
+
+ .info-item {
+ display: flex;
+ padding: 10px;
+
+ .info-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ }
+
+ .info-value {
+ display: flex;
+ align-items: center;
+ }
+ }
+}
+
+.question-list {
+ padding: 0 20px;
+ font-size: 14px;
+
+ .question-type {
+ height: 60px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ justify-content: space-between;
+ padding-right: 20px;
+
+ .type-name {}
+
+ .icon-box {}
+ }
+
+ .question-item {
+ margin-bottom: 20px;
+ padding: 10px;
+ background: #f5f7fa;
+ border-radius: 8px;
+
+ &>div {
+ margin: 14px 0;
+ }
+
+ .question-name {
+ display: flex;
+
+ .key {
+ width: 80%;
+ padding-right: 20px;
+ word-break: break-all;
+ }
+
+ .value {
+ width: 20%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .yh-pic-box {
+ display: flex;
+ height: 100px;
+
+ .yh-pic-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: left;
+ }
+
+ .yh-pic-list {
+ width: 0;
+ flex: 1;
+ display: flex;
+ }
+ }
+
+ .yh-remark {
+ display: flex;
+
+ .yh-remark-name {
+ width: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: left;
+ }
+
+ .yh-remark-value {
+ word-break: break-all;
+ }
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
index 0973fc3..aad41de 100644
--- a/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
+++ b/src/views/publicSecurity/ninePlaceManage/patrolRecord.vue
@@ -433,14 +433,16 @@
})
})
}
- // 把相同类型问题分组
- let obj = this.groupBy(row.patrolRecordVOList, 'qType')
- let arr = Object.entries(obj)
- let newArr = []
- arr.forEach(part => {
- newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
- })
- row.qTypeList = newArr
+ if (row.patrolRecordVOList) {
+ // 把相同类型问题分组
+ let obj = this.groupBy(row.patrolRecordVOList, 'qType')
+ let arr = Object.entries(obj)
+ let newArr = []
+ arr.forEach(part => {
+ newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
+ })
+ row.qTypeList = newArr
+ }
// 九小类型转换
row.nineTypeName = this.switchNineType(row.nineType)
this.rowDetail = row
diff --git a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
index 609ac4d..48fd1e1 100644
--- a/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
+++ b/src/views/publicSecurity/ninePlaceManage/situationRectification.vue
@@ -23,7 +23,7 @@
<el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
详情
</el-button>
- <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="goAudit(row)"
+ <el-button icon="el-icon-s-check" :size="size" :type="type" @click.stop="goAudit(row)"
:disabled="row.status != 1">审核</el-button>
</template>
</avue-crud>
@@ -123,21 +123,7 @@
<!-- 审核弹窗 -->
<el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
custom-class="flow-design-dialog" :before-close="handleClose">
- <el-form ref="auditForm" :model="auditForm" :rules="auditRules">
- <el-form-item label="审核结论：" prop="status">
- <el-radio-group v-model="auditForm.status">
- <el-radio :label="2">通过</el-radio>
- <el-radio :label="3">不通过</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="不通过原因：" prop="reasonFailure" v-if="auditForm.status == 3">
- <el-input type="textarea" v-model="auditForm.reasonFailure"></el-input>
- </el-form-item>
- </el-form>
- <div style="display:flex;justify-content:center">
- <el-button @click="submitAudit" size="small" type="primary">保 存</el-button>
- <el-button @click="cancelAudit" size="small">取 消</el-button>
- </div>
+ <audit-base @handleSubmit="submitAudit"></audit-base>
</el-dialog>
</basic-container>
</template>
@@ -173,7 +159,6 @@
status: [{ required: true, message: "必填" }],
reasonFailure: [{ required: true, message: "必填" }],
},
- auditForm: {},
visible: false,
typeStatus: 1,
isDetail: false,
@@ -404,23 +389,20 @@
// 取消审核
cancelAudit () {
this.visible = false
- this.auditForm = {}
- this.$refs.auditForm.resetFields()
},
// 确认提交审核
- submitAudit () {
- this.$refs.auditForm.validate((valid) => {
- if (valid) {
- applyRectification(Object.assign(this.auditParams, this.auditForm)).then(res => {
- if (res.data.code == 200) {
- this.$message.warning("审核成功")
- this.onLoad(this.page)
- this.cancelAudit()
- }
- })
- } else {
- return false
+ submitAudit (form) {
+ let auditForm = {
+ status: form.status == '1' ? '2' : '3',
+ reasonFailure: form.confirmNotion,
+ }
+
+ applyRectification(Object.assign(this.auditParams, auditForm)).then(res => {
+ if (res.data.code == 200) {
+ this.$message.warning("审核成功")
+ this.onLoad(this.page)
+ this.cancelAudit()
}
})
},
diff --git a/vue.config.js b/vue.config.js
index ad95f39..a0627eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,7 +38,8 @@
proxy: {
"/api": {
//本地服务接口地址
- target: "https://srgdjczzxtpt.com:2080/api",
+ target:"http://192.168.2.109:9528",
+ // target: "https://srgdjczzxtpt.com:2080/api",
// target: "https://kt39592615.goho.co",
// target: "http://z4042833u6.wicp.vip",
// target: "http://localhost:9528",
--
Gitblit v1.9.3