From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突
---
src/views/securityGuardManagement/dispatchChildoperable copy.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/securityGuardManagement/dispatchChildoperable copy.vue b/src/views/securityGuardManagement/dispatchChildoperable copy.vue
index ed12902..240c723 100644
--- a/src/views/securityGuardManagement/dispatchChildoperable copy.vue
+++ b/src/views/securityGuardManagement/dispatchChildoperable copy.vue
@@ -130,7 +130,7 @@
// // addDisplay: false
// },
{
- label: "保安公司",
+ label: "企业名称",
prop: "deptId",
labelWidth: 120,
searchLabelWidth: 75,
@@ -147,7 +147,7 @@
rules: [
{
required: true,
- message: "请输入保安公司",
+ message: "请输入企业名称",
trigger: "blur",
},
],
@@ -176,7 +176,7 @@
rules: [
{
required: true,
- message: "请输入保安公司",
+ message: "请输入企业名称",
trigger: "blur",
},
],
--
Gitblit v1.9.3