|
@@ -5,9 +5,9 @@
|
|
<div class="left">
|
|
<div class="left">
|
|
<div class="title">
|
|
<div class="title">
|
|
<span class="Micbold">可申诉的未执行策略</span>
|
|
<span class="Micbold">可申诉的未执行策略</span>
|
|
- <span>{{data.length}}</span>
|
|
|
|
|
|
+ <span v-if="appealsArr.length>0">{{appealsArr.length}}</span>
|
|
</div>
|
|
</div>
|
|
- <div class="execute" v-for="(item,index) in data" :key="index" @click="menu">
|
|
|
|
|
|
+ <div class="execute" v-for="(item,index) in data" :key="index">
|
|
<p class="date MicrYaHei">{{item.date}}</p>
|
|
<p class="date MicrYaHei">{{item.date}}</p>
|
|
<div class="card-box">
|
|
<div class="card-box">
|
|
<div class="card" v-for="(item2,index) in item.info" :key="index+'i'">
|
|
<div class="card" v-for="(item2,index) in item.info" :key="index+'i'">
|
|
@@ -38,35 +38,46 @@
|
|
<div class="center">
|
|
<div class="center">
|
|
<div class="title">
|
|
<div class="title">
|
|
<span class="Micbold">审核中</span>
|
|
<span class="Micbold">审核中</span>
|
|
- <span>{{review.length}}</span>
|
|
|
|
|
|
+ <span v-if="InAuditArr.length>0">{{InAuditArr.length}}</span>
|
|
</div>
|
|
</div>
|
|
- <div class="card" v-for="(item,index) in review" :key="index" @click="menu">
|
|
|
|
|
|
+ <div class="card" v-for="(item,index) in InAuditArr" :key="index">
|
|
<div class="time">
|
|
<div class="time">
|
|
- {{item.date}} {{item.title}}
|
|
|
|
|
|
+ <span class="time-box">
|
|
|
|
+ <span>{{item.pushTime?formatter(item.pushTime):'--'}}</span>
|
|
|
|
+ <span>{{item.title||'--'}}</span>
|
|
|
|
+ </span>
|
|
<span class="backout">
|
|
<span class="backout">
|
|
<img src="../../assets/backout.png" />撤销申请
|
|
<img src="../../assets/backout.png" />撤销申请
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
- <div class="remark">申请原因:{{item.reason}}</div>
|
|
|
|
- <div class="remark">{{item.advice}}</div>
|
|
|
|
|
|
+ <div class="remark">申请原因:{{item.reasonType||'--'}}</div>
|
|
|
|
+ <div class="remark">{{item.reason||'--'}}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="right">
|
|
<div class="right">
|
|
<div class="title Micbold">审核完成/超时未申诉</div>
|
|
<div class="title Micbold">审核完成/超时未申诉</div>
|
|
- <div class="card" v-for="(item,index) in complete" :key="index" @click="menu">
|
|
|
|
|
|
+ <div
|
|
|
|
+ class="card"
|
|
|
|
+ v-for="(item,index) in auditCompletedArr"
|
|
|
|
+ :key="index"
|
|
|
|
+ @click="menu(item)"
|
|
|
|
+ >
|
|
<div class="remark">
|
|
<div class="remark">
|
|
- <div class="remark-left">审批时间:{{item.time}}</div>
|
|
|
|
|
|
+ <div class="remark-left">审批时间:{{item.updateTime?formatter1(item.updateTime):'--'}}</div>
|
|
<div class="remark-right Micbold">
|
|
<div class="remark-right Micbold">
|
|
- <span :class="item.sign>5?'backout':(item.sign>2?'backout1':'backout2')">
|
|
|
|
- <img :src="item.img" />
|
|
|
|
- {{item.text}}
|
|
|
|
|
|
+ <span
|
|
|
|
+ :class="item.status=='303'?'backout':(item.status=='304'?'backout1':'backout2')"
|
|
|
|
+ >
|
|
|
|
+ <img
|
|
|
|
+ :src="item.status=='303'?require('../../assets/completed.png'):(item.status=='304'?require('../../assets/gray.png'):require('../../assets/error.png'))"
|
|
|
|
+ />
|
|
|
|
+ {{item.status=='303'?'申诉成功':(item.status=='304'?'未申诉':'申诉失败')}}
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="time">
|
|
<div class="time">
|
|
- <span>{{item.time}}</span>
|
|
|
|
- <span>{{item.date}}</span>
|
|
|
|
- <span>{{item.title}}</span>
|
|
|
|
|
|
+ <span>{{item.pushTime?formatter(item.pushTime):'--'}}</span>
|
|
|
|
+ <span>{{item.title||'--'}}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -76,11 +87,13 @@
|
|
<script>
|
|
<script>
|
|
import Head from "../main/index";
|
|
import Head from "../main/index";
|
|
import { queryWorkflow, queryChillerExecuteInfo } from "@/api/appeal/appeal.js";
|
|
import { queryWorkflow, queryChillerExecuteInfo } from "@/api/appeal/appeal.js";
|
|
|
|
+var moment = require("moment");
|
|
|
|
+import "moment/locale/zh-cn";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- headText: "申诉",
|
|
|
|
|
|
+ headText: "未执行申诉",
|
|
appealsArr: [],
|
|
appealsArr: [],
|
|
InAuditArr: [],
|
|
InAuditArr: [],
|
|
auditCompletedArr: [],
|
|
auditCompletedArr: [],
|
|
@@ -146,20 +159,20 @@ export default {
|
|
]
|
|
]
|
|
}
|
|
}
|
|
],
|
|
],
|
|
- review: [
|
|
|
|
- {
|
|
|
|
- date: "2020.02.12 08:30",
|
|
|
|
- title: "策略未执行申诉",
|
|
|
|
- reason: "策略原因",
|
|
|
|
- advice: "冷水温度过高,没有及时按策略执行"
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- date: "2020.02.12 08:30",
|
|
|
|
- title: "策略未执行申诉",
|
|
|
|
- reason: "策略原因",
|
|
|
|
- advice: "冷水温度过高,没有及时按策略执行"
|
|
|
|
- }
|
|
|
|
- ],
|
|
|
|
|
|
+ // review: [
|
|
|
|
+ // {
|
|
|
|
+ // date: "2020.02.12 08:30",
|
|
|
|
+ // title: "策略未执行申诉",
|
|
|
|
+ // reason: "策略原因",
|
|
|
|
+ // advice: "冷水温度过高,没有及时按策略执行"
|
|
|
|
+ // },
|
|
|
|
+ // {
|
|
|
|
+ // date: "2020.02.12 08:30",
|
|
|
|
+ // title: "策略未执行申诉",
|
|
|
|
+ // reason: "策略原因",
|
|
|
|
+ // advice: "冷水温度过高,没有及时按策略执行"
|
|
|
|
+ // }
|
|
|
|
+ // ],
|
|
complete: [
|
|
complete: [
|
|
{
|
|
{
|
|
date: "08:30",
|
|
date: "08:30",
|
|
@@ -195,21 +208,29 @@ export default {
|
|
this.init();
|
|
this.init();
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- menu() {
|
|
|
|
- this.$router.push("/appeal/appealDetail");
|
|
|
|
|
|
+ formatter(date) {
|
|
|
|
+ return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm");
|
|
|
|
+ },
|
|
|
|
+ formatter1(date) {
|
|
|
|
+ return moment.unix(date / 1000).format("YYYY.MM.DD");
|
|
|
|
+ },
|
|
|
|
+ menu(item) {
|
|
|
|
+ this.$router.push({
|
|
|
|
+ path: "/appeal/appealDetail",
|
|
|
|
+ query: { id: item.commandId }
|
|
|
|
+ });
|
|
},
|
|
},
|
|
init() {
|
|
init() {
|
|
this.appealsIng();
|
|
this.appealsIng();
|
|
- // this.auditCompletedIng();
|
|
|
|
- // this.InAuditIng();
|
|
|
|
|
|
+ this.auditCompletedIng();
|
|
|
|
+ this.InAuditIng();
|
|
},
|
|
},
|
|
// 可申诉的未执行策略
|
|
// 可申诉的未执行策略
|
|
appealsIng() {
|
|
appealsIng() {
|
|
- this.appealsArr = [];
|
|
|
|
let params = {
|
|
let params = {
|
|
postParams: {
|
|
postParams: {
|
|
criteria: {
|
|
criteria: {
|
|
- projectId: "Pj1101080002",
|
|
|
|
|
|
+ projectId: "Pj4413030001",
|
|
trackerId: 3, //固定为3
|
|
trackerId: 3, //固定为3
|
|
status: [301, 305] //固定为未申诉和已驳回
|
|
status: [301, 305] //固定为未申诉和已驳回
|
|
},
|
|
},
|
|
@@ -226,11 +247,13 @@ export default {
|
|
appealsArr.forEach(item => {
|
|
appealsArr.forEach(item => {
|
|
arr.push(item.commandId);
|
|
arr.push(item.commandId);
|
|
});
|
|
});
|
|
|
|
+ console.log(arr);
|
|
this.queryExecute(arr);
|
|
this.queryExecute(arr);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
queryExecute(id) {
|
|
queryExecute(id) {
|
|
|
|
+ this.appealsArr = [];
|
|
let params = {
|
|
let params = {
|
|
postParams: {
|
|
postParams: {
|
|
criteria: {
|
|
criteria: {
|
|
@@ -239,12 +262,12 @@ export default {
|
|
}
|
|
}
|
|
};
|
|
};
|
|
queryChillerExecuteInfo(params).then(res => {
|
|
queryChillerExecuteInfo(params).then(res => {
|
|
- console.log(res);
|
|
|
|
|
|
+ console.log("可申诉的未执行策略", res);
|
|
|
|
+ this.appealsArr = res.data ? res.data : [];
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// 审核完成、超时未申诉
|
|
// 审核完成、超时未申诉
|
|
auditCompletedIng() {
|
|
auditCompletedIng() {
|
|
- this.appealsArr = [];
|
|
|
|
let params = {
|
|
let params = {
|
|
postParams: {
|
|
postParams: {
|
|
criteria: {
|
|
criteria: {
|
|
@@ -259,11 +282,12 @@ export default {
|
|
}
|
|
}
|
|
};
|
|
};
|
|
queryWorkflow(params).then(res => {
|
|
queryWorkflow(params).then(res => {
|
|
|
|
+ console.log("审核完成、超时未申诉", res);
|
|
this.auditCompletedArr = res.content ? res.content : [];
|
|
this.auditCompletedArr = res.content ? res.content : [];
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
|
|
- // 申诉中
|
|
|
|
|
|
+ // 审核中
|
|
InAuditIng() {
|
|
InAuditIng() {
|
|
let params = {
|
|
let params = {
|
|
postParams: {
|
|
postParams: {
|
|
@@ -276,6 +300,7 @@ export default {
|
|
}
|
|
}
|
|
};
|
|
};
|
|
queryWorkflow(params).then(res => {
|
|
queryWorkflow(params).then(res => {
|
|
|
|
+ console.log("审核中", res);
|
|
this.InAuditArr = res.content ? res.content : [];
|
|
this.InAuditArr = res.content ? res.content : [];
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -454,6 +479,13 @@ export default {
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
color: rgba(31, 36, 41, 1);
|
|
color: rgba(31, 36, 41, 1);
|
|
line-height: 22px;
|
|
line-height: 22px;
|
|
|
|
+ .time-box {
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: center;
|
|
|
|
+ span:nth-of-type(1) {
|
|
|
|
+ width: 140px;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.backout {
|
|
.backout {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|