bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

费用结算

This commit is contained in:
zhouzy062 2024-02-26 10:17:48 +08:00
parent d0068ab35d
commit ad775627c5
5 changed files with 305 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-ui/src/api/claimAndRefund/return.js
View File

@ -9,7 +9,16 @@ export function ApiGetBackApplyList(query) {
}) })
} }
// 退料审核新增 // 退料审核列表
export function getBackAuditList(query) {
return request({
url: '/material/backApply/getBackAuditList',
method: 'get',
params: query
})
}
// 退料申请新增
export function ApiSubmitBackApply(query) { export function ApiSubmitBackApply(query) {
return request({ return request({
url: '/material/backApply/submitBackApply', url: '/material/backApply/submitBackApply',

33
sgzb-ui/src/api/cost/cost.js Normal file
View File

@ -0,0 +1,33 @@
import request from '@/utils/request'
// 查询费用结算列表
export function getSltAgreementInfo(query) {
return request({
url: '/material/sltAgreementInfo/getSltAgreementInfo',
method: 'get',
params: query
})
}

4
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -496,7 +496,7 @@
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { ApiGetBackApplyList, ApiGetView, ApiBackApplyAudit } from "@/api/claimAndRefund/return.js" import { getBackAuditList, ApiGetView, ApiBackApplyAudit } from "@/api/claimAndRefund/return.js"
import { import {
getInfo, h getInfo, h
} from "@/api/login"; } from "@/api/login";
@ -608,7 +608,7 @@ export default {
...this.queryParams ...this.queryParams
} }
console.log("paramsparamsparams", params) console.log("paramsparamsparams", params)
const res = await ApiGetBackApplyList(params) const res = await getBackAuditList(params)
this.typeList = res.data.rows; this.typeList = res.data.rows;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;

16
sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
View File

@ -38,13 +38,13 @@
<el-table-column label="外部租赁费用" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="外部租赁费用" align="center" prop="remark" :show-overflow-tooltip="true" />
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> /> -->
<div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计：97010.08</div> <div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计：97010.08</div>
</div> </div>
@ -63,13 +63,13 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> /> -->
<div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计：230</div> <div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计：230</div>
</div> </div>
@ -88,13 +88,13 @@
<el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" /> <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> /> -->
<div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计：230</div> <div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计：230</div>
</div> </div>
@ -112,13 +112,13 @@
<el-table-column label="丢失费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" /> <el-table-column label="丢失费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> /> -->
<div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计：230</div> <div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计：230</div>
</div> </div>

500
sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
View File

@ -1,255 +1,259 @@
<template> <template>
<div class="app-container" id="agreement"> <div class="app-container" id="agreement">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="结算单位" prop="unitId"> <el-form-item label="结算单位" prop="unitId">
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable> <el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable>
<el-option <el-option
v-for="item in unitList" v-for="item in unitList"
:key="item.unitId" :key="item.unitId"
:label="item.unitName" :label="item.unitName"
:value="item.unitId" :value="item.unitId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="结算工程" prop="projectId"> <el-form-item label="结算工程" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable> <el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable>
<el-option <el-option
v-for="item in projectList" v-for="item in projectList"
:key="item.projectId" :key="item.projectId"
:label="item.projectName" :label="item.projectName"
:value="item.projectId" :value="item.projectId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="结算状态" prop="projectId"> <el-form-item label="结算状态" prop="sltStatus">
<el-select v-model="queryParams.projectId" placeholder="请选择结算状态" clearable> <el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态" clearable>
<el-option <el-option
v-for="item in statusList" v-for="item in statusList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button <el-button
type="primary" type="primary"
plain plain
size="mini" size="mini"
>批量结算</el-button> >批量结算</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="60"/> <el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" /> <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
<!-- <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" /> <!-- <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" />
<el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" /> <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" />
<el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" /> --> <el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" /> -->
<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="projectName" :show-overflow-tooltip="true" /> <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
<el-table-column label="合计费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" /> <el-table-column label="合计费用" align="center" prop="cost" :show-overflow-tooltip="true" />
<!-- <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" :show-overflow-tooltip="true" /> <el-table-column label="结算状态" align="center" prop="sltStatus" :show-overflow-tooltip="true" />
<el-table-column label="授权人" align="center" prop="authPerson" :show-overflow-tooltip="true" /> <!-- <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
<el-table-column label="联系电话 " align="center" prop="phone" :show-overflow-tooltip="true" /> <el-table-column label="授权人" align="center" prop="authPerson" :show-overflow-tooltip="true" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> --> <el-table-column label="联系电话 " align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width"> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
<template slot-scope="scope"> <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="primary"
icon="el-icon-edit"
@click="handleApply(scope.row)"
>结算申请</el-button>
<el-button
size="mini" size="mini"
type="danger" type="primary"
icon="el-icon-delete" icon="el-icon-edit"
@click="handleDelete(scope.row)" @click="handleApply(scope.row)"
>撤销申请</el-button> >结算申请</el-button>
</template> <!-- <el-button
</el-table-column> size="mini"
</el-table> type="danger"
icon="el-icon-delete"
<pagination @click="handleDelete(scope.row)"
v-show="total>0" >撤销申请</el-button> -->
:total="total" </template>
:page.sync="queryParams.pageNum" </el-table-column>
:limit.sync="queryParams.pageSize" </el-table>
@pagination="getList"
/> <pagination
v-show="total>0"
</div> :total="total"
</template> :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
<script> @pagination="getList"
import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive"; />
export default {
name: "Agreement", </div>
dicts: ['sys_normal_disable'], </template>
data() {
return { <script>
// 遮罩层 import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
loading: true, import { getSltAgreementInfo } from "@/api/cost/cost";
// 选中数组
ids: [],
// 非单个禁用 export default {
single: true, name: "Agreement",
// 非多个禁用 dicts: ['sys_normal_disable'],
multiple: true, data() {
// 显示搜索条件 return {
showSearch: true, // 遮罩层
// 总条数 loading: true,
total: 0, // 选中数组
// 往来单位数据 ids: [],
unitList: [], // 非单个禁用
// 工程数据 single: true,
projectList: [], // 非多个禁用
statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合 multiple: true,
// 表格数据 // 显示搜索条件
agreementList: [], showSearch: true,
// 弹出层标题 // 总条数
title: "", total: 0,
// 是否显示弹出层 // 往来单位数据
open: false, unitList: [],
// 日期范围 // 工程数据
dateRange: [], projectList: [],
// 查询参数 statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
queryParams: { // 表格数据
pageNum: 1, agreementList: [],
pageSize: 10, // 弹出层标题
keyWord: undefined, title: "",
// 是否显示弹出层
}, open: false,
// 表单参数 // 日期范围
form: {}, dateRange: [],
//图片上传 // 查询参数
uploadHeader: process.env.VUE_APP_BASE_API, queryParams: {
imageUrl:'', pageNum: 1,
imageName:'', pageSize: 10,
fileList:[], keyWord: undefined,
field101fileList:[],
dialogImageUrl: '', },
dialogVisible: false, // 表单参数
//上传地址 form: {},
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system //图片上传
// uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system uploadHeader: process.env.VUE_APP_BASE_API,
uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址 imageUrl:'',
// 表单校验 imageName:'',
rules: { fileList:[],
contractCode: [ field101fileList:[],
{ required: true, message: "合同编号不能为空", trigger: "blur" } dialogImageUrl: '',
], dialogVisible: false,
signTime: [ //上传地址
{ required: true, message: "签订日期不能为空", trigger: "blur" } // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
], // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
unitName: [ uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
{ required: true, message: "往来单位不能为空", trigger: "blur" } // 表单校验
], rules: {
projectName: [ contractCode: [
{ required: true, message: "工程名称不能为空", trigger: "blur" } { required: true, message: "合同编号不能为空", trigger: "blur" }
] ],
}, signTime: [
peopleOpen:false, { required: true, message: "签订日期不能为空", trigger: "blur" }
noticeOpen:false, ],
nform:{ unitName: [
notice:'' { required: true, message: "往来单位不能为空", trigger: "blur" }
}, ],
nrules: { projectName: [
notice: [ { required: true, message: "工程名称不能为空", trigger: "blur" }
{ required: true, message: "通知内容不能为空", trigger: "blur" } ]
] },
}, peopleOpen:false,
deptName: undefined, noticeOpen:false,
}; nform:{
notice:''
},
nrules: {
notice: [
{ required: true, message: "通知内容不能为空", trigger: "blur" }
]
},
deptName: undefined,
};
},
created() {
this.getList();
this.getUnitList();
this.getProjectList();
},
methods: {
//获取单位类型 ,getUnitList, getProjectList
getUnitList(){
getUnitList().then(response => {
this.unitList = response.data;
})
}, },
created() { getProjectList(){
getProjectList().then(response => {
this.projectList = response.data;
})
},
/** 查询字典类型列表 */
getList() {
this.loading = true;
getSltAgreementInfo(this.queryParams).then(response => {
this.agreementList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.getUnitList();
this.getProjectList();
}, },
methods: { /** 重置按钮操作 */
//获取单位类型 ,getUnitList, getProjectList resetQuery() {
getUnitList(){ this.dateRange = [];
getUnitList().then(response => { this.resetForm("queryForm");
this.unitList = response.data; this.handleQuery();
}) },
}, //结算申请
getProjectList(){ handleApply(row){
getProjectList().then(response => { this.$tab.closeOpenPage({
this.projectList = response.data; path:'/cost/cost/costApplyAdd',
}) query:{
}, isEdit:true
/** 查询字典类型列表 */
getList() {
this.loading = true;
getAgreementList(this.queryParams).then(response => {
this.agreementList = response.rows;
this.total = response.total;
this.loading = false;
} }
); })
}, },
// 多选框选中数据
/** 搜索按钮操作 */ handleSelectionChange(selection) {
handleQuery() { this.ids = selection.map(item => item.agreementId)
this.queryParams.pageNum = 1; this.single = selection.length!=1
this.getList(); this.multiple = !selection.length
}, },
/** 重置按钮操作 */
resetQuery() { /** 删除按钮操作 */
this.dateRange = []; handleDelete(row) {
this.resetForm("queryForm"); // const agreementId = row.agreementId;
this.handleQuery(); // let param = {
}, // agreementId:row.agreementId+''
//结算申请 // }
handleApply(row){ // this.$modal.confirm('是否确认删除该数据项？').then(function() {
this.$tab.closeOpenPage({ // return removeAgreement(param);
path:'/cost/cost/costApplyAdd', // }).then(() => {
query:{ // this.getList();
isEdit:true // this.$modal.msgSuccess("删除成功");
} // }).catch(() => {});
}) },
}, /** 导出按钮操作 */
handleExport() {
// 多选框选中数据 // this.download('material/agreementInfo/export', {
handleSelectionChange(selection) { // ...this.queryParams
this.ids = selection.map(item => item.agreementId) // }, `协议_${new Date().getTime()}.xlsx`)
this.single = selection.length!=1 },
this.multiple = !selection.length
},
/** 删除按钮操作 */
handleDelete(row) {
// const agreementId = row.agreementId;
// let param = {
// agreementId:row.agreementId+''
// }
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
// return removeAgreement(param);
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("删除成功");
// }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('material/agreementInfo/export', {
// ...this.queryParams
// }, `协议_${new Date().getTime()}.xlsx`)
},
}
};
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 80px !important;
margin-bottom: 10px;
} }
</style> };
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 80px !important;
margin-bottom: 10px;
}
</style>