|
|
|
@ -27,13 +27,13 @@ |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="" prop="productLine"> |
|
|
|
<el-form-item prop="productLine"> |
|
|
|
<el-select |
|
|
|
v-model="listQuery.productLine" |
|
|
|
clearable |
|
|
|
placeholder="请选择" |
|
|
|
size="medium" |
|
|
|
style="margin-right: 15px" |
|
|
|
style="margin-right: 10px" |
|
|
|
@change="valueselectChange" |
|
|
|
> |
|
|
|
<el-option |
|
|
|
@ -44,6 +44,27 @@ |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<!-- 柱护板时候显示 --> |
|
|
|
<el-form-item |
|
|
|
prop="productGroup" |
|
|
|
v-show="this.listQuery.productType == 2" |
|
|
|
> |
|
|
|
<el-select |
|
|
|
v-model="listQuery.productGroup" |
|
|
|
clearable |
|
|
|
placeholder="请选择" |
|
|
|
size="medium" |
|
|
|
style="margin-right: 10px" |
|
|
|
@change="GroupselectChange" |
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="(item,key) in PLChildGroupList" |
|
|
|
:key="key" |
|
|
|
:label="item" |
|
|
|
:value="item" |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item> |
|
|
|
<el-button |
|
|
|
@ -140,14 +161,7 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<div id="app"> |
|
|
|
<div |
|
|
|
style=" |
|
|
|
border: solid 1px darkgray; |
|
|
|
border-radius: 5px; |
|
|
|
margin: 5px; |
|
|
|
padding: 5px; |
|
|
|
" |
|
|
|
> |
|
|
|
<div style="border: solid 1px darkgray;border-radius: 5px;margin: 5px;padding: 5px;"> |
|
|
|
<span ref="sp01">{{ content01 }}</span> |
|
|
|
|
|
|
|
<span ref="sp05">{{ content05 }}</span> |
|
|
|
@ -174,6 +188,7 @@ |
|
|
|
</el-drawer> |
|
|
|
<!--门板补打--> |
|
|
|
<el-drawer |
|
|
|
v-if="drawerbudaMBPrint" |
|
|
|
title="门板补打" |
|
|
|
:visible.sync="drawerbudaMBPrint" |
|
|
|
direction="rtl" |
|
|
|
@ -201,9 +216,9 @@ |
|
|
|
<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB> |
|
|
|
</el-drawer> |
|
|
|
|
|
|
|
|
|
|
|
<!--柱护板补打--> |
|
|
|
<el-drawer |
|
|
|
v-if="drawerbudaZHBPrint" |
|
|
|
title="柱护板补打" |
|
|
|
:visible.sync="drawerbudaZHBPrint" |
|
|
|
direction="rtl" |
|
|
|
@ -212,8 +227,6 @@ |
|
|
|
<budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB> |
|
|
|
</el-drawer> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!--柱护板重打和作废--> |
|
|
|
<el-drawer |
|
|
|
title="柱护板作废" |
|
|
|
@ -402,9 +415,9 @@ |
|
|
|
type="primary" |
|
|
|
:disabled="isDisable" |
|
|
|
@click="save" |
|
|
|
v-debounce="debounceClick" |
|
|
|
>确认</el-button |
|
|
|
> |
|
|
|
<!-- v-debounce="debounceClick" --> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
@ -414,7 +427,7 @@ |
|
|
|
<pagination |
|
|
|
v-show="totalCount > 0" |
|
|
|
:total="totalCount" |
|
|
|
style="margin-bottom: -5px; float: right" |
|
|
|
style="float: right" |
|
|
|
:page.sync="page" |
|
|
|
:limit.sync="listQuery.MaxResultCount" |
|
|
|
@pagination="getList" |
|
|
|
@ -558,6 +571,7 @@ export default { |
|
|
|
MaxResultCount: 15, |
|
|
|
productType: 1, //1:门板；2:柱护板 |
|
|
|
ProductLine: undefined, |
|
|
|
productGroup:undefined,//仅在柱护板时候显示 |
|
|
|
Version: undefined, |
|
|
|
printBillNum: undefined, |
|
|
|
serialNumBegin: undefined, |
|
|
|
@ -584,6 +598,7 @@ export default { |
|
|
|
BillStatus: undefined, |
|
|
|
CanNotPrint: false, |
|
|
|
ZHBBillStatus: undefined, |
|
|
|
GroupNmae:undefined, |
|
|
|
}, |
|
|
|
listExportQuery: { |
|
|
|
erpAssemblyCode: undefined, |
|
|
|
@ -611,6 +626,7 @@ export default { |
|
|
|
endHostSN: undefined, |
|
|
|
beginVin: undefined, |
|
|
|
endVin: undefined, |
|
|
|
Groupname: undefined, |
|
|
|
}, |
|
|
|
vinPrintQuery: { |
|
|
|
printType: undefined, //0:打印;1:重打;2:补打; |
|
|
|
@ -639,6 +655,7 @@ export default { |
|
|
|
details: [], //修改子表数据源 |
|
|
|
PLList: [], //产线下拉 |
|
|
|
PLChildList: [], //筛选后产线下拉 |
|
|
|
PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位 |
|
|
|
productTypeList: [ |
|
|
|
{ id: 1, name: "门板" }, |
|
|
|
{ id: 2, name: "柱护板" }, |
|
|
|
@ -651,12 +668,11 @@ export default { |
|
|
|
mounted() { |
|
|
|
this.$nextTick(() => { |
|
|
|
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 - boxH - 67 - 79 - 70; //57为footer高度，79为页面上部标签高度 |
|
|
|
//this.tableHeight = offsetHei -260 |
|
|
|
}); |
|
|
|
|
|
|
|
this.getPLChildGroupList() |
|
|
|
let timer = setInterval(() => { |
|
|
|
this.open(); |
|
|
|
}, 5000); |
|
|
|
@ -742,12 +758,10 @@ export default { |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
opens() { |
|
|
|
|
|
|
|
this.getList(); |
|
|
|
}, |
|
|
|
open() { |
|
|
|
// let productLineList = []; |
|
|
|
// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" ); |
|
|
|
// productLineList.forEach(element => { |
|
|
|
// element=this.listQuery.productLine; |
|
|
|
// }); |
|
|
|
@ -764,9 +778,7 @@ export default { |
|
|
|
productLineListMain.productLineList.push(itm.productLineCode); |
|
|
|
}); |
|
|
|
|
|
|
|
console.log( |
|
|
|
"门版-主界面传过来的值：" + JSON.stringify(productLineListMain) |
|
|
|
); |
|
|
|
console.log("门版-主界面传过来的值：" + JSON.stringify(productLineListMain)); |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/newjit/bill-m100/product-line-timeout-remind", |
|
|
|
@ -780,9 +792,7 @@ export default { |
|
|
|
}); |
|
|
|
return; |
|
|
|
} else { |
|
|
|
console.log( |
|
|
|
"超时提醒-接口传过来的值：" + JSON.stringify(response.item) |
|
|
|
); |
|
|
|
console.log("超时提醒-接口传过来的值：" + JSON.stringify(response.item)); |
|
|
|
|
|
|
|
if (response.item !== null) { |
|
|
|
response.item.forEach((JKITEM) => { |
|
|
|
@ -794,9 +804,6 @@ export default { |
|
|
|
"分钟没收到报文\xa0\xa0\xa0\xa0"; |
|
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
//写提示信息 |
|
|
|
console.log( |
|
|
|
"222222222222222222222222222222222222222222222222" |
|
|
|
); |
|
|
|
this.$refs.sp01.style.color = "red"; |
|
|
|
this.$refs.sp01.style.fontWeight = "bold"; |
|
|
|
} else { |
|
|
|
@ -811,9 +818,6 @@ export default { |
|
|
|
"分钟没收到报文\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 { |
|
|
|
@ -828,9 +832,6 @@ export default { |
|
|
|
"分钟没收到报文\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 { |
|
|
|
@ -846,9 +847,6 @@ export default { |
|
|
|
"分钟没收到报文"; |
|
|
|
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { |
|
|
|
//写提示信息 |
|
|
|
console.log( |
|
|
|
"222222222222222222222222222222222222222222222222" |
|
|
|
); |
|
|
|
this.$refs.sp08.style.color = "red"; |
|
|
|
this.$refs.sp08.style.fontWeight = "bold"; |
|
|
|
} else { |
|
|
|
@ -980,8 +978,6 @@ export default { |
|
|
|
//抽屉 |
|
|
|
handleDrawerOpen(param) { |
|
|
|
this.drawer = true; |
|
|
|
//console.log(510) |
|
|
|
//console.log(param) |
|
|
|
var parentId = param.assemblyID; //主键id |
|
|
|
this.customerInfos = [ |
|
|
|
{ |
|
|
|
@ -1000,7 +996,6 @@ export default { |
|
|
|
.then((response) => { |
|
|
|
this.form = response.item; |
|
|
|
//this.details = response.item.details; |
|
|
|
//console.log(this.details); |
|
|
|
}); |
|
|
|
}, |
|
|
|
/** 导出功能 */ |
|
|
|
@ -1080,7 +1075,6 @@ export default { |
|
|
|
handleAddDetails() { |
|
|
|
if (this.form.details === undefined) { |
|
|
|
this.form.details = []; |
|
|
|
//console.log(679); |
|
|
|
} |
|
|
|
let obj = {}; |
|
|
|
obj.partCode = ""; |
|
|
|
@ -1088,14 +1082,10 @@ export default { |
|
|
|
obj.partNum = ""; |
|
|
|
obj.isKey = false; |
|
|
|
obj.description = ""; |
|
|
|
|
|
|
|
//console.log(this.form.details); |
|
|
|
this.form.details.push(obj); |
|
|
|
//console.log(688); |
|
|
|
}, |
|
|
|
handleDeleteDetails(index) { |
|
|
|
this.form.details.splice(index, 1); |
|
|
|
//console.log(693); |
|
|
|
}, |
|
|
|
|
|
|
|
/** 格式化字段 */ |
|
|
|
@ -1138,9 +1128,8 @@ export default { |
|
|
|
this.listQueryList.BillStatus = 2; //状态 |
|
|
|
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 |
|
|
|
this.listQueryList.CanNotPrint = false; //不可打印 |
|
|
|
console.log( |
|
|
|
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) |
|
|
|
); |
|
|
|
this.listQueryList.GroupNmae = this.listQuery.productGroup |
|
|
|
console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList)); |
|
|
|
//this.click(); |
|
|
|
this.$axios |
|
|
|
.gets("/api/newjit/bill-m100/list", this.listQueryList) |
|
|
|
@ -1163,9 +1152,7 @@ export default { |
|
|
|
this.$axios |
|
|
|
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId) |
|
|
|
.then((response) => { |
|
|
|
//console.log(partCode) |
|
|
|
if (partCode !== "" && partCode !== undefined) { |
|
|
|
//console.log(partCode) |
|
|
|
this.list = response.item.details.filter( |
|
|
|
(u) => u.partCode === partCode |
|
|
|
); |
|
|
|
@ -1207,6 +1194,9 @@ export default { |
|
|
|
]; |
|
|
|
} |
|
|
|
}, |
|
|
|
GroupselectChange(val){ |
|
|
|
this.customerInfosZHB[0].productGroup = val |
|
|
|
}, |
|
|
|
handleImportSAP() {}, |
|
|
|
|
|
|
|
handleFilter() { |
|
|
|
@ -1256,6 +1246,7 @@ export default { |
|
|
|
endHostSN: undefined, |
|
|
|
beginVin: undefined, |
|
|
|
endVin: undefined, |
|
|
|
Groupname: undefined, |
|
|
|
}), |
|
|
|
(this.hostCheckQuery.printType = 0); |
|
|
|
this.hostPrintQuery.printType = 0; |
|
|
|
@ -1274,6 +1265,7 @@ export default { |
|
|
|
(this.printNumZHB = "24"), |
|
|
|
(this.hostSNQuery.productLine = this.listQuery.productLine); |
|
|
|
this.hostPrintQuery.productLine = this.listQuery.productLine; |
|
|
|
this.hostPrintQuery.Groupname = this.listQuery.productGroup; |
|
|
|
//后端服务更改了 前端跟着更改成以下方式 |
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
//门板 |
|
|
|
@ -1285,8 +1277,7 @@ export default { |
|
|
|
this.hostSNQuery |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("获取hostsn大众顺序号起始"); |
|
|
|
console.log(response.item); |
|
|
|
console.log("获取hostsn大众顺序号起始",response.item); |
|
|
|
if (response.item !== null) { |
|
|
|
this.form.beginHostSN = parseInt(response.item); |
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
@ -1315,7 +1306,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("获取hostsn大众顺序号起始"); |
|
|
|
console.log(response.item); |
|
|
|
if (response.item !== null) { |
|
|
|
this.form.beginHostSN = parseInt(response.item); |
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
@ -1616,7 +1606,6 @@ export default { |
|
|
|
*/ |
|
|
|
private_printMenBan() |
|
|
|
{ |
|
|
|
debugger |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/newjit/bill-m100/save-menban-report", |
|
|
|
@ -1624,8 +1613,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("保存门板报表"); |
|
|
|
console.log(response); |
|
|
|
console.log(response.status); |
|
|
|
if (response.status === false) { |
|
|
|
this.$message({ |
|
|
|
message: response.message, |
|
|
|
@ -1642,8 +1629,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("加载门板报表"); |
|
|
|
console.log(response); |
|
|
|
console.log(response.status); |
|
|
|
if (response.status === false) { |
|
|
|
this.$message({ |
|
|
|
message: response.message, |
|
|
|
@ -1658,7 +1643,6 @@ export default { |
|
|
|
); |
|
|
|
//this.fileQuery.dataname = ""; |
|
|
|
console.log("打印json"); |
|
|
|
console.log(this.fileQuery.dataname); |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/Handlers/Handler1.ashx?report=menban", |
|
|
|
@ -1666,7 +1650,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("获取文件base64编码"); |
|
|
|
console.log(response); |
|
|
|
this.formLoading = false; |
|
|
|
this.isDisable = false; |
|
|
|
this.printpdf(response); //打印我文件流 |
|
|
|
@ -1687,18 +1670,16 @@ export default { |
|
|
|
*/ |
|
|
|
private_printZhuHuBan(isSelAll = true) |
|
|
|
{ |
|
|
|
debugger |
|
|
|
//门板 |
|
|
|
console.log(1702,this.hostPrintQuery) |
|
|
|
//门板 /api/newjit/bill-m100/save-zhuhuban-report |
|
|
|
//传递大众顺序号起止 |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/newjit/bill-m100/save-zhuhuban-report", |
|
|
|
"/api/newjit/bill-m100/save-group-zhuhuban-report", |
|
|
|
this.hostPrintQuery |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("保存柱护板报表"); |
|
|
|
console.log(response); |
|
|
|
console.log(response.status); |
|
|
|
if (response.status === false) { |
|
|
|
this.$message({ |
|
|
|
message: response.message, |
|
|
|
@ -1719,8 +1700,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("加载柱护板报表"); |
|
|
|
console.log(response); |
|
|
|
console.log(response.status); |
|
|
|
if (response.status === false) { |
|
|
|
this.$message({ |
|
|
|
message: response.message, |
|
|
|
@ -1735,7 +1714,6 @@ export default { |
|
|
|
); |
|
|
|
//this.fileQuery.dataname = ""; |
|
|
|
console.log("打印json"); |
|
|
|
console.log(this.fileQuery.dataname); |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/Handlers/Handler1.ashx?report=zhuhuban", |
|
|
|
@ -1743,7 +1721,6 @@ export default { |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
console.log("获取文件base64编码"); |
|
|
|
console.log(response); |
|
|
|
this.formLoading = false; |
|
|
|
this.isDisable = false; |
|
|
|
this.printpdf(response); //打印我文件流 |
|
|
|
@ -1762,14 +1739,13 @@ export default { |
|
|
|
//获取所有产线 |
|
|
|
getProductLine() { |
|
|
|
this.listPLQuery.UserId = this.userInfo.userId; |
|
|
|
console.log( |
|
|
|
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + |
|
|
|
this.listPLQuery.UserId |
|
|
|
); |
|
|
|
// console.log( |
|
|
|
// "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + |
|
|
|
// this.listPLQuery.UserId |
|
|
|
// ); |
|
|
|
this.$axios |
|
|
|
.gets("/api/newjit/product-line/list", this.listPLQuery) |
|
|
|
.then((response) => { |
|
|
|
//console.log(response); |
|
|
|
this.PLList = response.item; |
|
|
|
this.PLChildList = this.PLList.filter( |
|
|
|
(u) => u.productType === parseInt(this.listQuery.productType) |
|
|
|
@ -1787,21 +1763,19 @@ export default { |
|
|
|
]; |
|
|
|
} |
|
|
|
this.getList(); |
|
|
|
//console.log(this.PLList) |
|
|
|
}) |
|
|
|
.catch(() => {}); |
|
|
|
}, |
|
|
|
//产线类型变更 |
|
|
|
ptypeselectChange() { |
|
|
|
this.$forceUpdate(); |
|
|
|
//console.log(this.listQuery.productType); |
|
|
|
this.listQuery.productLine = ""; |
|
|
|
this.listQuery.productGroup = undefined |
|
|
|
this.PLChildList = this.PLList.filter( |
|
|
|
(u) => u.productType === parseInt(this.listQuery.productType) |
|
|
|
).sort((a, b) => { |
|
|
|
return a.productLineCode - b.productLineCode; |
|
|
|
}); |
|
|
|
//console.log(this.PLList) |
|
|
|
//变更打印按钮文字 |
|
|
|
if (this.listQuery.productType === 1) { |
|
|
|
this.$refs.btn1.$el.innerText = "打印门板发货排序单"; |
|
|
|
@ -1898,12 +1872,23 @@ export default { |
|
|
|
|
|
|
|
return temp; |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取PLChildGroupList |
|
|
|
getPLChildGroupList(){ |
|
|
|
this.$axios |
|
|
|
.gets( |
|
|
|
"/api/newjit/print-template-configuration/list", |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
if (response.item !== null) { |
|
|
|
this.PLChildGroupList= response.item; |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}, |
|
|
|
}; |
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<style lang="scss" scoped> |
|
|
|
@import "../../../pg-fis/styles/crmtable.scss"; |
|
|
|
|
|
|
|
|
