Browse Source

任务结算bug修复

master
chentaiyu 5 years ago
parent
commit
575ffe7558
  1. 10
      src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

10
src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@ -14,7 +14,7 @@
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="left" class="demo-table-expand"> <el-form label-position="left" class="demo-table-expand">
<el-form-item label="报价"> <el-form-item label="报价">
工作量<span>{{ props.row.quoteWorkload }} 人时</span> 金额<span>{{ props.row.name }}</span>
工作量<span>{{ props.row.quoteWorkload }} 人时</span> 金额<span>{{ props.row.quoteAmount }}</span>
</el-form-item> </el-form-item>
<el-form-item label="报价工期"> <el-form-item label="报价工期">
<span>{{ props.row.quoteWeekday }} :{{props.row.quoteStartTime }}~{{props.row.quoteEndTime}}</span> <span>{{ props.row.quoteWeekday }} :{{props.row.quoteStartTime }}~{{props.row.quoteEndTime}}</span>
@ -33,7 +33,7 @@
<el-button type="primary" v-if="props.row.status=='4'" @click="toTest(props.row)">再申请验收</el-button> <el-button type="primary" v-if="props.row.status=='4'" @click="toTest(props.row)">再申请验收</el-button>
<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算--> <!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算-->
<el-button type="primary" v-if="props.row.status=='3' && props.row.settleStatus!='2' && props.row.settleStatus!='4' && props.row.settleStatus!='6' " @click="settle" >申请结算</el-button>
<el-button type="primary" v-if="props.row.status=='3' && props.row.settleStatus!='2' && props.row.settleStatus!='4' && props.row.settleStatus!='6' " @click="settle(props.row)" >申请结算</el-button>
<el-button type="success" v-if="props.row.status=='2' " @click="testSuccess(props.row)" >验收通过</el-button> <el-button type="success" v-if="props.row.status=='2' " @click="testSuccess(props.row)" >验收通过</el-button>
<el-button type="warning" v-if="props.row.status=='2' " @click="testFail(props.row)" >验收不通过</el-button> <el-button type="warning" v-if="props.row.status=='2' " @click="testFail(props.row)" >验收不通过</el-button>
@ -59,7 +59,7 @@
<el-button type="primary" v-if="scope.row.status=='4'" @click="toTest(scope.row)">再申请验收</el-button> <el-button type="primary" v-if="scope.row.status=='4'" @click="toTest(scope.row)">再申请验收</el-button>
<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算--> <!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算-->
<el-button type="primary" v-if="scope.row.status=='3' && scope.row.settleStatus!='2' && scope.row.settleStatus!='4' && scope.row.settleStatus!='6' " @click="settle" >申请结算</el-button>
<el-button type="primary" v-if="scope.row.status=='3' && scope.row.settleStatus!='2' && scope.row.settleStatus!='4' && scope.row.settleStatus!='6' " @click="settle(scope.row)" >申请结算</el-button>
<el-button type="success" v-if="scope.row.status=='2' " @click="testSuccess(scope.row)" >验收通过</el-button> <el-button type="success" v-if="scope.row.status=='2' " @click="testSuccess(scope.row)" >验收通过</el-button>
<el-button type="warning" v-if="scope.row.status=='2' " @click="testFail(scope.row)" >验收不通过</el-button> <el-button type="warning" v-if="scope.row.status=='2' " @click="testFail(scope.row)" >验收不通过</el-button>
@ -651,6 +651,10 @@
}, },
sendToProcessApprova:function(row,bizKey){ sendToProcessApprova:function(row,bizKey){
// //
if(this.settleForm.settleAmount==0||this.settleForm.settleAmount==''){
this.$message.error("结算金额为空/0,不允许发审");
return;
}
if(row.flowState=='1'){ if(row.flowState=='1'){
this.$message.error("审核中,不允许重复发审"); this.$message.error("审核中,不允许重复发审");
return; return;

Loading…
Cancel
Save