diff --git a/src/api/ManufacturingCenter/ContractApprovalQuery.js b/src/api/ManufacturingCenter/ContractApprovalQuery.js index eeceb5e8..1fce73a2 100644 --- a/src/api/ManufacturingCenter/ContractApprovalQuery.js +++ b/src/api/ManufacturingCenter/ContractApprovalQuery.js @@ -16,7 +16,7 @@ export function initBuyer() { }) } // 采购合同查询 -export function searchTable1(check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) { +export function searchTable1(radio, check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -25,7 +25,7 @@ export function searchTable1(check1, supplier, check2, start, end, check3, name, ModularID: router.currentRoute.path, type: '1', name: '采购管理_合同审核查询_查询数据', - param: '供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, + param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js index d54ec3f2..bba12053 100644 --- a/src/api/ManufacturingCenter/RequestApprovalQuery.js +++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js @@ -2,8 +2,8 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -// 查询审核/审批/付款 -export function initApproval(pageCurrent, pageSize, haha) { +// 初始化采购员 +export function initBuyer() { return request({ url: '', method: 'post', @@ -11,28 +11,27 @@ export function initApproval(pageCurrent, pageSize, haha) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${haha}`, + name: '人事档案管理_人员与角色_查询数据_采购员' + } + }) +} +// 采购合同查询 +export function searchTable1(radio, check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_情况审核查询_查询数据', + param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, Pagination: pageCurrent + '&' + pageSize } }) } -// 执行审核/审批/付款 -export function execApproval(num1, num2, reason, person, haha) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` - } - }) -} -// 查询离线合同审核/审批/付款 -export function initApprovalOffline(pageCurrent, pageSize, haha) { +// 采购合同明细查询 +export function searchTable2(num) { return request({ url: '', method: 'post', @@ -40,79 +39,8 @@ export function initApprovalOffline(pageCurrent, pageSize, haha) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_离线合同_审批付款_查询数据', - param: `审批_付款状态=${haha}`, - Pagination: pageCurrent + '&' + pageSize - } - }) -} -// 查询离线合同请款信息明细 -export function searchRequsetFundDetail1(num) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购合同_请款明细_查询数据', - param: `采购合同请款流水号=${num}` - } - }) -} -// 查询离线合同请款信息明细 -export function searchRequsetFundDetail2(num) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_离线合同_请款明细_查询数据', - param: `离线合同请款流水号=${num}` - } - }) -} -// 执行审核/审批/付款（离线合同） -export function execApprovalOffline(num1, num2, reason, person, haha) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '采购管理_离线合同_审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` - } - }) -} -// 采购合同内容查询 -export function searchContactDetail(check, num1, num2) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购合同内容_查询数据_合并后', - param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}` - } - }) -} -// 查询离线合同明细 -export function searchMateriel(num) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_离线合同明细_查询数据', - param: `离线合同流水号=${num}` + name: '采购管理_采购合同内容_查询数据', + param: '采购合同流水号=' + num } }) } diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue index f4805aea..94013c5d 100644 --- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue @@ -21,7 +21,10 @@ range-separator="～" start-placeholder="开始日期" end-placeholder="结束日期"/> - 查询 + 全部 + 通过 + 未过 + 查询 @@ -101,6 +104,7 @@ import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter export default { data() { return { + radio: '1', billNames: '', person: [], personValue: '', @@ -136,7 +140,7 @@ export default { this.billNames ? check1 = 1 : check1 = 0 this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') this.personValue ? check3 = 1 : check3 = 0 - searchTable1(check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => { + searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => { console.log(response.data) this.loading1 = false this.tableData1 = response.data.rows diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue index a6422de2..5c7836bc 100644 --- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue @@ -1,39 +1,88 @@