From 2ae96849b1f50301ca3a388534f0072887308ae0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:56:51 +0800
Subject: [PATCH] 通知公告，装备，车辆，枪支修改
---
src/views/securityEquipment/car.js | 60 ++++++++-------
src/views/securityEquipment/car.vue | 6 +
src/views/securityEquipment/equipments.js | 71 ++++-------------
src/views/securityEquipment/gun.js | 37 ++++-----
src/views/securityEquipment/gun.vue | 5
src/views/desk/notice.vue | 5
src/views/securityEquipment/equipments.vue | 7 +
7 files changed, 83 insertions(+), 108 deletions(-)
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 7c82918..fa52ade 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -162,14 +162,15 @@
label: "通知时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
searchRange: true,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
search: true,
+ searchSpan:6,
rules: [
{
required: true,
diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index dbcc8d7..e01794d 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -1,12 +1,10 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
export var column = [
// {
@@ -19,7 +17,7 @@
{
label: "车牌号码",
prop: "carNumber",
- searchSpan: 4,
+ searchSpan: 3,
search: true,
rules: [{
required: true,
@@ -30,14 +28,21 @@
{
label: "号码种类",
prop: "numberType",
- searchSpan: 4,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
+ search: true,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ searchSpan: 3,
rules: [{
required: true,
message: "请输入号码种类",
trigger: "blur"
}],
- search: true,
- },//上面不显示
+ }, //上面不显示
{
label: "车辆类型",
prop: "carType",
@@ -45,17 +50,23 @@
required: true,
message: "请输入车辆类型",
trigger: "blur"
- }]
- // search: true,
- }
- , {
+ }],
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
+ search: true,
+ searchSpan: 3,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ }, {
label: "车辆型号",
prop: "mode",
// search: true,
- searchSpan: 4,
width: 110,
overHidden: true,
- search: true,
+ // search: true,
rules: [{
required: true,
message: "请输入车辆型号",
@@ -83,13 +94,7 @@
label: "title",
value: "id"
},
- // search: true,
type: "select",
- // rules: [{
- // required: true,
- // message: "请选择学历",
- // trigger: "blur"
- // }],
},
{
label: "责任人",
@@ -117,7 +122,6 @@
{
label: "出厂日期",
prop: "dateForProduction",
- // search: true,
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
@@ -138,9 +142,9 @@
// search: true,
rules: [{
required: true,
- message: "请输入环保标志 ,国IV",
+ message: "请输入环保标志(如:国IV)",
trigger: "blur"
}],
searchSpan: 4,
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index f742e84..88a517e 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -26,6 +26,7 @@
>删 除
</el-button>
<el-button
+ style="display:none"
type="success"
size="small"
plain
@@ -113,6 +114,7 @@
menuWidth: 160,
align: "center",
selection: true,
+ labelWidth:110,
column: column,
},
};
@@ -257,9 +259,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[4].search = false;
this.option.column[4].hide = true;
this.option.column[4].addDisplay = false;
diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index 55e58a7..af74a6c 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -1,15 +1,12 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
-export var column = [
- {
+export var column = [{
label: "id",
prop: "id",
hide: true,
@@ -29,36 +26,14 @@
}]
},
{
- label: "编号",
- prop: "number",
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入编号",
- trigger: "blur"
- }],
- search: true,
- },//上面不显示
- {
- label: "规格",
- prop: "specifications",
- rules: [{
- required: true,
- message: "请输入规格",
- trigger: "blur"
- }]
- // search: true,
- },
- {
label: "型号",
prop: "mode",
- width: 70,
rules: [{
- required: true,
- message: "请输入型号",
- trigger: "blur"
- }]
- // search: true,
+ required: true,
+ message: "请输入型号",
+ trigger: "blur"
+ }]
+ // search: true,
},
{
label: "数量",
@@ -67,38 +42,30 @@
required: true,
message: "请输入数量",
trigger: "blur"
- }]
+ }],
// search: true,
+ width: 70,
},
{
label: "所属保安公司",
prop: "deptId",
- searchSpan: 4,
+ searchSpan: 6,
searchLabelWidth: 110,
rules: [{
required: true,
- message: "请输入组织机构",
+ message: "请输入所属保安公司",
trigger: "blur"
}],
hide: false,
search: true,
overHidden: true,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 4,
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id"
},
- // search: true,
type: "select",
- // rules: [{
- // required: true,
- // message: "请选择学历",
- // trigger: "blur"
- // }],
+ width: 250,
},
{
label: "负责人",
@@ -138,4 +105,4 @@
trigger: "blur"
}]
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 2f488f0..2f316cf 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -26,6 +26,7 @@
>删 除
</el-button>
<el-button
+ style="display:none"
type="success"
size="small"
plain
@@ -114,6 +115,7 @@
align: "center",
selection: true,
column: column,
+ labelWidth:110,
},
};
},
@@ -180,6 +182,7 @@
// }
},
searchChange(params, done) {
+ params = JSON.parse(JSON.stringify(params));
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -258,9 +261,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[6].search = false;
this.option.column[6].hide = true;
this.option.column[6].addDisplay = false;
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index ce39f63..cc2ae69 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,15 +1,12 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
-export var column = [
- {
+export var column = [{
label: "id",
prop: "id",
hide: true,
@@ -42,23 +39,23 @@
trigger: "blur"
}],
search: true,
- },//上面不显示
+ }, //上面不显示
{
label: "公务用枪编号",
prop: "cardNumber",
labelWidth: 160,
searchLabelWidth: 110,
rules: [{
- required: true,
- message: "请输入公务用枪编号",
- trigger: "blur"
- }]
- // search: true,
+ required: true,
+ message: "请输入公务用枪编号",
+ trigger: "blur"
+ }]
+ // search: true,
},
{
label: "枪型",
prop: "gunMode",
- searchSpan: 4,
+ // searchSpan: 4,
width: 70,
labelWidth: 160,
rules: [{
@@ -66,7 +63,7 @@
message: "请输入枪型",
trigger: "blur"
}],
- search: true,
+ // search: true,
},
{
label: "所属保安公司",
@@ -132,4 +129,4 @@
trigger: "blur"
}]
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index 201dc21..7bc403c 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -59,6 +59,7 @@
align: "center",
border: true,
selection: true,
+ labelWidth:110,
column: column,
},
};
@@ -189,9 +190,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[5].search = false;
this.option.column[5].hide = true;
this.option.column[5].addDisplay = false;
--
Gitblit v1.9.3