费用推送
This commit is contained in:
parent
c6d09da9f7
commit
615915a72c
|
|
@ -30,7 +30,9 @@
|
||||||
v-model="queryParams.month"
|
v-model="queryParams.month"
|
||||||
type="month"
|
type="month"
|
||||||
placeholder="请选择月份"
|
placeholder="请选择月份"
|
||||||
value-format="yyyy-MM">
|
value-format="yyyy-MM"
|
||||||
|
:clearable="false"
|
||||||
|
@input="handleMonthInput">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|
@ -95,10 +97,16 @@
|
||||||
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip />
|
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip />
|
||||||
<el-table-column label="单位名称" align="center" prop="unitName" show-overflow-tooltip />
|
<el-table-column label="单位名称" align="center" prop="unitName" show-overflow-tooltip />
|
||||||
<el-table-column label="工程名称" align="center" prop="projectName" show-overflow-tooltip />
|
<el-table-column label="工程名称" align="center" prop="projectName" show-overflow-tooltip />
|
||||||
<el-table-column label="推送月份" align="center" prop="month" show-overflow-tooltip />
|
<el-table-column label="推送月份" align="center" prop="month" show-overflow-tooltip >
|
||||||
|
<template slot-scope="scope" >
|
||||||
|
<span>
|
||||||
|
{{originalMonthTrue}}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="租赁费用" align="center" prop="leaseMoney" show-overflow-tooltip >
|
<el-table-column label="租赁费用" align="center" prop="leaseMoney" show-overflow-tooltip >
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.leaseMoney!=null" @click="openLease(scope.row)">
|
<span class="clickText" v-if="scope.row.leaseMoney" @click="openLease(scope.row)">
|
||||||
{{scope.row.leaseMoney}}
|
{{scope.row.leaseMoney}}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -117,10 +125,10 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="丢失费用" align="center" prop="loseMoney" show-overflow-tooltip >
|
<el-table-column label="丢失费用" align="center" prop="lostMoney" show-overflow-tooltip >
|
||||||
<template slot-scope="scope" >
|
<template slot-scope="scope" >
|
||||||
<span class="clickText" v-if="scope.row.loseMoney!=null" @click="openLose(scope.row)">
|
<span class="clickText" v-if="scope.row.lostMoney!=null" @click="openLose(scope.row)">
|
||||||
{{scope.row.loseMoney}}
|
{{scope.row.lostMoney}}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -147,11 +155,11 @@
|
||||||
<div class="tabelFirstBottom">
|
<div class="tabelFirstBottom">
|
||||||
<div class="columnFirstNum">合计费用</div>
|
<div class="columnFirstNum">合计费用</div>
|
||||||
<div style="display: flex;width:58%">
|
<div style="display: flex;width:58%">
|
||||||
<div class="columnFirst">{{ 2530.55 }}</div>
|
<div class="columnFirst">{{ leaseAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ 2530.55 }}</div>
|
<div class="columnFirst">{{ repairAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ 2530.55 }}</div>
|
<div class="columnFirst">{{ scrapAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ 2530.55 }}</div>
|
<div class="columnFirst">{{ loseAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirst">{{ 2530.55 }}</div>
|
<div class="columnFirst">{{ moneyAll.toFixed(2) }}</div>
|
||||||
<div class="columnFirstRight"></div>
|
<div class="columnFirstRight"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -196,10 +204,10 @@
|
||||||
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
|
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="租赁数量" align="center" prop="leaseNum" :show-overflow-tooltip="true"/>
|
<el-table-column label="租赁数量" align="center" prop="leaseNum" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="租赁日期" align="center" prop="leaseDate" :show-overflow-tooltip="true"/>
|
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="170px"/>
|
||||||
<el-table-column label="归还日期" align="center" prop="backDate" :show-overflow-tooltip="true"/>
|
<el-table-column label="归还日期" align="center" prop="backDate" width="170px"/>
|
||||||
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/>
|
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="租赁费用" align="center" width="130px" prop="leaseMoney" :show-overflow-tooltip="true">
|
<el-table-column label="租赁费用" align="center" width="126px" prop="leaseMoney" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.leaseMoney.toFixed(2) }}
|
{{ scope.row.leaseMoney.toFixed(2) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -256,10 +264,10 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="维修费用" align="center" width="130px" prop="costs" :show-overflow-tooltip="true">
|
<el-table-column label="维修费用" align="center" width="130px" prop="repairMoney" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.costs.toFixed(2) }}
|
{{ scope.row.costs.toFixed(2) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -316,10 +324,10 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="报废费用" align="center" width="130px" prop="costs" :show-overflow-tooltip="true">
|
<el-table-column label="报废费用" align="center" width="130px" prop="scrapMoney" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.costs.toFixed(2) }}
|
{{ scope.row.costs.toFixed(2) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -376,9 +384,9 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="丢失费用" align="center" width="130px" prop="costs" :show-overflow-tooltip="true">
|
<el-table-column label="丢失费用" align="center" width="130px" prop="loseMoney" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.costs.toFixed(2) }}
|
{{ scope.row.costs.toFixed(2) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -430,6 +438,17 @@ export default {
|
||||||
// 工程数据
|
// 工程数据
|
||||||
proList: [],
|
proList: [],
|
||||||
|
|
||||||
|
//合计
|
||||||
|
moneyAll: 0,
|
||||||
|
//租赁合计
|
||||||
|
leaseAll: 0,
|
||||||
|
//维修合计
|
||||||
|
repairAll: 0,
|
||||||
|
//报废合计
|
||||||
|
scrapAll: 0,
|
||||||
|
//丢失合计
|
||||||
|
loseAll: 0,
|
||||||
|
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
unitId: null,
|
unitId: null,
|
||||||
|
|
@ -481,6 +500,9 @@ export default {
|
||||||
modelName: undefined,
|
modelName: undefined,
|
||||||
},
|
},
|
||||||
dialogLoseTotal: 0,
|
dialogLoseTotal: 0,
|
||||||
|
|
||||||
|
originalMonth: null, // 用于存储原始的月份值,防止键盘按键删除
|
||||||
|
originalMonthTrue: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
@ -501,6 +523,21 @@ export default {
|
||||||
};
|
};
|
||||||
const dayDate = date.year + "-" + (date.month >= 10 ? date.month : "0" + date.month);
|
const dayDate = date.year + "-" + (date.month >= 10 ? date.month : "0" + date.month);
|
||||||
this.$set(this.queryParams, "month", dayDate.toString());
|
this.$set(this.queryParams, "month", dayDate.toString());
|
||||||
|
this.originalMonth = dayDate.toString();
|
||||||
|
this.originalMonthTrue = dayDate.toString();
|
||||||
|
},
|
||||||
|
|
||||||
|
//键盘按键删除触发返回效果
|
||||||
|
handleMonthInput() {
|
||||||
|
// 当用户输入时,检查是否为空
|
||||||
|
if (!this.queryParams.month) {
|
||||||
|
this.queryParams.month = this.originalMonth;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
//多选框选中数据
|
||||||
|
handleSelectionChange(val) {
|
||||||
|
this.ids = val.map(item => item.id);
|
||||||
},
|
},
|
||||||
|
|
||||||
/** 转换菜单数据结构 */
|
/** 转换菜单数据结构 */
|
||||||
|
|
@ -577,6 +614,16 @@ export default {
|
||||||
console.log(this.queryParams.month)
|
console.log(this.queryParams.month)
|
||||||
getPushReviewList(this.queryParams).then((response) => {
|
getPushReviewList(this.queryParams).then((response) => {
|
||||||
this.pushReviewList = response.rows;
|
this.pushReviewList = response.rows;
|
||||||
|
this.originalMonthTrue = this.queryParams.month;
|
||||||
|
if(response.rows){
|
||||||
|
response.rows.forEach(item => {
|
||||||
|
this.leaseAll += (Number(item.leaseMoney) || 0);
|
||||||
|
this.repairAll += (Number(item.repairMoney) || 0) ;
|
||||||
|
this.scrapAll += (Number(item.scrapMoney) || 0);
|
||||||
|
this.loseAll += (Number(item.loseMoney) || 0);
|
||||||
|
})
|
||||||
|
this.moneyAll = this.leaseAll + this.repairAll + this.scrapAll + this.loseAll;
|
||||||
|
}
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -595,7 +642,7 @@ export default {
|
||||||
projectId: null,
|
projectId: null,
|
||||||
agreementId: '',
|
agreementId: '',
|
||||||
agreementCode: '',
|
agreementCode: '',
|
||||||
month: null,
|
month: this.originalMonth,
|
||||||
}
|
}
|
||||||
this.resetForm('queryForm')
|
this.resetForm('queryForm')
|
||||||
this.handleQuery()
|
this.handleQuery()
|
||||||
|
|
@ -854,15 +901,16 @@ export default {
|
||||||
background-color: #f8f8f9;
|
background-color: #f8f8f9;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
border-left: 1px solid #dfe6ec;
|
border-left: 1px solid #dfe6ec;
|
||||||
width:14.38%;
|
width:14.5%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
justify-content: center; /* 将内容对齐到中间 */
|
justify-content: center; /* 将内容对齐到中间 */
|
||||||
}
|
}
|
||||||
.columnFirstRight {
|
.columnFirstRight {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
|
background-color: #f8f8f9;
|
||||||
border-left: 1px solid #dfe6ec;
|
border-left: 1px solid #dfe6ec;
|
||||||
width:28.6%;
|
width:28.5%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
justify-content: center; /* 将内容对齐到中间 */
|
justify-content: center; /* 将内容对齐到中间 */
|
||||||
|
|
@ -871,7 +919,7 @@ export default {
|
||||||
background-color: #f8f8f9;
|
background-color: #f8f8f9;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width:41.9%;
|
width:41.7%;
|
||||||
border-left: none;
|
border-left: none;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -224,6 +224,7 @@
|
||||||
:page.sync="queryParams.pageNum"
|
:page.sync="queryParams.pageNum"
|
||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
|
:page-sizes="[1000]"
|
||||||
/>
|
/>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -325,7 +326,7 @@ export default {
|
||||||
typeName: "",
|
typeName: "",
|
||||||
level: 0,
|
level: 0,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 1000,
|
||||||
displayBindRelationship: true,
|
displayBindRelationship: true,
|
||||||
houseId: "",
|
houseId: "",
|
||||||
// phonenumber: undefined,
|
// phonenumber: undefined,
|
||||||
|
|
@ -539,7 +540,7 @@ export default {
|
||||||
this.resetForm("queryForm");
|
this.resetForm("queryForm");
|
||||||
this.queryParams.typeId = undefined;
|
this.queryParams.typeId = undefined;
|
||||||
this.queryParams.pageNum = 1;
|
this.queryParams.pageNum = 1;
|
||||||
this.queryParams.pageSize = 10;
|
this.queryParams.pageSize = 1000;
|
||||||
this.queryParams.level = 0;
|
this.queryParams.level = 0;
|
||||||
this.$refs.tree.setCurrentKey(null);
|
this.$refs.tree.setCurrentKey(null);
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue