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 | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index 12e78fd..3b76958 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -65,10 +65,10 @@
var d = this.data,
b = [];
for (var k in d) {
- console.log({
- label: d[k].menuName,
- value: d[k].type + "",
- });
+ // console.log({
+ // label: d[k].menuName,
+ // value: d[k].type + "",
+ // });
b.push({
label: d[k].menuName,
value: d[k].type + "",
@@ -136,6 +136,14 @@
valueFormat: "yyyy-MM-dd HH:mm:ss",
},
{
+ label: "预计审核时间",
+ prop: "overtime",
+ addDisplay: false,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ {
label: "审核状态",
prop: "type",
addDisplay: false,
@@ -160,6 +168,9 @@
};
},
methods: {
+ refreshChange() {
+ this.onLoad(this.page);
+ },
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then((res) => {
@@ -172,43 +183,37 @@
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) => {
+ 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);
- // console.log(this.data);
- if (this.data.length == 0) {
- this.$store.commit("changecanDoIt", true);
- } else {
- if (this.data[0].type == 0 || this.data[0].type == 2) {
- this.$store.commit("changecanDoIt", false);
- } else {
- this.$store.commit("changecanDoIt", true);
- }
- }
+ this.page.total = num;
});
});
});
--
Gitblit v1.9.3