diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js
index de4c4a8..6bb71b4 100644
--- a/src/api/production/generateReport.js
+++ b/src/api/production/generateReport.js
@@ -46,3 +46,5 @@ export const cancelSfdc= data => createAPI(`dailyPlan/cancelSfdc`, 'post', data)
export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData`, 'post', data);
+export const getTvList=data => createAPI(`dailyPlan/getTvList`, 'post', data)
+
diff --git a/src/views/modules/board/sopBoard.vue b/src/views/modules/board/sopBoard.vue
index 112c66e..dac1cdb 100644
--- a/src/views/modules/board/sopBoard.vue
+++ b/src/views/modules/board/sopBoard.vue
@@ -4,26 +4,28 @@
SOP指导书 当前派工单|{{seqNo}}
-
+
![]()
+
+
+
+
+
+
+
@@ -37,12 +39,9 @@
import {
getSopAddress,
} from '@/api/board.js'
- import pdf from 'vue-pdf'
export default {
name: 'sopBoard',
- components: {
- pdf
- },
+
data () {
return {
@@ -61,71 +60,84 @@
// rollPx: 1,
sopUrl: '',
badUrl: '',
+ sopList:[],
+ badList:[],
pageLoaded: false,
timeOut:30000,
// packageUrl:'http://192.168.1.130/upload/',
- packageUrl:'http://192.168.2.172/sopFile/',
- // packageUrl:'http://192.168.1.83:81/upload/',
+ // packageUrl:'http://192.168.2.172/sopFile/',
+ packageUrl:'http://192.168.1.83:81/upload/',
}
},
mounted () {
- this.$nextTick(() => {
- this.changePdf();
- this.changePage();
- this.getPDF();
- });
+ this.changePdf();
+ this.changePage();
+ this.getPDF();
},
methods: {
-
- setSopPages(numPages) {
- this.sopMax = numPages
- },
- setBadPages(numPages) {
- this.badMax = numPages
- },
- setPageLoaded() {
- this.pageLoaded = true
- },
- changePage() {
- refresher = setInterval(() => {
- if(this.sopPage==this.sopMax){
- this.sopPage=1;
- }else {
- this.sopPage=Number(this.sopPage)+1
- }
- if(this.badPage==this.badMax){
- this.badPage=1;
- }else {
- this.badPage=Number(this.badPage)+1
- }
- }, this.timeOut)
- },
-
changePdf() {
refresher = setInterval(() => {
this.getPDF();
}, 30000)
},
+ changePage() {
+ refresher = setInterval(() => {
+ this.changePic()
+ }, 30000)
+ // }, this.timeOut)
+ },
+ changePic(){
+ if(this.sopPage==this.sopMax){
+ this.sopPage=1;
+ }else {
+ this.sopPage=Number(this.sopPage)+1
+ }
+ this.sopUrl=this.packageUrl+this.sopList[this.sopPage-1].attaFileNameDb;
+ if(this.badPage==this.badMax){
+ this.badPage=1;
+ }else {
+ this.badPage=Number(this.badPage)+1
+ }
+ this.badUrl=this.packageUrl+this.badList[this.badPage-1].attaFileNameDb;
+ },
getPDF(){
let data={
tvId: this.tvId
}
getSopAddress(data).then(({data}) => {
if(data.code==0){
- if(this.sopUrl!=this.packageUrl+data.data.sopAddress){
- this.sopUrl=this.packageUrl+data.data.sopAddress;
+ if(data.data.nowSeqNo==null||data.data.nowSeqNo==''){
+ this.sopUrl='';
+ this.badUrl='';
+ this.sopList=[];
+ this.badList=[];
+ this.seqNo='无';
+ this.operator='无';
+ }else if(this.seqNo!=data.data.nowSeqNo) {
+ this.sopUrl='';
+ this.badUrl='';
+ this.operator = data.data.nowOperator;
+ this.seqNo = data.data.nowSeqNo;
+ this.sopList=data.sop;
+ this.badList=data.bad;
this.sopPage=1;
- }
- if(this.badUrl!=this.packageUrl+data.data.badAddress){
- this.badUrl=this.packageUrl+data.data.badAddress;
this.badPage=1;
+ this.sopMax=data.sop.length;
+ this.badMax=data.bad.length;
+ if(data.sop.length>0){
+ this.sopUrl=this.packageUrl+data.sop[0].attaFileNameDb;
+ }
+ if(data.bad.length>0){
+ this.badUrl=this.packageUrl+data.bad[0].attaFileNameDb;
+ }
}
- console.log(this.sopUrl)
- this.operator=data.data.nowOperator;
- this.seqNo=data.data.nowSeqNo;
+ console.log( this.sopUrl)
+ console.log( this.badUrl)
}else {
this.sopUrl='';
this.badUrl='';
+ this.sopList=[];
+ this.badList=[];
this.seqNo='无';
this.operator='无';
}
@@ -163,6 +175,7 @@
background: #ffff00;
}
.container {
+ font-size: 13px;
position: fixed;
top: 0;
left: 0;
diff --git a/src/views/modules/board/sopBoard_old.vue b/src/views/modules/board/sopBoard_old.vue
new file mode 100644
index 0000000..0236f89
--- /dev/null
+++ b/src/views/modules/board/sopBoard_old.vue
@@ -0,0 +1,214 @@
+
+
+
+
+
+
+
diff --git a/src/views/modules/print/print_Abnormal_label.js b/src/views/modules/print/print_Abnormal_label.js
index 2b4e918..7b27dbd 100644
--- a/src/views/modules/print/print_Abnormal_label.js
+++ b/src/views/modules/print/print_Abnormal_label.js
@@ -61,8 +61,8 @@ export function printABLabel(printList) {
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.ADD_PRINT_TEXT(9,120,162,30,"异常情况通知单");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
@@ -72,7 +72,7 @@ export function printABLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(43,253,100,20,"异常原因:");
- LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(68,253,120,63,printData.abnormalDesc);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index d74a018..ec01c32 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -265,7 +265,19 @@
-
+
+
+
+
+
+
+
+
@@ -539,6 +551,7 @@
startSeqNo,
stopWork,
continueWork,
+ getTvList,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
@@ -569,6 +582,8 @@
approveFlag:false,
abnormalList:[],
moQty:'',
+ tvList:[],
+ tvId:'',
saveHeaderData: {
wasteWeight:0,
printQty:'',
@@ -966,6 +981,7 @@
},
openStart(){
this.scanSeqNo='';
+ this.tvId='';
this.startModalFlag=true;
this.$nextTick(() => { this.$refs.start.focus();})
},
@@ -1201,7 +1217,7 @@
let inData={
username:this.$store.state.user.name,
seqNo:this.scanSeqNo,
-
+ tvId:this.tvId,
}
startSeqNo(inData).then(({data}) => {
if (data && data.code === 0) {
@@ -1287,9 +1303,14 @@
}
})
},
-
+ searchAllTV(){
+ getTvList().then(({data}) => {
+ this.tvList = data.rows;
+ })
+ },
},
created () {
+ this.searchAllTV();
}
}