From cfe042e1c74fff9cf761e9ede3ea8e7684504a46 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Sep 2021 19:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/securityCompany/computents/service.vue | 4 +
src/views/securityGuardManagement/registerOnce.vue | 20 ++++--
src/views/securityCompany/computents/equipment.vue | 114 ++++++++++----------------------------
src/views/securityCompany/computents/punish.vue | 4 +
src/views/securityCompany/computents/staff.vue | 4 +
5 files changed, 55 insertions(+), 91 deletions(-)
diff --git a/src/views/securityCompany/computents/equipment.vue b/src/views/securityCompany/computents/equipment.vue
index 210a019..ec37f9c 100644
--- a/src/views/securityCompany/computents/equipment.vue
+++ b/src/views/securityCompany/computents/equipment.vue
@@ -12,6 +12,7 @@
@search-reset="equipmentSearchReset"
@current-change="equipmentCurrentChange"
@size-change="equipmentSizeChange"
+ @refresh-change="equipmentSizerefresh"
>
</avue-crud>
<!-- @on-load="equipmentOnLoad" -->
@@ -57,6 +58,8 @@
label: "名称",
prop: "name",
search: true,
+ searchSpan: 4,
+ searchLabelWidth: 50,
rules: [
{
required: true,
@@ -66,33 +69,8 @@
],
},
{
- label: "编号",
- prop: "number",
- 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,
@@ -103,33 +81,41 @@
// search: true,
},
{
- label: "保安公司",
- prop: "tenantName",
+ label: "数量",
+ prop: "num",
rules: [
{
required: true,
- message: "请输入组织机构",
+ 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,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 5,
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: "负责人",
@@ -147,6 +133,7 @@
prop: "brand",
// search: true,
width: 110,
+ searchSpan: 4,
overHidden: true,
search: true,
rules: [
@@ -160,11 +147,11 @@
{
label: "出厂日期",
prop: "dateForProduction",
- // search: true,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "timestamp",
searchSpan: 4,
+ // span:8,
+ valueFormat: "yyyy-MM-dd",
overHidden: true,
rules: [
{
@@ -175,50 +162,6 @@
],
},
],
- // [
- // {
- // label: "投资人姓名",
- // prop: "shareholder",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "投资比例",
- // prop: "shareholdingratio",
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "%");
- // },
- // },
- // {
- // label: "出资金额",
- // prop: "capital",
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "万元");
- // },
- // },
- // {
- // label: "投资时间",
- // prop: "capitaltime",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "身份证号",
- // prop: "cardid",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "联系电话",
- // prop: "cell",
- // slot: true,
- // display: false,
- // },
- // ],
},
equipmentSearch: {},
equipmentLoading: true,
@@ -237,6 +180,9 @@
this.equipmentOnLoad(this.equipmentPage);
},
methods: {
+ equipmentSizerefresh() {
+ this.equipmentOnLoad(this.equipmentPage, this.equipmentQuery);
+ },
equipmentOnLoad(page, params = {}) {
this.equipmentLoading = true;
getListequipment(
diff --git a/src/views/securityCompany/computents/punish.vue b/src/views/securityCompany/computents/punish.vue
index b585e5f..ba9b52a 100644
--- a/src/views/securityCompany/computents/punish.vue
+++ b/src/views/securityCompany/computents/punish.vue
@@ -12,6 +12,7 @@
@search-reset="punishSearchReset"
@current-change="punishCurrentChange"
@size-change="punishSizeChange"
+ @refresh-change="equipmentSizerefresh"
>
</avue-crud>
<!-- @on-load="punishOnLoad" -->
@@ -106,6 +107,9 @@
this.punishOnLoad(this.punishPage);
},
methods: {
+ equipmentSizerefresh() {
+ this.punishOnLoad(this.punishPage, this.punishQuery);
+ },
punishOnLoad(page, params = {}) {
this.punishLoading = true;
// console.log(this.form.departmentid);
diff --git a/src/views/securityCompany/computents/service.vue b/src/views/securityCompany/computents/service.vue
index 678fd34..2e74048 100644
--- a/src/views/securityCompany/computents/service.vue
+++ b/src/views/securityCompany/computents/service.vue
@@ -12,6 +12,7 @@
@search-reset="serviceSearchReset"
@current-change="serviceCurrentChange"
@size-change="serviceSizeChange"
+ @refresh-change="equipmentSizerefresh"
>
</avue-crud>
<!-- @on-load="serviceOnLoad" -->
@@ -166,6 +167,9 @@
this.serviceOnLoad(this.servicePage);
},
methods: {
+ equipmentSizerefresh() {
+ this.serviceOnLoad(this.servicePage, this.serviceQuery);
+ },
serviceOnLoad(page, params = {}) {
this.serviceLoading = true;
getListeservice(
diff --git a/src/views/securityCompany/computents/staff.vue b/src/views/securityCompany/computents/staff.vue
index 46f423d..41da349 100644
--- a/src/views/securityCompany/computents/staff.vue
+++ b/src/views/securityCompany/computents/staff.vue
@@ -12,6 +12,7 @@
@search-reset="staffSearchReset"
@current-change="staffCurrentChange"
@size-change="staffSizeChange"
+ @refresh-change="equipmentSizerefresh"
>
<!-- @on-load="staffOnLoad" -->
</avue-crud>
@@ -258,6 +259,9 @@
this.staffOnLoad(this.staffPage);
},
methods: {
+ equipmentSizerefresh() {
+ this.staffOnLoad(this.staffPage, this.staffQuery);
+ },
staffOnLoad(page, params = {}) {
this.staffLoading = true;
getListestaff(
diff --git a/src/views/securityGuardManagement/registerOnce.vue b/src/views/securityGuardManagement/registerOnce.vue
index 79bffa2..ec91ecd 100644
--- a/src/views/securityGuardManagement/registerOnce.vue
+++ b/src/views/securityGuardManagement/registerOnce.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-09-17 17:13:04
+ * @Last Modified time: 2021-09-17 17:21:15
* menu-name 保安员注册查询
*/
<template>
@@ -706,16 +706,22 @@
},
initData(tenantId) {
getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "roleId");
+ column.dicData = res.data.data;
+ } catch {}
});
getDeptTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ } catch {}
});
getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "postId");
+ column.dicData = res.data.data;
+ } catch {}
});
},
--
Gitblit v1.9.3