From 39862b8a7173aa9b37833e44d0b7b9416dda9026 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Dec 2021 11:48:41 +0800
Subject: [PATCH] +
---
src/components/Approval/Approval.vue | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index a7bc344..beb1d59 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -23,10 +23,11 @@
</div>
</basic-container>
</div>
- <div v-if="ApprovalShow && OnceChouseShow">
+ <div v-if="ApprovalShow && OnceChouseShow" class="licenseApproval">
<slot name="close" @click="clocks"></slot>
<div class="heards">审批进度查询{{ title }}</div>
- <basic-container class="Approval">
+ <!-- <basic-container class="Approval"> -->
+ <basic-container>
<avue-crud
:option="option1"
:table-loading="loading"
@@ -53,9 +54,9 @@
{{
row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
}}
- <i class="gz" v-if="row.type == '0'"></i>
+ <i class="gz" v-if="row.type == '2'"></i>
<i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '2'"></i>
+ <i class="zc" v-if="row.type == '0'"></i>
</el-tag>
</template>
</avue-crud>
@@ -179,7 +180,7 @@
},
{
label: "审批意见",
- prop: "approve",
+ prop: "approves",
},
{
label: "提交时间",
@@ -188,6 +189,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: "审核状态",
@@ -323,6 +332,19 @@
).then((res) => {
this.data = res.data.data.records;
this.page.total = this.data.length;
+ for (var k in this.data) {
+ // console.log(this.changeState(this.data[k]));
+ let paichusuoyijian = this.data[k].popinion
+ ? "派出所意见：" + this.data[k].popinion + "；"
+ : "";
+ let fenjuijian = this.data[k].xopinion
+ ? "分局意见：" + this.data[k].xopinion + "；"
+ : "";
+ let shijuyijian = this.data[k].sopinion
+ ? "市局意见：" + this.data[k].sopinion + "；"
+ : "";
+ this.data[k]["approves"] = paichusuoyijian + fenjuijian + shijuyijian;
+ }
this.loading = false;
});
// getList(
--
Gitblit v1.9.3