From d1954622eee916e07532a79e2cc2dfce6788487f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jan 2024 18:31:12 +0800
Subject: [PATCH] 公安安全
---
src/views/publicSecurity/keynotePlaceManage.vue | 90 +++---
src/views/publicSecurity/components/labelReporting.vue | 166 +++++++++---
src/views/publicSecurity/components/bailReportingDetail.vue | 111 +++++++-
src/views/publicSecurity/bailReporting.vue | 107 +------
src/api/task/campusReporting.js | 8
src/views/publicSecurity/components/campusReporting.vue | 99 ++++++-
src/views/publicSecurity/components/hotelReporting.vue | 122 ++++++++-
src/api/task/bailReporting.js | 8
src/api/task/hotelReporting.js | 8
src/api/task/labelReporting.js | 8
10 files changed, 495 insertions(+), 232 deletions(-)
diff --git a/src/api/task/bailReporting.js b/src/api/task/bailReporting.js
index 9b92382..8a2cdd4 100644
--- a/src/api/task/bailReporting.js
+++ b/src/api/task/bailReporting.js
@@ -10,4 +10,12 @@
...params,
},
});
+};
+
+export const update = (row) => {
+ return request({
+ url: "/api/blade-taskBailReportingEvent/taskBailReportingEvent/update",
+ method: "post",
+ data: row,
+ });
};
\ No newline at end of file
diff --git a/src/api/task/campusReporting.js b/src/api/task/campusReporting.js
index 5b1b158..e262661 100644
--- a/src/api/task/campusReporting.js
+++ b/src/api/task/campusReporting.js
@@ -10,4 +10,12 @@
...params,
},
});
+};
+
+export const update = (row) => {
+ return request({
+ url: "/api/blade-taskCampusReportingEvent/taskCampusReportingEvent/update",
+ method: "post",
+ data: row,
+ });
};
\ No newline at end of file
diff --git a/src/api/task/hotelReporting.js b/src/api/task/hotelReporting.js
index f16c874..ef15ad2 100644
--- a/src/api/task/hotelReporting.js
+++ b/src/api/task/hotelReporting.js
@@ -10,4 +10,12 @@
...params,
},
});
+};
+
+export const update = (row) => {
+ return request({
+ url: "/api/blade-taskHotelReporting/taskHotelReporting/update",
+ method: "post",
+ data: row,
+ });
};
\ No newline at end of file
diff --git a/src/api/task/labelReporting.js b/src/api/task/labelReporting.js
index c129af0..c3fce3d 100644
--- a/src/api/task/labelReporting.js
+++ b/src/api/task/labelReporting.js
@@ -10,4 +10,12 @@
...params,
},
});
+};
+
+export const update = (row) => {
+ return request({
+ url: "/api/blade-taskLabelReportingEvent/taskLabelReportingEvent/update",
+ method: "post",
+ data: row,
+ });
};
\ No newline at end of file
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index c74b132..71b3d51 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -5,7 +5,10 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="scope" slot="menu">
- <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
+ <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
+ </el-button>
+ <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
+ @click="lookDetail(scope.row,1)">审 核
</el-button>
<el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
</el-button>
@@ -13,9 +16,8 @@
</avue-crud>
- <el-dialog class="place-info-box audit-info-box" title="查看详情" append-to-body :visible.sync="auditBasePopup"
- width="80%">
- <bailReportingDetail ref="bailReportingDetail"></bailReportingDetail>
+ <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
+ <bailReportingDetail @colseDetail="colseDetail" ref="bailReportingDetail"></bailReportingDetail>
</el-dialog>
</basic-container>
</template>
@@ -27,6 +29,10 @@
update,
add,
} from "@/api/task/task"
+
+ import {
+ update as bailReportingUpdate,
+ } from "@/api/task/bailReporting"
import {
mapGetters
@@ -160,45 +166,17 @@
})
return ids.join(",")
},
-
- showConfirmFlag() {
- return (data) => {
- let tags = {
- text: '',
- type: ''
- }
- if (data == 1) {
- tags = {
- text: '待审核',
- type: 'warning'
- }
- } else if (data == 2) {
- tags = {
- text: '已审核',
- type: 'success'
- }
- } else if (data == 3) {
- tags = {
- text: '未通过',
- type: 'danger'
- }
- } else if (data == 4) {
- tags = {
- text: '待完善',
- type: 'info'
- }
- }
-
- return tags
- }
- }
},
methods: {
- lookDetail(row) {
+ colseDetail() {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+ lookDetail(row, applyType) {
this.auditBasePopup = true
var that = this
this.$nextTick(() => {
- that.$refs.bailReportingDetail.init(row)
+ that.$refs.bailReportingDetail.init(row, applyType)
})
},
auditCur(row) {
@@ -254,27 +232,8 @@
},
rowUpdate(row, index, done, loading) {
- if (row.imageUrls.length > 0) {
- var urls = []
- var split = row.imageUrls.split(",").filter(item => item != '')
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.imageUrls = urls.join(",")
- }
-
- let label = row.label
-
- if (row.smallLabel != '') {
- label = label + ',' + row.smallLabel
- }
-
- delete row.smallLabel
-
- update({
- ...row,
- label
+ bailReportingUpdate({
+ ...row
}).then(
() => {
this.onLoad(this.page)
@@ -353,26 +312,7 @@
},
beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- // getPlace(this.form.id).then((res) => {
- // this.form = res.data.data
- // if (this.form.imageUrls.length) {
- // this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
- // .minioUrl + item).join(',')
- // }
- // if (this.form.placePoiLabelVOList.length) {
- // let lebelTwo = this.form.placePoiLabelVOList.find(item => {
- // return item.type == 2
- // })
- // if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
- // let lebelThree = this.form.placePoiLabelVOList.find(item => {
- // return item.type == 3
- // })
- // if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
- // }
- // done()
- // })
- } else {
+ if (["edit", "view"].includes(type)) {} else {
done()
}
},
@@ -393,15 +333,6 @@
let values = {
...params,
}
- // if (dateTime) {
- // values = {
- // ...params,
- // startTime: dateTime[0],
- // endTime: dateTime[1],
- // ...this.query,
- // }
- // values.dateTime = null
- // }
values.reportType = 1
this.loading = true
getList(page.currentPage, page.pageSize, values).then((res) => {
diff --git a/src/views/publicSecurity/components/bailReportingDetail.vue b/src/views/publicSecurity/components/bailReportingDetail.vue
index cc0b7e6..4c95e48 100644
--- a/src/views/publicSecurity/components/bailReportingDetail.vue
+++ b/src/views/publicSecurity/components/bailReportingDetail.vue
@@ -1,47 +1,70 @@
<template>
- <avue-form :option="option" v-model="data"></avue-form>
+ <div class="cur-container-box">
+ <div v-if="applyType == 1">
+ <div class="content-box">
+ 审核当前项
+ </div>
+ <div class="footer-btn-box">
+ <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+ <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+ </div>
+ </div>
+
+ <avue-form v-else :option="option" v-model="form">
+ </avue-form>
+
+ </div>
</template>
<script>
import {
- getDetail
+ getDetail,
+ update
} from "@/api/task/bailReporting"
export default {
data() {
return {
- data: {},
+ form: {},
+ applyType: '',
option: {
submitBtn: false,
emptyBtn: false,
column: [{
// span: 10,
- label: '自查人名称',
+ label: '申请人',
prop: 'checkUserName',
disabled: true,
+ span: 8,
}, {
// span: 12,
- label: '自查人手机',
+ label: '申请人手机',
prop: 'checkTelephone',
disabled: true,
+ span: 8,
}, {
- label: '自查位置',
+ label: '申请位置',
prop: 'location',
disabled: true,
+ span: 8,
}, {
- label: '确认时间',
+ label: '审核时间',
prop: 'confirmTime',
disabled: true,
+ span: 8,
}, {
- label: '确认用户',
+ label: '审核人',
prop: 'confirmUserName',
disabled: true,
+ span: 8,
}, {
- label: '确认意见',
+ label: '审核意见',
prop: 'confirmNotion',
disabled: true,
+ span: 8,
}, {
- label: '确认标记',
+ label: '审核状态',
prop: 'confirmFlag',
disabled: true,
+ span: 8,
type: 'select',
dicData: [{
label: '待审核',
@@ -57,14 +80,17 @@
label: '申请时间',
prop: 'applyTime',
disabled: true,
+ span: 8,
}, {
label: '外出原因',
prop: 'applyName',
disabled: true,
+ span: 8,
}, {
label: '身份证号',
prop: 'idCard',
disabled: true,
+ span: 8,
}, {
label: '位置图片',
fileType: 'img',
@@ -74,17 +100,22 @@
prop: 'locationImageUrls',
disabled: true,
}, {
- label: '确认人电话',
+ label: '审核人电话',
prop: 'confirmUserTelephone',
disabled: true,
+ span: 8,
}, {
label: '出发-当前时间',
prop: 'startTime',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '出发-报备位置',
prop: 'startLocation',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '出发-位置图片',
fileType: 'img',
@@ -93,14 +124,19 @@
dataType: "string",
prop: 'startImageUrls',
disabled: true,
+ labelWidth: 120,
}, {
label: '到达-当前时间',
prop: 'reachTime',
disabled: true,
+ labelWidth: 120,
+ span: 8,
}, {
label: '到达-报备位置',
prop: 'reachLocation',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '到达-位置图片',
fileType: 'img',
@@ -109,14 +145,19 @@
dataType: "string",
prop: 'reachImageUrls',
disabled: true,
+ labelWidth: 120,
}, {
label: '返回-当前时间',
prop: 'returnTime',
disabled: true,
+ labelWidth: 120,
+ span: 8,
}, {
label: '返回-报备位置',
prop: 'returnLocation',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '返回-位置图片',
fileType: 'img',
@@ -124,17 +165,29 @@
listType: "picture-card",
dataType: "string",
prop: 'returnImageUrls',
- disabled: true,
- }, {
- label: '创建时间',
- prop: 'createTime',
+ labelWidth: 120,
disabled: true,
}, ]
}
}
},
methods: {
- init(data) {
+ auditPass(type) {
+ update({
+ confirmFlag: type,
+ taskId: this.form.taskId,
+ id: this.form.id
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$emit('colseDetail');
+ })
+ },
+ init(data, applyType) {
+ this.applyType = applyType
+ this.form = {}
this.getTaskDetail(data.id)
},
@@ -142,7 +195,7 @@
getDetail({
taskId: taskId
}).then((res) => {
- this.data = res.data.data
+ this.form = res.data.data
})
}
@@ -150,5 +203,27 @@
}
</script>
-<style>
+<style lang="scss" scoped>
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ // margin: 0 4px;
+ // padding: 0 16px;
+ // height: 0;
+ // flex: 1;
+ // overflow: hidden;
+ // overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/campusReporting.vue b/src/views/publicSecurity/components/campusReporting.vue
index f852542..b53a234 100644
--- a/src/views/publicSecurity/components/campusReporting.vue
+++ b/src/views/publicSecurity/components/campusReporting.vue
@@ -1,32 +1,46 @@
<template>
- <avue-form :option="option" v-model="data"></avue-form>
+ <div class="cur-container-box">
+ <div v-if="applyType == 1">
+ <div class="content-box">
+ 审核当前项
+ </div>
+ <div class="footer-btn-box">
+ <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+ <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+ </div>
+ </div>
+
+ <avue-form v-else :option="option" v-model="form"></avue-form>
+ </div>
</template>
<script>
import {
- getDetail
+ getDetail,
+ update
} from "@/api/task/campusReporting"
export default {
data() {
return {
- data: {},
+ form: {},
+ applyType: '',
option: {
submitBtn: false,
emptyBtn: false,
column: [{
- label: '自查时间',
- prop: 'checkTime',
- disabled: true,
- }, {
- label: '自查人',
+ label: '申请人',
prop: 'checkUserName',
disabled: true,
}, {
- label: '自查人手机号',
+ label: '申请人手机',
prop: 'checkTelephone',
disabled: true,
}, {
- label: '自查位置',
+ label: '申请位置',
prop: 'location',
+ disabled: true,
+ }, {
+ label: '申请时间',
+ prop: 'checkTime',
disabled: true,
}, {
label: '安全通道',
@@ -40,6 +54,7 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ labelWidth: 120,
}, {
label: '未成年人入住登记本照片',
prop: 'uanImageUrls',
@@ -48,20 +63,21 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ labelWidth: 120,
}, {
- label: '确认时间',
+ label: '审核时间',
prop: 'confirmTime',
disabled: true,
}, {
- label: '确认用户',
+ label: '审核人',
prop: 'confirmUserName',
disabled: true,
}, {
- label: '确认意见',
+ label: '审核意见',
prop: 'confirmNotion',
disabled: true,
}, {
- label: '确认标记',
+ label: '审核状态',
prop: 'confirmFlag',
type: 'select',
dicData: [{
@@ -83,10 +99,12 @@
label: '消费器材数量',
prop: 'fireFacsNums',
disabled: true,
+ labelWidth: 120,
}, {
label: '消费器材状态',
prop: 'fireFacsStatus',
disabled: true,
+ labelWidth: 120,
}, {
label: '消费器材图片',
prop: 'fireFacsImageUrls',
@@ -95,18 +113,22 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ labelWidth: 120,
}, {
label: '消防器材种类',
prop: 'fireFacsType',
disabled: true,
+ labelWidth: 120,
}, {
label: '校园周边安全巡查照片',
prop: 'patrolImageUrls',
disabled: true,
+ labelWidth: 120,
}, {
label: '学校大门是否配备防撞装置',
prop: 'antiCollision',
disabled: true,
+ labelWidth: 120,
}, {
label: '校园防撞装置照片',
prop: 'antiCollisionImageUrls',
@@ -115,26 +137,32 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ labelWidth: 120,
}, {
label: '专职保安人数',
prop: 'fullSoNums',
+ labelWidth: 120,
disabled: true,
}, {
label: '兼职保安人数',
prop: 'partSoNums',
+ labelWidth: 120,
disabled: true,
}, {
label: '学校监控总数',
prop: 'monitorNums',
disabled: true,
+ labelWidth: 120,
}, {
label: '监控是否全覆盖',
prop: 'monitorOver',
disabled: true,
+ labelWidth: 120,
}, {
label: '高空抛物监控',
prop: 'highAltitudeMonitor',
disabled: true,
+ labelWidth: 120,
}, {
label: '高空抛物监控照片',
prop: 'haImageUrls',
@@ -143,12 +171,27 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ labelWidth: 120,
}, ]
}
}
},
methods: {
- init(data) {
+ auditPass(type) {
+ update({
+ status: type,
+ taskId: this.form.taskId,
+ id: this.form.id
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$emit('colseDetail');
+ })
+ },
+ init(data, applyType) {
+ this.applyType = applyType
this.getTaskDetail(data.id)
},
@@ -156,7 +199,7 @@
getDetail({
taskId: taskId
}).then((res) => {
- this.data = res.data.data
+ this.form = res.data.data
})
}
@@ -164,5 +207,27 @@
}
</script>
-<style>
+<style lang="scss" scoped>
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/hotelReporting.vue b/src/views/publicSecurity/components/hotelReporting.vue
index 9e62299..e4722ff 100644
--- a/src/views/publicSecurity/components/hotelReporting.vue
+++ b/src/views/publicSecurity/components/hotelReporting.vue
@@ -1,14 +1,28 @@
<template>
- <avue-form :option="option" v-model="data"></avue-form>
+ <div class="cur-container-box">
+ <div v-if="applyType == 1">
+ <div class="content-box">
+ 审核当前项
+ </div>
+ <div class="footer-btn-box">
+ <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+ <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+ </div>
+ </div>
+
+ <avue-form v-else :option="option" v-model="form"></avue-form>
+ </div>
</template>
<script>
import {
- getDetail
+ getDetail,
+ update
} from "@/api/task/hotelReporting"
export default {
data() {
return {
- data: {},
+ form: {},
+ applyType: '',
option: {
submitBtn: false,
emptyBtn: false,
@@ -16,30 +30,44 @@
label: '酒店名称',
prop: 'hotelName',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '自查时间',
+ label: '申请时间',
prop: 'checkTime',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '自查人姓名',
+ label: '申请人',
prop: 'checkUserName',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '自查人手机',
+ label: '申请人手机',
prop: 'checkTelephone',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '自查位置',
+ label: '申请位置',
prop: 'location',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '灭火器数量',
prop: 'fireNums',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '灭火器状态',
prop: 'fireStatus',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '灭火器图片',
prop: 'fireImageUrls',
@@ -48,10 +76,14 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '安全通道状态',
prop: 'scStatus',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '安全通道图片',
prop: 'scImageUrls',
@@ -60,14 +92,20 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '技防设施有无',
prop: 'pfFlag',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '技防设施名称',
prop: 'pfName',
disabled: true,
+ span: 8,
+ labelWidth: 120,
type: 'select',
dicData: [{
label: '有',
@@ -87,11 +125,15 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
label: '接待未成年人需要做到五个必须',
prop: 'fiveMust',
disabled: true,
+ span: 8,
+ labelWidth: 120,
type: 'select',
dicData: [{
label: "必须询问同住人员身份关系情况，并记录备查",
@@ -127,34 +169,47 @@
listType: "picture-card",
dataType: "string",
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
label: '是否完全实名制登记',
prop: 'realName',
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
label: '确认时间',
prop: 'confirmTime',
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
label: '确认用户',
prop: 'confirmUserName',
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
label: '安全通道有无',
prop: 'scFlag',
disabled: true,
+ span: 8,
+ labelWidth: 120,
+
},
{
- label: '确认意见',
+ label: '审核意见',
prop: 'confirmNotion',
disabled: true,
+ span: 8,
+ labelWidth: 120,
},
{
- label: '确认标记',
+ label: '审核状态',
prop: 'confirmFlag',
type: 'select',
dicData: [{
@@ -168,18 +223,29 @@
value: '3'
}],
disabled: true,
- },
- {
- label: '创建时间',
- prop: 'createTime',
- disabled: true,
+ span: 8,
+ labelWidth: 120,
},
]
}
}
},
methods: {
- init(data) {
+ auditPass(type) {
+ update({
+ status: type,
+ taskId: this.form.taskId,
+ id: this.form.id
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$emit('colseDetail');
+ })
+ },
+ init(data, applyType) {
+ this.applyType = applyType
this.getTaskDetail(data.id)
},
@@ -187,7 +253,7 @@
getDetail({
taskId: taskId
}).then((res) => {
- this.data = res.data.data
+ this.form = res.data.data
})
}
@@ -195,5 +261,27 @@
}
</script>
-<style>
+<style lang="scss" scoped>
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/labelReporting.vue b/src/views/publicSecurity/components/labelReporting.vue
index 17452ad..7a2aa50 100644
--- a/src/views/publicSecurity/components/labelReporting.vue
+++ b/src/views/publicSecurity/components/labelReporting.vue
@@ -1,47 +1,90 @@
<template>
- <avue-form :option="option" v-model="data"></avue-form>
+ <div class="cur-container-box">
+ <div v-if="applyType == 1">
+ <div class="content-box">
+ 审核当前项
+ </div>
+ <div class="footer-btn-box">
+ <el-button type="primary" size="small" @click="auditPass(2)">通 过</el-button>
+ <el-button size="small" @click="auditPass(3)">驳 回</el-button>
+ </div>
+ </div>
+
+ <avue-form v-else :option="option" v-model="form"></avue-form>
+ </div>
</template>
<script>
import {
- getDetail
+ getDetail,
+ update
} from "@/api/task/labelReporting"
export default {
data() {
return {
- data: {},
+ form: {},
+ applyType: '',
option: {
submitBtn: false,
emptyBtn: false,
column: [{
+ label: '房屋名称',
+ prop: 'houseName',
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
+ }, {
+ label: '手机号',
+ prop: 'phoneNumber',
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
+ }, {
+ label: '对象电话',
+ prop: 'transactionObjectTel',
+ disabled: true,
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
+ }, {
+ label: '交易金额',
+ prop: 'transactionMoney',
+ disabled: true,
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
+ }, {
+ label: '物品数量',
+ prop: 'goodsNums',
+ disabled: true,
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
+ }, {
label: '发生时间',
prop: 'happenTime',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '身份证图片',
- prop: 'imageUrls',
- fileType: 'img',
- type: "upload",
- listType: "picture-card",
- dataType: "string",
- disabled: true,
- }, {
- label: '确认标记',
- prop: 'confirmFlag',
- disabled: true,
- }, {
- label: '确认时间',
+ label: '审核时间',
prop: 'confirmTime',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '位置',
prop: 'localtion',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '确认意见',
+ label: '审核意见',
prop: 'confirmNotion',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '确认标记',
+ label: '审核状态',
prop: 'confirmFlag',
type: 'select',
dicData: [{
@@ -55,26 +98,22 @@
value: '3'
}],
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '手机号',
- prop: 'phoneNumber',
+ label: '交易对象',
+ prop: 'transactionObject',
disabled: true,
+ disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '房屋名称',
- prop: 'houseName',
+ label: '交易过程',
+ prop: 'transactionProcess',
disabled: true,
- }, {
- label: '对象电话',
- prop: 'transactionObjectTel',
disabled: true,
- }, {
- label: '交易金额',
- prop: 'transactionMoney',
- disabled: true,
- }, {
- label: '物品数量',
- prop: 'goodsNums',
- disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
label: '物品照片',
prop: 'goodsImageUrls',
@@ -83,24 +122,39 @@
listType: "picture-card",
dataType: "string",
disabled: true,
- }, {
- label: '交易对象',
- prop: 'transactionObject',
disabled: true,
+ span: 8,
+ labelWidth: 120,
}, {
- label: '交易过程',
- prop: 'transactionProcess',
+ label: '身份证图片',
+ prop: 'imageUrls',
+ fileType: 'img',
+ type: "upload",
+ listType: "picture-card",
+ dataType: "string",
disabled: true,
- }, {
- label: '创建时间',
- prop: 'createTime',
- disabled: true,
+ span: 8,
+ labelWidth: 120,
}, ]
}
}
},
methods: {
- init(data) {
+ auditPass(type) {
+ update({
+ status: type,
+ taskId: this.form.taskId,
+ id: this.form.id
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$emit('colseDetail');
+ })
+ },
+ init(data, applyType) {
+ this.applyType = applyType
this.getTaskDetail(data.id)
},
@@ -108,7 +162,7 @@
getDetail({
taskId: taskId
}).then((res) => {
- this.data = res.data.data
+ this.form = res.data.data
})
}
@@ -116,5 +170,27 @@
}
</script>
-<style>
+<style lang="scss" scoped>
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 900ab39..f88ee5e 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -6,7 +6,10 @@
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="scope" slot="menu">
- <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
+ <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
+ </el-button>
+ <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
+ @click="lookDetail(scope.row,1)">审 核
</el-button>
<el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
</el-button>
@@ -15,11 +18,10 @@
</avue-crud>
- <el-dialog class="place-info-box audit-info-box" title="查看详情" append-to-body :visible.sync="auditBasePopup"
- width="80%">
- <campusReporting v-if="taskType == 6" ref="campusReporting"></campusReporting>
- <hotelReporting v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
- <labelReporting v-if="taskType == 3" ref="labelReporting"></labelReporting>
+ <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
+ <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
+ <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
+ <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
</el-dialog>
</basic-container>
</template>
@@ -168,8 +170,7 @@
components: {
campusReporting,
hotelReporting,
- labelReporting
-
+ labelReporting,
},
watch: {},
@@ -192,63 +193,35 @@
return ids.join(",")
},
- showConfirmFlag() {
- return (data) => {
- let tags = {
- text: '',
- type: ''
- }
- if (data == 1) {
- tags = {
- text: '待审核',
- type: 'warning'
- }
- } else if (data == 2) {
- tags = {
- text: '已审核',
- type: 'success'
- }
- } else if (data == 3) {
- tags = {
- text: '未通过',
- type: 'danger'
- }
- } else if (data == 4) {
- tags = {
- text: '待完善',
- type: 'info'
- }
- }
-
- return tags
- }
- }
},
methods: {
- lookDetail(row) {
+
+ colseDetail() {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+
+ lookDetail(row, applyType) {
this.auditBasePopup = true
var that = this
if (row.reportType == 6) {
this.taskType = 6
this.$nextTick(() => {
- that.$refs.campusReporting.init(row)
+ that.$refs.campusReporting.init(row, applyType)
})
}
if (row.reportType == 2) {
this.taskType = 2
this.$nextTick(() => {
- that.$refs.hotelReporting.init(row)
+ that.$refs.hotelReporting.init(row, applyType)
})
}
if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
this.taskType = 3
this.$nextTick(() => {
- that.$refs.labelReporting.init(row)
+ that.$refs.labelReporting.init(row, applyType)
})
}
-
-
-
},
auditCur(row) {
this.curAuditRow = row
@@ -475,8 +448,31 @@
}
</script>
-<style>
+<style lang="scss" scoped>
.avue-upload__icon {
line-height: 6;
}
+
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3