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 | 253 ++++++++++++++++++++++++++++++--------------------
1 files changed, 152 insertions(+), 101 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 61493e8..60db9df 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -18,22 +18,19 @@
</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="confirmFlag">
- <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
- }}</el-tag>
+ <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>
+ }}</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>
@@ -44,6 +41,17 @@
<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>
@@ -76,7 +84,7 @@
import baseAllInfo from './components/baseAllInfo'
export default {
- data () {
+ data() {
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
@@ -137,26 +145,6 @@
trigger: "blur",
},],
},
-
- {
- width: 156,
- overHidden: true,
- slot: true,
- label: "地址",
- prop: "location",
- type: 'map',
- dataType: "string",
- span: 12,
- value: [117.966460, 28.431002, ""],
- rules: [
- {
- required: true,
- message: "请选择地址",
- trigger: "blur",
- },
- ],
- },
-
{
width: 110,
label: "场所负责人",
@@ -170,7 +158,6 @@
trigger: "blur",
},],
},
-
{
width: 120,
overHidden: true,
@@ -186,7 +173,22 @@
}
],
},
-
+ {
+ width: 120,
+ overHidden: true,
+ label: "身份证号",
+ prop: "principalIdCard",
+ // search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: "请输身份证号",
+ trigger: "blur",
+ }
+ ],
+ },
{
width: 110,
label: "所属街道",
@@ -237,7 +239,6 @@
},
],
},
-
{
width: 110,
overHidden: true,
@@ -274,8 +275,6 @@
},
],
},
-
-
{
span: 7,
label: "场所标签",
@@ -295,7 +294,6 @@
trigger: "blur",
},],
},
-
{
span: 5,
label: "",
@@ -310,7 +308,6 @@
dataType: "string",
hide: true,
},
-
{
span: 12,
label: "标签颜色",
@@ -350,13 +347,20 @@
}
],
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择九小场所",
+ trigger: "blur",
+ },
+ ],
},
{
span: 12,
label: "九小分类",
prop: "nineType",
type: "select",
- display:false,
+ display: false,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
dataType: "number",
hide: true,
@@ -367,10 +371,9 @@
},
{
span: 12,
- label: "是否阵地",
+ label: "阵地",
prop: "isFront",
type: "select",
- display:false,
dicData: [
{
label: "是",
@@ -382,13 +385,20 @@
}
],
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择阵地",
+ trigger: "blur",
+ },
+ ],
},
{
span: 12,
- label: "阵地分类",
+ label: "阵地类型",
prop: "frontType",
type: "select",
- display:false,
+ display: false,
row: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
dataType: "number",
@@ -398,7 +408,28 @@
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: "场所照片",
@@ -415,8 +446,39 @@
},
span: 24,
},
-
-
+ {
+ width: 156,
+ overHidden: true,
+ 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,
@@ -424,9 +486,9 @@
editDisplay: false,
viewDisplay: false,
label: "经度",
+ hide: true,
prop: "lng",
},
-
{
width: 96,
slot: true,
@@ -434,9 +496,9 @@
editDisplay: false,
viewDisplay: false,
label: "纬度",
+ hide: true,
prop: "lat",
},
-
{
width: 100,
addDisplay: false,
@@ -487,7 +549,7 @@
}
},
- provide () {
+ provide() {
return {
placeElement: this,
}
@@ -503,42 +565,11 @@
this.option.column,
'nineType'
)
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
if (newData == 1) {
nineTypeColumn.display = true
} else {
nineTypeColumn.display = false
- isFrontColumn.display = false
- frontTypeColumn.display = false
- }
- }
- },
- },
- 'form.nineType': {
- handler(newData) {
- if (newData) {
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
-
- if (newData == 1) {
- isFrontColumn.display = true
- } else {
- isFrontColumn.display = false
- frontTypeColumn.display = false
}
}
},
@@ -563,7 +594,7 @@
computed: {
...mapGetters(["permission", "userInfo"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.place_add, true),
viewBtn: this.vaildData(this.permission.place_view, true),
@@ -571,7 +602,7 @@
editBtn: this.vaildData(this.permission.place_edit, true),
}
},
- ids () {
+ ids() {
let ids = []
this.selectionList.forEach((ele) => {
ids.push(ele.id)
@@ -579,7 +610,7 @@
return ids.join(",")
},
- showConfirmFlag () {
+ showConfirmFlag() {
return (data) => {
let tags = {
text: '',
@@ -611,7 +642,7 @@
}
},
- showSource () {
+ showSource() {
return (data) => {
let tags = {
text: '',
@@ -634,7 +665,7 @@
}
},
- showLocation () {
+ showLocation() {
return (data) => {
if (data != null && data.indexOf(',') != -1) {
data = data.split(',')
@@ -646,7 +677,7 @@
}
},
- decimalProcessing () {
+ decimalProcessing() {
return (data) => {
if (data != null) {
return Number(data).toFixed(6)
@@ -654,10 +685,28 @@
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: {
- locationDispose (data) {
+ showStringDispose(row, type) {
+ row[type] = !row[type]
+ },
+
+ locationDispose(data) {
data = data.split(',')
return {
@@ -667,16 +716,16 @@
}
},
- auditCur (row) {
+ auditCur(row) {
this.curAuditRow = row
this.auditBasePopup = true
},
- ManageTenants (item) {
+ 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 != '')
@@ -715,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 != '')
@@ -754,7 +803,7 @@
)
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -773,26 +822,26 @@
})
},
- 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
@@ -815,7 +864,7 @@
})
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getPlace(this.form.id).then((res) => {
this.form = res.data.data
@@ -847,16 +896,16 @@
}
},
- 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 = {}) {
+ onLoad(page, params = {}) {
this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
@@ -867,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