diff --git a/src/views/material/cost/component/applyDetail.vue b/src/views/material/cost/component/applyDetail.vue
index 41136be7..73668a69 100644
--- a/src/views/material/cost/component/applyDetail.vue
+++ b/src/views/material/cost/component/applyDetail.vue
@@ -673,7 +673,8 @@ export default {
repairList: this.repairList,
scrapList: this.scrapList,
loseList: this.loseList,
- reductionList: this.reducList
+ reductionList: this.reducList,
+ settlementType: this.rowData[0].settlementType || ''
}
console.log('2222222222222', params)
submitCosts(params).then(response => {
@@ -681,7 +682,7 @@ export default {
type: 'success',
message: '提交成功'
})
- this.$emit('goBackPage')
+ this.$emit('isReset')
})
})
.catch(() => {})
diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue
index e7c7292a..4174300c 100644
--- a/src/views/material/cost/component/applyHome.vue
+++ b/src/views/material/cost/component/applyHome.vue
@@ -53,6 +53,17 @@
>
+
+
+
+
+
+
查询
重置
@@ -83,6 +94,15 @@
无待结费用
+
+
+ 工器具
+ 安全工器具
+
+ 总费用
+
+
+
@@ -375,12 +395,18 @@ export default {
pageNum: 1,
pageSize: 10,
sltStatus: '',
+ settlementType: '',
isCommit: '',
unitId: null,
projectId: null,
agreementId: [],
agreementCode: ''
},
+ settlementTypeList: [
+ { label: '总费用', value: '' },
+ { label: '工器具', value: '1' },
+ { label: '安全工器具', value: '2' },
+ ],
openPrint: false,
// 协议书内容
agreementContent: {
@@ -520,6 +546,7 @@ export default {
pageSize: this.queryParams.pageSize,
projectId: this.queryParams.projectId,
sltStatus: this.queryParams.sltStatus,
+ settlementType: this.queryParams.settlementType,
agreementCode: this.queryParams.agreementCode,
// ...this.queryParams,
unitIds: this.unitIds
@@ -543,6 +570,7 @@ export default {
pageNum: 1,
pageSize: 10,
sltStatus: '',
+ settlementType: '',
isCommit: '',
unitId: null,
projectId: null,
@@ -555,6 +583,7 @@ export default {
//结算申请
handleApply(row) {
console.log('🚀 handleApply 被调用,传入数据:', row)
+ row.settlementType = this.queryParams.settlementType
let arr = []
arr.push(row)
console.log('🚀 准备发送的数据:', arr)
@@ -580,6 +609,7 @@ export default {
this.multiple = !selection.length
},
async openPrintDialog(row) {
+ row.settlementType = this.queryParams.settlementType
this.openPrint = true
try {
const res = await getSltInfo([row])
diff --git a/src/views/material/cost/costApplyList.vue b/src/views/material/cost/costApplyList.vue
index 13fe021d..ed3c1668 100644
--- a/src/views/material/cost/costApplyList.vue
+++ b/src/views/material/cost/costApplyList.vue
@@ -6,12 +6,14 @@
:pageContent="pageContent"
@goBack="goBack"
/>
-
+
@@ -48,6 +50,12 @@ export default {
goBack() {
this.isShowComponent = 'ApplyHome'
},
+ isReset() {
+ this.isShowComponent = "ApplyHome"
+ this.$nextTick(() => {
+ this.$refs.componentRef.getList()
+ })
+ }
},
}