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-24 10:09:41 +08:00
parent 556987ba33 6c08cd2ea8
commit 159a289ca3
30 changed files with 1757 additions and 2603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ParseQuery.js
View File

@@ -61,7 +61,7 @@ export function searchAll() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '1_总查询',
name: '综合查询_总查询',
param: '机床流水号=' + arguments[0]
}
})

2
src/api/ManufacturingCenter/ProjectPlanningQuery.js
View File

@@ -80,7 +80,7 @@ export function searchAll(num1, num2) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '16_项目总查询',
name: '项目计划查询_项目总查询',
param: '项目流水号_check=' + num1 + '&项目流水号=' + num2
}
})

4
src/api/MarketingCenter/ContractCapitalManagement.js
View File

@@ -26,7 +26,7 @@ export function initMarketingManager() {
}
})
}
export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) {
return request({
url: '',
method: 'post',
@@ -35,7 +35,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
ModularID: router.currentRoute.path,
type: '1',
name: '合同资金管理_资金信息_查询1',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string',
param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/api/Outsourcing/OutFactoryMaintenance.js
View File

@@ -11,7 +11,7 @@ export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
name: '车间生产管理工艺_外协厂家_查询',
param: '序号_check=' + num1 + '=int&序号=' + ManufacturerNumber + '&外协厂家名称_check=' + num2 + '=int&外协厂家名称=' + ManufacturerName + '&外协厂家简称_check=' + num10 + '=int&外协厂家简称=' + ManufacturerAbbreviation + '&地址_check=' + num3 + '=int&地址=' + address + '&联系人_check=' + num4 + '=int&联系人=' + roleName + '&电话_check=' + num5 + '=int&电话=' + phNumber + '&传真_check=' + num6 + '=int&传真=' + Fax + '&备注_check=' + num7 + '=int&备注=' + Remarks + '&类别_check=' + num8 + '=int&类别=' + category + '&关注_check=' + num11 + '=int&关注=' + attention + '&设备情况_check=' + num9 + '=int&设备情况=' + EquipmentCondition,
Pagination: pageCurrent + '&' + pageSize
}

2
src/api/Outsourcing/OutsourcingTaskChanges.js
View File

@@ -61,7 +61,7 @@ export function searchManufactor(name) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
name: '车间生产管理工艺_外协厂家_查询',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
}
})

161
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -15,34 +15,6 @@ export function initOutHelp() {
}
})
}
// 初始化获取已生成的外协加工任务单
export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_2020',
param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 初始化获取外协厂家数据
export function getData1() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据'
}
})
}
// 初始化获取已预算价格，未选入到外协加工任务单的零件
export function getTable1(check, partNumber) {
return request({
@@ -52,11 +24,41 @@ export function getTable1(check, partNumber) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新',
name: '车间生产管理工艺_外协任务执行_未选入零件_查询',
param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string'
}
})
}
// 初始化获取已生成的外协加工任务单
export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_2020',
param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询任务单明细
export function getParts(Number) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据',
param: '外协加工任务单流水号=' + Number
}
})
}
// 打回
export function getBack(processPlan) {
return request({
@@ -71,59 +73,45 @@ export function getBack(processPlan) {
}
})
}
// 获取零件工序信息（零件号表中）
export function getprocedure(processPlan, single) {
// 选入零件
export function insertParts(processNum, Number) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
type: '2',
name: '车间生产管理工艺_外协加工任务单_选入_循环执行',
param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum
}
})
}
// 外协厂家查询
export function searchManufactor(check, name) {
// 计算价格
export function getPrice(Number, money) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
type: '2',
name: '车间生产管理工艺_外协加工任务单_保存_循环执行',
param: '外协加工任务单明细流水号组=' + Number + '&加工价格_成交组=' + money
}
})
}
// 确定价格
export function spareParts(processNum, single) {
// 成交
export function editData1(Number, manufacturers, freight, Explain) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int'
}
})
}
// 暂未启用
export function spareParts1(processNum, single) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int'
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
}
})
}
@@ -155,20 +143,6 @@ export function editData(Number, manufacturers, freight, Explain) {
}
})
}
// 成交
export function editData1(Number, manufacturers, freight, Explain) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
}
})
}
// 删除外协加工任务单
export function deleteData(Number) {
return request({
@@ -197,34 +171,7 @@ export function deleteData1(Number) {
}
})
}
// 选入零件
export function insertParts(processNum, Number) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单明细_增加数据',
param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
}
})
}
// 查询任务单明细
export function getParts(Number) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单明细_查询数据',
param: '外协加工任务单流水号=' + Number + '=int'
}
})
}
// 数据库生产表单号
export function getNumber(time) {
return request({
@@ -239,17 +186,3 @@ export function getNumber(time) {
}
})
}
// 计算价格
export function getPrice(Number, money, money1, money2, money3) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单明细_修改数据',
param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int'
}
})
}

2
src/api/Outsourcing/OutsourcingTaskQuery.js
View File

@@ -81,7 +81,7 @@ export function searchManufactor(name) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
name: '车间生产管理工艺_外协厂家_查询',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
}
})

16
src/api/PurchasingCenter/FundApproval.js
View File

