meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-02-05 12:14:36 +08:00
parent a1b1feb81e da82d12e74
commit 18c5cf8f80
17 changed files with 492 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Assembly/SparePartsOutStockRecord.js
View File

@@ -24,14 +24,14 @@ export function searchgroup(num) {
})
}
// 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize) {
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize, ordername, order) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据',
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5,
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5 + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})

4
src/api/ManufacturingCenter/CreatePreparationBill.js
View File

@@ -1,14 +1,14 @@
import request from '@/utils/request'
// 查询零件
export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) {
export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize, ordername, order) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询',
param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0',
param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0' + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})

4
src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
View File

@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
data: {
type: '1',
name: '设备管理_设备加工能力_查询数据_设备维护NEW',
param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
pagination: pageCurrent + '&' + pageSize
param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
// pagination: pageCurrent + '&' + pageSize
}
})
}

3
src/api/MarketingCenter/CreateProject.js
View File

@@ -17,8 +17,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7
data: {
type: '1',
name: '合同信息管理_合同信息_制造部_查询_新',
param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string',
Pagination: pageCurrent + '&' + pageSize
param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string'
}
})
}

6
src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
View File

@@ -64,15 +64,15 @@ export function searchPurchasedMaterials(check1, name) {
})
}
// 查询采购单
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) {
export function searchPurchaseOrder(check1, num, check2, name, check3, name2, checktime, starttime, endtime) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_采购计划_查询数据',
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
Pagination: pageCurrent + '&' + pageSize
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}&时间_check=${checktime}&开始时间=${starttime}&结束时间=${endtime}`
// Pagination: pageCurrent + '&' + pageSize
}
})
}