This commit is contained in:
caoxinyu
2018-12-27 18:42:58 +08:00
54 changed files with 1347 additions and 532 deletions

View File

@@ -30,7 +30,7 @@ export function initPerson() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17=int'
param: '考核部门编号=9=int'
}
})
}

View File

@@ -8,7 +8,7 @@ export function initCraftmen() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

View File

@@ -8,7 +8,7 @@ export function initCraftmen() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

View File

@@ -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
}
})
}

View File

@@ -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
}
})
}

View File

@@ -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
}
})
}

View File

@@ -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({

View File

@@ -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: '',

View File

@@ -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
}
})
}

View File

@@ -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
}
})
}

View File

@@ -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
}
})
}

View File

@@ -7,7 +7,8 @@ export function initArrivalStateContact() {
method: 'post',
data: {
type: '1',
name: '车间管理_到货情况_查询数据'
name: '车间管理_到货情况_查询数据',
param: '采购合同流水号_check=0&供应商名称_check=0'
}
})
}

View File

@@ -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({

View File

@@ -8,7 +8,7 @@ export function initCraftmen() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

View File

@@ -8,7 +8,7 @@ export function getPerson() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

View File

@@ -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
}
})

View File

@@ -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'
}
})
}

View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545637585732" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3542" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M300.575 326.995l196.662 0c11.637 0 21.068-9.433 21.068-21.07s-9.431-21.073-21.068-21.073l-196.662 0c-11.639 0-21.073 9.436-21.073 21.073s9.436 21.07 21.073 21.07zM279.502 516.635c0 11.637 9.433 21.073 21.073 21.073l421.423 0c11.632 0 21.068-9.436 21.068-21.073s-9.436-21.07-21.068-21.07l-421.423 0c-11.637-0.001-21.073 9.433-21.073 21.07zM686.877 46.048l-505.705 0c-31.032 0-56.189 25.156-56.189 56.189l0 828.795c0 31.031 25.156 56.189 56.189 56.189l674.273 0c31.031 0 56.189-25.159 56.189-56.189l0-646.179-224.757-238.805zM686.877 102.238l168.568 182.614-140.471 0c-15.522 0-28.097-12.577-28.097-28.092l0-154.522zM855.445 902.94c0 15.513-12.579 28.092-28.092 28.092l-618.086 0c-15.518 0-28.094-12.579-28.094-28.092l0-772.608c0-15.515 12.579-28.094 28.094-28.094l435.466 0 0 168.568c0 31.032 25.159 56.189 56.194 56.189l154.52 0 0 575.945-0.001 0zM721.998 720.319l-421.423 0c-11.639 0-21.073 9.436-21.073 21.073 0 11.642 9.433 21.073 21.073 21.073l421.423 0c11.632 0 21.068-9.431 21.068-21.073 0-11.637-9.436-21.073-21.068-21.073z" p-id="3543"></path></svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545637095481" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2627" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M882.47272719 381.09090875L533.38181844 32H204.36363594a61.96363594 61.96363594 0 0 0-43.63636313 18.32727281 61.09090875 61.09090875 0 0 0-18.32727281 43.63636313v833.45454562A62.4 62.4 0 0 0 204.36363594 992h615.27272812a62.4 62.4 0 0 0 43.63636313-18.32727281 59.78181844 59.78181844 0 0 0 18.76363687-43.63636313V381.09090875z m-57.6 547.2c0 3.92727281 0 5.23636406-5.23636313 5.23636406H204.36363594c-3.92727281 0-5.23636406 0-5.23636313-5.23636406V94.83636406c0-3.49090875 0-5.23636406 5.23636313-5.23636406h305.45454562l26.18181844 26.18181844H533.38181844L800 381.09090875l24.43636406 24.43636406v32.29090875z m-109.09090875-392.72727281h-67.63636407a168.43636406 168.43636406 0 0 0-16.58181843-36.65454469l43.63636406-43.63636406a26.61818156 26.61818156 0 0 0 0-37.96363594l-19.2-18.76363688a27.49090875 27.49090875 0 0 0-38.4 0l-43.63636406 43.63636407A164.07272719 164.07272719 0 0 0 533.38181844 424.72727281V366.69090875A27.05454562 27.05454562 0 0 0 506.32727281 337.45454563h-27.05454562a27.05454562 27.05454562 0 0 0-27.05454563 27.05454562V424.72727281a158.4 158.4 0 0 0-43.63636312 18.32727282l-38.4-37.96363688a27.05454562 27.05454562 0 0 0-38.4 0L313.01818156 424.72727281a27.05454562 27.05454562 0 0 0 0 37.96363594l38.83636406 38.83636406a160.14545438 160.14545438 0 0 0-17.89090968 46.69090875H282.90909125a27.05454562 27.05454562 0 0 0-27.05454562 27.05454563v27.05454562a27.05454562 27.05454562 0 0 0 27.05454562 27.05454563h54.54545437a155.78181844 155.78181844 0 0 0 21.81818157 43.63636312l-36.65454563 36.65454563a27.05454562 27.05454562 0 0 0 0 37.96363687l19.2 19.2a27.49090875 27.49090875 0 0 0 38.4 0l41.0181825-41.0181825a160.14545438 160.14545438 0 0 0 43.63636313 14.4v56.29090969a27.05454562 27.05454562 0 0 0 27.05454562 27.05454469h27.05454563a27.05454562 27.05454562 0 0 0 27.05454562-27.05454469v-62.4a158.83636406 158.83636406 0 0 0 38.4-19.2l43.63636313 43.63636313a27.05454562 27.05454562 0 0 0 38.4 0l19.2-19.2a26.61818156 26.61818156 0 0 0 0-37.96363594l-47.56363594-48a159.27272719 159.27272719 0 0 0 13.09090875-37.96363688h64.58181844a27.05454562 27.05454562 0 0 0 27.05454562-27.05454562v-27.05454469a27.05454562 27.05454562 0 0 0-27.05454562-26.6181825z m-222.98181844 154.03636406a107.78181844 107.78181844 0 1 1 108.21818156-107.78181844 107.78181844 107.78181844 0 0 1-108.21818156 107.78181844z" p-id="2628"></path></svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545637519656" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2781" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1011.328 490.528l-16.384 5.152c0.448 3.488 0.96 6.976 0.96 10.656 0 3.616-0.576 7.136-1.12 10.592l16.544 5.184a14.56 14.56 0 0 1 8.992 7.296 14.368 14.368 0 0 1 1.024 11.52 15.84 15.84 0 0 1-19.616 9.632l-16.736-5.184a83.52 83.52 0 0 1-12.832 17.28l10.176 13.44a14.56 14.56 0 0 1-3.424 20.896 16 16 0 0 1-21.792-3.296l-10.208-13.568c-6.72 3.2-13.792 5.472-21.088 6.848v16.448a15.264 15.264 0 0 1-15.52 14.944 15.232 15.232 0 0 1-15.584-14.944v-16.448a85.824 85.824 0 0 1-21.12-6.848l-10.208 13.568a16.032 16.032 0 0 1-21.792 3.296 14.56 14.56 0 0 1-3.392-20.896l10.272-13.568a78.88 78.88 0 0 1-13.28-17.056l-16.416 5.088a15.616 15.616 0 0 1-19.552-9.568 14.816 14.816 0 0 1 9.92-18.816l16.448-5.12c-0.48-3.52-1.024-7.008-1.024-10.656 0-3.648 0.608-7.168 1.12-10.656l-16.544-5.152a14.72 14.72 0 0 1-9.952-18.816 15.648 15.648 0 0 1 19.552-9.6l16.736 5.216a84.48 84.48 0 0 1 12.864-17.312l-10.176-13.472a14.72 14.72 0 0 1-2.816-11.168 14.624 14.624 0 0 1 6.208-9.664 16 16 0 0 1 21.792 3.296l10.24 13.536c6.72-3.168 13.792-5.472 21.12-6.88v-16.448c0-8.288 6.912-14.976 15.552-14.976 8.576 0 15.52 6.656 15.52 14.976v16.384c7.456 1.344 14.432 3.808 21.088 6.816l10.24-13.536a16.064 16.064 0 0 1 21.76-3.296 14.528 14.528 0 0 1 3.424 20.864l-10.304 13.632a83.2 83.2 0 0 1 13.312 16.992l16.384-5.056a15.68 15.68 0 0 1 19.616 9.568 14.816 14.816 0 0 1-9.984 18.88z m-101.056-36.48c-30.112 0-54.56 23.392-54.56 52.288 0 28.832 24.448 52.224 54.56 52.224 30.08 0 54.464-23.392 54.464-52.224 0-28.896-24.352-52.288-54.464-52.288zM199.328 668.128h255.424c5.28-13.536 11.488-26.336 18.816-38.656h-274.24v38.656z m355.456-270.496H199.36v38.656h355.392v-38.656h0.032zM80.896 919.328a39.104 39.104 0 0 1-39.488-38.688V127.008c0-21.344 17.696-38.624 39.488-38.624h612.064c21.824 0 39.488 17.312 39.488 38.624v368.128c13.408 0.896 26.528 2.56 39.424 5.344V126.944c0-42.656-35.328-77.312-78.976-77.312H80.864C37.216 49.632 1.888 84.256 1.888 126.944V880.64c0 42.752 35.328 77.28 78.976 77.28h438.624a263.84 263.84 0 0 1-33.344-38.624H80.896v0.032z m473.888-376.448v-29.344H199.36v38.656h342.752c4.096-3.2 8.288-6.368 12.672-9.312z m157.696 28.576c-108.832 0-197.216 86.368-197.216 193.408 0 106.72 88.352 193.12 197.216 193.12 109.312 0 197.792-86.496 197.792-193.12-0.032-107.008-88.544-193.408-197.792-193.408z m0.064 347.872c-87.04 0-157.76-69.152-157.76-154.464 0-85.664 70.656-154.784 157.76-154.784 87.424 0 158.112 69.12 158.112 154.784 0 85.216-70.688 154.464-158.112 154.464z m-157.76-637.632H199.36v38.624h355.392V281.696h0.032z m177.664 386.432h-39.488v115.936h118.464v-38.656h-78.976v-77.28z" p-id="2782"></path></svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545636692920" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2323" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M810.656 128v695.456L768 793.6l-46.944 29.856L640 878.912l-81.056-55.456L512 793.6l-46.944 29.856L384 878.912l-81.056-55.456L256 793.6l-42.656 29.856V128h597.344zM896 42.656H128v938.656l128-85.344 128 85.344 128-85.344 128 85.344 128-85.344 128 85.344V42.656z" p-id="2324"></path><path d="M298.656 426.656h426.656V512H298.656v-85.344zM298.656 298.656h426.656V384H298.656V298.656zM298.656 554.656h256V640h-256v-85.344z" p-id="2325"></path></svg>

