From 6162d1cfeac4c4dc3b022eecfa67b6fa7e58495d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 26 Sep 2021 12:00:05 +0800
Subject: [PATCH] 默认图片
---
src/components/Approval/Approval.vue | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index 2ee2e9f..3b76958 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -53,9 +53,28 @@
type: Boolean,
default: false,
},
+ data: {
+ type: Array,
+ default: [],
+ },
},
computed: {
...mapGetters(["ApprovalShow", "userInfo"]),
+ },
+ created() {
+ var d = this.data,
+ b = [];
+ for (var k in d) {
+ // console.log({
+ // label: d[k].menuName,
+ // value: d[k].type + "",
+ // });
+ b.push({
+ label: d[k].menuName,
+ value: d[k].type + "",
+ });
+ }
+ this.option1.column[1].dicData = b;
},
data() {
return {
@@ -102,28 +121,7 @@
label: "许可类型",
prop: "ptype",
type: "select",
- dicData: [
- {
- label: "保安服务公司许可申请",
- value: "0",
- },
- {
- label: "自招保安单位备案",
- value: "1",
- },
- {
- label: "保安培训公司备案",
- value: "2",
- },
- {
- label: "跨区域经营备案",
- value: "3",
- },
- {
- label: "自招保安单位备案撤销",
- value: "6",
- },
- ],
+ dicData: [],
},
{
label: "审批意见",
@@ -136,6 +134,14 @@
type: "date",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "预计审核时间",
+ prop: "overtime",
+ addDisplay: false,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
},
{
label: "审核状态",
@@ -162,6 +168,9 @@
};
},
methods: {
+ refreshChange() {
+ this.onLoad(this.page);
+ },
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then((res) => {
@@ -174,35 +183,39 @@
this.loading = true;
// console.log(this.userInfo);
params["cardid"] = this.userInfo.Id;
+ var num = 0;
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;
+ num += res.data.data.total;
+ this.data = res.data.data.records;
this.loading = false;
getListre(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
).then((ress) => {
+ num += ress.data.data.total;
this.data = this.data.concat(ress.data.data.records);
- });
- getListrek(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((resk) => {
- this.data = this.data.concat(resk.data.data.records);
- });
- getListrev(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query)
- ).then((resv) => {
- this.data = this.data.concat(resv.data.data.records);
+ getListrek(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((resk) => {
+ num += resk.data.data.total;
+ this.data = this.data.concat(resk.data.data.records);
+ getListrev(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((resv) => {
+ num += resv.data.data.total;
+ this.data = this.data.concat(resv.data.data.records);
+ this.page.total = num;
+ });
+ });
});
});
},
--
Gitblit v1.9.3