From 931dd89a799b60f34e26ca326c811d3fe4a9cdc5 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 十二月 2023 15:20:24 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/plan/manufacturingorder/index.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 0337ab1..af81923 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -201,7 +201,7 @@
       </el-dialog>
     </basic-container>
     <!-- 鏍囩鎵撳嵃 -->
-    <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+    <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="28%" top="5vh">
       <div style="width:100%;height: 400px;overflow-y: auto;">
         <div class="dia_body">
           <el-checkbox 
@@ -234,26 +234,28 @@
                       <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                     </el-col>
                   </el-row> -->
-                   <div style="display: flex;">
+                   <div>
+                    <el-row style="font-size: 14px;padding-left: 20px;">
+                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
+                    </el-row>
+                    <div style="display: flex;">
                       <div>
-                        <el-col :span="8" :offset="2">
+                        <el-col :span="8" :offset="4">
                           <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                         </el-col>
                       </div>
-                      <div style="margin-left: 20px;width: 100%;">
-                        <el-row >
-                          <el-col  style="font-weight: bold;"><span>鎵规鍙�:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
+                      <div style="margin-left: 50px;width: 100%;">
+                        <el-row style="margin-top: 10px;">
+                          <el-col  style="font-weight: bold;font-size: 14px;"><span>鎵�&nbsp; 娆�&nbsp;鍙�:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                         </el-row>
-                        <el-row style="margin-top: 5px;">
-                          <el-col  style="font-weight: bold;"><span>璁㈠崟鍙�:&nbsp; </span>{{ item.orderNo }}</el-col>
+                        <el-row style="margin-top: 9px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>璁�&nbsp; 鍗�&nbsp;鍙�:&nbsp; </span>{{ item.orderNo }}</el-col>
                         </el-row>
-                        <el-row style="margin-top: 5px;">
+                        <el-row style="margin-top: 9px;font-size: 14px;">
                           <el-col  style="font-weight: bold;"><span>瀹㈡埛鍚嶇О:&nbsp; </span>{{ item.cName }}</el-col>
                         </el-row>
-                        <el-row style="margin-top: 5px;">
-                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
-                        </el-row>
                       </div>
+                  </div>
                   </div>
             </el-card>
           </el-checkbox-group>
@@ -267,7 +269,7 @@
     <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
         <div id="printMOrder">
           <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
-            <el-row style="font-size:12px;">
+            <!-- <el-row style="font-size:12px;">
               <el-col :span="10" :offset="3">鎵规鍙�</el-col>
               <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
             </el-row>
@@ -288,7 +290,28 @@
               <el-col :span="10">
                 <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
               </el-col>
-            </el-row>
+            </el-row> -->
+            <el-row style="font-size: 14px;padding-left: 20px;">
+                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
+                    </el-row>
+                    <div style="display: flex;">
+                      <div>
+                        <el-col :span="8" :offset="4">
+                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
+                        </el-col>
+                      </div>
+                      <div style="margin-left: 50px;width: 100%;">
+                        <el-row style="margin-top: 10px;">
+                          <el-col  style="font-weight: bold;font-size: 14px;"><span>鎵�&nbsp; 娆�&nbsp;鍙�:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 9px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>璁�&nbsp; 鍗�&nbsp;鍙�:&nbsp; </span>{{ item.orderNo }}</el-col>
+                        </el-row>
+                        <el-row style="margin-top: 9px;font-size: 14px;">
+                          <el-col  style="font-weight: bold;"><span>瀹㈡埛鍚嶇О:&nbsp; </span>{{ item.cName }}</el-col>
+                        </el-row>
+                      </div>
+                    </div>
           </el-card>
         </div>
       </div>

--
Gitblit v1.9.3