@@ -3,7 +3,7 @@ import state from '@/store'
import router from '@/router'
// 查询审核/审批/付款
export function initApproval(pageCurrent, pageSize, state) {
export function initApproval(pageCurrent, pageSize, haha) {
return request({
url: '',
method: 'post',
@@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购合同_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${haha}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 执行审核/审批/付款
export function execApproval(num1, num2, reason, person, state) {
export function execApproval(num1, num2, reason, person, haha) {
return request({
url: '',
method: 'post',
@@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_采购合同_审批付款_修改数据',
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
}
})
}
// 查询离线合同审核/审批/付款
export function initApprovalOffline(pageCurrent, pageSize, state) {
export function initApprovalOffline(pageCurrent, pageSize, haha) {
return request({
url: '',
method: 'post',
@@ -41,7 +41,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_离线合同_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${haha}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -75,7 +75,7 @@ export function searchRequsetFundDetail2(num) {
})
}
// 执行审核/审批/付款（离线合同）
export function execApprovalOffline(num1, num2, reason, person, state) {
export function execApprovalOffline(num1, num2, reason, person, haha) {
return request({
url: '',
method: 'post',
@@ -84,7 +84,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_离线合同_审批付款_修改数据',
param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
}
})
}

46
src/api/TechnologyCenter/PartDrawingMaintenance.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
export function projectSelect() {
export function getTableData(partNumber_check, partNumber, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
@@ -10,48 +10,8 @@ export function projectSelect() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
export function machineSelect(projectValue) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_机床名称_查询数据2',
param: `项目流水号=${projectValue}`
}
})
}
export function groupSelect(machineValue) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_组件流水号_查询数据_根据机床',
param: `机床流水号=${machineValue}`
}
})
}
export function basicPartsData(project_check, project, machine_check, machine, group_check, group, whetherToImport_check, whetherToImport, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_查询数据_综合gj',
param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&是否导入_check=${whetherToImport_check}&是否导入=${whetherToImport}`,
name: '技术中心_零件图维护_查询',
param: `零件图号_check=${partNumber_check}&零件图号=${partNumber}`,
Pagination: pageCurrent + '&' + pageSize
}
})

32
src/api/WorkshopProcurement/FundApproval.js
View File

@@ -3,7 +3,7 @@ import state from '@/store'
import router from '@/router'
// 查询审批/付款
export function initApproval(pageCurrent, pageSize, state) {
export function initApproval(pageCurrent, pageSize, state2) {
return request({
url: '',
method: 'post',
@@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_采购合同_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${state2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 执行审批/付款
export function execApproval(num1, num2, reason, person, state) {
export function execApproval(num1, num2, reason, person, state2) {
return request({
url: '',
method: 'post',
@@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间采购管理_采购合同_审批付款_修改数据',
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
}
})
}
// 查询车间合同审批/付款
export function initApproval1(pageCurrent, pageSize, state) {
export function initApproval1(pageCurrent, pageSize, state2) {
return request({
url: '',
method: 'post',
@@ -41,7 +41,7 @@ export function initApproval1(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_采购合同_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${state2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -60,7 +60,7 @@ export function searchRequsetFundDetail3(num) {
})
}
// 执行车间合同审批/付款
export function execApproval1(num1, num2, reason, person, state) {
export function execApproval1(num1, num2, reason, person, state2) {
return request({
url: '',
method: 'post',
@@ -69,12 +69,12 @@ export function execApproval1(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间采购管理_采购合同_审批付款_修改数据',
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
}
})
}
// 查询离线合同审批/付款
export function initApprovalOffline(pageCurrent, pageSize, state) {
export function initApprovalOffline(pageCurrent, pageSize, state2) {
return request({
url: '',
method: 'post',
@@ -83,7 +83,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_离线合同_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${state2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -103,7 +103,7 @@ export function searchRequsetFundDetail(num) {
})
}
// 执行审批/付款（离线合同）
export function execApprovalOffline(num1, num2, reason, person, state) {
export function execApprovalOffline(num1, num2, reason, person, state2) {
return request({
url: '',
method: 'post',
@@ -112,7 +112,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间采购管理_离线合同_审批付款_修改数据',
param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
}
})
}
@@ -131,7 +131,7 @@ export function searchRequsetFundDetail1(num) {
})
}
// 查询备料审批/付款
export function initApprovalMaterials(pageCurrent, pageSize, state) {
export function initApprovalMaterials(pageCurrent, pageSize, state2) {
return request({
url: '',
method: 'post',
@@ -140,13 +140,13 @@ export function initApprovalMaterials(pageCurrent, pageSize, state) {
ModularID: router.currentRoute.path,
type: '1',
name: '备料管理_审批付款_查询数据',
param: `审批_付款状态=${state}`,
param: `审批_付款状态=${state2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 执行审批/付款（备料）
export function execMaterials(num1, num2, reason, person, state) {
export function execMaterials(num1, num2, reason, person, state2) {
return request({
url: '',
method: 'post',
@@ -155,7 +155,7 @@ export function execMaterials(num1, num2, reason, person, state) {
ModularID: router.currentRoute.path,
type: '2',
name: '备料管理_审批付款_修改数据',
param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
}
})
}