diff --git a/src/api/factory.js b/src/api/factory.js
index d23375f..af5ff33 100644
--- a/src/api/factory.js
+++ b/src/api/factory.js
@@ -2,3 +2,4 @@ import { createAPI } from "@/utils/httpRequest.js";
// 获取工厂列表
export const getFactory = data => createAPI(`/factory/tblbasedata/list`,'get',data)
+
diff --git a/src/views/modules/print/print_hunlian_card.js b/src/views/modules/print/print_hunlian_card.js
index 09b89da..56590d6 100644
--- a/src/views/modules/print/print_hunlian_card.js
+++ b/src/views/modules/print/print_hunlian_card.js
@@ -116,9 +116,9 @@ export function printHunlianLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(113,593,126,25,printData.zkwd);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-
+ LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
}
- LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();
// LODOP.PRINT();
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index 8fb6e13..ddc619d 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -347,9 +347,9 @@ export function printCardLabel(printList) {
// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-
+ LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
}
- LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();
// LODOP.PRINT();
diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js
index 920b0c4..3e53637 100644
--- a/src/views/modules/print/print_outBox_label.js
+++ b/src/views/modules/print/print_outBox_label.js
@@ -12,6 +12,7 @@ export function printOutBoxLabel(printList) {
for(let i = 0; i < printList.length; i++){
let printData = printList[i];
LODOP.NewPage();
+ // LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
LODOP.ADD_PRINT_RECT(60,5,551,270,0,1);
LODOP.ADD_PRINT_TEXT(3,35,496,50,printData.siteName );
@@ -189,9 +190,9 @@ export function printOutBoxLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
+ LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
}
- LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();
// LODOP.PRINT();
diff --git a/src/views/modules/print/print_part_label.js b/src/views/modules/print/print_part_label.js
index 14b8c85..1619a71 100644
--- a/src/views/modules/print/print_part_label.js
+++ b/src/views/modules/print/print_part_label.js
@@ -131,8 +131,9 @@ export function printPartLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
LODOP.ADD_PRINT_TEXT(72,564,152,274,printData.remark);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
}
- LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();
// LODOP.PRINT();
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index 6f45581..2aeff09 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -38,6 +38,7 @@
查询
+ 扫码报工
关闭
+
+
+
+
+
+
+
+ 报工
+ 关闭
+
+
+
@@ -259,7 +272,9 @@
qtyOnHand:'',
qtyReal:'',
qtyRef:'',
- }
+ },
+ scanModalFlag:false,
+ scanTaskNo:'',
}
},
mounted() {
@@ -452,7 +467,47 @@
})
}).catch(() => {
})
- }
+ },
+ scanReport(){
+ this.scanTaskNo='';
+ this.scanModalFlag=true;
+ this.$nextTick(() => { this.$refs.start.focus();})
+ },
+ doScanTaskNo(){
+ if(this.scanTaskNo==''||this.scanTaskNo==null){
+ this.$alert("请扫描任务单二维码", '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ let inData={
+ taskNo:this.scanTaskNo,
+ reportFlag:'N'
+ }
+ getHunlianTaskData(inData).then(({data}) => {
+ let list = data.rows;
+ if(list.length==0){
+ this.scanTaskNo=''
+ this.$alert("该任务单不存在或者已经报过工！", '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }else {
+ let row=list[0]
+ this.reportData.site=row.site;
+ this.reportData.taskNo=row.taskNo;
+ this.reportData.qtyRequired=row.taskQty;
+ this.reportData.reportQty='';
+ this.reportData.partNo=row.partNo;
+ this.reportData.userId=row.userId;
+ this.reportData.qtyReal=0;
+ this.reportData.qtyRef=0;
+ this.getPartNoOnHand(row.site,row.partNo);
+ this.scanModalFlag = false
+ this.reportModalFlag=true;
+ }
+ })
+ },
},
created() {
}
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 98c6da9..05edc4a 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -287,7 +287,7 @@
-
+
@@ -943,6 +943,7 @@
this.$alert('该派工单不存在！', '错误', {
confirmButtonText: '确定'
})
+ this.$nextTick(() => { this.$refs.stop.focus();})
return false
}else {
this.stopData.shiftNo=data.rows[0].sShiftNo