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/bailReporting.vue | 107 +++++++++--------------------------------------------
1 files changed, 19 insertions(+), 88 deletions(-)
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) => {
--
Gitblit v1.9.3