From cbef0e8f5cf8538fb942879372e38c5b2fa09109 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 28 Jul 2021 14:53:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0eeaef8..044ae20 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,5 +1,5 @@
<template>
- <el-row>
+ <el-row class="securityGuard">
<el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
@@ -322,10 +322,12 @@
searchMenuSpan: 6,
border: false,
stripe: true,
+ align: "center",
index: true,
delBtnText: "注销",
selection: true,
viewBtn: true,
+ defaultExpandAll: true,
//dialogType: 'drawer',
dialogClickModal: false,
column: securityFormPageColumn,
@@ -414,7 +416,7 @@
prop: "name",
},
{
- label: "所属行政区",
+ label: "所属辖区",
prop: "jurisdiction",
// multiple: true,
type: "tree",
@@ -428,7 +430,7 @@
rules: [
{
required: true,
- message: "请选择所属行政区",
+ message: "请选择所属辖区",
trigger: "click",
},
],
@@ -486,6 +488,11 @@
trigger: "blur",
},
],
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ hide: true,
},
{
label: "手机号码",
@@ -584,6 +591,8 @@
label: "生日",
type: "date",
prop: "birthday",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
},
],
},
--
Gitblit v1.9.3