From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化
---
src/views/publicSecurity/bailReporting.vue | 376 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 237 insertions(+), 139 deletions(-)
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 12fe795..320caaf 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -4,45 +4,48 @@
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-scope="{row}" slot="confirmFlag">
- <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
- }}</el-tag>
- </template> -->
-
- <!-- <template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
+ <template slot-scope="{row, size, index}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-view" v-if="permission.bail_view" plain
+ @click="lookDetail(row, 0)">查 看
</el-button>
- </template> -->
-
- <!-- <template slot-scope="scope" slot="menu">
- <el-button type="text" :disabled="scope.row.confirmFlag == 2" icon="el-icon-s-check" size="small"
- v-if="permission.place_audit_cur && scope.row.confirmFlag != 4" @click="auditCur(scope.row)">审核
+ <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1 && permission.bail_check" plain
+ @click="lookDetail(row, 1)">审 核
</el-button>
-
- <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
- @click="ManageTenants(scope.row)">场所维护
+ <el-button :size="size" type="text" icon="el-icon-delete" v-if="permission.bail_del" plain
+ @click="rowDel(row)">删 除
</el-button>
- </template> -->
+ </template>
+
+ <template slot="status" slot-scope="{row, size}">
+ <el-tag :size="size" :type="showStatus(row.status).type">
+ {{ showStatus(row.status).text }}
+ </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')">
+ </el-button>
+ </template>
</avue-crud>
- <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
- <!-- <baseAllInfo></baseAllInfo> -->
- </el-dialog>
-
- <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
- width="30%">
- <!-- <auditBase></auditBase> -->
+ <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>
<script>
import {
- getList,
- remove,
+ getBailReportingPage,
+ removeTask,
update,
add,
} from "@/api/task/task"
+
+ import {
+ update as bailReportingUpdate,
+ getList as bailReportingGetList
+ } from "@/api/task/bailReporting"
import {
mapGetters
@@ -50,11 +53,24 @@
import website from '@/config/website'
- // import auditBase from './components/auditBase'
+ import bailReportingDetail from './components/bailReportingDetail'
// import baseAllInfo from './components/baseAllInfo'
export default {
data() {
+
+ //手机号格式校验
+ let validatorPhone = function(rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
+ callback()
+ }
+ }
+ callback()
+ }
+
return {
curRow: {},
roleBox: false,
@@ -71,52 +87,168 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
+ header: false,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 280,
border: true,
- menu: false,
+ // menu: false,
//stripe:true,
index: true,
- viewBtn: true,
+ // viewBtn: true,
+ delBtn: false,
editBtn: false,
selection: true,
dialogClickModal: false,
+ header: false,
column: [{
+ label: "申请时间",
+ prop: "dateRange",
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ startPlaceholder: '开始日期',
+ endPlaceholder: '结束日期',
+ align: 'center',
+ search: true,
+ hide: true,
+ searchSpan: 5,
+ searchLabelWidth: 76,
+ },
+ {
span: 12,
- label: "场所名称",
- prop: "name",
+ label: "小区名称",
+ prop: "districtName",
+ searchSpan: 4,
+ searchLabelWidth: 76,
+ search: true,
+ hide: true,
+ },
+ {
+ width: 100,
+ span: 12,
+ label: "姓名",
+ prop: "realName",
+ searchSpan: 3,
+ searchLabelWidth: 66,
+ search: true,
+ }, {
+ width: 120,
+ span: 12,
+ label: "联系方式",
+ prop: "phone",
searchSpan: 4,
search: true,
+ slot: true,
+ rules: [{
+ validator: validatorPhone,
+ trigger: 'blur'
+ }],
+ }, {
+ span: 12,
+ label: "外出事由",
+ prop: "applyName",
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ width: 110,
+ label: "所属街道",
+ search: true,
+ searchSpan: 4,
+ parent: false,
+ prop: "streetCode",
+ type: "tree",
+ dicUrl: "/api/blade-system/region/getTownTree",
+ props: {
+ label: "name",
+ value: "id"
+ },
rules: [{
required: true,
- message: "请输入场所名称",
+ message: "请选择所属街道",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ searchLabelWidth: 80,
+ parent: false,
+ label: "所属社区",
+ prop: "neiCode",
+ search: true,
+ searchSpan: 4,
+ width: 120,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/treeToCommunity",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ cascader: ["gridCode"],
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
trigger: "blur",
}, ],
}, {
- span: 12,
- label: "地址",
- prop: "addressName",
+ width: 220,
+ overHidden: true,
+ label: "小区",
+ prop: "aoiCode",
searchSpan: 4,
+ type: 'tree',
+ searchLabelWidth: 66,
// search: true,
+ parent: false,
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "aoiCode"
+ },
+ // defaultExpandedKeys: ["361102003"],
+ span: 12,
rules: [{
required: true,
- message: "请输入场所名称",
+ message: "请选择小区",
trigger: "blur",
}, ],
+ // disabled: true
+ display: true,
+ // hide: true,
},
{
- label: "创建时间",
+ width: 144,
+ label: "出发时间",
+ prop: "startTimes",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "到达时间",
+ prop: "reachTime",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "返程时间",
+ prop: "returnTime",
+ searchSpan: 4,
+ },
+ {
+ width: 144,
+ label: "申请时间",
prop: "createTime",
searchSpan: 4,
-
},
-
{
+ width: 100,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
@@ -135,20 +267,8 @@
value: 3
}]
},
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: '类型',
- prop: 'reportType',
- type: 'radio',
- slot: true,
- search: true,
- dicData: [{
- label: '取保候审',
- value: 1
- }, ]
- },
+
+
],
},
data: [],
@@ -163,21 +283,23 @@
}
},
- // components: {
- // auditBase,
- // baseAllInfo
- // },
+ components: {
+ bailReportingDetail,
+ },
watch: {},
computed: {
...mapGetters(["permission", "userInfo"]),
permissionList() {
+
+ console.log("permission===>", this.permission)
+
return {
- addBtn: this.vaildData(this.permission.place_add, true),
- viewBtn: this.vaildData(this.permission.place_view, true),
- delBtn: this.vaildData(this.permission.place_delete, true),
- editBtn: this.vaildData(this.permission.place_edit, true),
+ addBtn: this.vaildData(this.permission.bail_add, false),
+ viewBtn: this.vaildData(this.permission.bail_view, true),
+ delBtn: this.vaildData(this.permission.bail_del, true),
+ // editBtn: this.vaildData(this.permission.place_edit, true),
}
},
ids() {
@@ -188,39 +310,61 @@
return ids.join(",")
},
- showConfirmFlag() {
+ showStatus() {
return (data) => {
- let tags = {
- text: '',
- type: ''
- }
+ let tags = {}
+
if (data == 1) {
tags = {
- text: '待审核',
- type: 'warning'
+ type: 'warning',
+ text: '待审核'
}
} else if (data == 2) {
tags = {
- text: '已审核',
- type: 'success'
+ type: 'success',
+ text: '已审核'
}
} else if (data == 3) {
tags = {
- text: '未通过',
- type: 'danger'
- }
- } else if (data == 4) {
- tags = {
- text: '待完善',
- type: 'info'
+ type: 'danger',
+ text: '未通过'
}
}
return tags
}
+ },
+
+ 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]
+ },
+
+ colseDetail() {
+ this.auditBasePopup = false
+ this.onLoad(this.page)
+ },
+ lookDetail(row, applyType) {
+ this.auditBasePopup = true
+ var that = this
+ this.$nextTick(() => {
+ that.$refs.bailReportingDetail.init(row, applyType)
+ })
+ },
auditCur(row) {
this.curAuditRow = row
this.auditBasePopup = true
@@ -274,27 +418,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)
@@ -318,7 +443,8 @@
type: "warning",
})
.then(() => {
- return remove(row.id)
+ row.isDeleted = 1
+ return removeTask(row)
})
.then(() => {
this.onLoad(this.page)
@@ -336,6 +462,12 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ let dateRange = params.dateRange
+ if (params.dateRange) {
+ params.startTime = dateRange[0] + " 00:00:00"
+ params.endTime = dateRange[1] + " 23:59:59"
+ delete params.dateRange
+ }
this.onLoad(this.page, params)
done()
},
@@ -359,7 +491,7 @@
type: "warning",
})
.then(() => {
- return remove(this.ids)
+ // return remove(this.ids)
})
.then(() => {
this.onLoad(this.page)
@@ -372,33 +504,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()
}
},
@@ -419,22 +525,14 @@
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) => {
+ getBailReportingPage(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) {
var urls = []
var names = item.imageUrls.split(",").filter(item => item != '')
--
Gitblit v1.9.3