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/patrolList/patrolRecord.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/views/patrolList/patrolRecord.vue b/src/views/patrolList/patrolRecord.vue
index 5bb1ad1..e1d2332 100644
--- a/src/views/patrolList/patrolRecord.vue
+++ b/src/views/patrolList/patrolRecord.vue
@@ -9,6 +9,17 @@
详情
</el-button>
</template>
+ <template slot-scope="{type,size,row }" slot="menu">
+ <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(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>
</avue-crud>
@@ -19,12 +30,12 @@
<el-collapse v-model="activeNames" @change="handleChange">
<div v-for="(item, index) in 10" :key="index">
<el-collapse-item title="一致性 Consistency" name="1">
- <div>{{index}}
+ <div>{{ index }}
<el-collapse v-model="activeNames" @change="handleChange">
<div v-for="(item, index) in 3" :key="index">
<el-collapse-item title="er致性 Consistency" name="1">
- <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。{{index}}</div>
+ <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。{{ index }}</div>
</el-collapse-item>
</div>
</el-collapse>
@@ -125,6 +136,7 @@
// selection: true,
excelBtn: true,
dialogClickModal: false,
+ header: false,
column: [{
label: "所属街道",
prop: "streetName",
@@ -180,6 +192,7 @@
span: 24,
row: true,
searchSpan: 4,
+ slot: true
},
{
label: "场所地址",
@@ -247,8 +260,24 @@
}
},
+ 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]
+ },
getDetail(row) {
this.isDetail = true
@@ -328,6 +357,7 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
+ this.$set(item, 'principalPhoneflag', false)
if (item.signaturePath.length > 0) {
var urls = []
var names = item.signaturePath.split(",")
@@ -340,7 +370,10 @@
this.loading = false
this.selectionClear()
})
- getPatrolGroupTree({}).then((res) => {
+ getPatrolGroupTree({
+ type: 1,
+ childType: 1
+ }).then((res) => {
const data = res.data.data
this.patrolTree = data
// const column = this.findObject(this.option.column, "articleList")
@@ -387,4 +420,4 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3