|
@@ -63,8 +63,9 @@
|
|
<div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
|
|
<div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
|
|
<div class="vongi-slot-content">
|
|
<div class="vongi-slot-content">
|
|
<h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
|
|
<h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
|
|
- <p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
|
|
|
|
- </div>
|
|
|
|
|
|
+ <p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span><span v-if="item.status=='2'" class="color55f868" :style="getColor(item.status)" v-text="'('+detail.approvalExplain+')'"></span></p>
|
|
|
|
+
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -176,9 +177,14 @@
|
|
} else {
|
|
} else {
|
|
this.subForm.status = status;
|
|
this.subForm.status = status;
|
|
this.subForm.approvalExplain = val;
|
|
this.subForm.approvalExplain = val;
|
|
- //this.openFromVisible = true;
|
|
|
|
|
|
+ if('2'==status){
|
|
|
|
+ this.openFromVisible = true;
|
|
|
|
+ }
|
|
|
|
+ if('1'==status){
|
|
|
|
+ this.doAction();
|
|
|
|
+ }
|
|
//直接点击处理,不需要弹窗理由框
|
|
//直接点击处理,不需要弹窗理由框
|
|
- this.doAction();
|
|
|
|
|
|
+ //
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//同意拒绝
|
|
//同意拒绝
|