From 01b88dc2522aefafeea5ed2b7e45d52701150627 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 22 Aug 2024 18:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/cost/cost.js | 27 -
.../csotSettlement/component/exportDialog.vue | 92 --
.../component/finishAndDetails.vue | 414 -------
.../csotSettlement/component/finishTable.vue | 420 -------
.../csotSettlement/component/monthRecord.vue | 347 ------
.../cost/csotSettlement/costApplyAdd.vue | 766 +++++++------
.../cost/csotSettlement/costApplyList.vue | 565 ++++-----
src/views/cost/csotSettlement/costExame.vue | 1009 +++++++++++------
src/views/cost/csotSettlement/costList.vue | 25 +-
9 files changed, 1384 insertions(+), 2281 deletions(-)
delete mode 100644 src/views/cost/csotSettlement/component/exportDialog.vue
delete mode 100644 src/views/cost/csotSettlement/component/finishAndDetails.vue
delete mode 100644 src/views/cost/csotSettlement/component/finishTable.vue
delete mode 100644 src/views/cost/csotSettlement/component/monthRecord.vue
diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js
index 2f5d37b..a9dc86c 100644
--- a/src/api/cost/cost.js
+++ b/src/api/cost/cost.js
@@ -55,33 +55,6 @@ export function settlementReview(query) {
params: query
})
}
-/**
- * 7.29
- */
-
-/** 完工结算查询 */
-export const getComSellQueryApi = (params) => {
- return request.post('/material/sltAgreementInfo/getSltInfo', params)
-}
-/** 编辑后保存接口 */
-export const editSaveApi = (params) => {
- return request.post('/material/sltAgreementInfo/updateTrimDay', params)
-}
-/** 确认结算接口 01和03费用承担方单独结算接口*/
-export const submitFeeBearApi = (params) => {
- return request.post('/material/sltAgreementInfo/submitFeeBear', params)
-}
-/** 获取月结记录接口*/
-export const getMonthRecordApi = (params) => {
- return request.post('/material/sltAgreementInfo/getSltInfoMonth', params)
-}
-
-/** 确认结算接口所有结算*/
-export const submitAllFeeBearApi = (params) => {
- return request.post('/material/sltAgreementInfo/submitFee', params)
-}
-
-
diff --git a/src/views/cost/csotSettlement/component/exportDialog.vue b/src/views/cost/csotSettlement/component/exportDialog.vue
deleted file mode 100644
index d628b3f..0000000
--- a/src/views/cost/csotSettlement/component/exportDialog.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
deleted file mode 100644
index a90ad2b..0000000
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ /dev/null
@@ -1,414 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认完工结算
-
-
-
-
-
-
-
diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue
deleted file mode 100644
index df04fca..0000000
--- a/src/views/cost/csotSettlement/component/finishTable.vue
+++ /dev/null
@@ -1,420 +0,0 @@
-
-
-
-
-
- 调整天数批量设置:
-
-
-
- {{
- currRowInfo.isSlt == 0
- ? '勾选需要赔偿的维修项目'
- : '已选的维修赔偿项目'
- }}
-
- {{
- constBear === 1 ? '费用承担方:01' : '费用承担方:03'
- }}
-
- 合计:{{ totalPrice }}元
-
- {{ tableTitle }}
-
- 导出
- {{ isEdit ? '取消编辑' : '编辑' }}
- 确认结算
- 保存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 待报废
-
-
- {{ scope.row[t.t_prop] }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue
deleted file mode 100644
index 0d242a3..0000000
--- a/src/views/cost/csotSettlement/component/monthRecord.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
- 批量导出
-
-
-
-
-
-
-
-
-
-
-
-
- 明细
- 导出明细表
-
-
-
-
-
-
-
-
-
-
- 领用单位:{{ monthDetailsInfo.unitName || '' }}
-
-
- 月结月份:
- {{ monthDetailsInfo.month || '' }}
-
-
-
- 工程名称:{{ monthDetailsInfo.projectName || '' }}
-
-
- 费用承担方:{{
- monthDetailsInfo.costBearingParty || ''
- }}
-
- {{
- monthDetailsInfo.costBearingParty == '01'
- ? '(项目)'
- : '(分包)'
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/cost/csotSettlement/costApplyAdd.vue b/src/views/cost/csotSettlement/costApplyAdd.vue
index 7b29782..f52d00c 100644
--- a/src/views/cost/csotSettlement/costApplyAdd.vue
+++ b/src/views/cost/csotSettlement/costApplyAdd.vue
@@ -34,9 +34,8 @@
结算费用合计:¥{{ costAll }},租赁费用¥{{ leaseCost }},维修费用¥{{
repairCost
- }},报废费用¥{{ scrapCost }},丢失费用{{ loseCost }}。
+ }},报废费用¥{{ scrapCost }},丢失费用{{ loseCost }}
-
-
+
-
+
@@ -352,7 +351,7 @@
title="费用结算提交"
align="center"
:visible.sync="applyVisible"
- width="1200px"
+ width="80%"
>
-
+ > -->
+
+
+
-
+ > -->
+
+
+
@@ -472,322 +501,407 @@
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index 1cf0910..a4b7f93 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -1,217 +1,213 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 批量结算
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
- 批量导出月结明细表
-
-
-
-
+ {{
+ (queryParams.pageNum - 1) * 10 + scope.$index + 1
+ }}
+ -->
+
+
+
+
+
+
+
-
-
-
+
+ 未结算
+ 已结算
+ 已审核
+
+
+
+
+
+
+ 结算申请
+
+
+
+
-
-
-
-
-
-
- 结算中
- 已结算
-
-
-
-
- 月结记录
- {{
- row.isSlt == 1 ? '结算明细' : '完工结算'
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/cost/csotSettlement/costExame.vue b/src/views/cost/csotSettlement/costExame.vue
index 5435963..1a48c4e 100644
--- a/src/views/cost/csotSettlement/costExame.vue
+++ b/src/views/cost/csotSettlement/costExame.vue
@@ -1,383 +1,668 @@
-
-
-
-
- 租赁明细导出
- 丢失明细导出
- 维修明细导出
- 报废明细导出
- 全部明细导出
- 审批
-
-
- 返回
-
-
-
- 结算费用合计:¥{{costAll}}:
-
- 租赁费用¥{{item.leaseCost}},维修费用¥{{item.repairCost}},报废费用¥{{item.scrapCost}},丢失费用{{item.loseCost}},增加项费用¥{{item.addCost}},减免费用¥{{item.subCost}},增减原因:{{item.remark}}。
-
-
-
+
+
+
+ 租赁明细导出
+ 丢失明细导出
+ 维修明细导出
+ 报废明细导出
+ 全部明细导出
+ 审批
+
+
+ 返回
+
+
+
+ 结算费用合计:¥{{ costAll }}:
+
+ 租赁费用¥{{ item.leaseCost }},维修费用¥{{
+ item.repairCost
+ }},报废费用¥{{ item.scrapCost }},丢失费用{{
+ item.loseCost
+ }},增加项费用¥{{ item.addCost }},减免费用¥{{
+ item.subCost
+ }},增减原因:{{ item.remark }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
租赁费用小计:{{leaseCost}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 未审核
- 已审核
-
-
-
-
-
-
- 不收费
- 收费
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
维修费用小计:{{repairCost}}
+
+
租赁费用小计:{{ leaseCost }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
维修费用小计:{{ repairCost }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 自然
+ 人为
+
+
+
+
+
+
报废费用小计:{{ scrapCost }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
丢失费用小计:{{ loseCost }}
+
+
+
+
+
+ 通过
+ 不通过
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 自然
- 人为
-
-
-
-
-
-
报废费用小计:{{scrapCost}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
丢失费用小计:{{loseCost}}
-
-
-
-
-
- 通过
- 不通过
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/views/cost/csotSettlement/costList.vue b/src/views/cost/csotSettlement/costList.vue
index c8a896e..56bec74 100644
--- a/src/views/cost/csotSettlement/costList.vue
+++ b/src/views/cost/csotSettlement/costList.vue
@@ -82,26 +82,21 @@
@selection-change="handleSelectionChange"
>
-
-
+ >
+
+
审批