wilson
/
Jiantengmes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉pdf插件 无用 导致打包失误

master
ruanqi 2 years ago
parent
af5521a666
commit
72575e712e
5 changed files with 114 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/jtLogo.png
  2. 195
      src/views/modules/board/SORoutingBoard.vue
  3. 2
      src/views/modules/board/shopOrderBoard.vue
  4. 83
      src/views/modules/print/label/print_seqNo_label.js
  5. 2
      src/views/modules/schedule/generateReport.vue

BIN
src/assets/img/jtLogo.png
View File

Side by Side

After

Width: 253  |  Height: 92  |  Size: 34 KiB

195
src/views/modules/board/SORoutingBoard.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<!-- <img class="logo" src="~@/assets/img/jtLogo.jpg" style=" width: 10%; position: absolute;top: 0;left:0;" >-->
<img class="logo" src="~@/assets/img/jtLogo.png" style=" width: 10%; position: absolute;top: 0;left:0;" >
<div style="text-align: center"> <div style="text-align: center">
<h1>{{lineName}}生产看板</h1> <h1>{{lineName}}生产看板</h1>
</div> </div>
@ -26,7 +26,7 @@
<el-table-column <el-table-column
prop="seqNo" prop="seqNo"
header-align="center" header-align="center"
align="left"
align="center"
min-width="20" min-width="20"
style="font-size: 20px" style="font-size: 20px"
label="派工单号"> label="派工单号">
@ -34,7 +34,7 @@
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center" header-align="center"
align="left"
align="center"
min-width="50" min-width="50"
style="font-size: 20px" style="font-size: 20px"
label="生产订单号"> label="生产订单号">
@ -42,10 +42,17 @@
<el-table-column <el-table-column
prop="partNo" prop="partNo"
header-align="center" header-align="center"
align="left"
min-width="50"
align="center"
min-width="30"
label="物料编码"> label="物料编码">
</el-table-column> </el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="center"
min-width="30"
label="工序">
</el-table-column>
<el-table-column <el-table-column
prop="sScheduledDate" prop="sScheduledDate"
header-align="center" header-align="center"
@ -67,99 +74,106 @@
min-width="30" min-width="30"
label="报工数量"> label="报工数量">
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- prop="lastLineName"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- min-width="30"-->
<!-- label="上道生产线">-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
prop="lastLineName"
prop="lastSeqNoDoing"
header-align="center" header-align="center"
align="center" align="center"
min-width="30" min-width="30"
label="上道生产线">
label="上道派工单">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="lastSeqNoDoing"
prop="lastOperationDesc"
header-align="center" header-align="center"
align="center" align="center"
min-width="60"
label="上道开工派工单">
</el-table-column>
<el-table-column
prop="lastRequireQty"
header-align="center"
align="right"
min-width="40"
label="上工序需求数量">
min-width="30"
label="上道工序">
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- prop="lastRequireQty"-->
<!-- header-align="center"-->
<!-- align="right"-->
<!-- min-width="40"-->
<!-- label="上道派工单数量">-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
prop="lastReportQty" prop="lastReportQty"
header-align="center" header-align="center"
align="right" align="right"
min-width="40" min-width="40"
label="上工序完成数量">
</el-table-column>
</el-table>
<el-table
cell-style="cc"
height="99"
:data="tableData2"
ref="wt_table"
border
style="width: 100%;">
<el-table-column
prop="seqNo"
header-align="center"
align="left"
width="60"
label="派工单号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
width="100"
label="生产订单">
</el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="left"
width="60"
label="物料编码">
</el-table-column>
<el-table-column
prop="productionLineDesc"
header-align="center"
align="center"
width="100"
label="产线">
</el-table-column>
<el-table-column
prop="feedbackDate"
header-align="center"
align="center"
width="80"
label="反馈时间">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="left"
width="60"
label="状态">
</el-table-column>
<el-table-column
prop="abnormalDesc"
header-align="center"
align="left"
width="100"
label="异常原因">
</el-table-column>
<el-table-column
prop="abnormalRemark"
header-align="center"
align="left"
min-width="200"
label="异常描述">
label="上道完成数量">
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-table-->
<!-- cell-style="cc"-->
<!-- height="99"-->
<!-- :data="tableData2"-->
<!-- ref="wt_table"-->
<!-- border-->
<!-- style="width: 100%;">-->
<!-- <el-table-column-->
<!-- prop="seqNo"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- width="60"-->
<!-- label="派工单号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="orderNo"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- width="100"-->
<!-- label="生产订单">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="partNo"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- width="60"-->
<!-- label="物料编码">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionLineDesc"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="产线">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="feedbackDate"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="80"-->
<!-- label="反馈时间">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="status"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- width="60"-->
<!-- label="状态">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="abnormalDesc"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- width="100"-->
<!-- label="异常原因">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="abnormalRemark"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- min-width="200"-->
<!-- label="异常描述">-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</div> </div>
</div> </div>
@ -193,7 +207,8 @@
}, },
mounted () { mounted () {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 172
// this.height = window.innerHeight - 172
this.height = window.innerHeight - 80
}) })
// this.autoRoll() // this.autoRoll()
}, },
@ -217,13 +232,13 @@
this.pageIndex=this.pageIndex+1 this.pageIndex=this.pageIndex+1
} }
this.tableData2 = data.rows2;
this.totalPage2= data.maxPage2;
if(this.pageIndex2+1>data.maxPage2){
this.pageIndex2=1
}else {
this.pageIndex2=this.pageIndex2+1
}
// this.tableData2 = data.rows2;
// this.totalPage2= data.maxPage2;
// if(this.pageIndex2+1>data.maxPage2){
// this.pageIndex2=1
// }else {
// this.pageIndex2=this.pageIndex2+1
// }
}) })
}, },
// 鼠标进入 // 鼠标进入

