机具费用推送修改
This commit is contained in:
parent
f4040380bd
commit
5a57b46163
|
|
@ -56,12 +56,13 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
|
|
||||||
<!-- <el-form-item label="是否审核" prop="isReview">-->
|
<el-form-item label="推送状态" prop="pushStatus">
|
||||||
<!-- <el-select v-model="queryParams.isReview" placeholder="请选择" clearable>-->
|
<el-select v-model="queryParams.pushStatus" placeholder="请选择" clearable>
|
||||||
<!-- <el-option label="已审核" value="0"></el-option>-->
|
<el-option label="未提交" value="0"></el-option>
|
||||||
<!-- <el-option label="未审核" value="1"></el-option>-->
|
<el-option label="已推送" value="1"></el-option>
|
||||||
<!-- </el-select>-->
|
<el-option label="已退回" value="2"></el-option>
|
||||||
<!-- </el-form-item>-->
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
|
|
@ -109,7 +110,7 @@
|
||||||
<span v-else>{{ scope.$index+1 }} </span>
|
<span v-else>{{ scope.$index+1 }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip />
|
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip width="120px"/>
|
||||||
<el-table-column label="单位名称" align="center" prop="unitName" width="180" />
|
<el-table-column label="单位名称" align="center" prop="unitName" width="180" />
|
||||||
<el-table-column label="工程名称" align="center" prop="projectName" width="180" />
|
<el-table-column label="工程名称" align="center" prop="projectName" width="180" />
|
||||||
<el-table-column label="推送月份" align="center" prop="month" width="100" >
|
<el-table-column label="推送月份" align="center" prop="month" width="100" >
|
||||||
|
|
@ -125,7 +126,7 @@
|
||||||
<el-tag v-if="scope.row.settlementType == 2" type="warning" size="small">安全用品</el-tag>
|
<el-tag v-if="scope.row.settlementType == 2" type="warning" size="small">安全用品</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="租赁费用" align="center" prop="leaseMoney" >
|
<el-table-column label="租赁费用" align="center" prop="leaseMoney" width="140px">
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.leaseMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLease(scope.row)">
|
<span class="clickText" v-if="scope.row.leaseMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLease(scope.row)">
|
||||||
{{scope.row.leaseMoney}}
|
{{scope.row.leaseMoney}}
|
||||||
|
|
@ -135,7 +136,7 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="维修费用" align="center" prop="repairMoney" show-overflow-tooltip >
|
<el-table-column label="维修费用" align="center" prop="repairMoney" show-overflow-tooltip width="120px">
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.repairMoney!=null && scope.$index!=pushReviewList.length-1" @click="openRepair(scope.row)">
|
<span class="clickText" v-if="scope.row.repairMoney!=null && scope.$index!=pushReviewList.length-1" @click="openRepair(scope.row)">
|
||||||
{{scope.row.repairMoney}}
|
{{scope.row.repairMoney}}
|
||||||
|
|
@ -145,7 +146,7 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="报废费用" align="center" prop="scrapMoney" show-overflow-tooltip >
|
<el-table-column label="报废费用" align="center" prop="scrapMoney" show-overflow-tooltip width="120px">
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.scrapMoney!=null && scope.$index!=pushReviewList.length-1" @click="openScrap(scope.row)">
|
<span class="clickText" v-if="scope.row.scrapMoney!=null && scope.$index!=pushReviewList.length-1" @click="openScrap(scope.row)">
|
||||||
{{scope.row.scrapMoney}}
|
{{scope.row.scrapMoney}}
|
||||||
|
|
@ -155,7 +156,7 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="丢失费用" align="center" prop="lostMoney" show-overflow-tooltip >
|
<el-table-column label="丢失费用" align="center" prop="lostMoney" show-overflow-tooltip width="120px">
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.lostMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLose(scope.row)">
|
<span class="clickText" v-if="scope.row.lostMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLose(scope.row)">
|
||||||
{{scope.row.lostMoney}}
|
{{scope.row.lostMoney}}
|
||||||
|
|
@ -165,7 +166,7 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="合计费用" align="center" prop="money" show-overflow-tooltip >
|
<el-table-column label="合计费用" align="center" prop="money" show-overflow-tooltip width="120px">
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span v-if="scope.row.money!=null && scope.$index==pushReviewList.length-1" >
|
<span v-if="scope.row.money!=null && scope.$index==pushReviewList.length-1" >
|
||||||
{{Number(scope.row.money).toFixed(3)}}
|
{{Number(scope.row.money).toFixed(3)}}
|
||||||
|
|
@ -181,12 +182,14 @@
|
||||||
<span v-if="scope.row.isSettlement==0" style="color: #f56c6c">未结算</span>
|
<span v-if="scope.row.isSettlement==0" style="color: #f56c6c">未结算</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="是否审核" align="center" prop="checkStatus" width="100" >
|
<el-table-column label="是否推送" align="center" prop="pushStatus" width="100" >
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span v-if="scope.row.checkStatus==1" style="color: #67c23a">已审核</span>
|
<span v-if="scope.row.pushStatus == 0" style="color: #f56c6c">未推送</span>
|
||||||
<span v-if="scope.row.checkStatus==0" style="color: #f56c6c">未审核</span>
|
<span v-else-if="scope.row.pushStatus == 1" style="color: #67c23a">已推送</span>
|
||||||
|
<span v-else-if="scope.row.pushStatus == 2" style="color: #f56c6c">已退回</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="推送备注" align="center" prop="pushRemark" width="180" />
|
||||||
</el-table>
|
</el-table>
|
||||||
<!-- <div class="tabelFirstBottom">
|
<!-- <div class="tabelFirstBottom">
|
||||||
<div class="columnFirstNum">合计费用</div>
|
<div class="columnFirstNum">合计费用</div>
|
||||||
|
|
@ -194,7 +197,7 @@
|
||||||
<div class="columnFirst">{{ leaseAll.toFixed(2) }}</div>
|
<div class="columnFirst">{{ leaseAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ repairAll.toFixed(2) }}</div>
|
<div class="columnFirst">{{ repairAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ scrapAll.toFixed(2) }}</div>
|
<div class="columnFirst">{{ scrapAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ loseAll.toFixed(2) }}</div>
|
<div class="columnFirst">{{ lostAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ moneyAll.toFixed(2) }}</div>
|
<div class="columnFirst">{{ moneyAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirstRight"></div>
|
<div class="columnFirstRight"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -473,7 +476,7 @@ export default {
|
||||||
//报废合计
|
//报废合计
|
||||||
scrapAll: 0,
|
scrapAll: 0,
|
||||||
//丢失合计
|
//丢失合计
|
||||||
loseAll: 0,
|
lostAll: 0,
|
||||||
|
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
|
|
@ -482,7 +485,7 @@ export default {
|
||||||
agreementId: '',
|
agreementId: '',
|
||||||
agreementCode: '',
|
agreementCode: '',
|
||||||
month: null,
|
month: null,
|
||||||
isReview: null,
|
pushStatus: null,
|
||||||
isSettlement: null,
|
isSettlement: null,
|
||||||
settlementType: 1,
|
settlementType: 1,
|
||||||
isFilter: null,
|
isFilter: null,
|
||||||
|
|
@ -661,7 +664,7 @@ export default {
|
||||||
this.leaseAll = 0;
|
this.leaseAll = 0;
|
||||||
this.repairAll = 0;
|
this.repairAll = 0;
|
||||||
this.scrapAll = 0;
|
this.scrapAll = 0;
|
||||||
this.loseAll = 0;
|
this.lostAll = 0;
|
||||||
this.moneyAll = 0;
|
this.moneyAll = 0;
|
||||||
|
|
||||||
console.log(this.queryParams.month)
|
console.log(this.queryParams.month)
|
||||||
|
|
@ -678,15 +681,15 @@ export default {
|
||||||
this.leaseAll += (Number(item.leaseMoney) || 0);
|
this.leaseAll += (Number(item.leaseMoney) || 0);
|
||||||
this.repairAll += (Number(item.repairMoney) || 0) ;
|
this.repairAll += (Number(item.repairMoney) || 0) ;
|
||||||
this.scrapAll += (Number(item.scrapMoney) || 0);
|
this.scrapAll += (Number(item.scrapMoney) || 0);
|
||||||
this.loseAll += (Number(item.loseMoney) || 0);
|
this.lostAll += (Number(item.lostMoney) || 0);
|
||||||
})
|
})
|
||||||
this.moneyAll = this.leaseAll + this.repairAll + this.scrapAll + this.loseAll;
|
this.moneyAll = this.leaseAll + this.repairAll + this.scrapAll + this.lostAll;
|
||||||
}
|
}
|
||||||
let obj = {
|
let obj = {
|
||||||
leaseMoney: this.leaseAll,
|
leaseMoney: this.leaseAll,
|
||||||
repairMoney: this.repairAll,
|
repairMoney: this.repairAll,
|
||||||
scrapMoney: this.scrapAll,
|
scrapMoney: this.scrapAll,
|
||||||
loseMoney: this.loseAll,
|
lostMoney: this.lostAll,
|
||||||
money: this.moneyAll,
|
money: this.moneyAll,
|
||||||
}
|
}
|
||||||
this.pushReviewList.push(obj)
|
this.pushReviewList.push(obj)
|
||||||
|
|
@ -700,13 +703,13 @@ export default {
|
||||||
this.leaseAll = 0;
|
this.leaseAll = 0;
|
||||||
this.repairAll = 0;
|
this.repairAll = 0;
|
||||||
this.scrapAll = 0;
|
this.scrapAll = 0;
|
||||||
this.loseAll = 0;
|
this.lostAll = 0;
|
||||||
this.moneyAll = 0;
|
this.moneyAll = 0;
|
||||||
|
|
||||||
this.queryParams = {
|
this.queryParams = {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
isReview: null,
|
pushStatus: null,
|
||||||
isPay: null,
|
isPay: null,
|
||||||
isFilter: null,
|
isFilter: null,
|
||||||
unitId: null,
|
unitId: null,
|
||||||
|
|
@ -735,7 +738,7 @@ export default {
|
||||||
|
|
||||||
//是否可用勾选框
|
//是否可用勾选框
|
||||||
selectable(row) {
|
selectable(row) {
|
||||||
if (row.isReview == "0") {
|
if (row.pushStatus == 1) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue