Merge branch 'master' of ssh://123.56.95.229:29418/高精

This commit is contained in:
liulujia1
2020-04-10 10:39:06 +08:00
19 changed files with 409 additions and 443 deletions

View File

@@ -27,7 +27,7 @@ export function fetchDate(month) {
}
})
}
export function saveDate(num, partNum, procedure, num3, number, time1) {
export function saveDate(num, partNum, procedure, num3, number, time1, time) {
return request({
url: '',
method: 'post',
@@ -36,11 +36,11 @@ export function saveDate(num, partNum, procedure, num3, number, time1) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_其他数据_增加数据',
param: '操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
param: '操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + '&加工日期=' + time
}
})
}
export function editDate(ID, num, partNum, procedure, num3, number, time1) {
export function editDate(ID, num, partNum, procedure, num3, number, time1, time) {
return request({
url: '',
method: 'post',
@@ -49,7 +49,7 @@ export function editDate(ID, num, partNum, procedure, num3, number, time1) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_其他数据_编辑数据',
param: 'ID=' + ID + '&操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
param: 'ID=' + ID + '&操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + '&加工日期=' + time
}
})
}

View File

@@ -64,7 +64,7 @@ export function editSafetyMargin() {
ModularID: router.currentRoute.path,
type: '2',
name: '安全保证金管理_安全保证金信息_修改',
param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&交付日期=' + arguments[2] + '&提前X天提醒=' + arguments[3] + '&执行进度流水号=' + arguments[4] + '&备注=' + arguments[5] + '&安全保证金流水号=' + arguments[6]
param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&交付日期=' + arguments[2] + '&提前X天提醒=' + arguments[3] + '&执行进度流水号=1&备注=' + arguments[5] + '&安全保证金流水号=' + arguments[6]
}
})
}

View File

@@ -129,7 +129,7 @@ export function editPurchaseOrder(num5, num6, num8) {
})
}
// 删除采购单
export function deletePurchaseOrder(PurchaseOrderNameValue) {
export function deletePurchaseOrder(PurchaseOrderNameValue, ArrivalOrderGroup, ArrivalOrderMXNumberGroup, numberGroup, LxnumberGroup) {
return request({
url: '',
method: 'post',
@@ -138,7 +138,7 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) {
ModularID: router.currentRoute.path,
type: '2',
name: '备料管理_删除到货单',
param: `到货单流水号=${PurchaseOrderNameValue}`
param: `到货单流水号=${PurchaseOrderNameValue}&到货单明细流水号组=${ArrivalOrderGroup}&到货单明细绑定流水号组=${ArrivalOrderMXNumberGroup}&采购计划明细流水号组=${numberGroup}&离线采购计划明细流水号组=${LxnumberGroup}`
}
})
}
@@ -156,7 +156,7 @@ export function searchTable5(num) {
}
})
}
export function deleteArrivalMX(num) {
export function deleteArrivalMX(num, group, group1, group2) {
return request({
url: '',
method: 'post',
@@ -165,7 +165,7 @@ export function deleteArrivalMX(num) {
ModularID: router.currentRoute.path,
type: '2',
name: '备料管理_删除到货单明细',
param: `到货单明细流水号=${num}`
param: `到货单明细流水号=${num}&到货单明细绑定流水号组=${group}&采购计划明细流水号组=${group1}&离线采购计划明细流水号组=${group2}`
}
})
}