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/qualificationExamination/data.js | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/views/qualificationExamination/data.js b/src/views/qualificationExamination/data.js
index 21bf4ad..2aecf04 100644
--- a/src/views/qualificationExamination/data.js
+++ b/src/views/qualificationExamination/data.js
@@ -1,26 +1,21 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
-var DIC1 = [
- {
- label: '拥有',
- value: 1,
- }, {
- label: '未拥有',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
+var DIC1 = [{
+ label: '拥有',
+ value: 1,
+}, {
+ label: '未拥有',
+ value: 2,
+}]
-var w = 160
- , s = 12;
-export var column = [
- {
+var w = 160,
+ s = 12;
+export var column = [{
label: "id",
prop: "id",
hide: true,
@@ -51,11 +46,11 @@
// addDisplay: false
},
{
- label: "保安公司",
+ label: "企业名称",
prop: "deptId",
rules: [{
required: true,
- message: "请输入保安公司",
+ message: "请输入企业名称",
trigger: "blur"
}],
// addDisplay: true,
@@ -275,4 +270,4 @@
// trigger: "blur"
// }],
},
-]
+]
\ No newline at end of file
--
Gitblit v1.9.3