diff --git a/index.html b/index.html index c727e55c..32210826 100644 --- a/index.html +++ b/index.html @@ -8,31 +8,7 @@
- + diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index cb6176a7..f1c797f6 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -171,3 +171,15 @@ export function editInquirySheet(num1, num2, num3) { } }) } +// 编辑询价单 +export function saveOrder(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_询价单明细_保存数据', + param: `询价单明细流水号组=${num1}&数量组=${num2}&备注组=${num3}` + } + }) +} diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 68a160f5..5ffac52f 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -32,7 +32,7 @@ export function doneContract(...params) { data: { type: '2', name: '采购管理_采购合同_增加数据', - param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}` + param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}` } }) } diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js new file mode 100644 index 00000000..97df2770 --- /dev/null +++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js @@ -0,0 +1,111 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `发票号_check=${group[0]}&发票号=${group[1]}`, + Pagination: group[2] + '&' + group[3] + } + }) +} +// 编辑发票结算申请单 +export function submitEdit(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_修改数据', + param: `发票号=${group[0]}&发票金额=${group[1]}&已付款项=${group[2]}&尚欠金额=${group[3]}&税额=${group[4]}&是否费用类=${group[5]}&备注=${group[6]}&发票结算申请单流水号=${group[7]}` + } + }) +} +// 删除发票结算申请单 +export function submitDelete(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_删除数据', + param: `发票结算申请单流水号=${group[0]}` + } + }) +} +// 提交申请 发票结算申请单 +export function submitApply(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单_提交申请', + param: `发票结算申请单流水号=${group[0]}&申请人=${group[1]}` + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单查询 +export function searchInboundCard(data1, data2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单查询', + param: '入库单号_check=' + data1 + '&入库单号=' + data2 + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 发票结算申请单明细增加 +export function addTable2(data, group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_增加数据', + param: '发票结算申请单流水号=' + data + '&采购入库单流水号组=' + group + } + }) +} +// 发票结算申请单明细删除 +export function deleteTable2(group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_删除数据', + param: '发票结算申请单明细流水号组=' + group + } + }) +} diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js new file mode 100644 index 00000000..6c8898e1 --- /dev/null +++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`, + Pagination: group[3] + '&' + group[4] + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 执行审批 +export function excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_执行审批', + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}` + } + }) +} diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/api/PurchasingCenter/MaterialManagement.js index ab4513ce..3d258b15 100644 --- a/src/api/PurchasingCenter/MaterialManagement.js +++ b/src/api/PurchasingCenter/MaterialManagement.js @@ -82,7 +82,7 @@ export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, Mater data: { type: '2', name: '库存管理_物料主文件_基本_增加数据', - param: '物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 } }) } @@ -93,7 +93,7 @@ export function editData(MaterialValue, MaterialVariety, MaterialName, FullNameO data: { type: '2', name: '库存管理_物料主文件_基本_修改数据', - param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 } }) } diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 2088e18d..2995bcc8 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -122,15 +122,27 @@ export function deleteMateriel(num) { } }) } +// 保存离线合同 +export function saveOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_离线合同_保存合同', + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` + } + }) +} // 生成离线合同 -export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) { +export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_生成合同', - param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}` + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` } }) } diff --git a/src/api/PurchasingCenter/OfflineContractRequestFund.js b/src/api/PurchasingCenter/OfflineContractRequestFund.js index 2c72eb31..ea8e9add 100644 --- a/src/api/PurchasingCenter/OfflineContractRequestFund.js +++ b/src/api/PurchasingCenter/OfflineContractRequestFund.js @@ -55,7 +55,7 @@ export function cancelRequestFund(num) { url: '', method: 'post', data: { - type: '2', + type: '1', name: '采购管理_离线合同_请款_删除数据', param: `离线合同请款流水号=${num}` } diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index bdcc0daf..f4210aca 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -65,7 +65,7 @@ export function cancelRequestFund(num1) { url: '', method: 'post', data: { - type: '2', + type: '1', name: '采购管理_采购请款表_删除数据', param: '采购请款流水号=' + num1 } diff --git a/src/icons/svg/InvoiceSettlementApplication.svg b/src/icons/svg/InvoiceSettlementApplication.svg new file mode 100644 index 00000000..6640f8dc --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApplication.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/InvoiceSettlementApprove.svg b/src/icons/svg/InvoiceSettlementApprove.svg new file mode 100644 index 00000000..300ca023 --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApprove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 93330a41..5ffdedab 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -26,8 +26,8 @@ :data="tableData11" :row-class-name="tableRowClassName" border - style="width: 100%;max-height: 300px;" - height="300px" + style="width: 100%;max-height: 600px;" + height="600px" size="mini" @selection-change="handleSelectionChange1"> @@ -48,11 +48,21 @@ {{ scope.row.物料计划到货时间.split(' ')[0] }} - + + + + + + + - + + + + + + + - + @@ -278,33 +297,55 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> + 导出 + 保存 - - + + - + - + - + - + + + + + + + + + + + + +