After

Width:  |  Height:  |  Size: 830 B

View File

@@ -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 ''

View File

@@ -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].件流水
})
}
})

View File

@@ -63,7 +63,7 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑材料" center style="min-height: 200px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px">
<el-form ref="form2" :model="form2" :rules="rules1" label-position="left" label-width="110px">
<el-form-item label="材料名称" prop="MaterialName2" style="display: inline-block">
<el-input v-model="form2.MaterialName2" size="small" clearable style="width:200px"/>
</el-form-item>
@@ -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' }]
}
}

View File

@@ -19,7 +19,7 @@
:data="tableData"
border
size="mini"
style="width: 100%;height: 400px;">
style="width: 100%;height: 550px;">
<el-table-column label="开始工作时间">
<template slot-scope="scope">
{{ scope.row.开始工作时间 }}

View File

@@ -40,6 +40,7 @@
v-loading="listLoading"
:data="tableDataPurchase"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -74,8 +75,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="addDirect(scope.row)">直达</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchDirect(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
@@ -95,6 +96,7 @@
v-loading="listLoading1"
:data="directRecord"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -107,14 +109,14 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="80">
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" align="center" min-width="80">
<el-table-column label="组" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.件名称 }}
{{ scope.row. }}
</template>
</el-table-column>
<el-table-column label="采购合同" align="center" min-width="80">
@@ -122,9 +124,9 @@
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
<el-table-column label="名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="到货数量" align="center" min-width="80">
@@ -152,7 +154,7 @@
<el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
<el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in People"
:key="item.value"
@@ -176,7 +178,7 @@
<el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
<el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in People"
:key="item.value"
@@ -240,12 +242,15 @@ export default {
PageCurrent: 1,
PageSize: 10,
total: null,
projectName: '',
machineName: '',
teamName: '',
materialName: '',
contractNumber: '',
directPartNumber: ''
projectNumber: '', // 项目流水号
machineNumber: '', // 机床流水号
teamNumber: '', // 组件流水号
materialName: '', // 物料名称
materialtype: '', // 物料型号
materialMode: '', // 物料规格
partPicture: '', // 零件图号
directPartNumber: '',
teamBasicPart: ''
}
},
computed: {
@@ -297,11 +302,13 @@ export default {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
label: response.data[i].姓名,
value: parseInt(response.data[i].考勤编号)
value: Number(response.data[i].人员编号)
})
}
console.log(this.People)
})
console.log(this.token, 88)
console.log(this.People, 99)
},
searchContractData() { // 查询合同
this.Contract = []
@@ -344,17 +351,21 @@ export default {
},
// 打开直达件表单
addDirect(row) {
console.log(row)
this.PeopleValue = ''
this.form = {}
this.dialogFormVisible = true
this.materialNum = row.物料流水号
this.purchaseContractNumber = row.采购合同明细流水号
this.teamPart = row.组件零件流水号
this.projectName = row.项目名称
this.machineName = row.机床名称
this.teamName = row.组件名称
this.teamBasicPart = row.组件零件基本件流水号
this.projectNumber = row.项目流水号
this.machineNumber = row.机床流水号
this.teamNumber = row.组件流水号
this.materialName = row.物料名称
this.contractNumber = row.采购合同编
this.materialtype = row.物料型
this.materialMode = row.物料规格
this.partPicture = row.零件图号
},
// 打开直达件编辑表单
changeDirect(row) {
@@ -405,8 +416,7 @@ export default {
},
// 增加直达件
addDirectPartm() {
console.log(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.form.DirectNote)
addDirectPart(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.projectName, this.machineName, this.teamName, this.materialName, this.contractNumber, this.form.DirectNote).then(response => {
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: '成功',

View File

@@ -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()

View File

@@ -33,6 +33,7 @@
:data="tableDataPurchase"
border
style="width: 100%;"
size="mini"
height="200">
<el-table-column
label="序号"
@@ -66,13 +67,13 @@
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
{{ scope.row.外购件类型 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button :disabled="scope.row.是否禁用" size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
<el-button :disabled="scope.row.是否禁用" size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
<el-button :disabled="scope.row.是否禁用" size="mini" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
<el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
</template>
</el-table-column>
</el-table>
@@ -94,6 +95,7 @@
<el-table
:data="tableData1"
border
size="mini"
style="width: 100%;"
height="100"
>
@@ -127,7 +129,7 @@
</el-col>
<el-col :span="2">
<div style="margin: 10px 15px">
<el-button size="small" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange('form')" >交换</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" @click="total = 0;pageSize = 10;pageList = 1;exchange('form')" >交换</el-button>
</div>
</el-col>
<el-col :span="11">
@@ -135,6 +137,7 @@
<el-table
:data="tableData2"
border
size="mini"
style="width: 100%;"
height="100">
<el-table-column
@@ -173,6 +176,7 @@
v-loading="listLoading1"
:data="tableDataExchange"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -428,7 +432,7 @@ export default {
this.listLoading1 = true
searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => {
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('增加失败') }

View File

@@ -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,'
// 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中网页显示表格宽度建议1240tr/td视情况而定
const template = `<html xmlns:x="urn:schemas-microsoft-com:office:excel"><head><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><meta charset="UTF-8"><style type="text/css">table td {border: 1px solid #000000;width:100px;text-align: center;color: #000000;} th {border: 1px solid #000000;width:100px;text-align: center;color: #000000;}</style></head><body><table>{table}</table></body></html>`
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()
}
})()

View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName">
<el-tab-pane label="采购部采购" name="first">
<el-card>
<span>采购合同编号:</span>
@@ -28,7 +28,6 @@
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" @click="searchPartinfo()">导出</el-button>
</el-card>
<el-card>
<el-table
@@ -170,8 +169,9 @@
<el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchInboundCard1()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addCard()">创建</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="downLoadCjn()">导出</el-button>
<el-button size="small" type="primary" icon="el-icon-arrow-down" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
</el-card>
<el-card>
<el-table
v-loading="listLoading3"
:data="tableData3"
@@ -210,7 +210,12 @@
{{ scope.row.到货单号 }}
</template>
</el-table-column>
<el-table-column label="业务号" align="center" min-width="50">
<el-table-column label="到货日期" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="业务号" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.业务号 }}
</template>
@@ -225,17 +230,17 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="业务类型" align="center" min-width="130">
<el-table-column label="业务类型" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.业务类型 }}
</template>
</el-table-column>
<el-table-column label="采购类型" align="center" min-width="50">
<el-table-column label="采购类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.采购类型 }}
</template>
</el-table-column>
<el-table-column label="入库类别" align="center" min-width="50">
<el-table-column label="入库类别" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库类别 }}
</template>
@@ -245,16 +250,17 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px">
<el-table-column label="操作" align="center" min-width="300px">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="editInboundCardInfor(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropCard(scope.row)">删除</el-button>
<el-button size="small" type="warning" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent3"
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total3"
@@ -264,7 +270,10 @@
</div>
<el-table
v-loading="listLoading4"
id = "cardDetail"
:data="tableData4"
:summary-method="calculateContractSum"
:show-summary="true"
border
style="width: 100%;"
size="mini"
@@ -294,7 +303,7 @@
{{ scope.row.图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<el-table-column label="数量" align="center" min-width="100" prop="数量">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -304,136 +313,320 @@
{{ scope.row.本币单价 }}
</template>
</el-table-column>
<el-table-column label="本币金额" align="center" min-width="100">
<el-table-column label="本币金额" align="center" min-width="100" prop="sum">
<template slot-scope="scope">
{{ scope.row.本币单价 * scope.row.数量 }}
{{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="200">
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropCarddetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="合同名称" prop="合同名称">
<el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="仓库名称" prop="仓库名称">
<el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option
v-for="item in Inventory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="入库日期" prop="入库日期">
<el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="到货单号" prop="到货单号">
<el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务号" prop="业务号">
<el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务员" prop="业务员">
<el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
<el-option
v-for="item in People"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="到货日期" prop="到货日期">
<el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="业务类型" prop="业务类型">
<el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
</el-form-item>
<el-form-item label="采购类型" prop="采购类型">
<el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
</el-form-item>
<el-form-item label="备注" prop="备注">
<el-input v-model="form.note" placeholder="备注" size="small" clearable/>
</el-form-item>
<el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
<el-card>
<div id="print">
<div style="text-align: center">
<h2> </h2>
<hr>
<table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
<colgroup>
<col style="width: 120px">
<col style="width: 250px">
<col style="width: 110px">
<col style="width: 100px">
<col style="width: 120px">
<col style="width: 120px">
</colgroup>
<tr>
<td class="tg-s268">入库单号:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[0] }}</td>
<td class="tg-0lax">入库日期:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[1] }}</td>
<td class="tg-0lax">仓库名称:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[2] }}</td>
</tr>
<tr>
<td class="tg-0lax">订单编号:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[3] }}</td>
<td class="tg-0lax">到货单号:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[4] }}</td>
<td class="tg-0lax">业务编号:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[5] }}</td>
</tr>
<tr>
<td class="tg-0lax">供货单位:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[6] }}</td>
<td class="tg-0lax">部门名称:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[7] }}</td>
<td class="tg-0lax">业务人员:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[8] }}</td>
</tr>
<tr>
<td class="tg-0lax">到货日期:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[9] }}</td>
<td class="tg-0lax">业务类型:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[10] }}</td>
<td class="tg-0lax">采购类型:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[11] }}</td>
</tr>
<tr>
<td class="tg-0lax">入库类别:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[12] }}</td>
<td class="tg-0lax">备注信息:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[13] }}</td>
<td class="tg-0lax"/>
<td class="tg-0lax"/>
</tr>
</table>
</div>
<div style="margin-top: 10px">
<table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
<colgroup>
<col style="width: 150px">
<col style="width: 150px">
<col style="width: 120px">
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 100px">
</colgroup>
<tr>
<th class="tg-c3ow">存货编码</th>
<th class="tg-c3ow">存货名称</th>
<th class="tg-c3ow">规格型号</th>
<th class="tg-baqh">零件图号</th>
<th class="tg-c3ow">数量</th>
<th class="tg-c3ow">本币单价</th>
<th class="tg-c3ow">本币金额</th>
</tr>
<tr v-for="(list, index) in tableData4" :key="index">
<td class="tg-c3ow">{{ index + 1 }}</td>
<td class="tg-c3ow">{{ list.名称 }}</td>
<td class="tg-c3ow">{{ list.规格 }}</td>
<td class="tg-baqh">{{ list.零件图号 }}</td>
<td class="tg-c3ow">{{ list.数量 }}</td>
<td class="tg-c3ow">{{ list.本币单价 }}</td>
<td class="tg-c3ow">{{ list.本币单价 * parseInt(list.数量) }}</td>
</tr>
<tr>
<td class="tg-c3ow"/>
<td class="tg-c3ow"/>
<td class="tg-c3ow"/>
<td class="tg-baqh">合计</td>
<td class="tg-c3ow">{{ inbondCard[14] }}</td>
<td class="tg-c3ow">总价</td>
<td class="tg-c3ow">{{ inbondCard[15] }}</td>
</tr>
</table>
</div>
<div style="margin-top: 20px; text-align: right">
<span style="margin-right: 50px">制单人:{{ '李鑫' }}</span>
<span style="margin-right: 50px">审核人:{{ '李鑫' }}</span>
</div>
</div>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
<el-button type="primary" size="small" @click="printCard">打印</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
<el-row>
<el-col :span="12">
<el-form-item label="合同名称" prop="合同名称">
<el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库名称" prop="仓库名称">
<el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option
v-for="item in Inventory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="入库日期" prop="入库日期">
<el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="到货单号" prop="到货单号">
<el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务号" prop="业务号">
<el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务员" prop="业务员">
<el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
<el-option
v-for="item in People"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="到货日期" prop="到货日期">
<el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务类型" prop="业务类型">
<el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="采购类型" prop="采购类型">
<el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
<el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="入库类别" prop="入库类别">
<el-input v-model="form.inboundType" placeholder="入库类别" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1=false">取消</el-button>
<el-button type="primary" size="small" @click="submitCard">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="合同名称" prop="合同名称">
<el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="仓库名称" prop="仓库名称">
<el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option
v-for="item in Inventory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="入库日期" prop="入库日期">
<el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="到货单号" prop="到货单号">
<el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务号" prop="业务号">
<el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
</el-form-item>
<el-form-item label="业务员" prop="业务员">
<el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
<el-option
v-for="item in People"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="到货日期" prop="到货日期">
<el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="业务类型" prop="业务类型">
<el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
</el-form-item>
<el-form-item label="采购类型" prop="采购类型">
<el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
</el-form-item>
<el-form-item label="备注" prop="备注">
<el-input v-model="form.note" placeholder="备注" size="small" clearable/>
</el-form-item>
<el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
<el-row>
<el-col :span="12">
<el-form-item label="合同名称" prop="合同名称">
<el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
<el-option
v-for="item in Contract"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库名称" prop="仓库名称">
<el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option
v-for="item in Inventory"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="入库日期" prop="入库日期">
<el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="到货单号" prop="到货单号">
<el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务号" prop="业务号">
<el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务员" prop="业务员">
<el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
<el-option
v-for="item in People"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="到货日期" prop="到货日期">
<el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务类型" prop="业务类型">
<el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="采购类型" prop="采购类型">
<el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库类型" prop="入库类型">
<el-input v-model="form.inboundType" placeholder="入库类型" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
<el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible2=false">取消</el-button>
<el-button type="primary" size="small" @click="editCard">确定</el-button>
<el-button type="primary" size="small" @click="submitInboundCardInfor">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract } from '@/api/Inventory/InboundCard'
import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract, editInboundCard, deleteInboundCard } from '@/api/Inventory/InboundCard'
import { mapGetters } from 'vuex'
import $ from 'jquery'
export default {
data() {
return {
@@ -450,6 +643,7 @@ export default {
listLoading2: '',
tableData2: [],
listLoading3: '',
CardNumber: '', // 采购入库单流水号
inboundCardNumber: '',
inboundCardNumber_check: '',
tableData3: [],
@@ -490,7 +684,19 @@ export default {
numberGroup: [],
priceGroup: [],
DetailNumber: '',
CardDetailNumber: '' // 入库单明细流水号
CardDetailNumber: '', // 入库单明细流水号
contractSum: '',
total: 0,
pageCurrent: 1,
pageSize: 10,
total2: 0,
pageCurrent2: 1,
pageSize2: 10,
total3: 0,
pageCurrent3: 1,
pageSize3: 10,
dialogVisibleExport: false,
inbondCard: []
}
},
computed: {
@@ -514,7 +720,7 @@ export default {
}
})
// 查询车间合同
searchContract().then(response => {
searchShopContract().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.ShopContract.push({
label: response.data[i].采购合同编号,
@@ -522,7 +728,6 @@ export default {
})
}
})
searchShopContract
searchAffairPeople(this.token).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
@@ -547,7 +752,7 @@ export default {
this.listLoading = true
searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].组件零件流水号 !== 0) {
if (response.data[i].组件零件流水号 === 0) {
response.data[i].物料名称 = response.data[i].零件名称
}
}
@@ -581,7 +786,8 @@ export default {
addCard() {
this.dialogVisible1 = true
},
submitCard() { // 提交设置
// 增加入库单
submitCard() {
this.$refs['form'].validate((valid) => {
if (valid) {
addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
@@ -640,11 +846,65 @@ export default {
}
})
},
// 修改入库单
editInboundCardInfor(row) {
this.DetailNumber = row.采购入库单流水号
this.dialogVisible2 = true
this.form.contract = row.合同流水号
this.form.house = row.仓库流水号
this.form.inboundDay = row.入库日期
this.form.arrive = row.到货单号
this.form.affair = row.业务号
this.form.affairPeople = row.业务员
this.form.arriveDay = row.到货日期
this.form.affirType = row.业务类型
this.form.purchaseType = row.采购类型
this.form.inboundType = row.入库类别
this.form.note = row.备注
},
submitInboundCardInfor() {
editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.dialogVisible2 = false
} else {
this.$message.error('修改失败')
}
})
},
// 查询采购入库单明细
searchDetail(row) {
this.DetailNumber = row.采购入库单流水号
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
const data = response.data
for (let i = 0; i < data[i].length; i++) {
data[i].数量 = parseInt(data[i].数量)
}
this.tableData4 = data
})
},
// 删除领料单
dropCard(row) {
this.CardNumber = row.采购入库单流水号
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteInboundCard(this.CardNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.searchInboundCard1()
} else {
this.$message.error('数据占用')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
// 删除领料单明细
@@ -671,11 +931,117 @@ export default {
message: '已取消删除'
})
})
},
calculateContractSum(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
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[7] += ' 元'
} else if (index === 4) {
sums[index] = '合计'
return
} else if (index === 6) {
sums[index] = '总价'
return
}
})
return sums
},
handleSizeChange(val) { // 询价单列表分页
this.pageSize = val
},
handleCurrentChange(val) { // 询价单列表分页
this.pageCurrent = val
},
handleSizeChange2(val) { // 询价单列表分页
this.pageSize2 = val
},
handleCurrentChange2(val) { // 询价单列表分页
this.pageCurrent2 = val
},
handleSizeChange3(val) { // 询价单列表分页
this.pageSize2 = val
},
handleCurrentChange3(val) { // 询价单列表分页
this.pageCurrent2 = val
},
editCard() {
editInboundCard(this.CardDetailNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
} else {
this.$message.error('数据占用')
}
})
},
exportCard(row) {
this.dialogVisibleExport = true
this.inbondCard[0] = row.入库单号
this.inbondCard[1] = row.入库日期.substring(0, row.入库日期.length - 8)
this.inbondCard[2] = row.仓库名称
this.inbondCard[3] = row.采购合同编号
this.inbondCard[4] = row.到货单号
this.inbondCard[5] = row.业务号
this.inbondCard[6] = row.供应商名称
this.inbondCard[7] = '库存'
this.inbondCard[8] = row.姓名
this.inbondCard[9] = row.到货日期.substring(0, row.到货日期.length - 8)
this.inbondCard[10] = row.业务类型
this.inbondCard[11] = row.采购类型
this.inbondCard[12] = row.入库类别
this.inbondCard[13] = row.备注
this.DetailNumber = row.采购入库单流水号
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
return this.tableData4
}).then(data => {
var sum = 0
var total = 0
for (let i = 0; i < data.length; i++) {
sum += parseInt(data[i].数量)
total += data[i].本币单价 * parseInt(data[i].数量)
}
this.inbondCard[14] = sum
this.inbondCard[15] = total
})
},
printCard() {
const htmlNode = $('#print').html() // #print为需要打印的dom节点id
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
printNode.remove()
}
}
}
</script>
<style scoped>
.tg {border-collapse:collapse;border-spacing:0;}
.tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg .tg-baqh{text-align:center;vertical-align:top}
.tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
.tgClass {border-collapse:collapse;border-spacing:0;}
.tgtgClass td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:0px;overflow:hidden;word-break:normal;}
.tgtgClass th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:0px;overflow:hidden;word-break:normal;}
.tgtgClass .tg-s268{text-align:left}
.tgtgClass .tg-0lax{text-align:left;vertical-align:top}
</style>

