From 7edeaaa39078fcbc9fc773a86aa0cc9775d48306 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 16 Nov 2021 10:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/securityEquipment/gun.js | 256 +++++++++++++++++++++++++--------------------------
1 files changed, 125 insertions(+), 131 deletions(-)
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 9adda3b..dfe44db 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,134 +1,128 @@
-var DIC = [{
- label: '招聘中',
- value: 1,
-}, {
- label: '停止招聘',
- value: 2,
-}]
-
export var column = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false,
- labelWidth: 160,
-},
-{
- label: "公务用枪证编号",
- prop: "gunCardNumber",
- labelWidth: 160,
- searchSpan: 4,
- searchLabelWidth: 130,
- search: true,
- rules: [{
- required: true,
- message: "请输入公务用枪证编号",
- trigger: "blur"
- }]
-},
-{
- label: "发证单位名称",
- searchLabelWidth: 110,
- labelWidth: 160,
- prop: "issueUnit",
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入发证单位名称",
- trigger: "blur"
- }],
- search: true,
-}, //上面不显示
-{
- label: "公务用枪编号",
- prop: "cardNumber",
- labelWidth: 160,
- searchLabelWidth: 110,
- rules: [{
- required: true,
- message: "请输入公务用枪编号",
- trigger: "blur"
- }]
- // search: true,
-},
-{
- label: "枪型",
- prop: "gunMode",
- // searchSpan: 4,
- width: 70,
- labelWidth: 160,
- rules: [{
- required: true,
- message: "请输入枪型",
- trigger: "blur"
- }],
- // search: true,
-},
-{
- label: "所属保安公司",
- prop: "deptId",
- searchSpan: 6,
- searchLabelWidth: 110,
- rules: [{
- required: true,
- message: "请输入所属保安公司",
- trigger: "blur"
- }],
- hide: true,
- addDisplay: false,
- editDisplay: false,
- search: false,
- overHidden: true,
- dicUrl: "",
- props: {
- label: "title",
- value: "id"
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false,
+ labelWidth: 160,
},
- type: "tree",
- width: 250,
-},
-{
- label: "责任人",
- prop: "personInCharge",
- labelWidth: 160,
- rules: [{
- required: true,
- message: "请输入责任人",
- trigger: "blur"
- }]
-},
-{
- label: "发证日期",
- labelWidth: 160,
- prop: "issueTime",
- // search: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- // width: 110,
- // overHidden: true,
- // search: true,
- rules: [{
- required: true,
- message: "请输入发证日期",
- trigger: "blur"
- }]
-},
-{
- label: "有效日期",
- prop: "validTime",
- labelWidth: 160,
- // search: true,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 4,
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入有效日期",
- trigger: "blur"
- }]
-}
+ // {
+ // label: "公务用枪证编号",
+ // prop: "gunCardNumber",
+ // labelWidth: 160,
+ // searchSpan: 4,
+ // searchLabelWidth: 130,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入公务用枪证编号",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "发证单位名称",
+ searchLabelWidth: 110,
+ labelWidth: 160,
+ prop: "issueUnit",
+ searchSpan: 4,
+ rules: [{
+ required: false,
+ message: "请输入发证单位名称",
+ trigger: "blur"
+ }],
+ search: true,
+ }, //上面不显示
+ {
+ label: "公务用枪编号",
+ prop: "cardNumber",
+ labelWidth: 160,
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 110,
+ rules: [{
+ required: true,
+ message: "请输入公务用枪编号",
+ trigger: "blur"
+ }]
+ // search: true,
+ },
+ {
+ label: "枪型",
+ prop: "gunMode",
+ // searchSpan: 4,
+ width: 70,
+ labelWidth: 160,
+ rules: [{
+ required: false,
+ message: "请输入枪型",
+ trigger: "blur"
+ }],
+ // search: true,
+ },
+ {
+ label: "所属保安公司",
+ prop: "deptId",
+ searchSpan: 6,
+ searchLabelWidth: 110,
+ rules: [{
+ required: true,
+ message: "请输入所属保安公司",
+ trigger: "blur"
+ }],
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ search: false,
+ overHidden: true,
+ dicUrl: "",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ type: "tree",
+ width: 250,
+ },
+ {
+ label: "责任人",
+ prop: "personInCharge",
+ labelWidth: 160,
+ rules: [{
+ required: false,
+ message: "请输入责任人",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "发证日期",
+ labelWidth: 160,
+ prop: "issueTime",
+ // search: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // width: 110,
+ // overHidden: true,
+ // search: true,
+ rules: [{
+ required: true,
+ message: "请输入发证日期",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "有效日期",
+ prop: "validTime",
+ labelWidth: 160,
+ // search: true,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchSpan: 4,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入有效日期",
+ trigger: "blur"
+ }]
+ }
]
\ No newline at end of file
--
Gitblit v1.9.3