From f8914d5c57aa76bc92e03a21c49e9ef37664019e Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Sep 2021 10:34:29 +0800
Subject: [PATCH] 所属保安公司 装备管理bug
---
src/views/securityEquipment/car.js | 2
src/views/securityEquipment/equipments.js | 194 ++++++++++++------------
src/views/securityEquipment/gun.js | 242 +++++++++++++++---------------
3 files changed, 219 insertions(+), 219 deletions(-)
diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index e01794d..7d472fc 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -94,7 +94,7 @@
label: "title",
value: "id"
},
- type: "select",
+ type: "tree",
},
{
label: "责任人",
diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index af74a6c..7cab161 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -7,102 +7,102 @@
}]
export var column = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false
+},
+{
+ label: "名称",
+ prop: "name",
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 50,
+ rules: [{
+ required: true,
+ message: "请输入名称",
+ trigger: "blur"
+ }]
+},
+{
+ label: "型号",
+ prop: "mode",
+ rules: [{
+ required: true,
+ message: "请输入型号",
+ trigger: "blur"
+ }]
+ // search: true,
+},
+{
+ label: "数量",
+ prop: "num",
+ rules: [{
+ required: true,
+ message: "请输入数量",
+ trigger: "blur"
+ }],
+ // search: true,
+ width: 70,
+},
+{
+ label: "所属保安公司",
+ prop: "deptId",
+ searchSpan: 6,
+ searchLabelWidth: 110,
+ rules: [{
+ required: true,
+ message: "请输入所属保安公司",
+ trigger: "blur"
+ }],
+ hide: false,
+ search: true,
+ overHidden: true,
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id"
},
- {
- label: "名称",
- prop: "name",
- search: true,
- searchSpan: 4,
- searchLabelWidth: 50,
- rules: [{
- required: true,
- message: "请输入名称",
- trigger: "blur"
- }]
- },
- {
- label: "型号",
- prop: "mode",
- rules: [{
- required: true,
- message: "请输入型号",
- trigger: "blur"
- }]
- // search: true,
- },
- {
- label: "数量",
- prop: "num",
- rules: [{
- required: true,
- message: "请输入数量",
- trigger: "blur"
- }],
- // search: true,
- width: 70,
- },
- {
- label: "所属保安公司",
- prop: "deptId",
- searchSpan: 6,
- searchLabelWidth: 110,
- rules: [{
- required: true,
- message: "请输入所属保安公司",
- trigger: "blur"
- }],
- hide: false,
- search: true,
- overHidden: true,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id"
- },
- type: "select",
- width: 250,
- },
- {
- label: "负责人",
- prop: "personInCharge",
- rules: [{
- required: true,
- message: "请输入负责人",
- trigger: "blur"
- }]
- },
- {
- label: "厂商",
- prop: "brand",
- // search: true,
- width: 110,
- searchSpan: 4,
- overHidden: true,
- search: true,
- rules: [{
- required: true,
- message: "请输入厂商",
- trigger: "blur"
- }]
- },
- {
- label: "出厂日期",
- prop: "dateForProduction",
- type: "date",
- format: 'yyyy-MM-dd',
- searchSpan: 4,
- // span:8,
- valueFormat: 'yyyy-MM-dd',
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入出厂日期",
- trigger: "blur"
- }]
- }
+ type: "tree",
+ width: 250,
+},
+{
+ label: "负责人",
+ prop: "personInCharge",
+ rules: [{
+ required: true,
+ message: "请输入负责人",
+ trigger: "blur"
+ }]
+},
+{
+ label: "厂商",
+ prop: "brand",
+ // search: true,
+ width: 110,
+ searchSpan: 4,
+ overHidden: true,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请输入厂商",
+ trigger: "blur"
+ }]
+},
+{
+ label: "出厂日期",
+ prop: "dateForProduction",
+ type: "date",
+ format: 'yyyy-MM-dd',
+ searchSpan: 4,
+ // span:8,
+ valueFormat: 'yyyy-MM-dd',
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入出厂日期",
+ trigger: "blur"
+ }]
+}
]
\ No newline at end of file
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index cc2ae69..329f8b4 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -7,126 +7,126 @@
}]
export var column = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false,
- labelWidth: 160,
+ 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",
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 110,
+ labelWidth: 160,
+ rules: [{
+ required: true,
+ message: "请输入组织机构",
+ trigger: "blur"
+ }],
+ overHidden: true,
+ // searchSpan: 4,
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id"
},
- {
- 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",
- search: true,
- searchSpan: 4,
- searchLabelWidth: 110,
- labelWidth: 160,
- rules: [{
- required: true,
- message: "请输入组织机构",
- trigger: "blur"
- }],
- overHidden: true,
- // searchSpan: 4,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id"
- },
- type: "select",
- },
- {
- 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"
- }]
- }
+ type: "tree",
+},
+{
+ 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"
+ }]
+}
]
\ No newline at end of file
--
Gitblit v1.9.3