2
src/views/modules/board/shopOrderBoard.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<!-- <img class="logo" src="~@/assets/img/jtLogo.jpg" style=" width: 10%; position: absolute;top: 0;left:0;" >-->
<img class="logo" src="~@/assets/img/jtLogo.png" style=" width: 10%; position: absolute;top: 0;left:0;" >
<div style="text-align: center; "> <div style="text-align: center; ">
<h1>生产订单周完成情况</h1> <h1>生产订单周完成情况</h1>
</div> </div>

83
src/views/modules/print/label/print_seqNo_label.js
View File

@ -14,11 +14,11 @@ export function printSeqNoLabel(printList) {
LODOP.SET_PRINT_PAGESIZE(0,700,400,""); LODOP.SET_PRINT_PAGESIZE(0,700,400,"");
LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1); LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
LODOP.ADD_PRINT_BARCODE(32,165,191,94,"QRCode",printData.seqNo); LODOP.ADD_PRINT_BARCODE(32,165,191,94,"QRCode",printData.seqNo);
LODOP.ADD_PRINT_TEXT(4,4,95,25,printData.sScheduledDate);
LODOP.ADD_PRINT_TEXT(4,44,95,25,printData.sScheduledDate);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑"); LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(4,99,121,25,printData.itemDesc);
LODOP.ADD_PRINT_TEXT(3,139,111,25,printData.itemDesc);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑"); LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@ -57,89 +57,20 @@ export function printSeqNoLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑"); LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(129,1,69,25,"合格数量：");
LODOP.ADD_PRINT_TEXT(4,2,55,25,printData.operatorName);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑"); LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
// LODOP.ADD_PRINT_TEXT(129,62,48,25,"1000");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(129,111,81,25,"不合格数量：");
LODOP.ADD_PRINT_TEXT(129,0,64,25,"物料名称:");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑"); LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
// LODOP.ADD_PRINT_TEXT(129,180,50,25,"200");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(129,62,191,25,printData.partDesc);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
// LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
// LODOP.ADD_PRINT_BARCODE(0,187,165,71,"QRCode",printData.seqNo);
// LODOP.ADD_PRINT_TEXT(1,1,64,19,"工序：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(1,62,133,19,printData.itemDesc);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(18,1,64,19,"派工单号：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(18,62,133,19,printData.seqNo);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(35,1,64,19,"派工数量：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(35,62,133,19,printData.qtyRequired);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(52,1,64,19,"物料编码：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(52,62,133,19,printData.partNo);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_RECT(0,0,254,150,0,1);
// LODOP.ADD_PRINT_LINE(16,1,16,186,0,1);
// LODOP.ADD_PRINT_LINE(32,1,32,186,0,1);
// LODOP.ADD_PRINT_LINE(48,0,48,185,0,1);
// LODOP.ADD_PRINT_LINE(65,0,65,254,0,1);
// LODOP.ADD_PRINT_LINE(83,0,83,254,0,1);
// LODOP.ADD_PRINT_LINE(99,0,99,254,0,1);
// LODOP.ADD_PRINT_LINE(116,0,116,254,0,1);
// LODOP.ADD_PRINT_LINE(133,0,133,254,0,1);
// LODOP.ADD_PRINT_LINE(149,60,1,61,0,1);
// LODOP.ADD_PRINT_TEXT(86,1,64,19,"客户编码：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(86,62,133,19,printData.customerId);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(103,1,64,19,"工单编码：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(103,62,133,19,printData.orderNo);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(120,1,64,19,"工单数量：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(120,62,133,19,printData.lotSize);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(137,1,64,19,"派工日期：");
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_TEXT(137,62,133,19,printData.sScheduledDate);
// LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
// LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
// LODOP.ADD_PRINT_LINE(64,186,1,187,0,1);
} }

2
src/views/modules/schedule/generateReport.vue
View File

@ -652,7 +652,7 @@
this.setUp.saveButton=true; this.setUp.saveButton=true;
this.saveHeaderData.badList=[]; this.saveHeaderData.badList=[];
for (let i = 0; i < this.badList.length ; i++) { for (let i = 0; i < this.badList.length ; i++) {
if(this.badList[i].defectQty!==''&&this.badList[i].defectCode!==''){
if(this.badList[i].defectQty!==''&&this.badList[i].defectQty!==null&&this.badList[i].defectQty>0){
this.saveHeaderData.badList.push(this.badList[i]) this.saveHeaderData.badList.push(this.badList[i])
} }
} }

Write Preview
Loading…
Cancel
Save