字段调整

This commit is contained in:
BianLzhaoMin 2024-07-30 16:22:50 +08:00
parent 027b891f69
commit 2d435fa2ca
2 changed files with 645 additions and 363 deletions

View File

@ -112,7 +112,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="外部租赁费用"
label="租赁费用"
align="center"
prop="costs"
:show-overflow-tooltip="true"

View File

@ -1,69 +1,212 @@
<template>
<div class="app-container" id="agreement">
<el-row style="width: 100%;">
<el-row style="width: 100%">
<el-col :span="18">
<el-button type="primary" size="mini" @click="handleExport1">租赁明细导出</el-button>
<el-button type="primary" size="mini" @click="handleExport2">丢失明细导出</el-button>
<el-button type="primary" size="mini" @click="handleExport3">维修明细导出</el-button>
<el-button type="primary" size="mini" @click="handleExport4">报废明细导出</el-button>
<el-button type="warning" size="mini" @click="handleExportAll">全部明细导出</el-button>
<el-button type="success" size="mini" @click="handleExame">审批</el-button>
<el-button type="primary" size="mini" @click="handleExport1"
>租赁明细导出</el-button
>
<el-button type="primary" size="mini" @click="handleExport2"
>丢失明细导出</el-button
>
<el-button type="primary" size="mini" @click="handleExport3"
>维修明细导出</el-button
>
<el-button type="primary" size="mini" @click="handleExport4"
>报废明细导出</el-button
>
<el-button type="warning" size="mini" @click="handleExportAll"
>全部明细导出</el-button
>
<el-button type="success" size="mini" @click="handleExame"
>审批</el-button
>
</el-col>
<el-col :span="4">
<el-button type="danger" size="mini" style="float: right;" @click="handleBack">返回</el-button>
<el-button
type="danger"
size="mini"
style="float: right"
@click="handleBack"
>返回</el-button
>
</el-col>
</el-row>
<div style="color: rgb(217, 0, 27);font-weight: 700;padding: 20px 0;">
<div style="color: rgb(217, 0, 27); font-weight: 700; padding: 20px 0">
结算费用合计¥{{ costAll }}:
<div v-for="(item, index) in applyList" :key="index">
租赁费用¥{{item.leaseCost}}维修费用¥{{item.repairCost}}报废费用¥{{item.scrapCost}}丢失费用{{item.loseCost}},增加项费用¥{{item.addCost}}减免费用¥{{item.subCost}}增减原因{{item.remark}}
租赁费用¥{{ item.leaseCost }}维修费用¥{{
item.repairCost
}}报废费用¥{{ item.scrapCost }}丢失费用{{
item.loseCost
}},增加项费用¥{{ item.addCost }}减免费用¥{{
item.subCost
}}增减原因{{ item.remark }}
</div>
</div>
<div>
<el-table :data="leaseList" @selection-change="handleSelectionChange">
<el-table
:data="leaseList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="租赁费用明细" align="center">
<el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="结算工程" align="center" prop="projectName" :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="nuitName" :show-overflow-tooltip="true" />
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true" />
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true" />
<el-table-column
label="序号"
align="center"
type="index"
width="60"
/>
<el-table-column
label="结算单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="结算工程"
align="center"
prop="projectName"
: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="nuitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁单价"
align="center"
prop="leasePrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁日期"
align="center"
prop="startTime"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> -->
<el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true" />
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true" />
<el-table-column label="外部租赁费用" align="center" prop="costs" :show-overflow-tooltip="true" />
<el-table-column
label="归还日期 "
align="center"
prop="endTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁天数"
align="center"
prop="leaseDays"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁费用"
align="center"
prop="costs"
:show-overflow-tooltip="true"
/>
</el-table-column>
</el-table>
<div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计{{leaseCost}}</div>
<div style="width: 100%; text-align: right; padding: 20px 20px"
>租赁费用小计{{ leaseCost }}</div
>
</div>
<div>
<el-table :data="repairList" @selection-change="handleSelectionChange">
<el-table
:data="repairList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="维修费用明细" align="center">
<el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="结算工程" align="center" prop="projectName" :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="nuitName" :show-overflow-tooltip="true" />
<el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
<el-table-column
label="序号"
align="center"
type="index"
width="60"
/>
<el-table-column
label="结算单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="结算工程"
align="center"
prop="projectName"
: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="nuitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修状态"
align="center"
prop="repairStatus"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span v-if="scope.row.repairStatus==0">未审核</span>
<span v-if="scope.row.repairStatus==1">已审核</span>
<span v-if="scope.row.repairStatus == 0"
>未审核</span
>
<span v-if="scope.row.repairStatus == 1"
>已审核</span
>
</template>
</el-table-column>
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="维修费用" align="center" prop="costs" :show-overflow-tooltip="true" />
<el-table-column label="类型" align="center" prop="partType" :show-overflow-tooltip="true">
<el-table-column
label="维修数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修费用"
align="center"
prop="costs"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型"
align="center"
prop="partType"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span v-if="scope.row.partType == 0">不收费</span>
<span v-if="scope.row.partType == 1">收费</span>
@ -71,50 +214,152 @@
</el-table-column>
</el-table-column>
</el-table>
<div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计{{repairCost}}</div>
<div style="width: 100%; text-align: right; padding: 20px 20px"
>维修费用小计{{ repairCost }}</div
>
</div>
<div>
<el-table :data="scrapList" @selection-change="handleSelectionChange">
<el-table
:data="scrapList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="报废费用明细" align="center">
<el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="结算工程" align="center" prop="projectName" :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="nuitName" :show-overflow-tooltip="true" />
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="报废原因" align="center" prop="scrapType" :show-overflow-tooltip="true">
<el-table-column
label="序号"
align="center"
type="index"
width="60"
/>
<el-table-column
label="结算单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="结算工程"
align="center"
prop="projectName"
: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="nuitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废原因"
align="center"
prop="scrapType"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span v-if="scope.row.scrapType == 0">自然</span>
<span v-if="scope.row.scrapType == 1">人为</span>
</template>
</el-table-column>
<el-table-column label="维修费用" align="center" prop="costs" :show-overflow-tooltip="true" />
<el-table-column
label="维修费用"
align="center"
prop="costs"
:show-overflow-tooltip="true"
/>
</el-table-column>
</el-table>
<div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计{{scrapCost}}</div>
<div style="width: 100%; text-align: right; padding: 20px 20px"
>报废费用小计{{ scrapCost }}</div
>
</div>
<div>
<el-table :data="loseList" @selection-change="handleSelectionChange">
<el-table
:data="loseList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="丢失费用明细" align="center">
<el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="结算工程" align="center" prop="projectName" :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="nuitName" :show-overflow-tooltip="true" />
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="丢失费用" align="center" prop="costs" :show-overflow-tooltip="true" />
<el-table-column
label="序号"
align="center"
type="index"
width="60"
/>
<el-table-column
label="结算单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="结算工程"
align="center"
prop="projectName"
: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="nuitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="丢失数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="丢失费用"
align="center"
prop="costs"
:show-overflow-tooltip="true"
/>
</el-table-column>
</el-table>
<div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计{{loseCost}}</div>
<div style="width: 100%; text-align: right; padding: 20px 20px"
>丢失费用小计{{ loseCost }}</div
>
</div>
<!-- 审批弹窗 -->
<el-dialog title="费用结算审核" :visible.sync="applyVisible" width="650px" append-to-body>
<el-dialog
title="费用结算审核"
:visible.sync="applyVisible"
width="650px"
append-to-body
>
<el-form ref="aform" :model="aform" label-width="120px">
<el-form-item label="结算审核" prop="status">
<el-radio v-model="aform.status" label="1">通过</el-radio>
@ -122,33 +367,36 @@
</el-form-item>
<el-form-item label="原因" prop="remark">
<el-input
v-model="aform.remark" maxlength="100"
placeholder="请输入" show-word-limit
size="small" style="width: 350px"
v-model="aform.remark"
maxlength="100"
placeholder="请输入"
show-word-limit
size="small"
style="width: 350px"
type="textarea"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitListForm"> </el-button>
<el-button type="primary" @click="submitListForm"
> </el-button
>
<el-button @click="applyVisible = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
import { getSltExamInfo,settlementReview } from "@/api/cost/cost";
import {
getAgreementList,
getUnitList,
getProjectList,
} from '@/api/claimAndRefund/receive'
import { getSltExamInfo, settlementReview } from '@/api/cost/cost'
export default {
name: "Agreement",
name: 'Agreement',
dicts: ['sys_normal_disable'],
data() {
return {
@ -168,11 +416,16 @@ export default {
unitList: [],
//
projectList: [],
statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //
statusList: [
{ id: '0', name: '请选择' },
{ id: '1', name: '已结算' },
{ id: '2', name: '未结算' },
{ id: '3', name: '待审核' },
], //
//
agreementList: [],
//
title: "",
title: '',
//
open: false,
//
@ -182,7 +435,6 @@ export default {
pageNum: 1,
pageSize: 10,
keyWord: undefined,
},
//
form: {},
@ -197,31 +449,51 @@ export default {
//
// uploadUrl:'http://192.168.0.14:21624/system',//线+system
// uploadUrl:'http://112.29.103.165:21626/system',//线+system
uploadUrl: process.env.VUE_APP_BASE_API + "/system", //
uploadUrl: process.env.VUE_APP_BASE_API + '/system', //
//
rules: {
contractCode: [
{ required: true, message: "合同编号不能为空", trigger: "blur" }
{
required: true,
message: '合同编号不能为空',
trigger: 'blur',
},
],
signTime: [
{ required: true, message: "签订日期不能为空", trigger: "blur" }
{
required: true,
message: '签订日期不能为空',
trigger: 'blur',
},
],
unitName: [
{ required: true, message: "往来单位不能为空", trigger: "blur" }
{
required: true,
message: '往来单位不能为空',
trigger: 'blur',
},
],
projectName: [
{ required: true, message: "工程名称不能为空", trigger: "blur" }
]
{
required: true,
message: '工程名称不能为空',
trigger: 'blur',
},
],
},
peopleOpen: false,
noticeOpen: false,
nform: {
notice:''
notice: '',
},
nrules: {
notice: [
{ required: true, message: "通知内容不能为空", trigger: "blur" }
]
{
required: true,
message: '通知内容不能为空',
trigger: 'blur',
},
],
},
aform: { status: '1' },
Id: '',
@ -236,51 +508,48 @@ export default {
costAll: 0,
deptName: undefined,
applyVisible: false,
applyList:[]
};
applyList: [],
}
},
created() {
this.Id = this.$route.query.Id;
this.getDataAll();
this.Id = this.$route.query.Id
this.getDataAll()
// this.getUnitList();
// this.getProjectList();
},
methods: {
// ,getUnitList, getProjectList
getUnitList() {
getUnitList().then(response => {
this.unitList = response.data;
getUnitList().then((response) => {
this.unitList = response.data
})
},
getProjectList() {
getProjectList().then(response => {
this.projectList = response.data;
getProjectList().then((response) => {
this.projectList = response.data
})
},
/** 查询列表 */
getDataAll() {
let param = {
id:this.Id
id: this.Id,
}
getSltExamInfo(param).then(response => {
getSltExamInfo(param).then((response) => {
// this.agreementList = response.rows;
this.leaseList = response.data.leaseList;//
this.leaseList = response.data.leaseList //
this.leaseCost = this.countCost(this.leaseList)
this.repairList = response.data.repairList;//
this.repairList = response.data.repairList //
this.repairCost = this.countCost(this.repairList)
this.scrapList = response.data.scrapList;//
this.scrapList = response.data.scrapList //
this.scrapCost = this.countCost(this.scrapList)
this.loseList = response.data.loseList;//
this.loseList = response.data.loseList //
this.loseCost = this.countCost(this.loseList)
this.applyList = response.data.relations;
this.applyList = response.data.relations
// this.applyList.forEach(item=>{
// item.cost = Number(item.leaseCost)+Number(item.repairCost)+Number(item.scrapCost)+Number(item.loseCost)+Number(item.addCost)-Number(item.subCost);
@ -288,13 +557,12 @@ export default {
// let costSum = Number(this.leaseCost)+Number(this.repairCost)+Number(this.scrapCost)+Number(this.loseCost);
this.costAll = response.data.cost
}
);
})
},
//1
countCost(list) {
let arrCost = 0;
list.forEach(item=>{
let arrCost = 0
list.forEach((item) => {
arrCost = arrCost + Number(item.costs)
// console.log(arrCost)
})
@ -321,10 +589,9 @@ export default {
id: this.Id,
status: this.aform.status,
remark: this.aform.remark,
}
console.log(param)
settlementReview(param).then(res => {
settlementReview(param).then((res) => {
console.log(res)
if (res.code == 200) {
this.$tab.closeOpenPage({
@ -338,42 +605,57 @@ export default {
this.$tab.closeOpenPage({
path: '/cost/cost/costList',
query: {
isEdit:true
}
isEdit: true,
},
})
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.agreementId)
this.ids = selection.map((item) => item.agreementId)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 导出按钮操作 */
//
handleExport1() {
this.downloadJson('material/sltAgreementInfo/exportLease',JSON.stringify(this.rowData), `租赁费用明细_${new Date().getTime()}.xlsx`)
this.downloadJson(
'material/sltAgreementInfo/exportLease',
JSON.stringify(this.rowData),
`租赁费用明细_${new Date().getTime()}.xlsx`,
)
},
//
handleExport2() {
this.downloadJson('material/sltAgreementInfo/exportLose',JSON.stringify(this.rowData), `丢失费用明细_${new Date().getTime()}.xlsx`)
this.downloadJson(
'material/sltAgreementInfo/exportLose',
JSON.stringify(this.rowData),
`丢失费用明细_${new Date().getTime()}.xlsx`,
)
},
//
handleExport3() {
this.downloadJson('material/sltAgreementInfo/exportRepair',JSON.stringify(this.rowData), `维修费用明细_${new Date().getTime()}.xlsx`)
this.downloadJson(
'material/sltAgreementInfo/exportRepair',
JSON.stringify(this.rowData),
`维修费用明细_${new Date().getTime()}.xlsx`,
)
},
//
handleExport4() {
this.downloadJson('material/sltAgreementInfo/exportScrap',JSON.stringify(this.rowData), `报废费用明细_${new Date().getTime()}.xlsx`)
this.downloadJson(
'material/sltAgreementInfo/exportScrap',
JSON.stringify(this.rowData),
`报废费用明细_${new Date().getTime()}.xlsx`,
)
},
handleExportAll() {
this.handleExport1()
this.handleExport2()
this.handleExport3()
this.handleExport4()
},
},
}
};
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {