diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index 358b60bf..9b76969f 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -7,7 +7,7 @@ export function initApproval(pageCurrent, pageSize, state) { method: 'post', data: { type: '1', - name: '采购管理_请款表_查询数据_审批付款', + name: '采购管理_采购合同_审批付款_查询数据', param: `审批_付款状态=${state}`, Pagination: pageCurrent + '&' + pageSize } @@ -20,8 +20,8 @@ export function execApproval(num1, num2, reason, person, state) { method: 'post', data: { type: '2', - name: '采购管理_请款表_修改数据_审批付款', - param: `采购请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + name: '采购管理_采购合同_审批付款_修改数据', + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` } }) } @@ -39,7 +39,19 @@ export function initApprovalOffline(pageCurrent, pageSize, state) { }) } // 查询离线合同请款信息明细 -export function searchRequsetFundDetail(num) { +export function searchRequsetFundDetail1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 查询离线合同请款信息明细 +export function searchRequsetFundDetail2(num) { return request({ url: '', method: 'post', diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index f4210aca..d93c810c 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -11,66 +11,6 @@ export function searchTable0(check, date1, date2) { } }) } -// 初始化合同 -export function initContract() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购请款表_查询数据' - } - }) -} -// 查询表1 -export function searchTable1(...params) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购请款表_查询数据', - param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5], - Pagination: params[0] + '&' + params[1] - } - }) -} -// 查询请款进度 -export function searchCondition(num1) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购请款表_请款进度_查询数据', - param: '采购合同流水号=' + num1 - } - }) -} -// 请款 -export function requestFund(num1, money, time, id) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '采购管理_采购请款表_增加数据', - param: `采购合同流水号=${num1}&请款金额=${money}&请款人=${id}&请款时间=${time}` - } - }) -} -// 取消请款 -export function cancelRequestFund(num1) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '采购管理_采购请款表_删除数据', - param: '采购请款流水号=' + num1 - } - }) -} // 采购合同内容查询 export function searchContract(num) { return request({ @@ -83,3 +23,75 @@ export function searchContract(num) { } }) } +// 查询请款表 +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_请款_查询数据', + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 查询离线合同待请款信息 +export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_采购合同_请款_增加数据', + param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` + } + }) +} +// 查询离线合同待请款信息 +export function searchRequsetFundDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 取消请款 +export function cancelRequestFund(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_请款_删除数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 查询离线合同待请款信息 +export function searchPurchaseContract(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购合同_查询数据', + param: `供应商流水号_check=${check}&供应商流水号=${num}` + } + }) +} diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 70f64b13..53b646c5 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -2,38 +2,44 @@
- - - - - - - + - + - + - + - + @@ -77,7 +83,7 @@