From 5703d98a8354851f1981cd773408abcae178aef2 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 21 九月 2024 08:51:50 +0800
Subject: [PATCH] 打印功能修改

---
 jcdm-ui/src/views/main/kb/stationTerminal/index.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index bf14582..edd0de2 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -80,7 +80,7 @@
            <el-button id="print" v-print="'#printMe'" type="primary">鎵撳嵃</el-button>
            <div style="display: none">
              <div id="printMe">
-               <div style="text-align: center;margin-top: 64px">
+               <div style="text-align: center;margin-top: 70px">
                  <span style="font-size: 29px;">鐢甸┍绯荤粺鎬绘垚</span>
                </div>
                <div style="display: flex;margin-top: 2px;margin-left: 39px;font-size: 15px">
@@ -144,7 +144,7 @@
 
 
                <div style="text-align: center;margin-top: 101px;font-size: 20px">
-                 <div style="margin-top: 8px">
+                 <div style="margin-top: 12px">
                    <span style="font-size: 22px">TZ180XSDSZX01</span><br>
 
                  </div>
@@ -166,7 +166,7 @@
                  </div>
                </div>
 
-               <div style="margin-top: 61px;display: flex;margin-left: 40px">
+               <div style="margin-top: 57px;display: flex;margin-left: 40px">
                  <div style="width: 30%;flex: 1">
                    <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
                  </div>
@@ -211,7 +211,7 @@
                  </div>
                </div>
 
-               <div style="margin-top: 48px;display: flex;margin-left: 40px">
+               <div style="margin-top: 44px;display: flex;margin-left: 40px">
                  <div style="width: 30%;flex: 1">
                    <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
                  </div>
@@ -259,7 +259,7 @@
                  </div>
                </div>
 
-               <div style="text-align: center;margin-left: -190px;margin-top: 35px">
+               <div style="text-align: center;margin-left: -190px;margin-top: 31px">
                  <div style="margin-top: 4px">
                    <span>{{printMaterialCode}}</span><br>
                  </div>
@@ -391,6 +391,7 @@
         pageNum: 1,
         pageSize: 10,
         sfcCode: null,
+        productNum: '',
       },
       // 鏌ヨ鍙傛暟
       StationConfQueryParams: {
@@ -583,8 +584,10 @@
     /** 鏌ヨ宸ュ崟鍒楄〃 */
     async getList() {
       await listProductionOrdeLoopLine(this.queryParams).then(response => {
+        console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶')
         let rowsData = response.rows[0];
         if(rowsData){
+          console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶'+response.rows[0])
           if(this.headContent.processesCode === 'OP170'
             ||this.headContent.processesCode === 'OP180'||
             this.headContent.processesCode === 'OP190'||
@@ -603,7 +606,11 @@
           this.getListFormulaChild()
           this.workpieceInformation.inboundTime = this.getCurrentTime()
           this.printMaterialCode = rowsData.productCode
+          console.log(rowsData.productCode)
+          console.log(this.printMaterialCode)
           this.text = 'P'+this.printMaterialCode+'#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU'
+          console.log(this.text)
+
         }else {
           this.$message.error('绯荤粺娌℃湁姝ゅ伐鍗曪紝璇烽噸鏂版壂鐮侊紒');
         }
@@ -618,6 +625,7 @@
         if(response.msg !== ''){
           if(this.headContent.processesCode === 'OP165'){
             this.headContent.sfcCode = response.msg.substring(13,26)
+            this.queryParams.productNum = response.msg.substring(13,26);
           }else {
             this.headContent.sfcCode = response.msg;
             this.queryParams.productNum = response.msg;

--
Gitblit v1.9.3