diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js index 92649296..4f45b47c 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js +++ b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js @@ -66,7 +66,7 @@ export function submitDelete(...group) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', + type: '2', name: '车间采购管理_发票结算申请单_删除数据', param: `发票结算申请单流水号=${group[0]}` } diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js b/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js index f96555ba..d363bf84 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js +++ b/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js @@ -12,7 +12,7 @@ export function searchTable1(...group) { ModularID: router.currentRoute.path, type: '1', name: '车间采购管理_发票结算申请单_查询数据', - param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`, + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`, Pagination: group[3] + '&' + group[4] } }) @@ -39,9 +39,23 @@ export function excuteApprove(...data) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '1', + type: '2', name: '车间采购管理_发票结算申请单_执行审批', - param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}` + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}` + } + }) +} +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 } }) } diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index ad60e67c..732f59b6 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -59,7 +59,7 @@ placeholder="选择日期时间"/> @@ -75,7 +75,7 @@ placeholder="选择日期时间"/> @@ -91,7 +91,7 @@ placeholder="选择日期时间"/> @@ -107,7 +107,7 @@ placeholder="选择日期时间"/> @@ -166,12 +166,12 @@ diff --git a/src/views/Assembly/ColdWorkPlanExecution/index.vue b/src/views/Assembly/ColdWorkPlanExecution/index.vue index 69096f03..38442f8f 100644 --- a/src/views/Assembly/ColdWorkPlanExecution/index.vue +++ b/src/views/Assembly/ColdWorkPlanExecution/index.vue @@ -69,12 +69,12 @@ diff --git a/src/views/Assembly/ElectricalAssembly/index.vue b/src/views/Assembly/ElectricalAssembly/index.vue index df582c81..dfca7808 100644 --- a/src/views/Assembly/ElectricalAssembly/index.vue +++ b/src/views/Assembly/ElectricalAssembly/index.vue @@ -49,22 +49,22 @@ @@ -115,12 +115,12 @@ diff --git a/src/views/Assembly/PaintPlanExecution/index.vue b/src/views/Assembly/PaintPlanExecution/index.vue index 889dbb57..7d53a4d2 100644 --- a/src/views/Assembly/PaintPlanExecution/index.vue +++ b/src/views/Assembly/PaintPlanExecution/index.vue @@ -69,12 +69,12 @@ diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index 1dcd3ba5..b24b3e77 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -136,7 +136,7 @@ @@ -597,11 +597,9 @@ export default { type: 'warning' }).then(() => { submitDelete(row.发票结算申请单流水号).then(response => { - if (response.data[0].result === '删除成功') { + if (response.data[0].result === '1') { this.$message.success('删除成功') this.searchTable1() - } else if (response.data[0].result === '删除失败') { - this.$message.error('已提交申请,删除失败') } else { this.$message.error('删除失败') } }) }).catch(() => { diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue index 821d30df..7b58330b 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue @@ -72,38 +72,39 @@ {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }} - + - + - + - + - + - + - + @@ -546,11 +546,9 @@ export default { type: 'warning' }).then(() => { submitDelete(row.发票结算申请单流水号).then(response => { - if (response.data[0].result === '删除成功') { + if (response.data[0].result === '1') { this.$message.success('删除成功') this.searchTable1() - } else if (response.data[0].result === '删除失败') { - this.$message.error('已提交申请,删除失败') } else { this.$message.error('删除失败') } }) }).catch(() => { diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue index 73657840..8cba4496 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue @@ -66,27 +66,7 @@ {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }} - - - - - - - - - - - - @@ -96,9 +76,20 @@ {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }} - + + + + + + + @@ -161,7 +152,7 @@