From 86633a46ceb72f3311332ee9dd997281a17e50fd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 22 Jul 2021 10:58:42 +0800
Subject: [PATCH] 保安员管理和保安公司页面完善 。全部基本样式调整，数据对接（部分）
---
src/views/qualificationExamination/qualificationExamination.vue | 138 ++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 54 deletions(-)
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index e817eaa..34f3e7c 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -40,7 +40,8 @@
// } from "@/api/regulatoryInformation/regulatoryInformation";
import { mapGetters } from "vuex";
import { datasing } from "./dataqualificationExamination";
-import { getList } from "@/api/qualificationExamination/qualificationExamination";
+// import { getList } from "@/api/qualificationExamination/qualificationExamination";
+import { getListSecurity } from "@/api/system/user";
export default {
data() {
@@ -56,11 +57,11 @@
selectionList: [],
option: {
// 操作栏多余按钮去除
- // delBtn: false,
- // editBtn: false,
- // addBtn: false,
- // selection: false,
- // menu: false,
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: false,
+ menu: false,
align: "center",
height: "auto",
@@ -79,7 +80,7 @@
overHidden: true,
// labelWidth: 120,
// searchLabelWidth: 120,
- // searchSpan: 5,
+ // searchSpan: 4,
// dicUrl:
// "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// props: {
@@ -97,9 +98,36 @@
// },
// ],
},
+ // {
+ // label: "deptId",
+ // prop: "deptId",
+ // overHidden: true,
+ // // labelWidth: 120,
+ // // searchLabelWidth: 120,
+ // searchSpan: 4,
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // // hide: true,
+ // search: true,
+ // // overHidden: true,
+ // type: "select",
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入保安公司",
+ // // trigger: "blur",
+ // // },
+ // // ],
+ // },
{
label: "保安姓名",
prop: "realName",
+ search: true,
+ searchSpan: 4,
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -107,7 +135,7 @@
{
label: "性别",
- prop: "sex",
+ prop: "sexName",
// type: "select",
// labelWidth: 120,
// // display: false,
@@ -122,7 +150,7 @@
},
{
label: "身份证号",
- prop: "carid",
+ prop: "cardid",
// type: "select",
// labelWidth: 120,
// // display: false,
@@ -159,7 +187,7 @@
// },
{
label: "审查状态",
- prop: "examination_type",
+ prop: "examinationType",
// overHidden: true,
// type: "date",
// format: "yyyy-MM-dd",
@@ -177,7 +205,7 @@
{
label: "审查明细",
- prop: "examination_mx",
+ prop: "examinationMx",
// labelWidth: 120,
// display: false,
},
@@ -192,6 +220,7 @@
prop: "reviewTime",
// labelWidth: 120,
// display: false,
+ hide: true,
},
{
label: "是否在职",
@@ -342,54 +371,55 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getListSecurity(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data);
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
// onLoad(page, params = {}) {
// // this.loading = false;
// this.loading = true;
- // getList(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.query)
- // ).then((res) => {
- // const data = res.data.data;
- // this.page.total = data.total;
- // this.data = data.records;
+ // // getListJSON().then((res) => {
+ // // axios
+ // // .get(
+ // // "../../api/qualificationExamination/signQualificationExamination.json"
+ // // )
+ // // .then((res) => {
+ // // page.currentPage,
+ // // page.pageSize,
+ // // Object.assign(params, this.query)
+ // if (datasing) {
+ // var res = datasing;
+ // console.log(res, "signQualificationExamination");
+ // const data = res.data;
+ // // this.page.total = data.total;
+ // var d = data.records;
+ // for (var k in d) {
+ // d[k].examination_mx = "正常";
+ // d[k].examination_type = "正常";
+ // d[k]["carid"] = "370111198807051124";
+ // d[k]["certificate"] = "拥有";
+ // d[k]["reviewTime"] = "2021-02-21";
+ // d[k]["results"] = "通过";
+ // d[k]["onjob"] = "是";
+ // }
+ // this.data = d;
// this.loading = false;
- // // this.selectionClear();
- // });
+ // }
+ // // this.selectionClear();
+ // // });
// },
- onLoad1(page, params = {}) {
- // this.loading = false;
- this.loading = true;
- // getListJSON().then((res) => {
- // axios
- // .get(
- // "../../api/qualificationExamination/signQualificationExamination.json"
- // )
- // .then((res) => {
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.query)
- if (datasing) {
- var res = datasing;
- console.log(res, "signQualificationExamination");
- const data = res.data;
- // this.page.total = data.total;
- var d = data.records;
- for (var k in d) {
- d[k].examination_mx = "正常";
- d[k].examination_type = "正常";
- d[k]["carid"] = "370111198807051124";
- d[k]["certificate"] = "拥有";
- d[k]["reviewTime"] = "2021-02-21";
- d[k]["results"] = "通过";
- d[k]["onjob"] = "是";
- }
- this.data = d;
- this.loading = false;
- }
- // this.selectionClear();
- // });
- },
// 行单击
handleRowClick(row) {
--
Gitblit v1.9.3