This commit is contained in:
liushuai
2020-03-09 09:28:04 +08:00
parent 6714e10d90
commit 28177e7cd4
23 changed files with 1145 additions and 983 deletions

View File

@@ -67,7 +67,7 @@ export function searchTable6(machineCheck, machine, groupCheck, group) {
}
})
}
export function basicPartsData(machine_check, machine, group_check, group) {
export function basicPartsData(machine_check, machine, group_check, group, part_check, part) {
return request({
url: '',
method: 'post',
@@ -75,12 +75,12 @@ export function basicPartsData(machine_check, machine, group_check, group) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_查询数据_综合gj',
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
name: 'PDM_零件明细表_基本件_查询数据_综合gj_数量维护',
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&零件图号_check=${part_check}&零件图号=${part}`
}
})
}
export function purchasePartsData(num) {
export function purchasePartsData(num, part_check, part) {
return request({
url: '',
method: 'post',
@@ -88,8 +88,8 @@ export function purchasePartsData(num) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_标准件和外购件_查询数据',
param: `组件流水号=${num}`
name: 'PDM_零件明细表_标准件和外购件_查询数据_数量维护',
param: `组件流水号=${num}&物料名称_check=${part_check}&物料名称=${part}`
}
})
}

View File

@@ -113,7 +113,7 @@ export function addProcess(ProcessClassificationNum, ProcessName, ShortName) {
})
}
// 编辑工艺
export function editProcess(ProcessClassificationNum, ProcessName, ShortName) {
export function editProcess(ProcessClassificationNum, ProcessName, ShortName, Requirement) {
return request({
url: '',
method: 'post',
@@ -122,7 +122,7 @@ export function editProcess(ProcessClassificationNum, ProcessName, ShortName) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理工艺_基础表_工艺名称_修改名称及简称',
param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName
param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + '&工艺要求=' + Requirement
}
})
}

View File

@@ -308,7 +308,7 @@ export function selectBidBond() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '投标保证金管理_投标保证金查询',
name: '投标保证金管理_投标保证金查询_新',
param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
}
})

View File

@@ -17,7 +17,7 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime,
}
})
}
export function getInvoice(Number, pageCurrent, pageSize) {
export function getInvoice(Number, check2, starttime, endTime, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -26,12 +26,12 @@ export function getInvoice(Number, pageCurrent, pageSize) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_外协发票管理_查询数据',
param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
param: '外协厂家流水号_check=1&外协厂家流水号=' + Number + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function getPayment(Number, pageCurrent, pageSize) {
export function getPayment(Number, check2, starttime, endTime, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -40,7 +40,7 @@ export function getPayment(Number, pageCurrent, pageSize) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_外协付款记录_查询数据',
param: '外协厂家流水号=' + Number,
param: '外协厂家流水号=' + Number + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
Pagination: pageCurrent + '&' + pageSize
}
})

View File

@@ -30,7 +30,7 @@ export function getTable1(check, partNumber) {
})
}
// 初始化获取已生成的外协加工任务单
export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
export function getTable(checked, contractNumber, check) {
return request({
url: '',
method: 'post',
@@ -39,8 +39,7 @@ export function getTable(checked, contractNumber, check, pageCurrent, pageSize)
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_2020',
param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
Pagination: pageCurrent + '&' + pageSize
param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check
}
})
}

View File

@@ -62,7 +62,7 @@ export function initPartDrawing(check1, name) {
})
}
// 查询外购备料
export function searchPurchasedMaterials(check1, name) {
export function searchPurchasedMaterials(check1, name, order, partName) {
return request({
url: '',
method: 'post',
@@ -71,7 +71,7 @@ export function searchPurchasedMaterials(check1, name) {
ModularID: router.currentRoute.path,
type: '1',
name: '备料管理_外购备料_查询数据',
param: `零件图号_check=${check1}&零件图号=${name}`
param: `零件图号_check=${check1}&零件图号=${name}&排序名称=${partName}&排序方式=${order}`
}
})
}

View File

@@ -15,6 +15,19 @@ export function searchCailiao(name) {
}
})
}
// 获取新到货单编号
export function searchNewOrder() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '备料管理_获取新到货单编号'
}
})
}
// 查询采购单
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check, num1) {
return request({
@@ -74,7 +87,7 @@ export function searchLxMateriel(num, check, num1) {
})
}
// 查询到货单
export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) {
export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime) {
return request({
url: '',
method: 'post',
@@ -83,8 +96,7 @@ export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime,
ModularID: router.currentRoute.path,
type: '1',
name: '备料管理_到货单查询_新',
param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`,
Pagination: pageCurrent + '&' + pageSize
param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`
}
})
}