diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/api/MarketingCenter/ComprehensiveInquiryMS.js index 92319fb9..a5dba081 100644 --- a/src/api/MarketingCenter/ComprehensiveInquiryMS.js +++ b/src/api/MarketingCenter/ComprehensiveInquiryMS.js @@ -31,14 +31,14 @@ export function SelectMarketingManager(code) { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) { return request({ url: '', method: 'post', data: { type: '1', name: '合同信息管理_合同信息_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js index 00e6287c..3f52314e 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/api/MarketingCenter/ContractCapitalManagement.js @@ -20,14 +20,14 @@ export function initMarketingManager() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同资金管理_资金信息_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int', + name: '合同资金管理_资金信息_查询1', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string', Pagination: pageCurrent + '&' + pageSize } }) @@ -237,7 +237,7 @@ export function fukuan(code, num1, num2) { method: 'post', data: { type: '2', - name: '合同资金管理_批次付款明细表_增加数据', + name: '合同资金管理_批次付款明细表_增加数据_新', param: '批次资金ID=' + code + '=int&本次收款金额=' + num1 + '=string&本次收款时间=' + num2 + '=string' } }) @@ -368,8 +368,18 @@ export function never(num1) { method: 'post', data: { type: '2', - name: '合同资金管理_催收账款_不再提醒', + name: '合同资金管理_资金信息_查询', param: '批次资金ID=' + num1 + '=int' } }) } +export function getcustomername() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同资金管理_资金信息_查询_新' + } + }) +} diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js index b828ad70..5a8ba895 100644 --- a/src/api/MarketingCenter/ContractInformationManagement.js +++ b/src/api/MarketingCenter/ContractInformationManagement.js @@ -20,14 +20,14 @@ export function initMarketingManager() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) { return request({ url: '', method: 'post', data: { type: '1', name: '合同信息管理_合同信息_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string', Pagination: pageCurrent + '&' + pageSize } }) @@ -49,7 +49,7 @@ export function delList(num) { method: 'post', data: { type: '2', - name: '合同信息管理_合同信息_删除', + name: '合同信息管理_合同信息_删除_合同收款计划', param: '合同ID=' + num + '=int' } }) @@ -60,8 +60,8 @@ export function addList() { method: 'post', data: { type: '2', - name: '基础表_合同信息表_增加数据', - param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + name: '基础表_合同信息表_增加数据_新', + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + '&合同总额=' + arguments[12] } }) } diff --git a/src/api/MarketingCenter/CreateProject.js b/src/api/MarketingCenter/CreateProject.js index 33408fec..d8ddfc41 100644 --- a/src/api/MarketingCenter/CreateProject.js +++ b/src/api/MarketingCenter/CreateProject.js @@ -10,14 +10,14 @@ export function initProject() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10) { +export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10, num11, num12) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同信息管理_合同信息_制造部_查询', - param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', + name: '合同信息管理_合同信息_制造部_查询_新', + param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js index 8f4ae65f..ea73961a 100644 --- a/src/api/MarketingCenter/InvoiceRecord.js +++ b/src/api/MarketingCenter/InvoiceRecord.js @@ -10,14 +10,14 @@ export function initProject() { } }) } -export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { +export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { return request({ url: '', method: 'post', data: { type: '1', name: '合同资金管理_开票记录_合同信息统计_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&客户名称=' + num9 + '=string&客户名称_check=' + num10 + '=int', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/MarginManagement.js b/src/api/MarketingCenter/MarginManagement.js new file mode 100644 index 00000000..e69de29b diff --git a/src/api/MarketingCenter/PerformanceBond.js b/src/api/MarketingCenter/PerformanceBond.js index aa498530..be422e34 100644 --- a/src/api/MarketingCenter/PerformanceBond.js +++ b/src/api/MarketingCenter/PerformanceBond.js @@ -10,14 +10,14 @@ export function initProject() { } }) } -export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) { +export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同信息管理_履约保证金_合同信息统计_查询', - param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date', + name: '合同信息管理_履约保证金_合同信息统计_查询_新', + param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/SafetyMargin.js b/src/api/MarketingCenter/SafetyMargin.js index d2d5f1bc..e1007914 100644 --- a/src/api/MarketingCenter/SafetyMargin.js +++ b/src/api/MarketingCenter/SafetyMargin.js @@ -112,14 +112,14 @@ export function TakeBack() { } }) } -export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) { +export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同信息管理_安全保证金_合同信息统计_查询', - param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date', + name: '合同信息管理_安全保证金_合同信息统计_查询_新', + param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/ShippingInquiries.js b/src/api/MarketingCenter/ShippingInquiries.js new file mode 100644 index 00000000..71898ec7 --- /dev/null +++ b/src/api/MarketingCenter/ShippingInquiries.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function InvoiceListSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_发货单列表_查询', + param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=0\\&结束发货日期_check=0' + } + }) +} + +export function DetailsFeach() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单明细_查询', + param: '发货单流水号=' + arguments[0] + } + }) +} diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 60b8c4a6..7b2f3d91 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -76,14 +76,14 @@ export function getExport2(num) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', - name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, + name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单', + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -95,7 +95,7 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后', + name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单', param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } @@ -301,7 +301,7 @@ export function searchMachine(num) { data: { type: '1', name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + param: '项目流水号_check=0&项目流水号=' + num } }) } diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index 5a696614..d334f78d 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -75,14 +75,14 @@ export function execApprovalOffline(num1, num2, reason, person, state) { }) } // 采购合同内容查询 -export function searchContactDetail(num) { +export function searchContactDetail(check, num1, num2) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同内容_查询数据', - param: '采购合同流水号=' + num + name: '采购管理_采购合同内容_查询数据_合并后', + param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}` } }) } diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js index 198aeb3b..0d765617 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js @@ -30,8 +30,8 @@ export function searchTable1(...group) { data: { type: '1', name: '采购管理_发票结算申请单_查询数据', - param: `发票号_check=${group[0]}&发票号=${group[1]}`, - Pagination: group[2] + '&' + group[3] + param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}`, + Pagination: group[4] + '&' + group[5] } }) } diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index b0fee696..009a1eae 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -208,14 +208,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2 }) } // 查询分配后的标准件和外购件 -export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) { +export function searchMaterial1(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', - name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, + name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191109', + param: `名称规格型号_check=${check1}&名称规格型号=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -233,15 +233,16 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va } }) } -// 查询分配后的仓库采购件 -export function searchMaterial22(num1, check1, val1, check2, val2, check3, val3, person, val8, val9, val10) { +// 查询物料 +export function searchMaterial22(check1, val1, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_仓库采购_离线合同_查询', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}` + name: '采购管理_离线采购_物料主文件_基本_查询数据', + param: `名称规格型号_check=${check1}&名称规格型号=${val1}`, + Pagination: pageCurrent + '&' + pageSize } }) } @@ -264,7 +265,7 @@ export function searchMachine(num) { data: { type: '1', name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + param: '项目流水号_check=0&项目流水号=' + num } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 4c8c7443..e00fd12b 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -12,14 +12,14 @@ export function searchTable0(check, date1, date2) { }) } // 采购合同内容查询 -export function searchContract(num) { +export function searchContract(check, num1, num2) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同内容_查询数据', - param: '采购合同流水号=' + num + name: '采购管理_采购合同内容_查询数据_合并后', + param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}` } }) } @@ -48,14 +48,14 @@ export function searchSupplier() { }) } // 采购合同请款 -export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { +export function submitRequestFund(contractGroup, offGroup, sumGroup, supplier, money, person) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_采购合同_请款_增加数据', - param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` + name: '采购管理_采购合同_请款_增加数据_合并后', + param: `采购合同流水号组=${contractGroup}&离线合同流水号组=${offGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` } }) } @@ -84,14 +84,14 @@ export function cancelRequestFund(num) { }) } // 查询离线合同待请款信息 -export function searchPurchaseContract(check, num) { +export function searchPurchaseContract(check1, check, num) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同_查询数据', - param: `供应商流水号_check=${check}&供应商流水号=${num}` + name: '采购管理_采购合同_查询数据_合并后', + param: `check=${check1}&供应商流水号_check=${check}&供应商流水号=${num}` } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js index 0294e9c4..244d6ca2 100644 --- a/src/api/PurchasingCenter/PurchaseContractSearch.js +++ b/src/api/PurchasingCenter/PurchaseContractSearch.js @@ -29,7 +29,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, method: 'post', data: { type: '1', - name: '采购管理_合同_查询数据_采购部采购', + name: '采购管理_合同_查询数据_采购部采购_新', param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review, Pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index f326320b..d5399312 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -53,7 +53,7 @@ export function searchMachine(num) { data: { type: '1', name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + param: '项目流水号_check=0&项目流水号=' + num } }) } @@ -76,7 +76,7 @@ export function searchTable1(...params) { method: 'post', data: { type: '1', - name: 'xqs_采购管理_采购部采购_查询物料_分配后', + name: 'xqs_采购管理_采购部采购_查询物料_分配后_采购任务分配', param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`, Pagination: params[0] + '&' + params[1] } @@ -89,7 +89,7 @@ export function searchTable2(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后', + name: '采购管理_采购部采购_查询物料_基本件_分配后_采购任务分配', param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}`, Pagination: params[0] + '&' + params[1] } diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index ad68cd63..01b99b33 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -47,3 +47,15 @@ export function searchReceiveCheck(check1, num1, check2, num2, check3, num3) { } }) } +// 机床名称 +export function getMachines() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + } + }) +} diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index a3d40405..3336ea87 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -7,7 +7,7 @@ v-model="entryNameValue" :remote-method="remoteMethod" placeholder="项目名称" - style="margin-right: 10px" + style="margin-right: 10px; width: 150px" size="small" clearable filterable @@ -21,14 +21,14 @@ :value="item.value"/> 机床图号: - + - 查询 + 查询 @@ -38,7 +38,6 @@ style="width: 100%;max-height: 400px;" stripe size="mini" - height="300" highlight-current-row border @row-click="searchSpareParts"> @@ -68,137 +67,143 @@ -
- -
- - - - 组号: - - - - 零件图号: - - 查询 - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -211,7 +216,7 @@ export default { pageSize: 10, total: 0, pageCurrent1: 1, - pageSize1: 10, + pageSize1: 1000000, total1: 0, list: [], check3: '', diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 41579e2f..404f9fa7 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -3,9 +3,9 @@
- - - + + + - 查询 + 查询
- + - + @@ -55,7 +55,7 @@ {{ scope.row.货位名称 }} - + @@ -645,6 +691,8 @@ export default { }, data() { return { + customerName1: '', + customerName1_check: '', tableDataLoadingDeliveryManagement: false, tableDataDeliveryManagement: [], dialogVisible: false, @@ -726,13 +774,14 @@ export default { this.peoplename = row.姓名 }, fetchTableData1() { + if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 } if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 } if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 } if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 } if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 } this.listLoading = true - this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading']) + this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading']) this.tableDataInvoiceRecord = [] this.tableDataContractCapitalManagement = [] this.tableDataSafetyMargin = [] diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 7e7e4ba4..5c887249 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -9,10 +9,18 @@ :label="item.label" :value="item.value"/> - 营销经理： - + + + 客户名称： + + + 查询 - 新增 + 查看收款信息 @@ -62,9 +70,9 @@ {{ scope.row.项目名称 }} - + @@ -72,59 +80,59 @@ {{ scope.row.付款方式 }} - + - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233,16 +241,6 @@ {{ scope.row.已收金额 }} - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -540,7 +548,7 @@ + + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index f03eab2c..3e0b5081 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -9,22 +9,23 @@ :label="item.label" :value="item.value"/> - 开始日期： - - 结束日期： - + + + + + + + + + + + + + + + + + 查询 @@ -84,7 +85,7 @@ {{ scope.row.合同信息备注 }} - + @@ -128,44 +129,29 @@ {{ scope.row.供货商 }} - - - - - - + - - - - - - - - - - - - - - + + + + - + @@ -211,7 +197,7 @@ {{ scope.row.备注 }} - + @@ -244,37 +230,35 @@ @size-change="handleSizeChange11" @current-change="handleCurrentChange11"/> - + - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + 查询 + 导出未询价单 - 查询 - 导出未询价物料清单 - -
- - - - 确定 -
- 调整采购任务 - + 调整采购任务 + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + @@ -728,9 +720,9 @@ {{ scope.row.技术下达数量 }} - + @@ -740,7 +732,7 @@ @@ -760,8 +752,8 @@ @@ -771,7 +763,7 @@ - @@ -245,8 +152,33 @@ export default { this.fetchData() }, methods: { + getSummaries2(param) { // 合计 + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价' + return + } else if (index === 2 || index === 3) { + const values = data.map(item => Number(item[column.property])) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] = sums[index].toFixed(2) + ' 元' + } else { + sums[index] = 'N/A' + } + } + }) + return sums + }, showOffline(row) { - console.log(row, 222) const children = document.getElementsByClassName('tableData') const parent = document.getElementsByClassName('offlineContract')[0] if (children.length !== 0) { @@ -285,13 +217,13 @@ export default { document.getElementById('remark').innerHTML = row.离线合同备注 }, searchContactDetail(row) { - document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop - searchContactDetail(row.采购合同流水号).then(response => { - this.contractDetail1 = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.contractDetail2 = response.data }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 - document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop searchMateriel(row.离线合同流水号).then(response => { this.contractDetail2 = response.data this.showOffline(row) @@ -303,7 +235,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 7) { + } else if (index === 6) { const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -314,7 +246,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } @@ -357,6 +289,8 @@ export default { this.searchTable2() }, searchTable01(row) { // 查看详情（请款信息包含的合同） + this.gridData1 = [] + this.contractDetail2 = [] searchRequsetFundDetail1(row.采购合同请款流水号).then(response => { this.gridData1 = response.data }) diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue index 0c0738c5..7f8f18b0 100644 --- a/src/views/PurchasingCenter/FundApproval3/index.vue +++ b/src/views/PurchasingCenter/FundApproval3/index.vue @@ -2,7 +2,7 @@

采购合同

- + - + @@ -58,114 +42,77 @@ @current-change="handleCurrentChange1"/>
- -

离线合同

- - - - - - - - - - - - - - - - - -
- -
- -

采购合同

-
-

离线合同

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

合同明细

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -203,9 +150,37 @@ export default { this.fetchData() }, methods: { + getSummaries2(param) { // 合计 + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价' + return + } else if (index === 2 || index === 3) { + const values = data.map(item => Number(item[column.property])) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] = sums[index].toFixed(2) + ' 元' + } else { + sums[index] = 'N/A' + } + } + }) + return sums + }, searchContactDetail(row) { - searchContactDetail(row.采购合同流水号).then(response => { - this.contractDetail1 = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.contractDetail2 = response.data }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 @@ -219,7 +194,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 7) { + } else if (index === 6) { const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -230,7 +205,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } @@ -274,6 +249,8 @@ export default { this.searchTable2() }, searchTable01(row) { // 查看详情（请款信息包含的合同） + this.gridData1 = [] + this.contractDetail2 = [] searchRequsetFundDetail1(row.采购合同请款流水号).then(response => { this.gridData1 = response.data }) diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index cc514220..e5ab3fcd 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -2,13 +2,16 @@
+ 供应商: + 发票号: - 查询 + 查询 创建 + 追加入库记录
-

发票结算申请单

- +

发票结算申请单

+ - + - + - + - + - + - + - + - + - + - + -
- -
+ + + + + + + + + + + -

发票结算申请单明细

- 发票号： - - 追加入库记录 + + + - - - + + + + + - - - - - - - - - + + + + + + + + + @@ -307,12 +132,7 @@ - - - @@ -320,14 +140,14 @@ {{ scope.row.备注 }} - + - + @@ -343,217 +163,20 @@ @current-change="handleCurrentChange11"/>
- - - - - - - - - - - - - - - - - - - - 查询 - -
- - - - 确定 -
- 调整采购任务 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - 物料状态: - - - 查询 + + + 查询 - - - - - - - - - - - - - - - - + - + - - - - - - +
+ +
@@ -592,46 +216,25 @@
- - - 查询 - 创建离线合同 - + 查询 - 选入物料 + 选入物料 - - 生成 - - 保存 + + - + - +

税率:

- 快速修改价格 - 还原 + + 生成离线合同 + + 创建离线合同 + +
@@ -685,9 +288,8 @@ - + - @@ -702,22 +304,8 @@ @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> - - 使用滞货数量： - -
注意：确定后将不可取消使用滞货
-
- 取消 - 确定 -
- - - - - - - + - + - + - + - + - + @@ -788,14 +376,54 @@ {{ scope.row.到货数量 }} - + + @@ -902,7 +530,6 @@ - @@ -969,46 +596,15 @@ @click="submitEditOfflineContract">确定 - - + + 使用滞货数量： + +
注意：确定后将不可取消使用滞货
+
+ 取消 + 确定 +
+ @@ -1214,7 +810,10 @@ export default { 离线合同状态: '', paramRow: '', // 参数row disable: true, // 其他的禁用 - tabName: '标准件' + tabName: '标准件', + total22: 0, + pageCurrent22: 1, + pageSize22: 20 } }, computed: { @@ -1225,7 +824,7 @@ export default { }, created() { this.getPerson() - this.fetchData() + this.projectChange() // this.searchTable2() this.searchTable11() this.initDirection() @@ -1234,7 +833,6 @@ export default { initDirection() { const direction = this.$getDirection() direction.on('keyup', function(e, val) { - console.log(val) if (e.keyCode === 39) { direction.next() } @@ -1633,7 +1231,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 9) { + } else if (index === 8) { const values = data.map(item => Number(item['未税总额'])) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -1648,7 +1246,7 @@ export default { } else { sums[index] = 'N/A' } - } else if (index === 10) { + } else if (index === 9) { const values = data.map(item => Number(item['含税总额'])) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -1734,46 +1332,48 @@ export default { }) }, saveContract() { - this.$confirm('确定保存合同?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.totalPrice = 0 - this.partGroup = [] - this.numGroup = [] - this.priceGroup = [] - const dateGroup = [] - const remarkGroup = [] - for (let i = 0; i < this.tableData3.length; i++) { - this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价 - this.partGroup.push(this.tableData3[i].离线合同明细流水号) - this.numGroup.push(this.tableData3[i].数量) - this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate)) - dateGroup.push(this.tableData3[i].交货期要求) - remarkGroup.push(this.tableData3[i].备注) + console.log(11111) + this.totalPrice = 0 + this.partGroup = [] + this.numGroup = [] + this.priceGroup = [] + const dateGroup = [] + const remarkGroup = [] + for (let i = 0; i < this.tableData3.length; i++) { + this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价 + this.partGroup.push(this.tableData3[i].离线合同明细流水号) + this.numGroup.push(this.tableData3[i].数量) + this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate)) + dateGroup.push(this.tableData3[i].交货期要求) + remarkGroup.push(this.tableData3[i].备注) + } + saveOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => { + if (response.data[0].result !== '1') { + this.$message.error('离线合同保存失败') + // this.$message.success('离线合同保存成功') + // this.searchTable2() + // searchMateriel(this.offlineContractNum).then(response => { + // this.tableData3 = response.data + // this.tableData3.map(v => { + // this.$set(v, '未税总额', 0) + // this.$set(v, '含税总额', 0) + // !v.单价 ? v.单价 = v.参考价格 : v.单价 + // this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) + // }) + // }) } - saveOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => { - if (response.data[0].result === '1') { - this.$message.success('离线合同保存成功') - this.searchTable2() - searchMateriel(this.offlineContractNum).then(response => { - this.tableData3 = response.data - this.tableData3.map(v => { - this.$set(v, '未税总额', 0) - this.$set(v, '含税总额', 0) - !v.单价 ? v.单价 = v.参考价格 : v.单价 - this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) - }) - }) - } else { this.$message.error('离线合同保存失败') } - }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消操作' - }) }) + // this.$confirm('确定保存合同?', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // }).catch(() => { + // this.$message({ + // type: 'info', + // message: '已取消操作' + // }) + // }) }, doneOfflineContact() { // 生成离线合同 let judge = true @@ -1919,21 +1519,15 @@ export default { return Number(row.采购状态编号) < 3 && Number(row.是否确认) === 1 // 未采购&&确认物料修改 }, searchTable11() { // 查询外购件列表 - let check1, check2, check3, check4, check5, check6, check7 + let check1, check5, check7 this.materialName ? check1 = 1 : check1 = 0 - this.materialSpec ? check2 = 1 : check2 = 0 - this.materialModel ? check3 = 1 : check3 = 0 - this.projectValue ? check4 = 1 : check4 = 0 this.machineValue ? check5 = 1 : check5 = 0 - this.groupValue ? check6 = 1 : check6 = 0 this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') - console.log(this.tabName) if (this.tabName === '外购件') { this.partType = 2 } if (this.tabName === '标准件') { this.partType = 1 } - console.log(this.partType) - searchMaterial1(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.partType, check7, this.startTime[0], this.startTime[1]).then(response => { + searchMaterial1(this.pageCurrent11, this.pageSize11, check1, this.materialName, this.id, check5, this.machineValue, check7, this.startTime[0], this.startTime[1]).then(response => { + console.log(response.data, 111222) this.tableData00 = response.data.rows - console.log(this.tableData00, 111222) this.total11 = response.data.total const remark = [] const supplier = [] @@ -1962,7 +1556,8 @@ export default { this.pageCurrent11 = val this.searchTable11() }, - searchTable12() { // 查询基本件列表 + // 查询基本件列表 + searchTable12() { let check1, check2, check3, check4, check5, check6, check7 this.partNum ? check1 = 1 : check1 = 0 this.partName ? check2 = 1 : check2 = 0 @@ -1999,30 +1594,32 @@ export default { this.searchTable12() }, searchTable22() { - let check1, check2, check3, check7 + let check1 this.materialName ? check1 = 1 : check1 = 0 - this.materialSpec ? check2 = 1 : check2 = 0 - this.materialModel ? check3 = 1 : check3 = 0 - this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') - searchMaterial22(this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check7, this.startTime[0], this.startTime[1]).then(response => { - this.tableData22 = response.data - const remark = [] + searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => { + console.log(response.data, 3333) + this.tableData22 = response.data.rows + this.total22 = response.data.total const supplier = [] this.remarkFilters = [] this.supplierFilters = [] - response.data.map(v => { - if (v.备注 === null) { v.备注 = '' } + response.data.rows.map(v => { if (v.供货商 === null) { v.供货商 = '' } - if (!remark.includes(v.备注)) { - remark.push(v.备注) - this.remarkFilters.push({ text: v.备注, value: v.备注 }) - } if (!supplier.includes(v.供货商)) { supplier.push(v.供货商) this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) } }) }) + }, + handleSizeChange22(val) { // 标准件和外购件列表分页 + this.pageSize11 = val + this.pageCurrent11 = 1 + this.searchTable22() + }, + handleCurrentChange22(val) { // 标准件和外购件列表分页 + this.pageCurrent11 = val + this.searchTable22() } } } diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue index c40bb180..648715ea 100644 --- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue +++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue @@ -3,10 +3,8 @@
- 合同编号: - - 供应商: - + + 查询
- - - - - - - - - - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -

离线合同

GAOJING合同名称 - 供应商 - -
合同编号 - 采购员 -
序号名称规格型号数量单价合计交货期备注
总计 - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

离线合同

GAOJING合同名称 + 供应商 + +
合同编号 + 采购员 +
序号名称规格型号数量单价合计交货期备注
总计 + + +
+ + + @@ -164,7 +168,7 @@ export default { } const tr = [] let length = 0 - this.contractDetail.length < 15 ? length = 15 : length = this.contractDetail.length + length = this.contractDetail.length for (let i = 0; i < length; i++) { tr[i] = document.createElement('tr') tr[i].setAttribute('class', 'tableData') @@ -215,7 +219,7 @@ export default {