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

66

master
ruanqi 3 years ago
parent
8170a735af
commit
a439389464
5 changed files with 116 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/views/modules/board/SORoutingBoard.vue
  2. 80
      src/views/modules/board/shopOrderBoard.vue
  3. 36
      src/views/modules/print/label/print_stock_label_preview.js
  4. 2
      src/views/modules/schedule/cancelSfdc.vue
  5. 2
      src/views/modules/schedule/searchSfdc.vue

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

@ -27,7 +27,7 @@
prop="seqNo"
header-align="center"
align="left"
min-width="25"
min-width="20"
style="font-size: 20px"
label="派工单号">
</el-table-column>
@ -50,7 +50,7 @@
prop="sScheduledDate"
header-align="center"
align="center"
min-width="50"
min-width="40"
label="派工日期">
</el-table-column>
<el-table-column
@ -71,9 +71,16 @@
prop="lastLineName"
header-align="center"
align="center"
min-width="40"
min-width="30"
label="上道生产线">
</el-table-column>
<el-table-column
prop="lastSeqNoDoing"
header-align="center"
align="center"
min-width="60"
label="上道开工派工单">
</el-table-column>
<el-table-column
prop="lastRequireQty"
header-align="center"
@ -114,13 +121,20 @@
prop="partNo"
header-align="center"
align="left"
width="100"
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="left"
align="center"
width="80"
label="反馈时间">
</el-table-column>

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

@ -77,8 +77,71 @@
label="最近入库日期">
</el-table-column>
</el-table>
<el-table
cell-style="cc"
height="140"
: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="100"
label="物料编码">
</el-table-column>
<el-table-column
prop="productionLineDesc"
header-align="center"
align="center"
width="60"
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>
</template>
@ -97,6 +160,9 @@
totalPage: 1,
height: 200,
tableData: [],
pageIndex2: 1,
totalPage2: 1,
tableData2: [],
// 默认的刷新，滚动时间，滚动间距
// refreshTime: 5,
// rollTime: 5,
@ -105,7 +171,7 @@
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 80
this.height = window.innerHeight - 221
})
// this.autoRoll()
},
@ -116,7 +182,7 @@
return ''
},
search () {
let inData= {number:this.pageIndex};
let inData= {number:this.pageIndex,number2:this.pageIndex2};
shopOrderBoard(inData).then(({data}) => {
this.tableData = data.rows;
this.totalPage= data.maxPage;
@ -125,6 +191,14 @@
}else {
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
}
})
},
// 鼠标进入

36
src/views/modules/print/label/print_stock_label_preview.js
View File

@ -13,8 +13,8 @@ export function printMaterialLabelPreview(printList) {
LODOP.NewPage();
LODOP.SET_PRINT_PAGESIZE(0,700,400,"");
LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
LODOP.ADD_PRINT_BARCODE(3,189,165,71,"QRCode",printData.seqNo);
LODOP.ADD_PRINT_TEXT(2,1,185,19,"苏州江天电子材料有限公司");
LODOP.ADD_PRINT_BARCODE(81,188,165,71,"QRCode",printData.seqNo);
LODOP.ADD_PRINT_TEXT(2,1,252,19,"苏州江天电子材料有限公司");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
@ -22,56 +22,56 @@ export function printMaterialLabelPreview(printList) {
LODOP.ADD_PRINT_TEXT(21,1,76,19,"物料编码：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(21,74,112,19,printData.partNo);
LODOP.ADD_PRINT_TEXT(21,66,179,19,printData.partNo);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(40,1,76,19,"物料名称：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(40,74,112,19,printData.partDesc);
LODOP.ADD_PRINT_TEXT(40,66,191,19,printData.partDesc);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(59,1,76,19,"规格型号：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(59,74,112,19,printData.partSpec);
LODOP.ADD_PRINT_TEXT(59,66,191,19,printData.partSpec);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_RECT(0,0,254,150,0,1);
LODOP.ADD_PRINT_LINE(20,1,20,186,0,1);
LODOP.ADD_PRINT_LINE(40,1,40,186,0,1);
LODOP.ADD_PRINT_LINE(58,0,58,185,0,1);
LODOP.ADD_PRINT_LINE(20,1,20,254,0,1);
LODOP.ADD_PRINT_LINE(40,1,40,254,0,1);
LODOP.ADD_PRINT_LINE(58,0,58,253,0,1);
LODOP.ADD_PRINT_LINE(77,0,77,254,0,1);
LODOP.ADD_PRINT_LINE(97,0,97,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(97,0,97,185,0,1);
LODOP.ADD_PRINT_LINE(116,0,116,185,0,1);
LODOP.ADD_PRINT_LINE(133,0,133,185,0,1);
LODOP.ADD_PRINT_LINE(150,0,150,254,0,1);
LODOP.ADD_PRINT_LINE(150,62,21,63,0,1);
LODOP.ADD_PRINT_TEXT(78,1,76,19,"数量：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(78,74,179,19,printData.qty+' '+printData.umid);
LODOP.ADD_PRINT_TEXT(78,66,112,19,printData.qty+' '+printData.umid);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(97,1,76,19,"批号：");
LODOP.ADD_PRINT_TEXT(98,1,76,19,"批号：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(98,74,179,19,printData.batchNo);
LODOP.ADD_PRINT_TEXT(100,66,122,19,printData.batchNo);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
LODOP.ADD_PRINT_TEXT(116,1,76,19,"生产日期：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(116,74,179,19,printData.manufactureDate);
LODOP.ADD_PRINT_TEXT(116,66,112,19,printData.manufactureDate);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(134,1,76,19,"失效日期：");
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(134,74,179,19,printData.expiredDate);
LODOP.ADD_PRINT_TEXT(134,66,112,19,printData.expiredDate);
LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_LINE(76,186,1,187,0,1);
LODOP.ADD_PRINT_LINE(152,186,77,187,0,1);
}
// LODOP.PRINT_DESIGN();

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

@ -463,7 +463,7 @@
partNo: '',
site: this.$store.state.user.site,
itemNo:'',
startDate:new Date(),
startDate:'',
endDate:'',
operatorName:'',
resourceId:'',

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

@ -451,7 +451,7 @@
partNo: '',
site: this.$store.state.user.site,
itemNo:'',
startDate:new Date(),
startDate:'',
endDate:'',
operatorName:'',
resourceId:'',

Write Preview
Loading…
Cancel
Save