diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index 3fed5a75..d54ec3f2 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 查询审核/审批/付款 -export function initApproval(pageCurrent, pageSize, state) { +export function initApproval(pageCurrent, pageSize, haha) { return request({ url: '', method: 'post', @@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${haha}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审核/审批/付款 -export function execApproval(num1, num2, reason, person, state) { +export function execApproval(num1, num2, reason, person, haha) { return request({ url: '', method: 'post', @@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` } }) } // 查询离线合同审核/审批/付款 -export function initApprovalOffline(pageCurrent, pageSize, state) { +export function initApprovalOffline(pageCurrent, pageSize, haha) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_离线合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${haha}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -75,7 +75,7 @@ export function searchRequsetFundDetail2(num) { }) } // 执行审核/审批/付款（离线合同） -export function execApprovalOffline(num1, num2, reason, person, state) { +export function execApprovalOffline(num1, num2, reason, person, haha) { return request({ url: '', method: 'post', @@ -84,7 +84,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_离线合同_审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}` } }) } diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js index 2ec6115f..86f775a7 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/api/WorkshopProcurement/FundApproval.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 查询审批/付款 -export function initApproval(pageCurrent, pageSize, state) { +export function initApproval(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审批/付款 -export function execApproval(num1, num2, reason, person, state) { +export function execApproval(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } // 查询车间合同审批/付款 -export function initApproval1(pageCurrent, pageSize, state) { +export function initApproval1(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function initApproval1(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_采购合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -60,7 +60,7 @@ export function searchRequsetFundDetail3(num) { }) } // 执行车间合同审批/付款 -export function execApproval1(num1, num2, reason, person, state) { +export function execApproval1(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -69,12 +69,12 @@ export function execApproval1(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_采购合同_审批付款_修改数据', - param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } // 查询离线合同审批/付款 -export function initApprovalOffline(pageCurrent, pageSize, state) { +export function initApprovalOffline(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -83,7 +83,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_离线合同_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -103,7 +103,7 @@ export function searchRequsetFundDetail(num) { }) } // 执行审批/付款（离线合同） -export function execApprovalOffline(num1, num2, reason, person, state) { +export function execApprovalOffline(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -112,7 +112,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_离线合同_审批付款_修改数据', - param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } @@ -131,7 +131,7 @@ export function searchRequsetFundDetail1(num) { }) } // 查询备料审批/付款 -export function initApprovalMaterials(pageCurrent, pageSize, state) { +export function initApprovalMaterials(pageCurrent, pageSize, state2) { return request({ url: '', method: 'post', @@ -140,13 +140,13 @@ export function initApprovalMaterials(pageCurrent, pageSize, state) { ModularID: router.currentRoute.path, type: '1', name: '备料管理_审批付款_查询数据', - param: `审批_付款状态=${state}`, + param: `审批_付款状态=${state2}`, Pagination: pageCurrent + '&' + pageSize } }) } // 执行审批/付款（备料） -export function execMaterials(num1, num2, reason, person, state) { +export function execMaterials(num1, num2, reason, person, state2) { return request({ url: '', method: 'post', @@ -155,7 +155,7 @@ export function execMaterials(num1, num2, reason, person, state) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_审批付款_修改数据', - param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` } }) } diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 0bbb19fa..09a2e50c 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -2,7 +2,6 @@
- {{ item.name }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 交货期： - - 制造: - - 制造部采购 - - 金工: - - 车间生产 - - 采购: - - 采购部门采购 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 交货期： + + 制造: + + 制造部采购 + + 金工: + + 车间生产 + + 采购: + + 采购部门采购 + - 查询 新增 @@ -253,20 +219,15 @@ - - + + - - - - - - + @@ -281,17 +242,9 @@ {{ scope.row.备注 }} - - - - - - - - - - + + @@ -304,7 +257,7 @@ {{ scope.row.图号或型号 }} - + @@ -314,7 +267,7 @@ {{ scope.row.零件数量 }} - + @@ -324,11 +277,6 @@ {{ scope.row.物料计划到货时间 }} - - - - - - - + + @@ -370,7 +318,6 @@ size="small" style="width:200px"/> -