From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/place/index.vue | 702 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 532 insertions(+), 170 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index deedcdb..60db9df 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -5,20 +5,62 @@
: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="location">
+ <span v-text="showLocation(row.location)"></span>
+ </template>
+
+ <template slot-scope="{row}" slot="lng">
+ <span v-text="decimalProcessing(row.lng)"></span>
+ </template>
+
+ <template slot-scope="{row}" slot="lat">
+ <span v-text="decimalProcessing(row.lat)"></span>
+ </template>
+
+ <template slot-scope="{row, size}" slot="confirmFlag">
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{
+ showConfirmFlag(row.confirmFlag).text
+ }}</el-tag>
+ </template>
+
+ <template slot-scope="{row, size}" slot="source">
+ <el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
+ }}</el-tag>
+ </template>
+
<template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
+ <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete"
+ @click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.househould_manager"
- @click="ManageTenants(scope.row)">场所维护
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-s-check" v-if="permission.place_audit_cur"
+ @click="auditCur({ ...row, confirmFlag: 1 })">审核
+ </el-button>
+
+ <el-button :size="size" type="text" icon="el-icon-edit" v-if="permission.place_manage_tenants"
+ @click="ManageTenants(row)">场所维护
+ </el-button>
+ </template>
+
+ <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-scope="{row, size}" slot="principalIdCard">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'principalIdCardflag')"
+ v-text="textDispose(row, 'principalIdCardflag', 'principalIdCard')">
</el-button>
</template>
</avue-crud>
- <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
- <baseAllInfo></baseAllInfo>
+ <baseAllInfo ref="BaseAllInfo"></baseAllInfo>
+
+ <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
+ width="30%">
+ <auditBase></auditBase>
</el-dialog>
</basic-container>
</template>
@@ -30,7 +72,6 @@
update,
add,
getPlace,
- getPlaceExt,
} from "@/api/place/place"
import {
@@ -39,14 +80,25 @@
import website from '@/config/website'
+import auditBase from './components/auditBase'
import baseAllInfo from './components/baseAllInfo'
export default {
- data () {
- return {
- curRow: {},
- roleBox: false,
+ data() {
+ //手机号格式校验
+ let validatorPhone = function (rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
+ callback()
+ }
+ }
+ callback()
+ }
+
+ return {
form: {},
query: {},
loading: true,
@@ -59,13 +111,16 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 240,
border: true,
//stripe:true,
index: true,
@@ -73,59 +128,29 @@
editBtn: false,
selection: true,
dialogClickModal: false,
+ menuFixed: 'right',
column: [
{
- span: 8,
+ width: 156,
+ overHidden: true,
label: "场所名称",
+ span: 12,
prop: "placeName",
- searchSpan: 4,
+ searchSpan: 5,
search: true,
+ searchLabelWidth: 76,
rules: [{
required: true,
message: "请输入场所名称",
trigger: "blur",
},],
},
-
{
- span: 9,
- label: "场所标签",
- prop: "label",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?level=2",
- cascader: ["smallLabel"],
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
- dataType: "string",
- hide: true,
- rules: [{
- required: true,
- message: "请输入场所标签",
- trigger: "blur",
- },],
- },
-
- {
- span: 7,
- label: "",
- labelWidth: 0,
- prop: "smallLabel",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
- dataType: "string",
- hide: true,
- },
-
- {
- label: "负责人",
+ width: 110,
+ label: "场所负责人",
prop: "principal",
- searchSpan: 4,
+ searchSpan: 5,
+ searchLabelWidth: 110,
search: true,
rules: [{
required: false,
@@ -133,35 +158,57 @@
trigger: "blur",
},],
},
-
{
- width: 110,
- label: "电话",
+ width: 120,
+ overHidden: true,
+ label: "手机号码",
prop: "principalPhone",
search: true,
- searchSpan: 3,
+ searchSpan: 4,
slot: true,
+ rules: [
+ {
+ validator: validatorPhone,
+ trigger: 'blur'
+ }
+ ],
},
-
{
+ width: 120,
+ overHidden: true,
+ label: "身份证号",
+ prop: "principalIdCard",
+ // search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: "请输身份证号",
+ trigger: "blur",
+ }
+ ],
+ },
+ {
+ width: 110,
+ label: "所属街道",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- width: 96,
- label: "所属街道",
prop: "townStreetName",
search: true,
searchSpan: 4
},
{
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- label: "所属社区",
prop: "neiName",
search: true,
searchSpan: 4,
- width: 150,
rules: [
{
required: true,
@@ -183,7 +230,7 @@
label: "name",
value: "id",
},
- cascader: ["gridId"],
+ cascader: ["gridCode"],
rules: [
{
required: true,
@@ -192,14 +239,14 @@
},
],
},
-
{
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- label: "所属网格",
prop: "gridName",
- width: 150,
rules: [
{
required: true,
@@ -211,12 +258,12 @@
{
hide: true,
label: "所属网格",
- prop: "gridId",
+ prop: "gridCode",
type: "tree",
cell: true,
props: {
label: "gridName",
- value: "id",
+ value: "gridCode",
},
dicUrl:
"/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
@@ -229,9 +276,164 @@
],
},
{
+ span: 7,
+ label: "场所标签",
+ prop: "label",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?level=2",
+ cascader: ["smallLabel"],
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请输入场所标签",
+ trigger: "blur",
+ },],
+ },
+ {
+ span: 5,
+ label: "",
+ labelWidth: 20,
+ prop: "smallLabel",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ },
+ {
+ span: 12,
+ label: "标签颜色",
+ prop: "color",
+ type: "select",
+ dicData: [
+ {
+ label: '绿',
+ value: 'green'
+ }, {
+ label: '黄',
+ value: 'yellow'
+ }, {
+ label: '红',
+ value: 'red'
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ hide: true,
+ },
+ {
+ span: 12,
+ label: "九小场所",
+ prop: "isNine",
+ type: "select",
+ dicData: [
+ {
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ }
+ ],
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择九小场所",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ span: 12,
+ label: "九小分类",
+ prop: "nineType",
+ type: "select",
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ span: 12,
+ label: "阵地",
+ prop: "isFront",
+ type: "select",
+ dicData: [
+ {
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ }
+ ],
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择阵地",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ span: 12,
+ label: "阵地类型",
+ prop: "frontType",
+ type: "select",
+ display: false,
+ row: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ span: 12,
+ label: "三级消防单位",
+ prop: "threeFireProtection",
+ labelWidth: 120,
+ type: "select",
+ dicData: [{
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ }
+ ],
+ hide: true,
+ rules: [{
+ required: false,
+ message: "请选择三级消防单位",
+ trigger: "blur",
+ },],
+ },
+ {
+ width: 110,
label: "场所照片",
prop: "imageUrls",
- width: 80,
type: "upload",
listType: "picture-card",
dataType: "string",
@@ -244,72 +446,155 @@
},
span: 24,
},
-
{
- label: "位置",
- prop: "localtion",
- span: 24,
- minWidth: 220,
+ width: 156,
overHidden: true,
- // rules: [{
- // required: true,
- // message: "请输入区域",
- // trigger: "blur",
- // },],
+ slot: true,
+ label: "地址",
+ prop: "location",
+ type: 'map',
+ dataType: "string",
+ minWidth: 250,
+ span: 24,
+ value: [117.966460, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择地址",
+ trigger: "blur",
+ },
+ ],
},
{
+ label: "备注",
+ prop: "remark",
+ type: 'textarea',
+ hide: true,
+ span: 24,
+ rules: [
+ {
+ required: false,
+ message: "请输入场所备注",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ width: 96,
+ slot: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "经度",
+ hide: true,
+ prop: "lng",
+ },
+ {
+ width: 96,
+ slot: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "纬度",
+ hide: true,
+ prop: "lat",
+ },
+ {
+ width: 100,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
label: '审核状态',
prop: 'confirmFlag',
type: 'radio',
- dicData: [{
- label: '待审核',
- value: 1
- }, {
- label: '审核通过',
- value: 2
- }, {
- label: '审核不通过',
- value: 3
- }]
+ slot: true,
+ dicData: [
+ {
+ label: '待审核',
+ value: 1
+ }, {
+ label: '已审核',
+ value: 2
+ }, {
+ label: '未通过',
+ value: 3
+ }
+ ]
},
{
+ width: 120,
display: false,
label: '是否有二维码',
- searchLabelWidth:110,
+ searchLabelWidth: 104,
prop: 'source',
- type:"select",
- search:true,
- searchSpan:4,
- dicData: [{
- label: '是',
- value: 1
- }, {
- label: '否',
- value: 2
- }]
+ type: "select",
+ search: true,
+ searchSpan: 5,
+ slot: true,
+ dicData: [
+ {
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }
+ ]
}
],
},
data: [],
+
+ auditBasePopup: false,
}
},
- provide () {
+ provide() {
return {
placeElement: this,
}
},
- components: { baseAllInfo },
+ components: { auditBase, baseAllInfo },
- watch: {},
+ watch: {
+ 'form.isNine': {
+ handler(newData) {
+ if (newData) {
+ let nineTypeColumn = this.findObject(
+ this.option.column,
+ 'nineType'
+ )
+
+ if (newData == 1) {
+ nineTypeColumn.display = true
+ } else {
+ nineTypeColumn.display = false
+ }
+ }
+ },
+ },
+ 'form.isFront': {
+ handler(newData) {
+ if (newData) {
+ let frontTypeColumn = this.findObject(
+ this.option.column,
+ 'frontType'
+ )
+
+ if (newData == 1) {
+ frontTypeColumn.display = true
+ } else {
+ frontTypeColumn.display = false
+ }
+ }
+ },
+ },
+ },
computed: {
...mapGetters(["permission", "userInfo"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.place_add, true),
viewBtn: this.vaildData(this.permission.place_view, true),
@@ -317,58 +602,130 @@
editBtn: this.vaildData(this.permission.place_edit, true),
}
},
- ids () {
+ ids() {
let ids = []
this.selectionList.forEach((ele) => {
ids.push(ele.id)
})
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
+ }
+ },
+
+ showSource() {
+ return (data) => {
+ let tags = {
+ text: '',
+ type: ''
+ }
+
+ if (data == 1) {
+ tags = {
+ text: '是',
+ type: 'success'
+ }
+ } else if (data == 2) {
+ tags = {
+ text: '否',
+ type: 'info'
+ }
+ }
+
+ return tags
+ }
+ },
+
+ showLocation() {
+ return (data) => {
+ if (data != null && data.indexOf(',') != -1) {
+ data = data.split(',')
+
+ return data[2]
+ } else {
+ return data || ''
+ }
+ }
+ },
+
+ decimalProcessing() {
+ return (data) => {
+ if (data != null) {
+ return Number(data).toFixed(6)
+ } else {
+ return ''
+ }
+ }
+ },
+
+ 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: {
- roleBoxClose () {
- this.curRow = {}
+ showStringDispose(row, type) {
+ row[type] = !row[type]
},
- handleClick () {
+ locationDispose(data) {
+ data = data.split(',')
+ return {
+ longitude: data[0],
+ latitude: data[1],
+ location: data[2]
+ }
},
- ManageTenants (item) {
- this.curRow = item
- this.roleBox = true
- // this.onLoadPlaceExt(item.id)
+ auditCur(row) {
+ this.curAuditRow = row
+ this.auditBasePopup = true
},
- onLoadPlaceExt (placeId) {
- getPlaceExt({ placeId }).then(res => {
- const data = res.data.data
-
- if (data) {
- let imageUrls = data.imageUrls
- let planImageUrls = data.planImageUrls
-
- if (imageUrls.length) {
- imageUrls = imageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
- }
-
- if (planImageUrls.length) {
- planImageUrls = planImageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
- }
-
- this.placeForm = {
- ...data,
- imageUrls,
- planImageUrls
- }
-
- this.holdOnLoad(this.holdPage)
- this.selectionClear()
- }
- })
+ ManageTenants(item) {
+ this.$refs.BaseAllInfo.initOpen(item)
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",").filter(item => item != '')
@@ -389,7 +746,8 @@
add({
...row,
- label
+ label,
+ ...this.locationDispose(row.location)
}).then(
() => {
this.onLoad(this.page)
@@ -406,7 +764,7 @@
)
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
var split = row.imageUrls.split(",").filter(item => item != '')
@@ -416,7 +774,20 @@
})
row.imageUrls = urls.join(",")
}
- update(row).then(
+
+ let label = row.label
+
+ if (row.smallLabel != '') {
+ label = label + ',' + row.smallLabel
+ }
+
+ delete row.smallLabel
+
+ update({
+ ...row,
+ label,
+ ...this.locationDispose(row.location)
+ }).then(
() => {
this.onLoad(this.page)
this.$message({
@@ -432,7 +803,7 @@
)
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -450,26 +821,27 @@
})
})
},
- searchReset () {
+
+ searchReset() {
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
this.$nextTick(() => {
this.$refs.crud && this.$refs.crud.toggleSelection()
})
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -491,10 +863,13 @@
this.$refs.crud.toggleSelection()
})
},
- beforeOpen (done, type) {
+
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getPlace(this.form.id).then((res) => {
this.form = res.data.data
+
+ this.form.location = [this.form.lng, this.form.lat, this.form.location].join(',')
if (this.form.imageUrls.length) {
this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
@@ -515,40 +890,25 @@
}
done()
-
})
} else {
done()
}
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ 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
- }
-
+ onLoad(page, params = {}) {
this.loading = true
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
const data = res.data.data
this.page.total = data.total
@@ -556,6 +916,8 @@
this.data = data.records
this.data.forEach(item => {
+ this.$set(item, 'principalPhoneflag', false)
+ this.$set(item, 'principalIdCardflag', 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