0412 新看板

src/api/factory.js

@@ -2,3 +2,4 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 // 获取工厂列表
 export const getFactory = data => createAPI(`/factory/tblbasedata/list`,'get',data)
+

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();

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();

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();

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();

src/views/modules/production/dailyPlanReport.vue

@@ -38,6 +38,7 @@
       </el-form-item>
       <el-form-item :label="' '">
       <el-button @click="search()" style="margin-left: 0px;margin-top: 0px" type="primary">查询</el-button>
+      <el-button @click="scanReport()" style="margin-left: 0px;margin-top: 0px" type="primary">扫码报工</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -185,6 +186,18 @@
       <el-button @click="detailFlag = false" type="primary">关闭</el-button>
     </span>
     </el-dialog>
+    <el-dialog title="报工扫描" :close-on-click-modal="false" v-drag :visible.sync="scanModalFlag" width="215px">
+      <el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
+        <el-form-item :label="'混炼任务号：'">
+          <el-input v-model="scanTaskNo" ref="start"  style="width: 130px;"  @keyup.enter.native="doScanTaskNo()"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="doScanTaskNo()">报工</el-button>
+        <el-button type="primary" @click="scanModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <el-dialog title="保存报工" :close-on-click-modal="false" v-drag :visible.sync="reportModalFlag" width="470px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'任务单号：'">
@@ -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() {
     }

src/views/modules/production/generateReport.vue

@@ -287,7 +287,7 @@
     <el-dialog title="派工单暂停" :close-on-click-modal="false" v-drag :visible.sync="stopModalFlag" width="620px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'派工单号：'">
-          <el-input v-model="stopData.seqNo" ref="stop" type="number" @blur="seqNoCheck()" @keyup.enter.native="seqNoCheck()" style="width: 85px"></el-input>
+          <el-input v-model="stopData.seqNo" ref="stop" type="number"  @keyup.enter.native="seqNoCheck()" style="width: 85px"></el-input>
         </el-form-item>
         <el-form-item :label="'生产订单：'">
           <el-input v-model="stopData.orderNo" disabled style="width: 100px"></el-input>
@@ -943,6 +943,7 @@
               this.$alert('该派工单不存在！', '错误', {
                 confirmButtonText: '确定'
               })
+            this.$nextTick(() => { this.$refs.stop.focus();})
             return false
           }else {
             this.stopData.shiftNo=data.rows[0].sShiftNo