diff --git a/src/api/costPush/costPush.js b/src/api/costPush/costPush.js index 029f82cf..60a48f36 100644 --- a/src/api/costPush/costPush.js +++ b/src/api/costPush/costPush.js @@ -182,3 +182,21 @@ export function submitPushCosts(params){ }) } +// 安全工机具租赁费用推送审核提交 +export function submitPushSafetyCosts(params){ + return request({ + url: '/material/iws_cost_push/safetyMaterialCostPush', + method: 'post', + data: params + }) +} + +// 安全工机具消耗性费用推送审核提交 +export function submitPushSafetyConsumeCosts(params){ + return request({ + url: '/material/iws_cost_push/safetyConsumeMaterialCostPush', + method: 'post', + data: params + }) +} + diff --git a/src/views/material/costPush/expendableExpensePush/index.vue b/src/views/material/costPush/expendableExpensePush/index.vue index 1fb17a4f..f2d5840b 100644 --- a/src/views/material/costPush/expendableExpensePush/index.vue +++ b/src/views/material/costPush/expendableExpensePush/index.vue @@ -60,7 +60,7 @@ 导出数据 - 提 交 + 提 交 @@ -70,13 +70,15 @@ fit highlight-current-row show-summary - :summary-method="getSummaries" + ref="multipleTable" + row-key="id" + :summary-method="ge---tSummaries" style="width: 100%" :max-height="650" @selection-change="selectionChange" > - + import { getProjectList, getUnitList, getAgreementInfoById } from '@/api/back/index.js' -import { getConsumPushCheckList, getConsumPushCheckListCount, consumeCheckData } from '@/api/costPush/costPush' +import { getConsumPushCheckList, getConsumPushCheckListCount, submitPushSafetyConsumeCosts } from '@/api/costPush/costPush' import TreeSelect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' @@ -164,6 +166,13 @@ export default { data() { return { showSearch: true, + // 非单个禁用 + single: true, + // 非多个禁用 + multiple: true, + // 多选框选中数据 + ids: [], + taskId:[], queryParams: { pageNum: 1, pageSize: 10, @@ -265,9 +274,12 @@ export default { } }, // 多选 - selectionChange(val) { - console.log('selectionChange', val) - this.selectionList = val + selectionChange(selection) { + console.log("xxxxxxxxxxxxx",selection) + this.taskId = selection.map((item) => item.taskId).filter(id => id != null) + this.ids = selection.map((item) => item.agreementId).filter(id => id != null) + this.single = selection.length != 1 + this.multiple = !selection.length }, // 合计 getSummaries() { @@ -360,6 +372,15 @@ export default { } }, submit() { + this.ids = this.ids.filter(id => id != null) + console.log("xxxxxxxxxxxxxxx",this.ids) + if (this.ids.length == 0) { + this.$message({ + type: 'warning', + message: '请选择数据', + }) + return; + } // 弹框确认 this.$confirm('是否确认提交?', '提示', { confirmButtonText: '确定', @@ -368,8 +389,11 @@ export default { }) .then(() => { try { - const cheks = JSON.stringify(this.selectionList) - consumeCheckData(cheks).then(res => { + let params = { + agreementIds: this.ids.filter(id => id != null), + taskId: this.taskId.filter(id => id!= null)[0] + } + submitPushSafetyConsumeCosts(params).then(res => { // 确定 this.$message({ type: 'success', diff --git a/src/views/material/costPush/leaseExpensePush/index.vue b/src/views/material/costPush/leaseExpensePush/index.vue index 2d1eff6b..8d198d14 100644 --- a/src/views/material/costPush/leaseExpensePush/index.vue +++ b/src/views/material/costPush/leaseExpensePush/index.vue @@ -61,7 +61,7 @@ 导出数据 - 提 交 + 提 交 @@ -71,13 +71,15 @@ fit highlight-current-row show-summary + ref="multipleTable" + row-key="id" :summary-method="getSummaries" style="width: 100%" :max-height="650" @selection-change="selectionChange" > - + - + /> --> @@ -176,7 +178,7 @@