From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 54217a5..f997a1d 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -988,7 +988,7 @@
rules: [
{
required: true,
- message: "请选择",
+ message: "请选择是否有持证",
trigger: "blur",
},
],
@@ -997,6 +997,12 @@
label: "保安员证编号",
prop: "securitynumber",
hide: true,
+ display:true,
+ rules: [{
+ required: false,
+ message: "请输入保安员证编号",
+ trigger: "blur",
+ }],
},
// {
// label: "发证日期",
@@ -1007,8 +1013,21 @@
// valueFormat: "yyyy-MM-dd",
// },
{
- label: "电子邮箱",
+ label: "保安证书照片",
prop: "email",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "url",
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 1.0,
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files",
+ tip: "上传jpg,png格式图片，大小不超过2M",
+ span: 12,
},
// {
// label: "籍贯",
@@ -1259,6 +1278,16 @@
};
},
watch: {
+ // windowHeight() {
+ // let d = {
+ // option: this.option,
+ // fn: function () {
+ // console.log(123);
+ // },
+ // add: 100,
+ // };
+ // this.$store.dispatch("WHchangeHight", d);
+ // },
radio() {
if (this.radio) {
this.SFZloding = true;
@@ -1276,6 +1305,32 @@
if (this.form.tenantId !== "" && this.initFlag) {
this.initData(this.form.tenantId);
}
+ },
+ "form.hold":{
+ handler(val){
+ var securitynumbercolumn =this.findObject(this.option.group,'securitynumber')
+ // console.log(val,1234);
+ if(val==1){
+ securitynumbercolumn.display=true;
+ securitynumbercolumn.rules=[
+ {
+ required: true,
+ message: "请输入保安员证编号",
+ trigger: "blur",
+ }
+ ];
+ }else{
+ securitynumbercolumn.display=false;
+ securitynumbercolumn.rules=[
+ {
+ required: false,
+ message: "请输入保安员证编号",
+ trigger: "blur",
+ }
+ ];
+ }
+ },
+ immediate: true
},
"form.fingerprint"() {
let that = this;
@@ -1340,7 +1395,7 @@
},
},
computed: {
- ...mapGetters(["userInfo", "permission"]),
+ ...mapGetters(["userInfo", "permission", "windowHeight"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.securityGuard_add, false),
--
Gitblit v1.9.3