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 | 908 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 646 insertions(+), 262 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 555f94d..60db9df 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -5,35 +5,63 @@
: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-circle-plus-outline" 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 title="场所维护" append-to-body :visible.sync="roleBox" center>
- <h3>基本信息：</h3>
- <avue-form :option="optionDetail" v-model="placeForm"></avue-form>
+ <baseAllInfo ref="BaseAllInfo"></baseAllInfo>
- <h3>从业人员：</h3>
- <avue-crud :option="placeOption" :search.sync="search" :table-loading="loading" :data="placeExt" ref="crud"
- v-model="houseHoldForm" :permission="permissionList" @row-del="houseHoldRowDel"
- @row-update="houseHoldRowUpdate" @row-save="houseHoldRowSave" :page.sync="holdPage"
- @current-change="currentChange" @size-change="sizeChange">
- </avue-crud>
-
- <span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">提 交</el-button>
- </span>
+ <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>
@@ -44,88 +72,37 @@
update,
add,
getPlace,
- getPlaceExt,
- updatePlaceExt
} from "@/api/place/place"
+
import {
mapGetters
} from "vuex"
+
import website from '@/config/website'
+
+import auditBase from './components/auditBase'
+import baseAllInfo from './components/baseAllInfo'
+
export default {
- data () {
+ 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,
- roleBox: false,
- placeForm: {},
- optionDetail: {
- submitBtn: false,
- emptyBtn: false,
- column: [{
- label: '场所名称',
- prop: 'placeName',
- },
- {
- label: '法人信息',
- prop: 'legalPerson'
- },
- {
- label: '法人电话',
- prop: 'legalTel'
- },
- {
- label: '场所位置',
- prop: 'localtion'
- }, {
- label: '审核状态',
- prop: 'confirmFlag',
- type: 'radio',
- dicData: [{
- label: '待审核',
- value: 0
- }, {
- label: '审核通过',
- value: 1
- }, {
- label: '审核不通过',
- value: 2
- }]
- }
- ]
- },
- rowPlace: {},
- placeExt: [],
- placeOption: {
- menu: false,
- height: 300,
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- searchShow: false,
- addBtn: false,
- delBtn: false,
- editBtn: false,
- border: true,
- index: true,
- dialogClickModal: false,
- column: [{
- label: "名称",
- prop: "name",
- searchSpan: 4,
- search: true,
- }, {
- label: "电话",
- prop: "telephone",
- searchSpan: 4,
- search: true,
- }, {
- label: "暂住地",
- prop: "tempAddress",
- searchSpan: 4,
- search: true,
- },]
- },
+
page: {
pageSize: 10,
currentPage: 1,
@@ -134,25 +111,34 @@
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: 280,
border: true,
//stripe:true,
index: true,
viewBtn: true,
+ editBtn: false,
selection: true,
dialogClickModal: false,
+ menuFixed: 'right',
column: [
{
+ width: 156,
+ overHidden: true,
label: "场所名称",
+ span: 12,
prop: "placeName",
- searchSpan: 4,
+ searchSpan: 5,
search: true,
+ searchLabelWidth: 76,
rules: [{
required: true,
message: "请输入场所名称",
@@ -160,9 +146,11 @@
},],
},
{
- label: "负责人",
+ width: 110,
+ label: "场所负责人",
prop: "principal",
- searchSpan: 4,
+ searchSpan: 5,
+ searchLabelWidth: 110,
search: true,
rules: [{
required: false,
@@ -170,11 +158,128 @@
trigger: "blur",
},],
},
-
{
+ width: 120,
+ overHidden: true,
+ label: "手机号码",
+ prop: "principalPhone",
+ search: true,
+ 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,
+ prop: "townStreetName",
+ search: true,
+ searchSpan: 4
+ },
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "neiName",
+ search: true,
+ searchSpan: 4,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ hide: true,
+ parent: false,
+ label: "所属社区",
+ prop: "neiCode",
+ search: false,
+ width: 150,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ cascader: ["gridCode"],
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "gridName",
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ hide: true,
+ label: "所属网格",
+ prop: "gridCode",
+ type: "tree",
+ cell: true,
+ props: {
+ label: "gridName",
+ value: "gridCode",
+ },
+ dicUrl:
+ "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ span: 7,
label: "场所标签",
prop: "label",
- type: "cascader",
+ type: "select",
dicUrl: "/api/blade-category/category/getCategory?level=2",
cascader: ["smallLabel"],
props: {
@@ -189,11 +294,12 @@
trigger: "blur",
},],
},
-
{
+ span: 5,
label: "",
+ labelWidth: 20,
prop: "smallLabel",
- type: "cascader",
+ type: "select",
dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
props: {
label: "categoryName",
@@ -202,39 +308,132 @@
dataType: "string",
hide: true,
},
-
{
- label: "联系电话",
- prop: "principalPhone",
- searchSpan: 4,
- search: 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: "请输入联系电话",
+ message: "请选择三级消防单位",
trigger: "blur",
},],
},
-
{
- label: "审核状态",
- prop: "confirmFlag",
- searchSpan: 4,
- search: true,
- dicData: [{
- label: '待审核',
- value: 0,
- }, {
- label: '审核通过',
- value: 1,
- }, {
- label: '审核不通过',
- value: 2,
- }],
- },
- {
+ width: 110,
label: "场所照片",
prop: "imageUrls",
- width: 80,
type: "upload",
listType: "picture-card",
dataType: "string",
@@ -247,53 +446,155 @@
},
span: 24,
},
-
{
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 96,
- label: "所属街道",
- prop: "townStreetName",
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 160,
- label: "所属社区",
- prop: "neiName",
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 96,
- label: "所属网格",
- prop: "gridName",
- },
-
- {
- 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',
+ slot: true,
+ dicData: [
+ {
+ label: '待审核',
+ value: 1
+ }, {
+ label: '已审核',
+ value: 2
+ }, {
+ label: '未通过',
+ value: 3
+ }
+ ]
+ },
+ {
+ width: 120,
+ display: false,
+ label: '是否有二维码',
+ searchLabelWidth: 104,
+ prop: 'source',
+ type: "select",
+ search: true,
+ searchSpan: 5,
+ slot: true,
+ dicData: [
+ {
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }
+ ]
}
],
},
data: [],
+
+ auditBasePopup: false,
}
},
- watch: {},
+
+ provide() {
+ return {
+ placeElement: this,
+ }
+ },
+
+ components: { auditBase, baseAllInfo },
+
+ 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),
@@ -301,66 +602,133 @@
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: {
+ showStringDispose(row, type) {
+ row[type] = !row[type]
+ },
- ManageTenants (item) {
- this.roleBox = true
- this.rowPlace = item
- this.placeForm = {
- placeName: '',
- legalPerson: '',
- legalTel: '',
- localtion: '',
- confirmFlag: '',
+ locationDispose(data) {
+ data = data.split(',')
+
+ return {
+ longitude: data[0],
+ latitude: data[1],
+ location: data[2]
}
- this.placeExt = []
- this.onLoadPlaceExt()
},
- submitRole () {
- updatePlaceExt(this.placeForm).then(
- () => {
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.roleBox = false
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
+ auditCur(row) {
+ this.curAuditRow = row
+ this.auditBasePopup = true
},
- onLoadPlaceExt () {
- let params = {
- placeId: this.rowPlace.id,
- }
- getPlaceExt(Object.assign(params)).then(res => {
- const data = res.data.data
- if (data) {
- this.placeForm = data
- this.placeExt = data.placePractitioner
- this.loading = false
- this.selectionClear()
- }
- })
+ ManageTenants(item) {
+ this.$refs.BaseAllInfo.initOpen(item)
},
- rowSave (row, done, loading) {
- console.log(row, 9999)
+ rowSave(row, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
- var split = row.imageUrls.split(",")
+ var split = row.imageUrls.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
@@ -378,7 +746,8 @@
add({
...row,
- label
+ label,
+ ...this.locationDispose(row.location)
}).then(
() => {
this.onLoad(this.page)
@@ -394,17 +763,31 @@
}
)
},
- rowUpdate (row, index, done, loading) {
+
+ rowUpdate(row, index, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
- var split = row.imageUrls.split(",")
+ var split = row.imageUrls.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
})
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({
@@ -419,7 +802,8 @@
}
)
},
- rowDel (row) {
+
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -430,30 +814,34 @@
})
.then(() => {
this.onLoad(this.page)
+
this.$message({
type: "success",
message: "操作成功!",
})
})
},
- 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.$refs.crud.toggleSelection()
+ this.$nextTick(() => {
+ this.$refs.crud && this.$refs.crud.toggleSelection()
+ })
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -475,75 +863,71 @@
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
- if (this.form.imageUrls) {
- if (this.form.imageUrls.length > 0) {
- var urls = []
- var names = this.form.imageUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- this.form.imageUrls = urls.join(",")
- }
+
+ 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(',')
}
- if (this.form.placePoiLabelVOList) {
- var arr = []
- this.form.placePoiLabelVOList.forEach(item => {
- arr.push(item.poiCode)
+
+ if (this.form.placePoiLabelVOList.length) {
+ let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+ return item.type == 2
})
- this.form.label = arr.join(",")
+
+ 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)
}
- console.log(this.form, 888888)
+
+ done()
})
+ } else {
+ done()
}
- // con
- 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
+
this.data = data.records
+
this.data.forEach(item => {
- if (item.imageUrls) {
- if (item.imageUrls.length > 0) {
- var urls = []
- var names = item.imageUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.imageUrls = urls.join(",")
- }
+ 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 != '')
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.imageUrls = urls.join(",")
}
})
+
this.loading = false
this.selectionClear()
})
--
Gitblit v1.9.3