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.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-06-21 09:31:55 +08:00
parent 750a4edcc7 5e18bfcc3a
commit 983ec7e1f6
19 changed files with 2445 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/api/Assembly/DeliveryConfirmation.js Normal file
View File

@@ -0,0 +1,46 @@
import request from '@/utils/request'
export function InvoiceListSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货确认_发货单_发货单列表_查询',
param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29] + '\\&是否发出_check=' + arguments[30] + '\\&是否发出=' + arguments[31],
Pagination: arguments[32] + '&' + arguments[33]
}
})
}
export function DetailsFeach() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单明细_查询',
param: '发货单流水号=' + arguments[0]
}
})
}
export function confirmation() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货确认_发货单_发货确认',
param: '发货单流水号=' + arguments[0] + '&司机姓名=' + arguments[1] + '&司机电话=' + arguments[2] + '&车辆牌号=' + arguments[3] + '&执行人=' + arguments[4] + '&备注=' + arguments[5]
}
})
}
export function reconfirmation() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货确认_发货单_打回确认',
param: '发货单流水号=' + arguments[0]
}
})
}

2
src/api/Inventory/MaterialOut.js
View File

@@ -42,7 +42,7 @@ export function searchList(pageCurrent, pageSize, listNumber_check, listNumber)
data: {
type: '1',
name: '车间装配管理_领料单_查询数据',
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
Pagination: pageCurrent + '&' + pageSize
}
})

167
src/api/MarketingCenter/DeliveryApplication.js Normal file
View File

@@ -0,0 +1,167 @@
import request from '@/utils/request'
export function InvoiceAdd() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_新增',
param: '制单人=' + arguments[0] + '&发货单流水号=0=int=output'
}
})
}
export function InvoiceDelete() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_删除',
param: '发货单流水号=' + arguments[0]
}
})
}
export function InvoiceSelectPush() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_下拉框数据_查询',
param: '查询条件=' + arguments[0]
}
})
}
export function PickSelectPush() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_货品_查询',
param: '查询类别=' + arguments[0] + '\\&查询条件=' + arguments[1]
}
})
}
export function SelectMachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_机床_查询',
param: '机床图号=' + arguments[0]
}
})
}
export function SelectAssembly() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_组件_查询',
param: '组号=' + arguments[0]
}
})
}
export function SelectPart() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_零件_查询',
param: '零件图号=' + arguments[0]
}
})
}
export function SelectMateriel() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_物料_查询',
param: '物料名称=' + arguments[0]
}
})
}
export function InvoiceFeach() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单数据_查询',
param: '发货单流水号=' + arguments[0]
}
})
}
export function InvoiceSave() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货申请_发货单_保存',
param: '发货单流水号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&收货地址=' + arguments[2] + '\\&收货人员=' + arguments[3] + '\\&联系电话=' + arguments[4] + '\\&注意事项=' + arguments[5] + '\\&发货单名称=' + arguments[6]
}
})
}
export function InvoiceExamine() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货申请_发货单_审核',
param: '发货单流水号=' + arguments[0] + '&审核人=' + arguments[1]
}
})
}
export function InvoiceAbandoningTrial() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_弃审',
param: '发货单流水号=' + arguments[0]
}
})
}
export function DetailsFeach() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单明细_查询',
param: '发货单流水号=' + arguments[0]
}
})
}
export function InvoiceDetailsSave() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货申请_发货单_发货单明细_循环增加',
param: '货品类别组=' + arguments[0] + '\\&货品编号组=' + arguments[1] + '\\&货品名称组=' + arguments[2] + '\\&货品规格组=' + arguments[3] + '\\&货品型号组=' + arguments[4] + '\\&设计者组=' + arguments[5] + '\\&数量组=' + arguments[6] + '\\&发货单流水号=' + arguments[7]
}
})
}
export function InvoiceListSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_发货单列表_查询',
param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29]
}
})
}

0
src/api/Outsourcing/OutsourcingQCSearch.js Normal file
View File

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

@@ -45,7 +45,7 @@ export function doneContract(...params) {
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]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}`
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]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}\\&备注组=${params[19]}`
}
})
}
@@ -72,6 +72,17 @@ export function savePrice(price, num1, num2, num3, num4, num5) {
}
})
}
// 实时保存备注
export function saveRemark(price, num1, num2, num3, num4, num5) {
return request({
url: '',
method: 'post',
data: {
type: '4',
name: `update 采购管理_询价单明细_视图 set 备注 = '${price}' where isnull(物料流水号,0) = isnull('${num1}',0) and 询价单流水号 = ${num2} and isnull(零件名称,'') = '${num3}' and isnull(零件图号,'') = '${num4}' and (isnull(规格,'') = '${num5}' or isnull(物料规格,'') = '${num5}')`
}
})
}
// 实时保存合同头
export function saveContractHeader(...params) {
return request({