View File

@@ -1,7 +1,5 @@
<template>
<div class="app-container">
<el-card>
<span style="margin: 5px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px" />
@@ -13,6 +11,7 @@
v-loading="listLoading"
:data="tableData"
border
size="mini"
style="width: 100%;height: 650px" >
<el-table-column
label="序号"

View File

@@ -245,7 +245,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @row-click="searchGeneralPartRecord(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -280,7 +280,7 @@
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
@@ -343,7 +343,8 @@
style="margin: 10px;"
@change="GeneralShow()">
<el-radio v-model="radio2" :label="3">外购件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 2px">标准件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
<el-radio v-model="radio2" :label="5" style="margin-left: 20px">基本件</el-radio>
</el-radio-group>
<span>项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -378,7 +379,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="searchPurchasePartRecord">
<el-table-column
label="序号"
align="center"
@@ -416,7 +418,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
<el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -452,7 +454,7 @@
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
@@ -497,7 +499,8 @@
style="margin: 10px;"
@change="GeneralShow()">
<el-radio v-model="radio2" :label="3">外购件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 2px">标准件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
<el-radio v-model="radio2" :label="5" style="margin-left: 20px">基本件</el-radio>
</el-radio-group>
<span>项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -533,7 +536,8 @@
size="mini"
border
style="width: 100%;"
height="200">
height="200"
@row-click="standardselecting">
<el-table-column
label="序号"
align="center"
@@ -576,7 +580,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope" align="center">
<el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
<el-button size="mini" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
</template>
</el-table-column>
@@ -604,6 +608,162 @@
<el-button type="primary" @click="edeitsafeAmount()"> </el-button>
</div>
</el-dialog>
<el-card v-show="purchaseBasicShow">
<el-radio-group
v-model="radio"
size="mini"
style="margin: 10px;"
@change="GeneralShow()">
<el-radio v-model="radio2" :label="3">外购件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
<el-radio v-model="radio2" :label="7" style="margin-left: 20px">基本件</el-radio>
</el-radio-group>
<span>项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
v-for="item in Project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in Machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px">
<el-option
v-for="item in GroupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="total7 = 0;pageSize7 = 10;pageList7 = 1;searchPurchaseBasciinfo()">基本件查询</el-button><br>
</el-card>
<el-card v-show="purchaseBasicShow">
<el-table
v-loading="listLoading6"
:data="tablePurchaseBasic"
border
size="mini"
style="width: 100%;"
height="200"
@row-click="searchPurchasePartRecord">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.基本件项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.基本件机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.基本件组号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent7"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total7"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange7"
@current-change="handleCurrentChange7"/>
</div>
</el-card>
<el-card v-show="purchaseBasicShow">
<el-table
v-loading="listLoading7"
:data="PurchasePartIn"
size="mini"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
size="mini"
align="center"
type="index"
width="50"/>
<el-table-column label="实际到货数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.实际到货数量 }}
</template>
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading8"
:data="PurchasePartOut"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="领用者" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.领用者 }}
</template>
</el-table-column>
</el-table>
</el-card>
<el-card v-show="standardshow">
<el-table
v-loading="listLoading10"
@@ -624,7 +784,7 @@
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
@@ -706,7 +866,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="HouseBasicRecord">
<el-table-column
label="序号"
align="center"
@@ -749,7 +910,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HouseBasicRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -784,7 +945,7 @@
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
@@ -864,7 +1025,8 @@
border
size="mini"
style="width: 100%;"
height="200">
height="200"
@row-click="HousePurchaseRecord">
<el-table-column
label="序号"
align="center"
@@ -912,7 +1074,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HousePurchaseRecord(scope.row)">选择</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="AlterNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -947,7 +1109,7 @@
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
@@ -992,7 +1154,7 @@
<script>
import { mapGetters } from 'vuex'
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter } from '@/api/Inventory/InventoryCheck'
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart } from '@/api/Inventory/InventoryCheck'
export default {
data() {
return {
@@ -1061,6 +1223,9 @@ export default {
PageCurrent6: 1,
PageSize6: 10,
total6: null,
PageCurrent7: 1,
PageSize7: 10,
total7: null,
radio: 1,
radio2: 1,
radio3: 1,
@@ -1070,12 +1235,14 @@ export default {
standardshow: false,
housebasicshow: true,
housepurchaseshow: false,
purchaseBasicShow: false,
HouseDataBasic: [],
HouseDataBasicOut: [],
HouseDataBasicIn: [],
HouseDataPurchase: [],
HouseDataPurchaseOut: [],
HouseDataPurchaseIn: [],
tablePurchaseBasic: [],
rules2: { // 表单验证规则
Number: [{ required: true, message: '请输入安全库存量', trigger: 'blur' }],
AlterReason: [{ required: true, message: '请输入安全库存量', trigger: 'blur' }]
@@ -1117,11 +1284,17 @@ export default {
},
GeneralShow() {
if (this.radio === 3) {
this.purchaseBasicShow = false
this.purchaseshow = true
this.standardshow = false
} else {
} else if (this.radio === 4) {
this.purchaseBasicShow = false
this.purchaseshow = false
this.standardshow = true
} else {
this.purchaseBasicShow = true
this.purchaseshow = false
this.standardshow = false
}
},
HouseShow() {
@@ -1278,6 +1451,31 @@ export default {
this.listLoading3 = false
})
},
// 查询外购基本件
searchPurchaseBasciinfo() {
this.listLoading = true
this.tablePurchaseBasic = []
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchPurchaseBasicPart(this.PageCurrent7, this.PageSize7, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tablePurchaseBasic = response.data.rows
this.listLoading = false
this.total7 = response.data.total
})
},
// 查询基本件
searchBasciPartinfo() {
this.listLoading = true
@@ -1429,6 +1627,15 @@ export default {
this.PageCurrent6 = val
this.searchHousePurchase()
},
handleSizeChange7(val) {
this.PageCurrent7 = 1
this.PageSize7 = val
this.searchPurchaseBasciinfo()
},
handleCurrentChange7(val) {
this.PageCurrent7 = val
this.searchPurchaseBasciinfo()
},
// 查询车间采购基本件
searchHouseBasci() {
this.listLoadingx1 = true
@@ -1519,7 +1726,6 @@ export default {
this.dialogFormVisible = true
},
submitChannge() {
console.log(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate)
CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')

View File

@@ -7,6 +7,7 @@
<el-table
:data="tableData"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400"
@row-click="getWarehouse">
@@ -40,7 +41,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right">
<el-table-column label="操作" min-width="200" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -52,18 +53,17 @@
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加</el-button>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableData2"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400">
<el-table-column label="货位名称" align="center" width="200">

View File

@@ -4,9 +4,12 @@
<el-table
v-loading="listLoading"
:data="tableDataBasic"
size="mini"
border
style="width: 100%;"
height="200">
height="200"
@row-click = "searchoutRecord"
>
<el-table-column
label="序号"
align="center"
@@ -39,8 +42,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="parOut(scope.row)">出库</el-button>
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchoutRecord(scope.row)">选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="parOut(scope.row)">出库</el-button>
</template>
</el-table-column>
</el-table>
@@ -100,6 +102,7 @@
<el-table
v-loading="listLoading1"
:data="tableDataOut"
size="mini"
border
style="width: 100%;"
height="350">
@@ -244,7 +247,6 @@ export default {
},
// 打开表单
parOut(row) {
console.log(row)
this.form = []
this.MachineValue = ''
this.GroupNumValue = ''
@@ -253,7 +255,6 @@ export default {
this.locateNumber = row.货位流水号
this.materialNumber = row.物料流水号
this.partnumber = row.货位存量
console.log(this.partnumber)
this.searchoutRecord()
},
// 重置表单
@@ -280,15 +281,15 @@ export default {
} else {
outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息添加成功',
type: 'success'
})
this.$message.success('零件出库成功')
this.dialogFormVisible = false
this.searchDirect()
this.searchPurchasePartinfo()
outRecord(this.contractNumber).then(response => {
this.tableDataOut = response.data
this.listLoading1 = false
})
} else {
this.$message.error('信息添加失败')
this.$message.error('零件出库失败')
}
})
this.dialogFormVisible = false

View File

@@ -42,7 +42,7 @@
<el-tag v-else type="success" size="small">充足</el-tag>
</template>
</el-table-column>
<el-table-column label="物料名称" min-width="200" align="center">
<el-table-column label="物料名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -57,7 +57,7 @@
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="供货商" min-width="200" align="center">
<el-table-column label="供货商" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
@@ -162,6 +162,7 @@
<el-table-column label="操作" align="center" width="280" fixed="right">
<template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
<el-button type="warning" size="mini" icon="el-icon-download" @click="exportCard(scope.row)">导出</el-button>
</template>
</el-table-column>
</el-table>
@@ -198,6 +199,16 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="物料品种" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
@@ -210,12 +221,69 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
<el-card>
<div id="print">
<div style="text-align: center">
<h2> 线 </h2>
<hr>
<table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
<colgroup>
<col style="width: 73px">
<col style="width: 78px">
<col style="width: 84px">
<col style="width: 88px">
<col style="width: 94px">
<col style="width: 80px">
</colgroup>
<tr>
<td class="tg-s268">请购单号:</td>
<td class="tg-0lax" style=" text-align: left">{{ inbondCard[0] }}</td>
<td class="tg-0lax">请购人:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[1] }}</td>
</tr>
<tr>
<td class="tg-0lax">仓库名称:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[2] }}</td>
<td class="tg-0lax">请购时间:</td>
<td class="tg-0lax" style="text-align: left">{{ inbondCard[3] }}</td>
</tr>
</table>
<div style="margin-top: 10px">
<table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
<tr>
<th class="tg-c3ow">物料名称</th>
<th class="tg-c3ow">物料规格</th>
<th class="tg-c3ow">物料型号</th>
<th class="tg-c3ow">物料品种</th>
<th class="tg-c3ow">物料类别</th>
<th class="tg-c3ow">数量</th>
</tr>
<tr v-for="(list, index) in tableData3" :key="index">
<td class="tg-c3ow">{{ list.物料名称 }}</td>
<td class="tg-c3ow">{{ list.物料规格 }}</td>
<td class="tg-c3ow">{{ list.物料型号 }}</td>
<td class="tg-c3ow">{{ list.物料品种 }}</td>
<td class="tg-c3ow">{{ list.物料类别 }}</td>
<td class="tg-c3ow">{{ list.数量 }}</td>
</tr>
</table>
</div>
</div>
</div>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
<el-button type="primary" size="small" @click="printCard">打印</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail, deleteRequest, deleteRequestDetail, alterNumber, setSafeValue } from '@/api/Inventory/OfflinePurchase'
import { mapGetters } from 'vuex'
import $ from 'jquery'
export default {
data() {
@@ -285,7 +353,9 @@ export default {
disable4: true,
disable: false, // 其他的禁用
House: [],
HouseNumber: ''
HouseNumber: '',
dialogVisibleExport: false, // 导出表单
inbondCard: [] // 导出表格表头
}
},
computed: {
@@ -348,6 +418,14 @@ export default {
this.total1 = response.data.total
})
},
handleSizeChange1(val) { // 离线请购单列表分页
this.pageSize1 = val
this.searchTable1()
},
handleCurrentChange1(val) { // 离线请购单列表分页
this.pageCurrent1 = val
this.searchTable1()
},
handleSizeChange2(val) { // 离线请购单列表分页
this.pageSize2 = val
this.searchTable2()
@@ -455,6 +533,27 @@ export default {
}
})
},
exportCard(row) {
this.dialogVisibleExport = true
this.inbondCard[0] = row.请购单编号
this.inbondCard[1] = row.姓名
this.inbondCard[2] = row.仓库名称
this.inbondCard[3] = row.请购时间.split(' ')[0]
SeeDetail(this.purchasecardnumber).then(response => {
this.tableData3 = response.data
})
},
// 打印请购单
printCard() {
const htmlNode = $('#print').html() // #print为需要打印的dom节点id
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
printNode.remove()
},
// 传递请购单
doneRequestCard() {
this.$confirm('确定传递请购单?', '提示', {
@@ -518,4 +617,8 @@ export default {
right: 15px;
top: 5px;
}
.tg {border-collapse:collapse;border-spacing:0;}
.tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
</style>

View File

@@ -8,8 +8,10 @@
v-loading="listLoading"
:data="tableData1"
border
size="mini"
style="width: 100%;"
height="300">
height="300"
@row-click = "chooseListinfor">
<el-table-column
label="序号"
align="center"
@@ -30,11 +32,6 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading1"
@@ -63,7 +60,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="领用数量" align="center" width="50">
<el-table-column label="领用数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
@@ -90,8 +87,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
<el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
<el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
<el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
</template>
</el-table-column>
</el-table>
@@ -99,9 +96,6 @@
<!--异常出库对话框-->
<el-dialog :visible.sync="dialogFormVisible" title="异常出库" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form.ErrorNumber" size="small" placeholder="出库数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="异常数量" prop="ContractNumberValue" label-width="100px" size="small">
<el-input v-model="form.ErrorNumber" size="small" placeholder="异常数量" style="width: 200px"/>
</el-form-item>
@@ -166,9 +160,12 @@ export default {
projectnumber: '',
machinenumber: '',
teamnumber: '',
teanmpartnumber: '',
craftnumber: '',
locatenumber: ''
purchaseDeatileNumber: '', // 采购合同明细流水号
askPurchaseNumber: '', // 请购单明细流水号
craftnumber: '', // 工艺计划流水号
partType: '', // 零件类型
locatenumber: '',
partName: '' // 名称
}
},
computed: {
@@ -183,7 +180,6 @@ export default {
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
console.log(this.picikingPeople)
},
// 查询领料单
searchListinfor() {
@@ -208,6 +204,7 @@ export default {
data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataPicking = data
console.log(this.tableDataPicking)
this.listLoading1 = false
})
},
@@ -220,17 +217,16 @@ export default {
},
// 出库
partOut(row) {
console.log(row)
if (row.车间外购 === 1) {
WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (row.出库类型 === 3) {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
this.searchListDetailt()
} else { this.$message.error('出库失败') }
})
} else if (row.零件类型 === 1 || row.零件类型 === 2) {
PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
} else if (row.出库类型 === 2) {
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
@@ -248,20 +244,24 @@ export default {
}
},
ErrorpartOut(row) {
console.log(row, 1111)
this.dialogFormVisible = true
this.projectnumber = row.项目流水号
this.machinenumber = row.机床流水号
this.teamnumber = row.组件流水号
this.teanmpartnumber = row.采购合同明细流水号
this.purchaseDeatileNumber = row.采购合同明细流水号
this.askPurchaseNumber = row.请购单明细流水号
this.craftnumber = row.工艺计划流水号
this.locatenumber = row.货位流水号
this.partType = row.零件类型
this.partName = row.名称
},
callOff(form) {
this.form = []
this.dialogFormVisible = false
},
submitEdit() {
ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.teanmpartnumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason).then(response => {
ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.partName, this.picikingPeople, this.purchaseDeatileNumber, this.askPurchaseNumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason, this.partType).then(response => {
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.dialogFormVisible = false

View File

@@ -77,6 +77,7 @@
</el-table-column>
<el-table-column label="修改原因" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.修改原因 }}
</template>
</el-table-column>
@@ -87,7 +88,7 @@
</el-table-column>
<el-table-column label="修改日期" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.修改日期 }}
{{ scope.row.修改日期 ? scope.row.修改日期.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="仓库" min-width="100" align="center">
@@ -160,7 +161,7 @@
</el-table-column>
<el-table-column label="记录时间" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.记录时间 }}
{{ scope.row.记录时间 ? scope.row.记录时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="零件类型" min-width="100" align="center">
@@ -225,7 +226,7 @@
</el-table-column>
<el-table-column label="补投时间" align="center" min-width="250">
<template slot-scope="scope">
{{ scope.row.补投时间 }}
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="仓库名称" align="center" min-width="250">
@@ -470,10 +471,10 @@ export default {
} else {
this.GroupNumValue_check = 1
}
searchAlterRecord(this.pageCurrent, this.pageSize, this.rojectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
searchAlterRecord(this.pageCurrent, this.pageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableData1 = response.data.rows
console.log(response.data)
console.log(this.tableData1)
console.log(response.data.rows)
console.log(this.tableData1, 112233)
this.total = response.data.total
this.loading = false
})

View File

@@ -5,7 +5,8 @@
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchListinfor()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addListinfor()">创建</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="downLoadCjn()">导出</el-button>
</el-card>
<el-card>
<el-table
v-loading="listLoading2"
:data="tableData1"
@@ -13,7 +14,7 @@
style="width: 100%;"
size="mini"
height="200"
@row-click = "searchListDetailt()">
@row-click = "chooseListinfor">
<el-table-column
label="序号"
align="center"
@@ -36,8 +37,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -63,9 +63,9 @@
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="100">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="100">
@@ -115,8 +115,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 10px 10px" @click="editListDetailx(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropListdetail(scope.row)">删除</el-button>
<el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 10px 10px" @click="editListDetailx(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropListdetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -181,7 +181,7 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="40">
<el-table-column label="计划数量" align="center" min-width="40">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -218,7 +218,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button :disabled="scope.row.是否禁用" size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button>
<el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button>
</template>
</el-table-column>
</el-table>
@@ -274,7 +274,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -301,7 +301,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addListDetailinfor(scope.row)">领料</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addListDetailinfor(scope.row)">领料</el-button>
</template>
</el-table-column>
</el-table>
@@ -319,6 +319,7 @@
v-loading="listLoadingx"
:data="tableDataHouse"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -356,9 +357,9 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
@@ -582,13 +583,17 @@ export default {
pickingListDetail: '',
tableDataHouse: [],
listLoadingx: '',
purchaseDetailNum: '',
purchaseDetailNum: '', // 采购合同明细流水号
askPurchaseNumber: '', // 请购单明细流水号
dialogFormVisibleWork: false,
time: [],
materialLocate: '',
enableOut: '',
pickingListNumber_check: 1,
outNumber: ''
outNumber: '',
outType: '',
material: '', // 材料
partPiant: '' // 零件图号
}
},
computed: {
@@ -663,7 +668,6 @@ export default {
}
}
this.tableDataPurchase = response.data.rows
console.log(this.tableDataPurchase, 124124)
this.listLoading = false
this.total1 = response.data.total
})
@@ -808,10 +812,12 @@ export default {
// 选择领料单
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
this.searchListDetailt()
},
// 增加基本件领料单明细
addBasicListDetailinfor(row) {
this.form = []
this.outType = 1
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
@@ -826,11 +832,8 @@ export default {
this.materialName = row.零件名称
this.materialNumber = row.零件图号
this.dialogFormVisible1 = true
this.materialName = row.零件名称
this.materialType = row.零件类型名称
this.materialNumber = row.零件图号
this.enableOut = row.可出库数量
this.purchaseDetailNum = row.采购合同明细流水号
},
addBasicListDetail(formName) {
if (this.pickingListNumberx === '') {
@@ -840,7 +843,7 @@ export default {
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
@@ -858,6 +861,7 @@ export default {
// 增加外购件领料单明细
addListDetailinfor(row) {
this.form = []
this.outType = 2
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
@@ -873,6 +877,8 @@ export default {
this.materialNumber = row.物料型号
this.materialType = row.物料规格
this.dialogFormVisible = true
this.partPiant = row.零件图号
this.material = row.材料
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量 - row.待出库数量
@@ -886,7 +892,7 @@ export default {
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()
@@ -904,23 +910,22 @@ export default {
// 增加车间采购领料单明细
addWorkshopDetailinfor(row) {
this.form = []
this.outType = 3
console.log(row)
this.partProjectNumber = row.项目流水号
this.partProjectName = row.项目名称
this.partMachineNumber = row.机床流水号
this.partMachineName = row.机床图号
this.partGroupNumber = row.组件流水号
this.partGroupName = row.组号
this.partType = row.零件类型
this.receive = row.收件信息ID
this.locatenumber = row.货位流水号
this.dialogFormVisibleWork = true
this.askPurchaseNumber = row.请购单明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
this.materialName = row.物料名称
this.materialNumber = row.物料型号
this.materialType = row.物料规格
this.dialogFormVisibleWork = true
this.purchaseDetailNum = row.采购合同明细流水号
this.materialLocate = row.物料与货位对照流水号
this.enableOut = row.货位存量
console.log(this.enableOut)
this.partPiant = row.零件图号
this.material = row.材料
},
addWorkshopListDetail(formName) {
this.$refs[formName].validate((valid) => {
@@ -930,7 +935,7 @@ export default {
} else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
this.$message.error('请正确输入领用数量')
} else {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.searchPartinfo()

View File

@@ -12,6 +12,7 @@
v-loading="listLoading"
:data="tableDataExchange"
border
size="mini"
style="width: 100%;"
height="450">
<el-table-column
@@ -49,6 +50,16 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="仓库" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="货位" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="substitutePart(scope.row)">替换件到货</el-button>

View File

@@ -25,12 +25,13 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="total = 0;pageSize = 10;pageList = 1;searchPartinfo()">查询</el-button><br>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px; " @click="total = 0;pageSize = 10;pageList = 1;searchPartinfo()">查询</el-button><br>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableDataPurchase"
size = "mini"
border
style="width: 100%;"
height="200">
@@ -66,12 +67,12 @@
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
{{ scope.row.外购件类型 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selecting(scope.row)">替换</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selecting(scope.row)">替换</el-button>
</template>
</el-table-column>
</el-table>
@@ -85,6 +86,7 @@
:data="tableData1"
border
style="width: 100%;"
size = "mini"
height="100"
>
<el-table-column
@@ -128,6 +130,7 @@
<el-table
:data="tableData2"
border
size = "mini"
style="width: 100%;"
height="100">
<el-table-column
@@ -181,13 +184,14 @@
<!--选择替换件-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增替换件" center width="600px">
<el-form :rules="rules" label-position="left">
<el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="small">
<el-input v-model="form.ExchangeNumber" size="small" placeholder="物料名称" style="width: 200px"/>
<el-button type="primary" @click="getSubstituted()">查询</el-button>
<el-form-item label="物料名称" prop="ContractNumberValue" label-width="150px" size="mini">
<el-input v-model="materialName" size="small" placeholder="物料名称" style="width: 200px"/>
<el-button type="primary" size = "mini" @click="getSubstituted()">查询</el-button>
</el-form-item>
<el-table
:data="tableDataSub"
border
size = "mini"
style="width: 100%;"
height="100">
<el-table-column
@@ -205,21 +209,21 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="量" align="center" min-width="80">
<el-table-column label="货位存量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row. }}
{{ scope.row.货位存 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="chooseSub()"> </el-button>
<el-button size = "mini" @click="callOff('form')">取消</el-button>
<el-button size = "mini" type="primary" @click="chooseSub()"> </el-button>
</div>
</el-dialog>
</el-card>
@@ -228,6 +232,7 @@
v-loading="listLoading1"
:data="tableDataExchange"
border
size = "mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -272,8 +277,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 0px" @click="dropListinfor(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -287,13 +292,13 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
ProjectValue: ' ',
ProjectValue: '',
Project: [],
ProjectValue_check: 1,
MachineValue: ' ',
MachineValue: '',
Machine: [],
MachineValue_check: 1,
GroupNumValue: ' ',
GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
tableDataPurchase: [],
@@ -327,7 +332,9 @@ export default {
listLoading: '',
listLoading1: '',
substituteListNumber: '',
title: ''
title: '',
materialName: '',
materialName_check: 0
}
},
computed: {
@@ -381,19 +388,24 @@ export default {
// 被替换件查询
searchPartinfo() {
this.tableDataPurchase = []
if (this.ProjectValue === ' ') {
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === ' ') {
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === ' ') {
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
this.listLoading = true
searchPurchasePart(this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data
console.log(this.tableDataPurchase)
this.listLoading = false
})
},
@@ -407,7 +419,12 @@ export default {
},
// 被替换件查询
getSubstituted() {
searchSubstituted().then(response => {
if (this.materialName === '') {
this.materialName_check = 0
} else {
this.materialName_check = 1
}
searchSubstituted(this.materialName_check, this.materialName).then(response => {
this.tableDataSub = response.data
})
},
@@ -434,9 +451,9 @@ export default {
chooseSub() {
this.dialogFormVisible2 = false
},
// 增加换件
// 增加换件
addListDetailinfor() {
addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].组件零件流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
addSubstitutepart(this.tableData2[0].离线合同明细流水号, this.tableData1[0].采购合同明细流水号, this.form.ExchangeNumber, this.tableData1[0].物料名称, this.tableData2[0].货位流水号, this.tableData2[0].物料名称, this.picikingPeople, this.form.ExchangeNumberx, this.form.ExchangeNote).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }

View File

@@ -554,7 +554,7 @@ export default {
background-color: transparent;
border: 0px solid white;
}
.green{
.lightgreen{
background-color: lightgreen;
border: 1px solid #1f2d3d;
}

View File

@@ -632,12 +632,13 @@ export default {
} else {
this.$message.error('信息编辑失败')
}
}).then(() => {
this.getTableData()
})
} else {
this.$message.error('信息编辑失败')
}
})
this.getTableData()
} else {
handlechange3(this.Num, this.form.考勤编号).then(response => {
if (response.data[0].result === '1') {
@@ -648,6 +649,8 @@ export default {
} else {
this.$message.error('信息编辑失败')
}
}).then(() => {
this.getTableData()
})
} else {
this.$message.error('信息编辑失败')
@@ -724,7 +727,7 @@ export default {
background-color: transparent;
border: 0px solid white;
}
.green{
.lightgreen{
background-color: lightgreen;
border: 1px solid #1f2d3d;
}

View File

@@ -253,7 +253,7 @@ export default {
this.listLoading = true
this.tableData = []
this.num0 = ''
if (this.radio === 1) {
if (this.radio === 1) { // 未编制
detailInfo(this.partNumValue).then(response => {
if (response.data.length !== 0) {
this.typeValue = response.data[0].零件类型名称
@@ -264,6 +264,7 @@ export default {
}
}).then(() => {
mainTable(this.num0).then(response => {
console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
} else {

View File

@@ -4,7 +4,6 @@
<el-card>
<div>
<!--项目名称-->
<span>项目名称:</span>
<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
<el-option
@@ -13,7 +12,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--机床号-->
<span style="margin-left: 15px">机床号:</span>
<el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:200px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
<el-option
@@ -22,7 +20,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--组号-->
<span style="margin-left: 15px">组号:</span>
<el-select v-model="TeamValue" placeholder="请选择组号" style="width:200px" clearable size="small">
<el-option
@@ -88,11 +85,11 @@
<el-table-column
align="center"
prop="province7"
label="批次零件状态"
label="零件状态"
>
<template slot-scope="scope">
<div v-if="scope.row.批次零件状态 === '2'">停产</div>
<div v-else >正常生产</div>
<el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
<el-tag v-else type="success" size="small">生产</el-tag>
</template>
</el-table-column>
<el-table-column
@@ -102,7 +99,7 @@
width="100px"
>
<template slot-scope="scope" >
<el-button type="primary" size="small" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" size="small" @click="handleEdit(scope.row)">停产</el-button>
</template>
</el-table-column>
</el-table>
@@ -185,61 +182,6 @@
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<!--编辑对话框-->
<div style="text-align: left">
<el-dialog :visible.sync="dialogeditVisible" title="编辑" style="width: 800px;margin: auto" center >
<el-form ref="form" :model="form" label-position="left">
<el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
</el-form-item>
<el-form-item label="批次零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
<el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
<el-radio-button label="正常生产"/>
<el-radio-button label="停止生产"/>
</el-radio-group>
</el-form-item>
<el-form-item label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
<el-date-picker
v-model="input3"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
<el-date-picker
v-model="input4"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
</el-form>
<div style="margin-right: 60px;margin-top: 10px">
<el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div>
<el-dialog :visible.sync="dialogeditVisible1" title="停产记录" style="width: 800px;margin: auto" center>
<el-form ref="form2" :model="form2" label-position="left">
<el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form2.reason" auto-complete="off"/>
</el-form-item>
<el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-date-picker
v-model="form2.time"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
</el-form>
<div style="margin-left: 140px;margin-top: 10px">
<el-button type="primary" @click="submitRemark()">确定</el-button>
</div>
</el-dialog>
<el-card>
<div>停产后,将重新补投两种零件一种是接着加工(执行原来的加工计划)另一种是从第一序重新加工(重新制定零件的加工计划)补投的零件号后加B</div>
@@ -248,19 +190,19 @@
<el-input v-model="inputA" auto-complete="off" style="width: 200px" size="small"/>
<span>开始工序</span>
<el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
<el-button :disabled="disabled" type="success" size="small" @click="editA">补投接着生产零件</el-button>
<el-button type="success" size="small" @click="editA">补投接着生产零件</el-button>
</div>
<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>
<!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
<div style="margin-top: 20px; display: block">
<span>补投重新加工零件数量</span>
<el-input v-model="inputC" auto-complete="off" style="width: 200px" size="small" />
<span>开始工序</span>
<el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
<el-button :disabled="disabledB" type="success" size="small" @click="editB">补投重新生产零件</el-button>
<el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
</div>
</el-card>
<el-card>
<el-card v-show="false">
<el-table
:data="tableData4"
height="250"
@@ -295,11 +237,75 @@
</el-table>
</el-card>
<el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
<el-form ref="form" :model="form" label-position="left">
<el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
</el-form-item>
<el-form-item label="停产原因" label-width="100px" prop="reason" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form2.reason" auto-complete="off" style="margin-left: 20px"/>
</el-form-item>
<el-form-item label="停产时间" label-width="120px" prop="time" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-date-picker
v-model="form2.time"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
<el-form-item v-show="false" label="零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
<el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
<el-radio-button label="正常生产"/>
<el-radio-button label="停止生产"/>
</el-radio-group>
</el-form-item>
<el-form-item v-show="false" label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
<el-date-picker
v-model="input3"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
<el-form-item v-show="false" label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
<el-date-picker
v-model="input4"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
</el-form>
<div style="margin-right: 60px;margin-top: 10px">
<el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
<el-form ref="form2" :model="form2" label-position="left">
<el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form2.reason" auto-complete="off"/>
</el-form-item>
<el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-date-picker
v-model="form2.time"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="选择日期"/>
</el-form-item>
</el-form>
<div style="margin-left: 140px;margin-top: 10px">
<el-button type="primary" @click="submitRemark()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, TableData3Select, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
export default {
data() {
return {
@@ -361,6 +367,7 @@ export default {
},
created() {
this.fetchProjectNameData()
this.fetchTableData()
},
methods: {
// 项目名称查询
@@ -453,7 +460,7 @@ export default {
this.radio === '正常生产' ? this.temp = '1' : this.temp = '2'
const Time = await editTime(this.code, this.input3, this.input4)
const Char = await editchar(this.remark1, this.remark2, this.code)
const Stop = await editStop(this.code, this.temp)
const Stop = await editStop(this.code, 2)
if (Time.data[0].result === '1' && Char.data[0].result === '1' && Stop.data[0].result === '1') {
this.dialogeditVisible = false
this.$message.success('信息更新成功')
@@ -481,10 +488,7 @@ export default {
editA(this.CutCodeBefore, this.inputA, this.inputB).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补投成功')
this.disabled = true
TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
this.tableData4 = response.data
})
this.fetchTableData()
} else {
this.$message.error('补投失败')
}
@@ -496,10 +500,7 @@ export default {
editA(this.CutCodeBefore, this.inputC, this.inputD).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补投成功')
this.disabledB = true
TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
this.tableData4 = response.data
})
this.fetchTableData()
} else {
this.$message.error('补投失败')
}

View File

@@ -98,7 +98,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
<el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
<el-row style="margin: 2px 0 30px 30px;">
<el-radio-group v-model="radio">

View File

@@ -73,7 +73,7 @@
</el-col>
</el-row>
</el-form>
<el-table :data="tableData1" border style="margin-bottom: 10px;max-height: 300px;" height="300px" size="mini" show-summary>
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 300px;" height="300px" size="mini" show-summary>
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="交货期" align="center" min-width="130">
<template slot-scope="scope">
@@ -510,8 +510,8 @@ export default {
document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
this.$refs.tinymce.initTinymce()
@@ -579,4 +579,7 @@ export default {
span{
margin: 0 0 0 20px;
}
.el-form-item{
margin: 0;
}
</style>

View File

@@ -197,6 +197,7 @@ export default {
},
methods: {
fetchData() {
this.person = []
initBuyer().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.person.push({
@@ -206,6 +207,7 @@ export default {
})
}
})
this.contractNum = []
initContract().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.contractNum.push({
@@ -244,7 +246,12 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('审批成功')
this.dialogVisible3 = false
this.fetchData() // 重新初始化
this.contractNumValue = ''
this.personValue = ''
this.supplierName = ''
this.searchTable1()
this.returns = ''
} else { this.$message.error('审批失败') }
})
} else {

View File

@@ -56,6 +56,7 @@
<el-card>
<el-table
v-loading="loading1"
id="expandTable"
:data="tableData1"
size="mini"
border
@@ -101,17 +102,22 @@
<el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
</template>
</el-table-column>
<el-table-column label="采购合同号" align="center" min-width="130">
<el-table-column label="审批时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.审批时间 }}
</template>
</el-table-column>
<el-table-column label="采购合同号" align="center" min-width="160">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="采购合同名称" align="center" min-width="130">
<el-table-column label="采购合同名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="200">
<el-table-column label="供应商" align="center" min-width="220">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -363,7 +369,7 @@ export default {
}
</style>
<style>
.el-form-item {
#expandTable .el-form-item {
margin: 0;
}
</style>

View File

@@ -9,17 +9,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>采购合同号:</span>-->
<!--<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
<!--<el-option-->
<!--v-for="item in contractNums"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value">-->
<!--<div style="float: left">{{ item.label }}</div>-->
<!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
<!--</el-option>-->
<!--</el-select>-->
<el-button
type="success"
size="small"
@@ -36,34 +25,29 @@
</el-card>
<el-card>
<el-table v-loading="" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border highlight-current-row @row-click="searchPic">
<el-table id="expandTable" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border @row-click="searchPicInner">
<el-table-column type="expand">
<template slot-scope="scope">
<el-form id="table" label-position="left" inline class="demo-table-expand">
<el-row>
<el-col :span="8">
<el-col :span="10">
<viewer>
<img :src="scope.row.scanSrc" alt="发票扫描件" height="200px">
</viewer>
</el-col>
<el-col :span="14">
<el-form-item label="接收人">
{{ scope.row.接收人 ? scope.row.接收人 : '—' }}
</el-form-item>
</el-col>
<el-col :span="8">
</el-form-item><br>
<el-form-item label="接收时间">
{{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
</el-form-item>
</el-col>
<el-col :span="8">
</el-form-item><br>
<el-form-item label="发票号">
{{ scope.row.发票号 ? scope.row.发票号 : '—' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-form-item><br>
<el-form-item label="开户行">
{{ scope.row.开户行 ? scope.row.开户行 : '—' }}
</el-form-item>
</el-col>
<el-col :span="8">
</el-form-item><br>
<el-form-item label="开票时间">
{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '—' }}
</el-form-item>
@@ -83,7 +67,7 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="关合同" min-width="80px">
<el-table-column align="center" label="关合同" min-width="80px">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<el-table :data="tableData01" stripe size="mini" show-summary>
@@ -104,15 +88,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" plain type="success" size="mini" icon="el-icon-search" @click="invoiceDetail(scope.row)"/>
<el-button slot="reference" plain type="success" size="mini" icon="el-icon-document" @click="invoiceDetail(scope.row)"/>
</el-popover>
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="150px">
<template slot-scope="scope">
{{ scope.row.备注 ? scope.row.备注 : '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额" min-width="100px" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
@@ -128,6 +107,11 @@
{{ scope.row.传送时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="150px">
<template slot-scope="scope">
{{ scope.row.备注 ? scope.row.备注 : '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button
@@ -156,7 +140,6 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<img :src="scanSrc" alt="发票扫描件" width="100%">
</el-card>
<el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="460px">
@@ -208,7 +191,8 @@
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
</el-form-item>
<el-form-item label="发票扫描件">
<b style="color: #f56c6c;margin: 0">* </b>
<el-form-item label="发票扫描件" style="display: inline-block">
<el-upload
id="invoiceScan"
ref="upload"
@@ -233,17 +217,18 @@
<el-dialog :title="title1" :visible.sync="dialogVisible2" center style="min-height: 300px" width="1200px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="80px">
<el-row>
<el-col style="width: 800px">
<viewer>
<img :src="scanSrc" style="margin: 0 auto" alt="发票扫描件" width="800px">
</viewer>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-input v-model="form1.supplierName" size="small" disabled placeholder="供应商"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开票金额">
<el-input v-model="form1.money" size="small" disabled placeholder="开票金额"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="传送人">
<el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled>
<el-option
@@ -253,8 +238,6 @@
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="接收人">
<el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" disabled>
<el-option
@@ -264,25 +247,15 @@
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" disabled placeholder="备注"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发票号" prop="invoiceNum">
<el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开户行" prop="bank">
<el-input v-model="form1.bank" size="small" placeholder="开户行"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开票时间" prop="invoiceTime">
<el-date-picker
v-model="form1.invoiceTime"
@@ -294,11 +267,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="扫描件">
<img :src="scanSrc" alt="发票扫描件" width="1000px">
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
@@ -320,7 +288,7 @@ export default {
return {
offline: '非离线',
check1: 0,
office: false,
office: null, // 是否为办公室
scanSrc: '',
upload: uploadInvoiceScan,
limit: 1,
@@ -374,12 +342,15 @@ export default {
'sidebar',
'avatar',
'name',
'token', // 角色编号
'id' // 人员编号
])
},
created() {
this.fetchData()
this.searchTable1()
console.log(this.token)
Number(this.token) === 8 ? this.office = true : this.office = false // 是否为办公室8是办公室2是采购部
},
methods: {
offlineChange2() { // 切换离线非离线(内)
@@ -457,6 +428,13 @@ export default {
this.contractNumValue ? this.check2 = 1 : this.check2 = 0
searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.supplierNumValue, this.check2, this.contractNumValue).then(response => {
this.tableData1 = response.data.rows
this.tableData1.map(v => {
this.$set(v, 'scanSrc', '')
return v
})
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
}
this.total1 = response.data.total
})
this.scanSrc = ''
@@ -570,7 +548,18 @@ export default {
})
})
},
async searchPic(row) {
async searchPic(row, i) {
const { data } = await request({
url: '',
method: 'post',
data: {
type: '3',
name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
}
})
this.tableData1[i].scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
},
async searchPicInner(row) {
const { data } = await request({
url: '',
method: 'post',
@@ -586,6 +575,9 @@ export default {
</script>
<style scoped>
#expandTable .el-form-item{
margin: 0;
}
.el-tag{
margin: 0
}
@@ -601,9 +593,6 @@ export default {
.el-input{
width:200px
}
span{
margin: 10px 0 10px 10px;
}
.searchForm .el-form-item{
margin-top: 1px;
margin-bottom: 1px;

View File

@@ -406,18 +406,29 @@ export default {
}
},
allDelete() {
if (this.projectName !== '' && this.machineValue !== '' && this.groupValue !== '') {
allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
if (response.data[0].result === '1') {
this.tableData = []
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.projectName !== '' && this.machineValue !== '' && this.groupValue !== '') {
allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
if (response.data[0].result === '1') {
this.tableData = []
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
} else {
this.$message.warning('请选择好项目机床分组')
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
} else {
this.$message.warning('请选择好项目机床分组')
}
})
},
getGroups() {
this.$emit('machineChange', this.machineValue)

View File

@@ -73,7 +73,7 @@
<el-progress
:text-inside="true"
:stroke-width="18"
:percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))"
:percentage="(parseInt(10000*(scope.row.合同物料到货总数)/scope.row.合同物料采购总数)) / 100"
status="success"/>
</template>
</el-table-column>

View File

@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column align="center" label="到票情况" min-width="200px">
<template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.剩余总金额).toFixed(2)" status="success"/>
<el-progress :text-inside="true" :stroke-width="18" :percentage="(parseInt(10000*(scope.row.到票总金额)/scope.row.剩余总金额)) / 100" status="success"/>
</template>
</el-table-column>
</el-table>
@@ -178,6 +178,7 @@ export default {
})
},
searchTable1() {
this.tableData2 = []
this.contractNum ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {

View File

@@ -136,7 +136,7 @@
<el-table-column label="操作" align="center" width="350px" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
<el-button type="warning" size="mini" icon="el-icon-download" @click="exportTable('QG')">导出</el-button>
<el-button type="warning" size="mini" icon="el-icon-download" @click="exportTable('QG', scope.row)">导出</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" @click="handleDelete(scope.row)">作废</el-button>
</template>
</el-table-column>
@@ -249,7 +249,7 @@
</template>
<script>
import { searchInventoryNum, searchOfflineContract, addData, editData, deleteData, searchMateriel, update,
import { searchInventoryNum, searchOfflineContract, addData, editData, deleteData, searchMateriel, update, updateStatus,
addMateriel, deleteMateriel, setSafeValue } from '@/api/WorkshopProcurement/OfflineContract1'
import { mapGetters } from 'vuex'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
@@ -375,7 +375,10 @@ export default {
this.pageCurrent2 = val
this.searchTable2()
},
exportTable(tableid) {
exportTable(tableid, row) {
updateStatus(row.请购单流水号).then(response => {
this.searchTable2()
})
if (this.tableData3.length === 0) {
this.$message.warning('暂无数据')
} else {

View File

@@ -3,18 +3,8 @@
<div style="width: 48%; float: left;margin-left: 20px">
<el-card>
<el-row>
<span>时间段:</span>
<el-date-picker
v-model="startEndDate"
style="width:240px"
size="small"
type="daterange"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width:180px" filterable clearable>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width:150px" filterable clearable>
<el-option
v-for="item in contractNum"
:key="item.value"
@@ -26,10 +16,8 @@
</el-select>
<span>采购员:</span>
<el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;buyer=0"/>
</el-row>
<el-row style="margin-top: 10px">
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<el-input v-model="supplierName" placeholder="供应商" size="small" style="width:120px" clearable/>
<el-button
type="success"
size="small"
@@ -37,7 +25,7 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询现有合同</el-button>
</el-row>
<el-card>
<el-card style="margin-top: 20px">
<el-table v-loading="loading1" :data="tableData1" border style="width: 100%;max-height: 400px;" height="200px" highlight-current-row size="mini" @row-click="searchTable2">
<el-table-column label="采购合同号" align="center">
<template slot-scope="scope">
@@ -54,6 +42,11 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
@@ -218,18 +211,8 @@
<div style="width: 48%; float: right; margin-right: 20px">
<el-card>
<el-row>
<span>时间段:</span>
<el-date-picker
v-model="startEndDate1"
style="width:240px"
size="small"
type="daterange"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span>合同号:</span>
<el-select v-model="contractNumValue1" placeholder="合同号" size="small" style="width:180px" filterable clearable>
<el-select v-model="contractNumValue1" placeholder="合同号" size="small" style="width:150px" filterable clearable>
<el-option
v-for="item in contractNum1"
:key="item.value"
@@ -241,10 +224,8 @@
</el-select>
<span>采购员:</span>
<el-input v-model="buyerName1" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true;buyer=1"/>
</el-row>
<el-row style="margin-top: 10px">
<span>供应商:</span>
<el-input v-model="supplierName1" placeholder="供应商" size="small" clearable/>
<el-input v-model="supplierName1" placeholder="供应商" size="small" style="width:120px" clearable/>
<el-button
type="success"
size="small"
@@ -252,14 +233,14 @@
style="margin-left:10px"
@click="total2=0;pageCurrent2=1;pageSize2=10;searchTable3()">查询变更记录</el-button>
</el-row>
<el-card>
<el-card style="margin-top: 20px">
<el-table v-loading="loading2" :data="tableData2" border style="width: 100%;max-height: 400px" height="200px" highlight-current-row size="mini" @row-click="searchTable4">
<el-table-column label="采购合同号" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="规定到货时间" align="center">
<el-table-column label="规定到货时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.规定到货时间 }}
</template>
@@ -269,6 +250,11 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
@@ -498,13 +484,10 @@ export default {
TotalAmount1: '',
TotalAmount3: '',
TotalAmount4: '',
check1: 0,
check2: 0,
check3: 0,
check4: 0,
check5: 0,
startEndDate: '',
startEndDate1: '',
contract: '',
contract1: '',
taxRate: '',
@@ -516,6 +499,10 @@ export default {
ProcurementContractNum: '',
buyer: 0,
Supplier: 0,
Name: '',
Name1: '',
Value: '',
Value1: '',
buyerName: '',
buyerValue: '',
buyerName1: '',
@@ -593,23 +580,26 @@ export default {
clickBuyer(row) { // 点击采购员表某一行
this.submitDisable = false
if (this.buyer === 0) {
this.buyerName = row.姓名
this.buyerValue = row.人员编号
this.Name = row.姓名
this.Value = row.人员编号
} else if (this.buyer === 1) {
this.buyerName1 = row.姓名
this.buyerValue1 = row.人员编号
this.Name1 = row.姓名
this.Value1 = row.人员编号
}
},
submitSelectBuyer() { // 确定
this.dialogVisible2 = false
if (this.buyer === 0) {
this.buyerName = this.Name
this.buyerValue = this.Value
} else if (this.buyer === 1) {
this.buyerName1 = this.Name1
this.buyerValue1 = this.Value1
}
},
searchTable1() {
this.textarea = ``
this.loading1 = true
if (this.startEndDate === '' || this.startEndDate === null || this.startEndDate[0] === '' || this.startEndDate[1] === '') {
this.check1 = 0
this.startEndDate = ''
} else { this.check1 = 1 }
this.contractNumValue ? this.check2 = 1 : this.check2 = 0
this.buyerName ? this.check3 = 1 : this.check3 = 0
this.supplierName ? this.check4 = 1 : this.check4 = 0
@@ -618,7 +608,7 @@ export default {
} else {
this.check5 = 1
}
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
searchTable1(this.pageCurrent1, this.pageSize1, this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
this.loading1 = false
console.log(response.data.rows)
for (let j = 0; j < response.data.rows.length; j++) {
@@ -633,14 +623,10 @@ export default {
searchTable3() {
this.textarea1 = ``
this.loading2 = true
if (this.startEndDate1 === '' || this.startEndDate1 === null || this.startEndDate1[0] === '' || this.startEndDate1[1] === '') {
this.check1 = 0
this.startEndDate1 = ''
} else { this.check1 = 1 }
this.contractNumValue1 ? this.check2 = 1 : this.check2 = 0
this.buyerName1 ? this.check3 = 1 : this.check3 = 0
this.supplierName1 ? this.check4 = 1 : this.check4 = 0
searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate1[0], this.startEndDate1[1], this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
searchTable3(this.pageCurrent2, this.pageSize2, this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
this.loading2 = false
for (let j = 0; j < response.data.rows.length; j++) {
if (response.data.rows[j].规定到货时间 !== null) {