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

0412 新看板

master
ruanqi 2 years ago
parent
8944c980cf
commit
052396abb5
4 changed files with 146 additions and 8 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. 2
      src/api/production/generateReport.js
  2. 79
      src/views/modules/print/print_transNo_label.js
  3. 27
      src/views/modules/production/generateReport.vue
  4. 46
      src/views/modules/production/searchSfdc.vue

2
src/api/production/generateReport.js
View File

@ -49,3 +49,5 @@ export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData
export const getTvList=data => createAPI(`dailyPlan/getTvList`, 'post', data)
export const getBadCodeList=data => createAPI(`dailyPlan/getBadCodeList`, 'post', data)
export const printDefectCard=data => createAPI(`dailyPlan/printDefectCard`, 'post', data)

79
src/views/modules/print/print_transNo_label.js
View File

@ -86,7 +86,84 @@ export function printTransNoLabel(printList) {
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
}
}else {
} else
if(printData.type=='bad'){
let remark = '';
if (printData.partNo.substring(0, 2) == 'FP') {
remark = '产成品'
} else {
remark = '半成品'
}
LODOP.NewPage();
LODOP.SET_PRINT_PAGESIZE(0, 1000, 700, "");
LODOP.ADD_PRINT_TEXT(82, 8, 108, 25, "Part:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(82, 55, 195, 56, printData.partNo + '|' + printData.partDesc);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(155, 8, 77, 24, "Job No:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(155, 110, 140, 20, printData.seqNo);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(134, 8, 113, 22, "Equip No:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(134, 110, 139, 25, printData.workCenterNo);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(41,8,118,25, "Confirmed By:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(41, 110, 136, 25, printData.userName);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(175, 8, 94, 25, "Order No:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(175, 110, 141, 25, printData.orderNo);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(61, 8, 121, 25, "Trans Q.T.Y:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(61,110,67,24, printData.transQty + printData.umid);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(194, 8, 97, 25, "Trans Date:");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(194, 110, 244, 25, printData.transDate);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(224, 5, 256, 24, "Manufactured by A&M Polymer");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.ADD_PRINT_TEXT(224, 212, 156, 25, "IATF:16949 Certified");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 3);
LODOP.ADD_PRINT_LINE(218, 2, 217, 374, 0, 1);
LODOP.ADD_PRINT_TEXT(12, 122, 135, 30, "让步接收单");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(194, 266, 110, 25, "工厂编码:" + printData.site);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 11);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(174, 267, 100, 21, remark);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
if(printData.orderRef5!=null) {
LODOP.ADD_PRINT_TEXT(61,162,116,25, "净重:" + printData.orderRef5 + "kg");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
}
LODOP.ADD_PRINT_TEXT(41,254,115,133,"不良原因: "+printData.remark);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
}
else {
LODOP.NewPage();
LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
LODOP.ADD_PRINT_TEXT(95,208,173,46,'合格');

27
src/views/modules/production/generateReport.vue
View File

@ -506,12 +506,14 @@
<el-option label="无" value=""></el-option>
<el-option v-for="item in badCodeList " :key="index" :label="item.defectDesc"
:value="item.defectCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input style="width: 440px;" v-model="saveHeaderData.badRemark"></el-input>
<el-form-item label="让步接收数量">
<el-input style="width: 120px;" type="number" v-model="saveHeaderData.badQty"></el-input>
</el-form-item>
<el-form-item label="不良原因">
<el-input style="width: 300px;" v-model="saveHeaderData.badRemark"></el-input>
</el-form-item>
</el-form>
</fieldset>
@ -674,6 +676,7 @@
reportWeight:'',
approveWeight:'',
moldQty:'',
badQty:'',
},
scanSeqNo:'',
previousSeqNo:'',
@ -830,6 +833,20 @@
})
return
}
if (this.saveHeaderData.badCodeNo == 'PQ003' ) {
if(this.saveHeaderData.badQty==''||this.saveHeaderData.badQty==null||this.saveHeaderData.badQty<=0){
this.$alert('让步接收数量必须大于0！', '错误信息', {
confirmButtonText: '确定'
})
return
}
if(this.saveHeaderData.badQty>this.saveHeaderData.qtyUnApprove){
this.$alert('让步接收数量不能大于不合格数量！', '错误信息', {
confirmButtonText: '确定'
})
return
}
}
if(this.saveHeaderData.printQty>30){
this.$alert('打印标签数最多为30张！', '错误信息', {
confirmButtonText: '确定'
@ -862,6 +879,9 @@
if(data.transData!=null){
inList.push(data.transData)
}
if(data.badData!=null){
inList.push(data.badData)
}
if(this.saveHeaderData.printQty>0){
for (let i = 0; i <this.saveHeaderData.printQty ; i++) {
inList.push(this.currentRow)
@ -1120,6 +1140,7 @@
this.saveHeaderData.qtyUnApprove=0
this.saveHeaderData.badCodeNo=''
this.saveHeaderData.badRemark= ''
this.saveHeaderData.badQty= 0
this.saveHeaderData.qtyRework=0
this.saveHeaderData.moldQty=0
this.saveHeaderData.reportWeight=0

46
src/views/modules/production/searchSfdc.vue
View File

@ -73,6 +73,17 @@
:data="tableData"
border
style="width: 100%">
<el-table-column
prop=""
header-align="center"
fixed="left"
align="center"
width="100"
label="操作">
<template slot-scope="scope" class="foo_container">
<a type="text" size="small" v-if="scope.row.defectCode==='PQ003'" @click="printCard(scope.row)">让步接收标签</a>
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
@ -97,10 +108,12 @@
<script>
import {
getSfdcList,
printDefectCard,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
printTransNoLabel,
} from "@/views/modules/print/print_transNo_label.js"
export default {
name: 'searchSfdc',
@ -456,11 +469,28 @@
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectQty",
columnLabel: "处理数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 85,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectRemark",
columnLabel: "不良处理备注",
columnLabel: "不良处理原因",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -690,7 +720,15 @@
return Y + M + D + H + MM + S;
},
printCard(row){
printDefectCard(row).then(({data}) => {
let inList=[];
inList.push(data.row)
if(inList.length>0){
printTransNoLabel(inList);
}
})
}
},
created () {

Write Preview
Loading…
Cancel
Save