diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/api/Assembly/AssemblyProcessAssignment.js index fbe7519b..42d429e3 100644 --- a/src/api/Assembly/AssemblyProcessAssignment.js +++ b/src/api/Assembly/AssemblyProcessAssignment.js @@ -30,7 +30,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17=int' + param: '考核部门编号=9=int' } }) } diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/api/Assembly/AssemblyProcessPlanning.js index 41619c17..229319bb 100644 --- a/src/api/Assembly/AssemblyProcessPlanning.js +++ b/src/api/Assembly/AssemblyProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/Assembly/AssemblyQuotaSetting.js b/src/api/Assembly/AssemblyQuotaSetting.js index f1769456..62050c24 100644 --- a/src/api/Assembly/AssemblyQuotaSetting.js +++ b/src/api/Assembly/AssemblyQuotaSetting.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/Inventory/DirectPart.js b/src/api/Inventory/DirectPart.js index 944d2ea0..dd91a708 100644 --- a/src/api/Inventory/DirectPart.js +++ b/src/api/Inventory/DirectPart.js @@ -84,14 +84,14 @@ export function searchPeople(data1) { }) } // 直达件增加 -export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14) { +export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14, data15) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_直达件_直达件增加', - param: '物料流水号=' + data1 + '&实际到货数量=' + data2 + '&货位流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&入库人员流水号=' + data5 + '&领用者=' + data6 + '&出库数量=' + data7 + '&组件零件流水号=' + data8 + '&项目名称=' + data9 + '&机床名称=' + data10 + '&组件名称=' + data11 + '&物料名称=' + data12 + '&采购合同编号=' + data13 + '&备注=' + data14 + param: '实际到货数量=' + data1 + '&采购合同明细流水号=' + data2 + '&入库人员流水号=' + data3 + '&领用者=' + data4 + '&出库数量=' + data5 + '&组件零件流水号=' + data6 + '&组件零件基本件流水号=' + data7 + '&项目流水号=' + data8 + '&机床流水号=' + data9 + '&组件流水号=' + data10 + '&名称=' + data11 + '&备注=' + data12 + '&物料型号=' + data13 + '&物料规格=' + data14 + '&零件图号=' + data15 } }) } diff --git a/src/api/Inventory/ExchangeApproval.js b/src/api/Inventory/ExchangeApproval.js index 21c190be..a8d02e43 100644 --- a/src/api/Inventory/ExchangeApproval.js +++ b/src/api/Inventory/ExchangeApproval.js @@ -13,14 +13,14 @@ export function searchExchangePart(pageCurrent, pageSize) { }) } // 通过交换件 -export function approvalExchangepart(data1, data2, data22, data3, data33, data4, data5, data55, data6) { +export function approvalExchangepart(data1, data2, data22, data3, data33, data4) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件审批通过', - param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&被交换件物料流水号=' + data22 + '&交换件组件零件流水号=' + data3 + '&被交换件组件零件流水号=' + data33 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&被货位流水号=' + data55 + '&交换数量=' + data6 + param: '交换单流水号=' + data1 + '&交换件采购合同明细流水号=' + data2 + '&被交换件采购合同明细流水号=' + data22 + '&交换件货位流水号=' + data3 + '&被交换货位流水号=' + data33 + '&交换数量=' + data4 } }) } diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js index 40037811..9565acdb 100644 --- a/src/api/Inventory/ExchangePart.js +++ b/src/api/Inventory/ExchangePart.js @@ -73,14 +73,14 @@ export function searchExchangePart(pageCurrent, pageSize) { }) } // 增加交换件 -export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data88, data9, data10, data11, data12, data13) { +export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14, data15, data16, data17) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件增加', - param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&被交换货位流水号=' + data88 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11 + '&领料单流水号=' + data12 + '&被交换件物料流水号=' + data13 + param: '交换单编号=' + data1 + '&交换件采购合同明细流水号=' + data2 + '&被交换件采购合同明细流水号=' + data3 + '&交换件名称=' + data4 + '&被交换件名称=' + data5 + '&交换件项目流水号=' + data6 + '&被交换件项目流水号=' + data7 + '&交换件机床流水号=' + data8 + '&被交换件机床流水号=' + data9 + '&交换件组件流水号=' + data10 + '&被交换件组件流水号=' + data11 + '&货位流水号=' + data12 + '&被交换货位流水号=' + data13 + '&交换数量=' + data14 + '&申请人=' + data15 + '&备注=' + data16 + '&领料单流水号=' + data17 } }) } diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js index 96afedc3..6bd7ba98 100644 --- a/src/api/Inventory/InboundCard.js +++ b/src/api/Inventory/InboundCard.js @@ -80,7 +80,30 @@ export function addInboundCard(data1, data2, data3, data4, data5, data6, data7, } }) } - +// 入库单删除 +export function deleteInboundCard(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_采购入库单_入库单删除', + param: '采购入库单流水号=' + data1 + } + }) +} +// 入库单修改 +export function editInboundCard(data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_采购入库单_入库单修改', + param: '采购入库单流水号=' + data0 + '&入库日期=' + data1 + '&仓库流水号=' + data2 + '&合同流水号=' + data3 + '&到货单号=' + data4 + '&业务员=' + data5 + '&业务号=' + data6 + '&到货日期=' + data7 + '&业务类型=' + data8 + '&采购类型=' + data9 + '&入库类别=' + data10 + '&备注=' + data11 + } + }) +} // 库存角色查询 export function searchAffairPeople(data1) { return request({ diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index 4bd567b6..4618e7c5 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -42,7 +42,7 @@ export function searchPurchasePart(pageCurrent, pageSize, project_check, project method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_外购件查询', + name: '库存管理_库存盘点_外购件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -79,7 +79,7 @@ export function searchStandardPart(pageCurrent, pageSize, project_check, project method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_标准件查询', + name: '库存管理_库存盘点_标准件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -121,6 +121,20 @@ export function safeAmount(data1, data2) { } }) } + +// 采购基本件件查询 +export function searchPurchaseBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_采购部基本件查询', + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize + } + }) +} // 基本件查询 export function searchBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { return request({ @@ -128,7 +142,7 @@ export function searchBasicPart(pageCurrent, pageSize, project_check, project, m method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_基本件查询', + name: '库存管理_库存盘点_基本件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -141,7 +155,7 @@ export function searchBasicPartIn(craftNumber) { method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_基本件入库记录', + name: '库存管理_库存盘点_基本件入库记录', param: '工艺计划流水号=' + craftNumber } }) @@ -197,7 +211,7 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p } }) } -// 车间采购外购件查询 +// 车间采购库存盘点修改 export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) { return request({ url: '', diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index b68ee094..170cfc0e 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -44,7 +44,7 @@ export function PurchasePart(data1, data2, data3, data4, data5) { data: { type: '2', name: '库存管理_外购件出库_修改数据', - param: '组件零件流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 } }) } @@ -68,19 +68,19 @@ export function WorkShopPart(data1, data2, data3, data4, data5) { data: { type: '2', name: '库存管理_车间采购出库_修改数据', - param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 } }) } // 车间采购件零件出库 -export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8) { +export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) { return request({ url: '', method: 'post', data: { type: '2', name: '零件出库_零件出库_异常出库', - param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&工艺计划流水号=' + data5 + '&货位流水号=' + data6 + '&异常数量=' + data7 + '&异常原因=' + data8 + param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&名称=' + data4 + '&人员编号=' + data5 + '&采购合同明细流水号=' + data6 + '&请购单明细流水号=' + data7 + '&工艺计划流水号=' + data8 + '&货位流水号=' + data9 + '&异常数量=' + data10 + '&异常原因=' + data11 + '&零件类型=' + data12 } }) } diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index 9bc3eb10..2d87cc63 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -137,14 +137,14 @@ export function dropListDetail(DetailNumberx) { }) } // 增加领料单明细 -export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) { +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) { return request({ url: '', method: 'post', data: { type: '2', name: '车间装配管理_领料单_领料单明细增加', - param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7 + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 } }) } diff --git a/src/api/Inventory/SubstitutePart.js b/src/api/Inventory/SubstitutePart.js index caa426a3..90408e00 100644 --- a/src/api/Inventory/SubstitutePart.js +++ b/src/api/Inventory/SubstitutePart.js @@ -48,13 +48,14 @@ export function searchPurchasePart(project_check, project, machine_check, machin }) } // 被替换件查询 -export function searchSubstituted() { +export function searchSubstituted(material_check, material) { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_替换件_被替换件查询' + name: '库存管理_替换件_被替换件查询', + param: '物料名称_check=' + material_check + '&物料名称=' + material } }) } @@ -95,14 +96,14 @@ export function deleteSubstitutedCard(data1) { }) } // 增加替换件 -export function addSubstitutepart(data1, data2, data3, data4, data5, data6, data7, data8) { +export function addSubstitutepart(data1, data2, data3, data4, data55, data5, data6, data7, data8) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_替换件_零件替换', - param: '离线合同明细流水号=' + data1 + '&替换件组件零件流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8 + param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件货位流水号=' + data55 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8 } }) } diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index 9e9ac3c6..fc550fe1 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -7,7 +7,8 @@ export function initArrivalStateContact() { method: 'post', data: { type: '1', - name: '车间管理_到货情况_查询数据' + name: '车间管理_到货情况_查询数据', + param: '采购合同流水号_check=0&供应商名称_check=0' } }) } diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/api/WorkshopProcurement/OfflineContract1.js index 71d1a725..2d2f7bc9 100644 --- a/src/api/WorkshopProcurement/OfflineContract1.js +++ b/src/api/WorkshopProcurement/OfflineContract1.js @@ -59,6 +59,17 @@ export function deleteData(RequisitionList) { } }) } +export function updateStatus(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_离线合同_导出更改状态', + param: '请购单流水号=' + num + } + }) +} // 查询离线合同明细 export function searchMateriel(num) { return request({ diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js index ab5ae7ec..57496b04 100644 --- a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js +++ b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js index a4527017..0c4b846b 100644 --- a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js +++ b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js @@ -8,7 +8,7 @@ export function getPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index bc8cae34..82b842c0 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -35,14 +35,14 @@ export function initBuyer() { }) } // 采购合同查询 -export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) { +export function searchTable1(pageCurrent, pageSize, check2, contract, check3, name, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '车间采购管理_现有合同_查询数据', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, + param: '采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, Pagination: pageCurrent + '&' + pageSize } }) @@ -72,14 +72,14 @@ export function searchTable5(num) { }) } // 采购合同变更查询 -export function searchTable3(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) { +export function searchTable3(pageCurrent, pageSize, check2, contract, check3, name, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, + param: '采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js index 11c45928..dfb3b616 100644 --- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js +++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js @@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) { } }) } -// 传送人接收人初始化 采购科改16 +// 传送人接收人初始化 export function initPerson() { return request({ url: '', @@ -57,7 +57,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=16' + param: '考核部门编号=9' } }) } @@ -68,7 +68,8 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_付款情况_查询数据' + name: '车间采购管理_付款情况_查询数据', + param: '采购合同流水号_check=0&供应商名称_check=0' } }) } diff --git a/src/icons/svg/OfflineContract1.svg b/src/icons/svg/OfflineContract1.svg new file mode 100644 index 00000000..2edf5865 --- /dev/null +++ b/src/icons/svg/OfflineContract1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingProcessPlanning.svg b/src/icons/svg/OutsourcingProcessPlanning.svg new file mode 100644 index 00000000..ce9f5559 --- /dev/null +++ b/src/icons/svg/OutsourcingProcessPlanning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingQuotaSetting.svg b/src/icons/svg/OutsourcingQuotaSetting.svg new file mode 100644 index 00000000..aaf07848 --- /dev/null +++ b/src/icons/svg/OutsourcingQuotaSetting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReceiptConnectionSheet.svg b/src/icons/svg/ReceiptConnectionSheet.svg new file mode 100644 index 00000000..6b3cb48f --- /dev/null +++ b/src/icons/svg/ReceiptConnectionSheet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 17f08747..36e6a610 100644 --- a/src/main.js +++ b/src/main.js @@ -23,10 +23,15 @@ import 'viewerjs/dist/viewer.css' Vue.use(curd) Vue.use(htmlToPdf) Vue.use(ElementUI) +Vue.use(curd) +Vue.use(htmlToPdf) +Vue.use(ElementUI) +// 查看图片 Vue.use(Viewer) Viewer.setDefaults({ Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' } }) + // 处理时间字符串格式全局过滤器 '2018/1/23 00:00:00' to '2018-01-23' Vue.filter('formatTime', function(value) { if (!value) return '' diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue index 423324e9..f06eeda4 100644 --- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue +++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue @@ -286,7 +286,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.GroupNumber.push({ label: response.data[i].组号, - value: response.data[i].组号 + value: response.data[i].组件流水号 }) } }) diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue index afd74ae3..bae4bedc 100644 --- a/src/views/BasicData/MaterialMaintenance/index.vue +++ b/src/views/BasicData/MaterialMaintenance/index.vue @@ -63,7 +63,7 @@ - + @@ -97,7 +97,9 @@ export default { MaterialName2: '' }, rules: { - MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }], + MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] + }, + rules1: { MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] } } diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index 4c6f53d8..95d37e8c 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -19,7 +19,7 @@ :data="tableData" border size="mini" - style="width: 100%;height: 400px;"> + style="width: 100%;height: 550px;"> - + @@ -152,7 +154,7 @@ - + - + { + addDirectPart(this.form.DirectNumber, this.purchaseContractNumber, this.PeopleNumber, this.form.getPeople, this.form.DirectNumber, this.teamPart, this.teamBasicPart, this.projectNumber, this.machineNumber, this.teamNumber, this.materialName, this.form.DirectNote, this.materialtype, this.materialMode, this.partPicture).then(response => { if (response.data[0].result === '1') { this.$notify({ title: '成功', diff --git a/src/views/Inventory/ExchangeApproval/index.vue b/src/views/Inventory/ExchangeApproval/index.vue index fd9d97ae..0089d0a4 100644 --- a/src/views/Inventory/ExchangeApproval/index.vue +++ b/src/views/Inventory/ExchangeApproval/index.vue @@ -129,7 +129,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.被交换件物料流水号, row.交换件组件零件流水号, row.被交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.被交换货位流水号, row.交换数量).then(response => { + approvalExchangepart(row.交换单流水号, row.交换件采购合同明细流水号, row.被交换件采购合同明细流水号, row.交换件货位流水号, row.被交换件货位流水号, row.交换数量).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') this.searchTable1() diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index 7bbb1661..e511be4c 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -33,6 +33,7 @@ :data="tableDataPurchase" border style="width: 100%;" + size="mini" height="200"> @@ -94,6 +95,7 @@ @@ -127,7 +129,7 @@
- 交换 + 交换
@@ -135,6 +137,7 @@ { const data = response.data.rows - console.log(data) + console.log(data, 2233) for (let i = 0; i < data.length; i++) { data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false } @@ -455,7 +459,7 @@ export default { addListDetailinfor(form) { this.$refs[form].validate((valid) => { if (valid) { - addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[1].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => { + addExchangepart(this.form.ExchangeNumber, this.tableData1[0].采购合同明细流水号, this.tableData2[0].采购合同明细流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].项目流水号, this.tableData2[0].项目流水号, this.tableData1[0].机床流水号, this.tableData2[0].机床流水号, this.tableData1[0].分组流水号, this.tableData2[0].分组流水号, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') } else { this.$message.error('增加失败') } diff --git a/src/views/Inventory/InboundCard/exportExcel.js b/src/views/Inventory/InboundCard/exportExcel.js new file mode 100644 index 00000000..a8efad67 --- /dev/null +++ b/src/views/Inventory/InboundCard/exportExcel.js @@ -0,0 +1,19 @@ +// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） +export function exportExcelMethod(tableId, fileName, sheetName) { + tableToExcel(tableId, fileName, sheetName) +} +const tableToExcel = (function() { + const uri = 'data:application/vnd.ms-excel;base64,' + // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 + const template = `{worksheet}{table}
` + const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } + const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } + return function(table, filename, sheetname) { + if (!table.nodeType) table = document.getElementById(table) + const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } + const aTag = document.createElement('a') + aTag.href = uri + base64(format(template, ctx)) + aTag.download = filename + aTag.click() + } +})() diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index 8551d4ab..9c883c3e 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -1,6 +1,6 @@ - + - + - + @@ -245,16 +250,17 @@ {{ scope.row.备注 }} - +
- + @@ -304,136 +313,320 @@ {{ scope.row.本币单价 }} - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+
+

采 购 入 库 单

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
入库单号:{{ inbondCard[0] }}入库日期:{{ inbondCard[1] }}仓库名称:{{ inbondCard[2] }}
订单编号:{{ inbondCard[3] }}到货单号:{{ inbondCard[4] }}业务编号:{{ inbondCard[5] }}
供货单位:{{ inbondCard[6] }}部门名称:{{ inbondCard[7] }}业务人员:{{ inbondCard[8] }}
到货日期:{{ inbondCard[9] }}业务类型:{{ inbondCard[10] }}采购类型:{{ inbondCard[11] }}
入库类别:{{ inbondCard[12] }}备注信息:{{ inbondCard[13] }} + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
存货编码存货名称规格型号零件图号数量本币单价本币金额
{{ index + 1 }}{{ list.名称 }}{{ list.规格 }}{{ list.零件图号 }}{{ list.数量 }}{{ list.本币单价 }}{{ list.本币单价 * parseInt(list.数量) }}
+ + + 合计{{ inbondCard[14] }}总价{{ inbondCard[15] }}
+
+
+ 制单人:{{ '李鑫' }} + 审核人:{{ '李鑫' }} +
+
+ +
+ 取消 + 打印 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
取消 确定
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
取消 - 确定 + 确定
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index b4a4025e..da432e2d 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -1,7 +1,5 @@