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

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

Browse Source
This commit is contained in:
lixin
2018-12-11 19:38:56 +08:00
parent 169e51435f cf28234900
commit 2d89d09cbe
32 changed files with 1125 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -156,6 +156,17 @@ export function purchaseRequisition1(RequisitionList, projectName, projectFloatV
}
})
}
export function purchaseRequisition2(projectFloatValue, machineFloatValue, groupFloatValue, BasicPartsNumber, NumberOfParts, time) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_采购部采购_基本件_传递数据',
param: `组件流水号=${groupFloatValue}&基本件流水号组=${BasicPartsNumber}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}&物料计划到货时间=${time}&零件数量组=${NumberOfParts}`
}
})
}
export function MoveOut(num, num1) {
return request({
url: '',

12
src/api/PurchasingCenter/CreatePurchaseContract.js
View File

@@ -24,3 +24,15 @@ export function searchSheetContract(num1) {
}
})
}
// 生成采购合同
export function doneContract(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_采购合同_增加数据',
param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}`
}
})
}

4
src/api/PurchasingCenter/PurchaseContractApproval.js
View File

@@ -55,7 +55,7 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同明细_查询数据',
name: '采购管理_采购合同内容_查询数据',
param: '采购合同流水号=' + num
}
})
@@ -67,7 +67,7 @@ export function submitApproval(num, num1, num2) {
method: 'post',
data: {
type: '2',
name: '采购管理_合同审批_修改数据',
name: '采购管理_合同审批_采购部_修改数据',
param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
}
})

73
src/api/PurchasingCenter/PurchaseContractRequestFund.js Normal file
View File

@@ -0,0 +1,73 @@
import request from '@/utils/request'
// 初始化合同
export function initContract() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购请款表_查询数据'
}
})
}
// 查询表1
export function searchTable1(...params) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购请款表_查询数据',
param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5],
Pagination: params[0] + '&' + params[1]
}
})
}
// 查询请款进度
export function searchCondition(num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购请款表_请款进度_查询数据',
param: '采购合同流水号=' + num1
}
})
}
// 请款
export function requestFund(num1, money, time, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_采购请款表_增加数据',
param: `采购合同流水号=${num1}&请款金额=${money}&请款人=${id}&请款时间=${time}`
}
})
}
// 取消请款
export function cancelRequestFund(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_采购请款表_删除数据',
param: '采购请款流水号=' + num1
}
})
}
// 采购合同内容查询
export function searchContract(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同内容_查询数据',
param: '采购合同流水号=' + num
}
})
}

4
src/api/PurchasingCenter/PurchaseContractSearch.js
View File

@@ -48,14 +48,14 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
}
})
}
// 采购合同明细查询
// 采购合同内容查询
export function searchTable2(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同明细_查询数据',
name: '采购管理_采购合同内容_查询数据',
param: '采购合同流水号=' + num
}
})

8
src/api/TechnologyCenter/ImportParts.js
View File

@@ -279,26 +279,26 @@ export function searchGroupNum1(project, name) {
})
}
// 传递零件
export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id) {
export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_大量导入',
param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id
param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id
}
})
}
// 传递零件
export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id, oldId) {
export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_整改件_大量导入',
param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId
param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum
}
})
}

4
src/api/WorkshopProcurement/CreatingProcurementContracts.js
View File

@@ -149,14 +149,14 @@ export function searchSheetContract(num1) {
})
}
// 生成采购合同
export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}`
}
})
}