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-25 13:38:33 +08:00
parent f26e3ec4ac e284656a1e
commit 7e81b57ab4
18 changed files with 519 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ export function initMachine(projectNum) {
}
// 查询项目详情
export function searchatabledata(projectNum, machineValue) {
export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -41,7 +41,7 @@ export function searchatabledata(projectNum, machineValue) {
ModularID: router.currentRoute.path,
type: '1',
name: '项目工时统计_合同详情查询_工时综合查询',
param: `项目流水号=${projectNum}&机床流水号=${machineValue}`
param: `项目流水号=${projectNum}&机床流水号=${machineValue}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}

5
src/api/ManufacturingCenter/MonthEndHourAccounting.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
export function searchTable(time, time1) {
export function searchTable(time, time1, order, orderName, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -11,7 +11,8 @@ export function searchTable(time, time1) {
ModularID: router.currentRoute.path,
type: '1',
name: '工艺月底工时核算_查询数据',
param: '开始时间=' + time + '&结束时间=' + time1
param: '开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName,
Pagination: pageCurrent + '&' + pageSize
}
})
}

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

@@ -44,7 +44,7 @@ export function initPerson() {
})
}
// 查询
export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4) {
export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) {
return request({
url: '',
method: 'post',
@@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}`,
param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`,
Pagination: pageCurrent + '&' + pageSize
}
})