|
|
@ -1,4 +1,5 @@ |
|
|
<!--日常打印M100信息模块--> |
|
|
<!--日常打印M100信息模块--> |
|
|
|
|
|
<!--日常打印M100信息模块--> |
|
|
<template> |
|
|
<template> |
|
|
<div class="cr-body-content"> |
|
|
<div class="cr-body-content"> |
|
|
<div ref="box"> |
|
|
<div ref="box"> |
|
|
@ -45,6 +46,24 @@ |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="大众工位" prop="fwStation" v-show="this.listQuery.productType === 2"> |
|
|
|
|
|
<el-select |
|
|
|
|
|
v-model="listQuery.fwStation" |
|
|
|
|
|
clearable |
|
|
|
|
|
placeholder="请选择" |
|
|
|
|
|
size="medium" |
|
|
|
|
|
style="margin-right: 15px" |
|
|
|
|
|
@change="fwStation_selectChange" |
|
|
|
|
|
> |
|
|
|
|
|
<el-option |
|
|
|
|
|
v-for="item in fwStationList" |
|
|
|
|
|
:key="item.id" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.id" |
|
|
|
|
|
/> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
<el-form-item> |
|
|
<el-form-item> |
|
|
<el-button |
|
|
<el-button |
|
|
type="primary" |
|
|
type="primary" |
|
|
@ -76,8 +95,9 @@ |
|
|
@click="print()" |
|
|
@click="print()" |
|
|
>打印门板发货排序单 |
|
|
>打印门板发货排序单 |
|
|
</el-button> |
|
|
</el-button> |
|
|
|
|
|
|
|
|
<el-button |
|
|
<el-button |
|
|
v-show="this.listQuery.productType === 1" |
|
|
v-show="false" |
|
|
@click="drawerMBPrint = true" |
|
|
@click="drawerMBPrint = true" |
|
|
size="mini" |
|
|
size="mini" |
|
|
type="warning" |
|
|
type="warning" |
|
|
@ -86,7 +106,7 @@ |
|
|
<strong>重新打印门板</strong></el-button |
|
|
<strong>重新打印门板</strong></el-button |
|
|
> |
|
|
> |
|
|
<el-button |
|
|
<el-button |
|
|
v-show="this.listQuery.productType === 1" |
|
|
v-show="false" |
|
|
@click="drawerbudaMBPrint = true" |
|
|
@click="drawerbudaMBPrint = true" |
|
|
size="mini" |
|
|
size="mini" |
|
|
type="warning" |
|
|
type="warning" |
|
|
@ -95,7 +115,7 @@ |
|
|
<strong>门板补打</strong></el-button |
|
|
<strong>门板补打</strong></el-button |
|
|
> |
|
|
> |
|
|
<el-button |
|
|
<el-button |
|
|
v-show="this.listQuery.productType === 1" |
|
|
v-show="false" |
|
|
@click="drawerMBDelete = true" |
|
|
@click="drawerMBDelete = true" |
|
|
size="mini" |
|
|
size="mini" |
|
|
type="danger" |
|
|
type="danger" |
|
|
@ -114,15 +134,15 @@ |
|
|
> |
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-button |
|
|
<el-button |
|
|
v-show="this.listQuery.productType === 2" |
|
|
v-show="this.listQuery.productType === 2" |
|
|
@click="drawerbudaZHBPrint = true" |
|
|
@click="drawerbudaZHBPrint = true" |
|
|
size="mini" |
|
|
size="mini" |
|
|
type="warning" |
|
|
type="warning" |
|
|
plain |
|
|
plain |
|
|
> |
|
|
> |
|
|
<strong>柱护板补打</strong></el-button |
|
|
<strong>柱护板补打</strong></el-button |
|
|
> |
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-button |
|
|
<el-button |
|
|
@ -224,7 +244,7 @@ |
|
|
<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB> |
|
|
<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB> |
|
|
</el-drawer> |
|
|
</el-drawer> |
|
|
|
|
|
|
|
|
<div class="l-table" style="margin-top: -10px"> |
|
|
<div class="l-table" style="margin-top: -15px"> |
|
|
<!--表格渲染--> |
|
|
<!--表格渲染--> |
|
|
<el-table |
|
|
<el-table |
|
|
ref="multipleTable" |
|
|
ref="multipleTable" |
|
|
@ -365,7 +385,7 @@ |
|
|
clearable |
|
|
clearable |
|
|
:disabled="true" |
|
|
:disabled="true" |
|
|
size="small" |
|
|
size="small" |
|
|
style="width: 240px" |
|
|
style="width: 240px;" |
|
|
/> |
|
|
/> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
@ -414,7 +434,7 @@ |
|
|
<pagination |
|
|
<pagination |
|
|
v-show="totalCount > 0" |
|
|
v-show="totalCount > 0" |
|
|
:total="totalCount" |
|
|
:total="totalCount" |
|
|
style="margin-bottom: -5px; float: right" |
|
|
style="float: right" |
|
|
:page.sync="page" |
|
|
:page.sync="page" |
|
|
:limit.sync="listQuery.MaxResultCount" |
|
|
:limit.sync="listQuery.MaxResultCount" |
|
|
@pagination="getList" |
|
|
@pagination="getList" |
|
|
@ -557,6 +577,7 @@ export default { |
|
|
SkipCount: 0, |
|
|
SkipCount: 0, |
|
|
MaxResultCount: 15, |
|
|
MaxResultCount: 15, |
|
|
productType: 1, //1:门板；2:柱护板 |
|
|
productType: 1, //1:门板；2:柱护板 |
|
|
|
|
|
fwStation : "BA2", //大众工位 |
|
|
ProductLine: undefined, |
|
|
ProductLine: undefined, |
|
|
Version: undefined, |
|
|
Version: undefined, |
|
|
printBillNum: undefined, |
|
|
printBillNum: undefined, |
|
|
@ -643,19 +664,17 @@ export default { |
|
|
{ id: 1, name: "门板" }, |
|
|
{ id: 1, name: "门板" }, |
|
|
{ id: 2, name: "柱护板" }, |
|
|
{ id: 2, name: "柱护板" }, |
|
|
], |
|
|
], |
|
|
|
|
|
fwStationList: [ |
|
|
|
|
|
{ id: "BA2", name: "BA2" }, |
|
|
|
|
|
{ id: "BA5", name: "BA5" } |
|
|
|
|
|
], |
|
|
isShowHostSN: false, |
|
|
isShowHostSN: false, |
|
|
isShowVin: false, |
|
|
isShowVin: false, |
|
|
isShowState: true, |
|
|
isShowState: true, |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
this.$nextTick(() => { |
|
|
this.setTableHeight() |
|
|
var offsetHei = document.documentElement.clientHeight; |
|
|
|
|
|
//console.log(offsetHei); |
|
|
|
|
|
let boxH = this.$refs.box.offsetHeight; |
|
|
|
|
|
this.tableHeight = offsetHei - boxH - 67 - 79; //57为footer高度，79为页面上部标签高度 |
|
|
|
|
|
//this.tableHeight = offsetHei -260 |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
let timer = setInterval(() => { |
|
|
let timer = setInterval(() => { |
|
|
this.open(); |
|
|
this.open(); |
|
|
@ -741,6 +760,15 @@ export default { |
|
|
...mapGetters(["userInfo"]), //获取当前用户信息 |
|
|
...mapGetters(["userInfo"]), //获取当前用户信息 |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
setTableHeight(){ |
|
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
|
var offsetHei = document.documentElement.clientHeight; |
|
|
|
|
|
//console.log(offsetHei); |
|
|
|
|
|
let boxH = this.$refs.box.offsetHeight; |
|
|
|
|
|
this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57为footer高度，79为页面上部标签高度 |
|
|
|
|
|
//this.tableHeight = offsetHei -260 |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
opens() { |
|
|
opens() { |
|
|
|
|
|
|
|
|
this.getList(); |
|
|
this.getList(); |
|
|
@ -789,13 +817,13 @@ export default { |
|
|
if (JKITEM.productLine == "01") { |
|
|
if (JKITEM.productLine == "01") { |
|
|
this.$refs.sp01.Visible = true; |
|
|
this.$refs.sp01.Visible = true; |
|
|
this.content01 = |
|
|
this.content01 = |
|
|
"01生产线已经" + |
|
|
"大众一厂已经" + |
|
|
JKITEM.timeoutMinutes + |
|
|
JKITEM.timeoutMinutes + |
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
//写提示信息 |
|
|
//写提示信息 |
|
|
console.log( |
|
|
console.log( |
|
|
"222222222222222222222222222222222222222222222222" |
|
|
"222222222222222222222222222222222222222222222222-1" |
|
|
); |
|
|
); |
|
|
this.$refs.sp01.style.color = "red"; |
|
|
this.$refs.sp01.style.color = "red"; |
|
|
this.$refs.sp01.style.fontWeight = "bold"; |
|
|
this.$refs.sp01.style.fontWeight = "bold"; |
|
|
@ -803,58 +831,76 @@ export default { |
|
|
this.$refs.sp01.style.color = "green"; |
|
|
this.$refs.sp01.style.color = "green"; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (JKITEM.productLine == "05") { |
|
|
if (JKITEM.productLine == "02") { |
|
|
this.$refs.sp05.Visible = true; |
|
|
this.$refs.sp05.Visible = true; |
|
|
this.content05 = |
|
|
this.content05 = |
|
|
"05生产线已经" + |
|
|
"大众二厂已经" + |
|
|
JKITEM.timeoutMinutes + |
|
|
JKITEM.timeoutMinutes + |
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
//写提示信息 |
|
|
//写提示信息 |
|
|
console.log( |
|
|
console.log( |
|
|
"222222222222222222222222222222222222222222222222" |
|
|
"222222222222222222222222222222222222222222222222-2" |
|
|
); |
|
|
); |
|
|
|
|
|
this.setTableHeight() |
|
|
this.$refs.sp05.style.color = "red"; |
|
|
this.$refs.sp05.style.color = "red"; |
|
|
this.$refs.sp05.style.fontWeight = "bold"; |
|
|
this.$refs.sp05.style.fontWeight = "bold"; |
|
|
} else { |
|
|
} else { |
|
|
this.$refs.sp05.style.color = "green"; |
|
|
this.$refs.sp05.style.color = "green"; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (JKITEM.productLine == "07") { |
|
|
// if (JKITEM.productLine == "05") { |
|
|
this.$refs.sp07.Visible = true; |
|
|
// this.$refs.sp05.Visible = true; |
|
|
this.content07 = |
|
|
// this.content05 = |
|
|
"07生产线已经" + |
|
|
// "05生产线已经" + |
|
|
JKITEM.timeoutMinutes + |
|
|
// JKITEM.timeoutMinutes + |
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
// "分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
// if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
//写提示信息 |
|
|
// //写提示信息 |
|
|
console.log( |
|
|
// console.log( |
|
|
"222222222222222222222222222222222222222222222222" |
|
|
// "222222222222222222222222222222222222222222222222" |
|
|
); |
|
|
// ); |
|
|
this.$refs.sp07.style.color = "red"; |
|
|
// this.$refs.sp05.style.color = "red"; |
|
|
this.$refs.sp07.style.fontWeight = "bold"; |
|
|
// this.$refs.sp05.style.fontWeight = "bold"; |
|
|
} else { |
|
|
// } else { |
|
|
this.$refs.sp07.style.color = "green"; |
|
|
// this.$refs.sp05.style.color = "green"; |
|
|
} |
|
|
// } |
|
|
} |
|
|
// } |
|
|
if (JKITEM.productLine == "08") { |
|
|
// if (JKITEM.productLine == "07") { |
|
|
this.$refs.sp08.Visible = true; |
|
|
// this.$refs.sp07.Visible = true; |
|
|
this.content08 = |
|
|
// this.content07 = |
|
|
JKITEM.productLine + |
|
|
// "07生产线已经" + |
|
|
"生产线已经" + |
|
|
// JKITEM.timeoutMinutes + |
|
|
JKITEM.timeoutMinutes + |
|
|
// "分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
"分钟没收到报文"; |
|
|
// if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
// //写提示信息 |
|
|
//写提示信息 |
|
|
// console.log( |
|
|
console.log( |
|
|
// "222222222222222222222222222222222222222222222222" |
|
|
"222222222222222222222222222222222222222222222222" |
|
|
// ); |
|
|
); |
|
|
// this.$refs.sp07.style.color = "red"; |
|
|
this.$refs.sp08.style.color = "red"; |
|
|
// this.$refs.sp07.style.fontWeight = "bold"; |
|
|
this.$refs.sp08.style.fontWeight = "bold"; |
|
|
// } else { |
|
|
} else { |
|
|
// this.$refs.sp07.style.color = "green"; |
|
|
this.$refs.sp08.style.color = "green"; |
|
|
// } |
|
|
} |
|
|
// } |
|
|
} |
|
|
// if (JKITEM.productLine == "08") { |
|
|
|
|
|
// this.$refs.sp08.Visible = true; |
|
|
|
|
|
// this.content08 = |
|
|
|
|
|
// JKITEM.productLine + |
|
|
|
|
|
// "生产线已经" + |
|
|
|
|
|
// JKITEM.timeoutMinutes + |
|
|
|
|
|
// "分钟没收到报文"; |
|
|
|
|
|
// if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
|
|
// //写提示信息 |
|
|
|
|
|
// console.log( |
|
|
|
|
|
// "222222222222222222222222222222222222222222222222" |
|
|
|
|
|
// ); |
|
|
|
|
|
// this.$refs.sp08.style.color = "red"; |
|
|
|
|
|
// this.$refs.sp08.style.fontWeight = "bold"; |
|
|
|
|
|
// } else { |
|
|
|
|
|
// this.$refs.sp08.style.color = "green"; |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
@ -979,6 +1025,7 @@ export default { |
|
|
}, |
|
|
}, |
|
|
//抽屉 |
|
|
//抽屉 |
|
|
handleDrawerOpen(param) { |
|
|
handleDrawerOpen(param) { |
|
|
|
|
|
debugger |
|
|
this.drawer = true; |
|
|
this.drawer = true; |
|
|
//console.log(510) |
|
|
//console.log(510) |
|
|
//console.log(param) |
|
|
//console.log(param) |
|
|
@ -986,9 +1033,11 @@ export default { |
|
|
this.customerInfos = [ |
|
|
this.customerInfos = [ |
|
|
{ |
|
|
{ |
|
|
ParentId: parentId, |
|
|
ParentId: parentId, |
|
|
|
|
|
BillId: param.id |
|
|
}, |
|
|
}, |
|
|
]; |
|
|
]; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleDrawerClose(done) { |
|
|
handleDrawerClose(done) { |
|
|
done(); |
|
|
done(); |
|
|
}, |
|
|
}, |
|
|
@ -1119,6 +1168,7 @@ export default { |
|
|
return projectTypeKeyValue[type]; |
|
|
return projectTypeKeyValue[type]; |
|
|
}, |
|
|
}, |
|
|
getList(data) { |
|
|
getList(data) { |
|
|
|
|
|
|
|
|
this.listLoading = true; |
|
|
this.listLoading = true; |
|
|
if (data != undefined) { |
|
|
if (data != undefined) { |
|
|
this.listQueryList.SkipCount = (this.page - 1) * data.limit; |
|
|
this.listQueryList.SkipCount = (this.page - 1) * data.limit; |
|
|
@ -1138,6 +1188,7 @@ export default { |
|
|
this.listQueryList.BillStatus = 2; //状态 |
|
|
this.listQueryList.BillStatus = 2; //状态 |
|
|
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 |
|
|
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 |
|
|
this.listQueryList.CanNotPrint = false; //不可打印 |
|
|
this.listQueryList.CanNotPrint = false; //不可打印 |
|
|
|
|
|
this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5 |
|
|
console.log( |
|
|
console.log( |
|
|
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) |
|
|
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) |
|
|
); |
|
|
); |
|
|
@ -1194,6 +1245,7 @@ export default { |
|
|
{ |
|
|
{ |
|
|
PrintType: 1, |
|
|
PrintType: 1, |
|
|
ProductLine: val, |
|
|
ProductLine: val, |
|
|
|
|
|
fwStation: this.listQuery.fwStation |
|
|
}, |
|
|
}, |
|
|
]; |
|
|
]; |
|
|
} |
|
|
} |
|
|
@ -1203,10 +1255,36 @@ export default { |
|
|
{ |
|
|
{ |
|
|
PrintType: 1, |
|
|
PrintType: 1, |
|
|
ProductLine: val, |
|
|
ProductLine: val, |
|
|
|
|
|
fwStation: this.listQuery.fwStation |
|
|
}, |
|
|
}, |
|
|
]; |
|
|
]; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
fwStation_selectChange(val) { |
|
|
|
|
|
this.$forceUpdate(); |
|
|
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
|
|
//把产线值传到子组件 |
|
|
|
|
|
this.customerInfosMB = [ |
|
|
|
|
|
{ |
|
|
|
|
|
PrintType: 1, |
|
|
|
|
|
ProductLine: this.listQuery.productLine, |
|
|
|
|
|
fwStation: val |
|
|
|
|
|
}, |
|
|
|
|
|
]; |
|
|
|
|
|
} |
|
|
|
|
|
if (this.listQuery.productType === 2) { |
|
|
|
|
|
//把产线值传到子组件 |
|
|
|
|
|
this.customerInfosZHB = [ |
|
|
|
|
|
{ |
|
|
|
|
|
PrintType: 1, |
|
|
|
|
|
ProductLine: this.listQuery.productLine, |
|
|
|
|
|
fwStation: val |
|
|
|
|
|
} |
|
|
|
|
|
]; |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleImportSAP() {}, |
|
|
handleImportSAP() {}, |
|
|
|
|
|
|
|
|
handleFilter() { |
|
|
handleFilter() { |
|
|
@ -1260,6 +1338,7 @@ export default { |
|
|
(this.hostCheckQuery.printType = 0); |
|
|
(this.hostCheckQuery.printType = 0); |
|
|
this.hostPrintQuery.printType = 0; |
|
|
this.hostPrintQuery.printType = 0; |
|
|
this.vinPrintQuery.printType = 0; |
|
|
this.vinPrintQuery.printType = 0; |
|
|
|
|
|
|
|
|
if ( |
|
|
if ( |
|
|
this.listQuery.productLine === "" || |
|
|
this.listQuery.productLine === "" || |
|
|
this.listQuery.productLine === undefined |
|
|
this.listQuery.productLine === undefined |
|
|
@ -1272,8 +1351,13 @@ export default { |
|
|
} |
|
|
} |
|
|
(this.printNum = "12"), |
|
|
(this.printNum = "12"), |
|
|
(this.printNumZHB = "24"), |
|
|
(this.printNumZHB = "24"), |
|
|
(this.hostSNQuery.productLine = this.listQuery.productLine); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.hostSNQuery.productLine = this.listQuery.productLine; |
|
|
|
|
|
this.hostSNQuery.fwStation = this.listQuery.fwStation |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
|
|
this.hostPrintQuery.fwStation = this.listQuery.fwStation; |
|
|
|
|
|
|
|
|
//后端服务更改了 前端跟着更改成以下方式 |
|
|
//后端服务更改了 前端跟着更改成以下方式 |
|
|
if (this.listQuery.productType === 1) { |
|
|
if (this.listQuery.productType === 1) { |
|
|
//门板 |
|
|
//门板 |
|
|
@ -1281,16 +1365,17 @@ export default { |
|
|
console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery)); |
|
|
console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery)); |
|
|
this.$axios |
|
|
this.$axios |
|
|
.gets( |
|
|
.gets( |
|
|
"/api/newjit/bill-m100/get-print-start-hostsn2", |
|
|
"/api/newjit/bill-m100/get-print-start-hostsn3", |
|
|
this.hostSNQuery |
|
|
this.hostSNQuery |
|
|
) |
|
|
) |
|
|
.then((response) => { |
|
|
.then((response) => { |
|
|
console.log("获取hostsn大众顺序号起始"); |
|
|
console.log("获取hostsn大众顺序号起始"); |
|
|
console.log(response.item); |
|
|
console.log(response.item); |
|
|
if (response.item !== null) { |
|
|
if (response.item !== null) { |
|
|
this.form.beginHostSN = parseInt(response.item); |
|
|
this.form.beginHostSN = parseInt(response.item.beginHostSN); |
|
|
|
|
|
this.printNum = parseInt(response.item.count); |
|
|
if (this.listQuery.productType === 1) { |
|
|
if (this.listQuery.productType === 1) { |
|
|
this.form.endHostSN = parseInt(response.item) + 11; |
|
|
this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1; |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
//柱护板 |
|
|
//柱护板 |
|
|
this.form.endHostSN = parseInt(response.item) + 23; |
|
|
this.form.endHostSN = parseInt(response.item) + 23; |
|
|
@ -1308,6 +1393,31 @@ export default { |
|
|
this.hostSNQuery.isZhuHuBan = "1"; |
|
|
this.hostSNQuery.isZhuHuBan = "1"; |
|
|
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); |
|
|
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); |
|
|
|
|
|
|
|
|
|
|
|
//调用 get-zhuhuban-vin-num 服务 赋值给 this.printNumZHB--------------------------------- |
|
|
|
|
|
this.$axios |
|
|
|
|
|
.gets( |
|
|
|
|
|
"/api/newjit/bill-m100/get-zhuhuban-vin-num", |
|
|
|
|
|
this.hostSNQuery |
|
|
|
|
|
) |
|
|
|
|
|
.then((response) => { |
|
|
|
|
|
console.log("获取柱护板打印数量"); |
|
|
|
|
|
console.log(response.item); |
|
|
|
|
|
if (response.item !== null) { |
|
|
|
|
|
this.printNumZHB = parseInt(response.item); |
|
|
|
|
|
|
|
|
|
|
|
//this.form.endHostSN = this.form.beginHostSN + this.printNumZHB - 1; |
|
|
|
|
|
this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
message: "获取柱护板打印数量失败，返回空", |
|
|
|
|
|
type: "warning", |
|
|
|
|
|
}); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
//--------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.$axios |
|
|
this.$axios |
|
|
.gets( |
|
|
.gets( |
|
|
"/api/newjit/bill-m100/get-print-start-hostsn2", |
|
|
"/api/newjit/bill-m100/get-print-start-hostsn2", |
|
|
@ -1323,7 +1433,8 @@ export default { |
|
|
this.form.endHostSN = parseInt(response.item) + 11; |
|
|
this.form.endHostSN = parseInt(response.item) + 11; |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
//柱护板 |
|
|
//柱护板 |
|
|
this.form.endHostSN = parseInt(response.item) + 23; |
|
|
//this.form.endHostSN = parseInt(response.item) + 23; |
|
|
|
|
|
this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1; |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
@ -1337,17 +1448,8 @@ export default { |
|
|
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") { |
|
|
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") { |
|
|
this.productName = ""; |
|
|
this.productName = ""; |
|
|
switch (this.listQuery.productLine) { |
|
|
switch (this.listQuery.productLine) { |
|
|
case "01": |
|
|
case "00": |
|
|
this.productName = "总装-01"; |
|
|
this.productName = "全部门板"; |
|
|
break; |
|
|
|
|
|
case "05": |
|
|
|
|
|
this.productName = "总装-05"; |
|
|
|
|
|
break; |
|
|
|
|
|
case "07": |
|
|
|
|
|
this.productName = "总装-07"; |
|
|
|
|
|
break; |
|
|
|
|
|
case "08": |
|
|
|
|
|
this.productName = "总装-08"; |
|
|
|
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -1355,8 +1457,11 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
this.productName = ""; |
|
|
this.productName = ""; |
|
|
switch (this.listQuery.productLine) { |
|
|
switch (this.listQuery.productLine) { |
|
|
case "08": |
|
|
case "01": |
|
|
this.productName = "总装-柱护板"; |
|
|
this.productName = "大众一厂"; |
|
|
|
|
|
break; |
|
|
|
|
|
case "02": |
|
|
|
|
|
this.productName = "大众二厂"; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
this.formTitle = "打印-柱护板发货排序单"; |
|
|
this.formTitle = "打印-柱护板发货排序单"; |
|
|
@ -1395,6 +1500,7 @@ export default { |
|
|
} |
|
|
} |
|
|
this.formTitle = "重打"; |
|
|
this.formTitle = "重打"; |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
|
|
this.hostPrintQuery.fwStation = this.listQuery.fwStation; |
|
|
this.dialogFormVisible = true; |
|
|
this.dialogFormVisible = true; |
|
|
this.form = { |
|
|
this.form = { |
|
|
beginVin: "", |
|
|
beginVin: "", |
|
|
@ -1428,6 +1534,7 @@ export default { |
|
|
} |
|
|
} |
|
|
this.formTitle = "补打"; |
|
|
this.formTitle = "补打"; |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
|
|
this.hostPrintQuery.fwStation = this.listQuery.fwStation; |
|
|
this.dialogFormVisible = true; |
|
|
this.dialogFormVisible = true; |
|
|
this.form = { |
|
|
this.form = { |
|
|
beginVin: "", |
|
|
beginVin: "", |
|
|
@ -1438,11 +1545,10 @@ export default { |
|
|
}, |
|
|
}, |
|
|
save() { |
|
|
save() { |
|
|
this.$refs.form.validate((valid) => { |
|
|
this.$refs.form.validate((valid) => { |
|
|
|
|
|
|
|
|
if (valid) { |
|
|
if (valid) { |
|
|
//this.listLoaddingPrint = true; |
|
|
//this.listLoaddingPrint = true; |
|
|
if (this.isShowHostSN === true) { |
|
|
if (this.isShowHostSN === true) { |
|
|
if (this.form.beginHostSN === "" || this.form.endHostSN === "") { |
|
|
if (this.form.beginHostSN === "") { // || this.form.endHostSN === "" |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
message: "请输入完整的顺序号起始范围", |
|
|
message: "请输入完整的顺序号起始范围", |
|
|
type: "error", |
|
|
type: "error", |
|
|
@ -1453,8 +1559,7 @@ export default { |
|
|
//门板 |
|
|
//门板 |
|
|
if ( |
|
|
if ( |
|
|
parseInt(this.form.endHostSN) - |
|
|
parseInt(this.form.endHostSN) - |
|
|
parseInt(this.form.beginHostSN) <= |
|
|
parseInt(this.form.beginHostSN) < 0 |
|
|
0 |
|
|
|
|
|
) { |
|
|
) { |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
message: "起止大众顺序号相减不能为零！", |
|
|
message: "起止大众顺序号相减不能为零！", |
|
|
@ -1464,19 +1569,19 @@ export default { |
|
|
} |
|
|
} |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
//柱护板 |
|
|
//柱护板 |
|
|
if ( |
|
|
// if ( |
|
|
parseInt(this.form.endHostSN) - |
|
|
// parseInt(this.form.endHostSN) - |
|
|
parseInt(this.form.beginHostSN) > |
|
|
// parseInt(this.form.beginHostSN) > |
|
|
23 |
|
|
// 23 |
|
|
) { |
|
|
// ) { |
|
|
this.$message({ |
|
|
// this.$message({ |
|
|
message: |
|
|
// message: |
|
|
"最多只能打印24个顺序号，终止顺序号不能大于" + |
|
|
// "最多只能打印24个顺序号，终止顺序号不能大于" + |
|
|
(parseInt(this.form.beginHostSN) + 23), |
|
|
// (parseInt(this.form.beginHostSN) + 23), |
|
|
type: "error", |
|
|
// type: "error", |
|
|
}); |
|
|
// }); |
|
|
return; |
|
|
// return; |
|
|
} |
|
|
// } |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -1498,7 +1603,7 @@ export default { |
|
|
this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
|
|
|
|
|
|
if (this.listQuery.productType === 1) { |
|
|
if (this.listQuery.productType === 1) { |
|
|
//柱护板-打印 |
|
|
//门板-打印 |
|
|
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); |
|
|
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); |
|
|
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
this.hostCheckQuery.productLine = this.listQuery.productLine; |
|
|
this.hostCheckQuery.productLine = this.listQuery.productLine; |
|
|
@ -1550,6 +1655,7 @@ export default { |
|
|
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); |
|
|
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); |
|
|
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
this.hostCheckQuery.productLine = this.listQuery.productLine; |
|
|
this.hostCheckQuery.productLine = this.listQuery.productLine; |
|
|
|
|
|
this.hostCheckQuery.fwStation = this.listQuery.fwStation; |
|
|
this.isDisable = true; |
|
|
this.isDisable = true; |
|
|
this.$axios |
|
|
this.$axios |
|
|
.posts( |
|
|
.posts( |
|
|
@ -1616,7 +1722,6 @@ export default { |
|
|
*/ |
|
|
*/ |
|
|
private_printMenBan() |
|
|
private_printMenBan() |
|
|
{ |
|
|
{ |
|
|
debugger |
|
|
|
|
|
this.$axios |
|
|
this.$axios |
|
|
.posts( |
|
|
.posts( |
|
|
"/api/newjit/bill-m100/save-menban-report", |
|
|
"/api/newjit/bill-m100/save-menban-report", |
|
|
@ -1687,7 +1792,6 @@ export default { |
|
|
*/ |
|
|
*/ |
|
|
private_printZhuHuBan(isSelAll = true) |
|
|
private_printZhuHuBan(isSelAll = true) |
|
|
{ |
|
|
{ |
|
|
debugger |
|
|
|
|
|
//门板 |
|
|
//门板 |
|
|
//传递大众顺序号起止 |
|
|
//传递大众顺序号起止 |
|
|
this.$axios |
|
|
this.$axios |
|
|
@ -1709,6 +1813,7 @@ export default { |
|
|
let loadInput = {}; |
|
|
let loadInput = {}; |
|
|
loadInput.dataResultType = (isSelAll == true) ? "1" : "2"; |
|
|
loadInput.dataResultType = (isSelAll == true) ? "1" : "2"; |
|
|
loadInput.reportIdList = response.item; |
|
|
loadInput.reportIdList = response.item; |
|
|
|
|
|
loadInput.productLine = this.hostPrintQuery.productLine |
|
|
//-------------------------------------- |
|
|
//-------------------------------------- |
|
|
//门板 |
|
|
//门板 |
|
|
//传递大众顺序号起止 |
|
|
//传递大众顺序号起止 |
|
|
@ -1736,9 +1841,12 @@ export default { |
|
|
//this.fileQuery.dataname = ""; |
|
|
//this.fileQuery.dataname = ""; |
|
|
console.log("打印json"); |
|
|
console.log("打印json"); |
|
|
console.log(this.fileQuery.dataname); |
|
|
console.log(this.fileQuery.dataname); |
|
|
|
|
|
|
|
|
|
|
|
let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2 |
|
|
|
|
|
|
|
|
this.$axios |
|
|
this.$axios |
|
|
.posts( |
|
|
.posts( |
|
|
"/Handlers/Handler1.ashx?report=zhuhuban", |
|
|
reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban", |
|
|
qs.stringify(this.fileQuery) |
|
|
qs.stringify(this.fileQuery) |
|
|
) |
|
|
) |
|
|
.then((response) => { |
|
|
.then((response) => { |
|
|
@ -1761,10 +1869,18 @@ export default { |
|
|
|
|
|
|
|
|
//获取所有产线 |
|
|
//获取所有产线 |
|
|
getProductLine() { |
|
|
getProductLine() { |
|
|
this.listPLQuery.UserId = this.userInfo.userId; |
|
|
|
|
|
|
|
|
if (this.userInfo == null || this.userInfo.userId == null) //设置默认值，调试时使用 |
|
|
|
|
|
{ |
|
|
|
|
|
this.listPLQuery.UserId = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA'; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
this.listPLQuery.UserId = this.userInfo.userId; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
console.log( |
|
|
console.log( |
|
|
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + |
|
|
"this.listPLQuery.UserId::" + this.listPLQuery.UserId |
|
|
this.listPLQuery.UserId |
|
|
|
|
|
); |
|
|
); |
|
|
this.$axios |
|
|
this.$axios |
|
|
.gets("/api/newjit/product-line/list", this.listPLQuery) |
|
|
.gets("/api/newjit/product-line/list", this.listPLQuery) |
|
|
@ -1802,6 +1918,7 @@ export default { |
|
|
return a.productLineCode - b.productLineCode; |
|
|
return a.productLineCode - b.productLineCode; |
|
|
}); |
|
|
}); |
|
|
//console.log(this.PLList) |
|
|
//console.log(this.PLList) |
|
|
|
|
|
this.setTableHeight() |
|
|
//变更打印按钮文字 |
|
|
//变更打印按钮文字 |
|
|
if (this.listQuery.productType === 1) { |
|
|
if (this.listQuery.productType === 1) { |
|
|
this.$refs.btn1.$el.innerText = "打印门板发货排序单"; |
|
|
this.$refs.btn1.$el.innerText = "打印门板发货排序单"; |
|
|
@ -1809,6 +1926,7 @@ export default { |
|
|
this.$refs.btn3.$el.innerText = "补打门板发货排序单"; |
|
|
this.$refs.btn3.$el.innerText = "补打门板发货排序单"; |
|
|
this.listQuery.state.push(this.billState[0].id); |
|
|
this.listQuery.state.push(this.billState[0].id); |
|
|
this.isShowState = true; |
|
|
this.isShowState = true; |
|
|
|
|
|
|
|
|
} else if (this.listQuery.productType === 2) { |
|
|
} else if (this.listQuery.productType === 2) { |
|
|
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单"; |
|
|
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单"; |
|
|
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单"; |
|
|
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单"; |
|
|
@ -1816,12 +1934,14 @@ export default { |
|
|
this.listQuery.state = []; |
|
|
this.listQuery.state = []; |
|
|
this.isShowState = false; |
|
|
this.isShowState = false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (this.listQuery.productType === 2) { |
|
|
if (this.listQuery.productType === 2) { |
|
|
this.listQueryList.ZHBBillStatus = 2; |
|
|
this.listQueryList.ZHBBillStatus = 2; |
|
|
} else { |
|
|
} else { |
|
|
this.listQueryList.ZHBBillStatus = 0; |
|
|
this.listQueryList.ZHBBillStatus = 0; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
/*单据状态变更 */ |
|
|
/*单据状态变更 */ |
|
|
checkedListChange(index) { |
|
|
checkedListChange(index) { |
|
|
if (this.listQuery.state.length <= 1) { |
|
|
if (this.listQuery.state.length <= 1) { |
|
|
|
liuyunfeng
安虹睿
lyf