From bdad6250537fd945c43db23a2e9a1cf28ac162e0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Jan 2024 15:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/publicSecurity/components/bailReportingDetail.vue | 125 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 18 deletions(-)
diff --git a/src/views/publicSecurity/components/bailReportingDetail.vue b/src/views/publicSecurity/components/bailReportingDetail.vue
index cc0b7e6..77cbf5e 100644
--- a/src/views/publicSecurity/components/bailReportingDetail.vue
+++ b/src/views/publicSecurity/components/bailReportingDetail.vue
@@ -1,47 +1,71 @@
<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"
+ import website from '@/config/website'
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 +81,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 +101,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 +125,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 +146,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 +166,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 +196,20 @@
getDetail({
taskId: taskId
}).then((res) => {
- this.data = res.data.data
+ this.form = res.data.data
+ if (this.form.reachImageUrls) {
+ this.form.reachImageUrls = website.minioUrl + this.form.reachImageUrls
+ }
+ if (this.form.returnImageUrls) {
+ this.form.returnImageUrls = website.minioUrl + this.form.returnImageUrls
+ }
+ if (this.form.startImageUrls) {
+ this.form.startImageUrls = website.minioUrl + this.form.startImageUrls
+ }
+ if (this.form.locationImageUrls) {
+ this.form.locationImageUrls = website.minioUrl + this.form.locationImageUrls
+ }
+ // console.table(this.form)
})
}
@@ -150,5 +217,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
--
Gitblit v1.9.3