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

0412 新看板

master
ruanqi 3 years ago
parent
1848ee6b75
commit
e5840d016d
7 changed files with 42 additions and 22 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. 6
      src/store/modules/user.js
  2. 31
      src/views/modules/board/sopBoard.vue
  3. 6
      src/views/modules/pad/padPartPhoto.vue
  4. 7
      src/views/modules/print/print_stock_label.js
  5. 7
      src/views/modules/print/print_stock_label_preview.js
  6. 6
      src/views/modules/production/generateReport.vue
  7. 1
      src/views/modules/production/stockPrint.vue

6
src/store/modules/user.js
View File

@ -5,7 +5,11 @@ export default {
name: '',
site: 0,
languageDefault: '',
userDisplay: ''
userDisplay: '',
padSopUrl:'http://192.168.2.172/upload/',
tvSopUrl:'http://192.168.2.172/sopFile/',
// padSopUrl:'http://192.168.1.83:81/upload/',
// tvSopUrl:'http://192.168.1.83:81/upload/',
},
mutations: {
updateId (state, id) {

31
src/views/modules/board/sopBoard.vue
View File

@ -33,9 +33,6 @@
</template>
<script>
let rollstop = ''
let rolltimer = ''// 自动滚动的定时任务
let refresher = '' //数据刷新定时器
import {
getSopAddress,
} from '@/api/board.js'
@ -66,7 +63,7 @@
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:this.$store.state.user.tvSopUrl,
}
},
mounted () {
@ -76,12 +73,14 @@
},
methods: {
changePdf() {
refresher = setInterval(() => {
//获取图片数据
setInterval(() => {
this.getPDF();
}, 30000)
}, 60000)
},
changePage() {
refresher = setInterval(() => {
//刷新图片
setInterval(() => {
this.changePic()
}, 30000)
// }, this.timeOut)
@ -106,6 +105,7 @@
}
getSopAddress(data).then(({data}) => {
if(data.code==0){
debugger
if(data.data.nowSeqNo==null||data.data.nowSeqNo==''){
this.sopUrl='';
this.badUrl='';
@ -120,19 +120,24 @@
this.seqNo = data.data.nowSeqNo;
this.sopList=data.sop;
this.badList=data.bad;
console.log("开始打印")
console.log(data.sop)
this.sopPage=1;
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(this.sopList.length>0){
this.sopUrl=this.packageUrl+this.sopList[0].attaFileNameDb;
}
if(data.bad.length>0){
this.badUrl=this.packageUrl+data.bad[0].attaFileNameDb;
if(this.badList.length>0){
this.badUrl=this.packageUrl+this.badList[0].attaFileNameDb;
}
}
console.log( this.sopUrl)
console.log( this.badUrl)
console.log("SOP："+ this.sopUrl)
console.log("不良："+ this.badUrl)
console.log(this.$store.state.user.tvSopUrl)
console.log(this.sopList)
console.log("SOP："+ this.sopList[0].attaFileNameDb)
}else {
this.sopUrl='';
this.badUrl='';

6
src/views/modules/pad/padPartPhoto.vue
View File

@ -92,7 +92,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
})
},
@ -111,7 +111,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
lastPicture(){
@ -129,7 +129,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
},

7
src/views/modules/print/print_stock_label.js
View File

@ -46,7 +46,7 @@ export function printMaterialLabel(printList) {
LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(91,110,138,24,printData.qty+printData.umid);
LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:");
@ -78,6 +78,11 @@ export function printMaterialLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
if(printData.weight!=''&&printData.weight!=0) {
LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG');
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
}
}
// LODOP.PRINT_DESIGN();
// LODOP.PREVIEW();

7
src/views/modules/print/print_stock_label_preview.js
View File

@ -46,7 +46,7 @@ export function printMaterialLabelPreview(printList) {
LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(91,110,138,24,printData.qty+printData.umid);
LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:");
@ -78,6 +78,11 @@ export function printMaterialLabelPreview(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
if(printData.weight!=''&&printData.weight!=0) {
LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG');
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
}
}
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();

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

@ -932,7 +932,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
})
},
@ -951,7 +951,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 ("+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
lastPicture(){
@ -971,7 +971,7 @@
}
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 ("+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
// this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
openScan(){

1
src/views/modules/production/stockPrint.vue
View File

@ -258,6 +258,7 @@
transDate:row.transDate,
expiredDate:row.expiredDate,
status:row.status,
weight:row.weight
}
array.push(data)
printMaterialLabelPreview(array);

Write Preview
Loading…
Cancel
Save