From d356332a2003d00ca803b4e73dc404b9643b60d5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 08 Sep 2021 08:27:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 79 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 4efc3de..4f05081 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -21,7 +21,7 @@
</template>
<script>
import { mapGetters } from "vuex";
-import { getListSecurity } from "@/api/system/user";
+import { pageSecurity } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
export default {
name: "保安员明细",
data() {
@@ -95,8 +95,7 @@
prop: "realName",
search: true,
searchSpan: 4,
- display: false,
- width: 78
+ display: false
},
{
label: "性别",
@@ -116,15 +115,14 @@
}
],
slot: true,
- display: false,
- width: 48
+ display: false
},
{
label: "保安公司",
prop: "deptName",
- // width: 120,
- search: true,
- searchSpan: 4,
+ width: 300,
+ // search: true,
+ // searchSpan: 4,
overHidden: true,
slot: true,
display: false
@@ -134,7 +132,8 @@
prop: "securitynumber",
display: false,
searchSpan: 5,
- searchLabelWidth: 110
+ searchLabelWidth: 110,
+ width: 180
// search: true,
},
{
@@ -142,37 +141,37 @@
prop: "cardid",
slot: true,
display: false,
- width: 145
+ width: 180
},
{
label: "联系方式",
prop: "phone",
slot: true,
display: false,
- width: 100
+ width: 180
},
- {
- label: "联系地址",
- prop: "address",
- slot: true,
- display: false,
- hide: true
- },
+ // {
+ // label: "联系地址",
+ // prop: "address",
+ // slot: true,
+ // display: false,
+ // hide: true
+ // },
{
label: "入职时间",
prop: "rtime",
slot: true,
display: false,
- width: 82
+ width: 180
},
- {
- label: "所属角色",
- prop: "roleName",
- slot: true,
- display: false,
- width: 78,
- hide: true
- },
+ // {
+ // label: "所属角色",
+ // prop: "roleName",
+ // slot: true,
+ // display: false,
+ // width: 78,
+ // hide: true
+ // },
// {
// label: "所属辖区",
@@ -204,7 +203,7 @@
dicData: [
{
label: "否",
- value: 0
+ value: 2
},
{
label: "是",
@@ -213,7 +212,6 @@
],
slot: true,
display: false,
- width: 70
},
{
label: "是否持证",
@@ -237,7 +235,6 @@
],
slot: true,
display: false,
- width: 70
}
]
},
@@ -283,13 +280,14 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptName"] = params["enterpriseName"];
- params["jurisdiction"] = this.jurisdiction;
- getListSecurity(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then(res => {
+ let param = {};
+ param["realName"] = params["realName"] || "";
+ param["status"] = params["status"] || "";
+ param["deptId"] = this.deptid;
+ param["hold"] = params["hold"] || "";
+ param["current"] = page.currentPage;
+ param["size"] = page.pageSize;
+ pageSecurity(param).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -304,9 +302,9 @@
let mm = urlArr[i].split("=");
object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
}
- let enterpriseName = object["enterpriseName"] || "";
- let obj = { enterpriseName: enterpriseName };
- this.onLoad(this.page, obj);
+ this.deptid = object["departmentid"] || "";
+ this.query = { deptid: this.deptid };
+ this.onLoad(this.page, this.query);
// this.onLoad(this.page, this.query);
}
},
@@ -315,4 +313,3 @@
}
};
</script>
-<style lang="scss" scoped></style>
--
Gitblit v1.9.3