From 2d50c51214f0ced8c992a415c72ea33b519fff59 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 03 Sep 2021 15:53:05 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/qualificationExamination/qualificationExamination.vue | 70 ++++++++++-------------------------
1 files changed, 20 insertions(+), 50 deletions(-)
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index 34cce98..06df4d4 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -25,6 +25,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
+ @sort-change="sortChange"
>
</avue-crud>
</basic-container>
@@ -46,6 +47,7 @@
export default {
data() {
return {
+ sort: {},
form: {},
query: {},
loading: true,
@@ -77,56 +79,6 @@
column: [
{
- label: "保安公司",
- prop: "deptName",
- minWidth: 110,
- overHidden: true,
- // labelWidth: 120,
- // searchLabelWidth: 120,
- // searchSpan: 4,
- // dicUrl:
- // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // props: {
- // label: "title",
- // value: "id",
- // },
- // search: true,
- // overHidden: true,
- // type: "select",
- // rules: [
- // {
- // required: true,
- // message: "请输入保安公司",
- // trigger: "blur",
- // },
- // ],
- },
- // {
- // 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,
@@ -134,6 +86,12 @@
// hide: true,
// editDisplay: false,
// addDisplay: false
+ },
+ {
+ label: "保安公司",
+ prop: "deptName",
+ minWidth: 110,
+ overHidden: true,
},
{
@@ -219,6 +177,7 @@
label: "审查状态",
prop: "examinationType",
// overHidden: true,
+ sortable: true,
// type: "date",
// format: "yyyy-MM-dd",
// valueFormat: "yyyy-MM-dd",
@@ -236,6 +195,7 @@
{
label: "审查明细",
prop: "examinationMx",
+ sortable: true,
// labelWidth: 120,
// display: false,
},
@@ -405,8 +365,17 @@
var d = new Date();
return d.getFullYear();
},
+ sortChange(val) {
+ // console.log(val);
+ this.sort = {
+ sort: val.order == "descending" ? "asc" : "desc",
+ useName: val.prop,
+ };
+ this.onLoad(this.page, this.sort);
+ },
onLoad(page, params = {}) {
// this.loading = false;
+ params = Object.assign(params, this.sort);
this.loading = true;
params["status"] = 1;
getListSecurity(
@@ -422,6 +391,7 @@
d[k]["examinationMx"] = "正常";
d[k]["examinationType"] = "正常";
} else {
+ console.log(d[k]);
d[k]["examinationType"] = "异常";
}
// if (d[k]["examinationType"] == "") {
--
Gitblit v1.9.3