|
|
|
@ -44,6 +44,24 @@ |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</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-button |
|
|
|
@ -76,8 +94,9 @@ |
|
|
|
@click="print()" |
|
|
|
>打印门板发货排序单 |
|
|
|
</el-button> |
|
|
|
|
|
|
|
<el-button |
|
|
|
v-show="this.listQuery.productType === 1" |
|
|
|
v-show="false" |
|
|
|
@click="drawerMBPrint = true" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
@ -86,7 +105,7 @@ |
|
|
|
<strong>重新打印门板</strong></el-button |
|
|
|
> |
|
|
|
<el-button |
|
|
|
v-show="this.listQuery.productType === 1" |
|
|
|
v-show="false" |
|
|
|
@click="drawerbudaMBPrint = true" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
@ -95,7 +114,7 @@ |
|
|
|
<strong>门板补打</strong></el-button |
|
|
|
> |
|
|
|
<el-button |
|
|
|
v-show="this.listQuery.productType === 1" |
|
|
|
v-show="false" |
|
|
|
@click="drawerMBDelete = true" |
|
|
|
size="mini" |
|
|
|
type="danger" |
|
|
|
@ -114,15 +133,15 @@ |
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
<el-button |
|
|
|
v-show="this.listQuery.productType === 2" |
|
|
|
@click="drawerbudaZHBPrint = true" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
plain |
|
|
|
> |
|
|
|
<strong>柱护板补打</strong></el-button |
|
|
|
> |
|
|
|
<el-button |
|
|
|
v-show="this.listQuery.productType === 2" |
|
|
|
@click="drawerbudaZHBPrint = true" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
plain |
|
|
|
> |
|
|
|
<strong>柱护板补打</strong></el-button |
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
<el-button |
|
|
|
@ -557,6 +576,7 @@ export default { |
|
|
|
SkipCount: 0, |
|
|
|
MaxResultCount: 15, |
|
|
|
productType: 1, //1:门板；2:柱护板 |
|
|
|
fwStation : "BA2", //大众工位 |
|
|
|
ProductLine: undefined, |
|
|
|
Version: undefined, |
|
|
|
printBillNum: undefined, |
|
|
|
@ -643,6 +663,10 @@ export default { |
|
|
|
{ id: 1, name: "门板" }, |
|
|
|
{ id: 2, name: "柱护板" }, |
|
|
|
], |
|
|
|
fwStationList: [ |
|
|
|
{ id: "BA2", name: "BA2" }, |
|
|
|
{ id: "BA5", name: "BA5" } |
|
|
|
], |
|
|
|
isShowHostSN: false, |
|
|
|
isShowVin: false, |
|
|
|
isShowState: true, |
|
|
|
@ -751,7 +775,7 @@ export default { |
|
|
|
// productLineList.forEach(element => { |
|
|
|
// element=this.listQuery.productLine; |
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
|
|
//let productLineList = { productLineList: [this.listQuery.productLine] }; |
|
|
|
this.$refs.sp01.Visible = false; |
|
|
|
this.$refs.sp05.Visible = false; |
|
|
|
@ -803,10 +827,10 @@ export default { |
|
|
|
this.$refs.sp01.style.color = "green"; |
|
|
|
} |
|
|
|
} |
|
|
|
if (JKITEM.productLine == "05") { |
|
|
|
if (JKITEM.productLine == "02") { |
|
|
|
this.$refs.sp05.Visible = true; |
|
|
|
this.content05 = |
|
|
|
"05生产线已经" + |
|
|
|
"02生产线已经" + |
|
|
|
JKITEM.timeoutMinutes + |
|
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
@ -820,41 +844,58 @@ export default { |
|
|
|
this.$refs.sp05.style.color = "green"; |
|
|
|
} |
|
|
|
} |
|
|
|
if (JKITEM.productLine == "07") { |
|
|
|
this.$refs.sp07.Visible = true; |
|
|
|
this.content07 = |
|
|
|
"07生产线已经" + |
|
|
|
JKITEM.timeoutMinutes + |
|
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
//写提示信息 |
|
|
|
console.log( |
|
|
|
"222222222222222222222222222222222222222222222222" |
|
|
|
); |
|
|
|
this.$refs.sp07.style.color = "red"; |
|
|
|
this.$refs.sp07.style.fontWeight = "bold"; |
|
|
|
} else { |
|
|
|
this.$refs.sp07.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"; |
|
|
|
} |
|
|
|
} |
|
|
|
// if (JKITEM.productLine == "05") { |
|
|
|
// this.$refs.sp05.Visible = true; |
|
|
|
// this.content05 = |
|
|
|
// "05生产线已经" + |
|
|
|
// JKITEM.timeoutMinutes + |
|
|
|
// "分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
|
// if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
// //写提示信息 |
|
|
|
// console.log( |
|
|
|
// "222222222222222222222222222222222222222222222222" |
|
|
|
// ); |
|
|
|
// this.$refs.sp05.style.color = "red"; |
|
|
|
// this.$refs.sp05.style.fontWeight = "bold"; |
|
|
|
// } else { |
|
|
|
// this.$refs.sp05.style.color = "green"; |
|
|
|
// } |
|
|
|
// } |
|
|
|
// if (JKITEM.productLine == "07") { |
|
|
|
// this.$refs.sp07.Visible = true; |
|
|
|
// this.content07 = |
|
|
|
// "07生产线已经" + |
|
|
|
// JKITEM.timeoutMinutes + |
|
|
|
// "分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
|
// if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
// //写提示信息 |
|
|
|
// console.log( |
|
|
|
// "222222222222222222222222222222222222222222222222" |
|
|
|
// ); |
|
|
|
// this.$refs.sp07.style.color = "red"; |
|
|
|
// this.$refs.sp07.style.fontWeight = "bold"; |
|
|
|
// } else { |
|
|
|
// this.$refs.sp07.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 { |
|
|
|
this.$message({ |
|
|
|
@ -1119,6 +1160,7 @@ export default { |
|
|
|
return projectTypeKeyValue[type]; |
|
|
|
}, |
|
|
|
getList(data) { |
|
|
|
|
|
|
|
this.listLoading = true; |
|
|
|
if (data != undefined) { |
|
|
|
this.listQueryList.SkipCount = (this.page - 1) * data.limit; |
|
|
|
@ -1138,6 +1180,7 @@ export default { |
|
|
|
this.listQueryList.BillStatus = 2; //状态 |
|
|
|
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 |
|
|
|
this.listQueryList.CanNotPrint = false; //不可打印 |
|
|
|
this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5 |
|
|
|
console.log( |
|
|
|
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) |
|
|
|
); |
|
|
|
@ -1185,6 +1228,7 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
valueselectChange(val) { |
|
|
|
debugger |
|
|
|
this.$forceUpdate(); |
|
|
|
this.customerInfosMB = []; |
|
|
|
this.customerInfosZHB = []; |
|
|
|
@ -1194,6 +1238,7 @@ export default { |
|
|
|
{ |
|
|
|
PrintType: 1, |
|
|
|
ProductLine: val, |
|
|
|
fwStation: this.listQuery.fwStation |
|
|
|
}, |
|
|
|
]; |
|
|
|
} |
|
|
|
@ -1203,10 +1248,37 @@ export default { |
|
|
|
{ |
|
|
|
PrintType: 1, |
|
|
|
ProductLine: val, |
|
|
|
fwStation: this.listQuery.fwStation |
|
|
|
}, |
|
|
|
]; |
|
|
|
} |
|
|
|
}, |
|
|
|
fwStation_selectChange(val) { |
|
|
|
debugger |
|
|
|
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() {}, |
|
|
|
|
|
|
|
handleFilter() { |
|
|
|
@ -1260,6 +1332,7 @@ export default { |
|
|
|
(this.hostCheckQuery.printType = 0); |
|
|
|
this.hostPrintQuery.printType = 0; |
|
|
|
this.vinPrintQuery.printType = 0; |
|
|
|
|
|
|
|
if ( |
|
|
|
this.listQuery.productLine === "" || |
|
|
|
this.listQuery.productLine === undefined |
|
|
|
@ -1272,8 +1345,13 @@ export default { |
|
|
|
} |
|
|
|
(this.printNum = "12"), |
|
|
|
(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.fwStation = this.listQuery.fwStation; |
|
|
|
|
|
|
|
//后端服务更改了 前端跟着更改成以下方式 |
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
//门板 |
|
|
|
@ -1307,6 +1385,28 @@ export default { |
|
|
|
//柱护板 |
|
|
|
this.hostSNQuery.isZhuHuBan = "1"; |
|
|
|
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); |
|
|
|
} else { |
|
|
|
this.$message({ |
|
|
|
message: "获取柱护板打印数量失败，返回空", |
|
|
|
type: "warning", |
|
|
|
}); |
|
|
|
return; |
|
|
|
} |
|
|
|
}); |
|
|
|
//--------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
|
|
this.$axios |
|
|
|
.gets( |
|
|
|
@ -1337,17 +1437,8 @@ export default { |
|
|
|
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") { |
|
|
|
this.productName = ""; |
|
|
|
switch (this.listQuery.productLine) { |
|
|
|
case "01": |
|
|
|
this.productName = "总装-01"; |
|
|
|
break; |
|
|
|
case "05": |
|
|
|
this.productName = "总装-05"; |
|
|
|
break; |
|
|
|
case "07": |
|
|
|
this.productName = "总装-07"; |
|
|
|
break; |
|
|
|
case "08": |
|
|
|
this.productName = "总装-08"; |
|
|
|
case "00": |
|
|
|
this.productName = "全部门板"; |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1355,8 +1446,11 @@ export default { |
|
|
|
} else { |
|
|
|
this.productName = ""; |
|
|
|
switch (this.listQuery.productLine) { |
|
|
|
case "08": |
|
|
|
this.productName = "总装-柱护板"; |
|
|
|
case "01": |
|
|
|
this.productName = "大众一厂"; |
|
|
|
break; |
|
|
|
case "02": |
|
|
|
this.productName = "大众二厂"; |
|
|
|
break; |
|
|
|
} |
|
|
|
this.formTitle = "打印-柱护板发货排序单"; |
|
|
|
@ -1395,6 +1489,7 @@ export default { |
|
|
|
} |
|
|
|
this.formTitle = "重打"; |
|
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
this.hostPrintQuery.fwStation = this.listQuery.fwStation; |
|
|
|
this.dialogFormVisible = true; |
|
|
|
this.form = { |
|
|
|
beginVin: "", |
|
|
|
@ -1428,6 +1523,7 @@ export default { |
|
|
|
} |
|
|
|
this.formTitle = "补打"; |
|
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
this.hostPrintQuery.fwStation = this.listQuery.fwStation; |
|
|
|
this.dialogFormVisible = true; |
|
|
|
this.form = { |
|
|
|
beginVin: "", |
|
|
|
@ -1550,6 +1646,7 @@ export default { |
|
|
|
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); |
|
|
|
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); |
|
|
|
this.hostCheckQuery.productLine = this.listQuery.productLine; |
|
|
|
this.hostCheckQuery.fwStation = this.listQuery.fwStation; |
|
|
|
this.isDisable = true; |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
@ -1736,9 +1833,12 @@ export default { |
|
|
|
//this.fileQuery.dataname = ""; |
|
|
|
console.log("打印json"); |
|
|
|
console.log(this.fileQuery.dataname); |
|
|
|
|
|
|
|
let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2 |
|
|
|
|
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/Handlers/Handler1.ashx?report=zhuhuban", |
|
|
|
reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban", |
|
|
|
qs.stringify(this.fileQuery) |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
@ -1761,16 +1861,25 @@ export default { |
|
|
|
|
|
|
|
//获取所有产线 |
|
|
|
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( |
|
|
|
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + |
|
|
|
this.listPLQuery.UserId |
|
|
|
"this.listPLQuery.UserId::" + this.listPLQuery.UserId |
|
|
|
); |
|
|
|
this.$axios |
|
|
|
.gets("/api/newjit/product-line/list", this.listPLQuery) |
|
|
|
.then((response) => { |
|
|
|
//console.log(response); |
|
|
|
this.PLList = response.item; |
|
|
|
debugger |
|
|
|
this.PLChildList = this.PLList.filter( |
|
|
|
(u) => u.productType === parseInt(this.listQuery.productType) |
|
|
|
).sort((a, b) => { |
|
|
|
@ -1809,6 +1918,7 @@ export default { |
|
|
|
this.$refs.btn3.$el.innerText = "补打门板发货排序单"; |
|
|
|
this.listQuery.state.push(this.billState[0].id); |
|
|
|
this.isShowState = true; |
|
|
|
|
|
|
|
} else if (this.listQuery.productType === 2) { |
|
|
|
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单"; |
|
|
|
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单"; |
|
|
|
@ -1822,6 +1932,7 @@ export default { |
|
|
|
this.listQueryList.ZHBBillStatus = 0; |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
/*单据状态变更 */ |
|
|
|
checkedListChange(index) { |
|
|
|
if (this.listQuery.state.length <= 1) { |
|
|
|
|
lyf
2 years ago