|
|
@@ -81,9 +81,13 @@
|
|
|
<!-- 步骤条-->
|
|
|
<a-card style="margin-bottom:10px;width: 15%;float: left">
|
|
|
<a-steps direction="vertical" :current="steps.current" size="small" @change="stepsClick">
|
|
|
- <a-step v-for="item in steps.stepsNow" :key="item.title" :title="item.title" :status="item.status">
|
|
|
+ <a-step v-for="item in steps.stepsNow" :key="item.title" :status="item.status">
|
|
|
<a-icon v-if="item.solution" style='color: #faad14;' :type="item.type" :slot="item.slot" />
|
|
|
<a-icon v-if="item.solutionGreen" style='color: #52c41a;' :type="item.type" :slot="item.slot" />
|
|
|
+ <span v-if="item.solutionGreen" style='color: #52c41a;' slot="title" >{{item.title}}</span>
|
|
|
+ <span v-else-if='item.status==="error"' style='color: red' slot="title" >{{item.title}}</span>
|
|
|
+ <span v-else-if='item.yellow' style='color: sandybrown' slot="title" >{{item.title}}</span>
|
|
|
+ <span v-else slot="title" >{{item.title}}</span>
|
|
|
</a-step>
|
|
|
|
|
|
</a-steps>
|
|
|
@@ -2526,22 +2530,32 @@ export default {
|
|
|
let boolean = state == "1" ? true : false;
|
|
|
if (boolean) {
|
|
|
if ( (this.steps.stepsNow[this.steps.current]["status"] === "wait"|| this.steps.stepsNow[this.steps.current]["status"] ==="process")
|
|
|
- && this.steps.stepsNow[this.steps.current]["type"] !== "solution"){
|
|
|
+ && this.steps.stepsNow[this.steps.current]["type"] !== "solution" || !this.steps.stepsNow[this.steps.current].Isyellow){
|
|
|
this.steps.stepsNow[this.steps.current]["status"] = "finish";
|
|
|
|
|
|
}else {
|
|
|
this.steps.stepsNow[this.steps.current]["status"] = "finish";
|
|
|
this.steps.stepsNow[this.steps.current].solutionGreen = true;
|
|
|
+ this.steps.stepsNow[this.steps.current].yellow = false;
|
|
|
this.steps.stepsNow[this.steps.current].slot="icon"
|
|
|
this.steps.stepsNow[this.steps.current].type="solution"
|
|
|
this.steps.stepsNow[this.steps.current].solution = false;
|
|
|
}
|
|
|
} else {
|
|
|
+ this.steps.stepsNow[this.steps.current].solutionGreen = false;
|
|
|
this.steps.stepsNow[this.steps.current].solution = false;
|
|
|
this.steps.stepsNow[this.steps.current].slot=""
|
|
|
this.steps.stepsNow[this.steps.current].status = "error";
|
|
|
this.steps.stepsNow[this.steps.current].type=""
|
|
|
}
|
|
|
+ //若以前稽核整改过
|
|
|
+ if ( this.steps.stepsNow[this.steps.current].Isyellow && !this.steps.stepsNow[this.steps.current].solutionGreen){
|
|
|
+ this.steps.stepsNow[this.steps.current].type="solution"
|
|
|
+ this.steps.stepsNow[this.steps.current].slot="icon"
|
|
|
+ this.steps.stepsNow[this.steps.current].status = "final"
|
|
|
+ this.steps.stepsNow[this.steps.current].solution = true;
|
|
|
+ this.steps.stepsNow[this.steps.current].yellow = true;
|
|
|
+ }
|
|
|
},
|
|
|
dataListToStr(data){
|
|
|
if (data.contractDate!==null && data.contractDate!==undefined){
|
|
|
@@ -2726,6 +2740,8 @@ export default {
|
|
|
that.steps.stepsNow[i].slot="icon"
|
|
|
that.steps.stepsNow[i].status = "final"
|
|
|
that.steps.stepsNow[i].solution = true;
|
|
|
+ that.steps.stepsNow[i].yellow = true;
|
|
|
+ that.steps.stepsNow[i].Isyellow = true;
|
|
|
}
|
|
|
}
|
|
|
}
|