From 9edc20f04ae1cdc847a2f709831b8d0e6f4f0eda Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 六月 2023 14:47:36 +0800
Subject: [PATCH] 1.生产入库无源单提交测试OK   生产入库开发完成2.MES工单 流程单新增工单编码二维码

---
 src/views/produceManager/workOrder.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index ba81498..a9908d3 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -557,7 +557,7 @@
         </el-form-item>
         <el-form-item
           v-if="operation==='add'"
-          label="浜у搧鍚嶇О"
+          label="浜у搧鍚嶇О/缂栫爜"
           prop="partcode"
         >
           <el-select
@@ -572,7 +572,7 @@
             <el-option
               v-for="item in partArr"
               :key="item.partcode"
-              :label="item.partname"
+              :label="item.partname+'/'+item.partcode"
               :value="item.partcode"
             />
           </el-select>
@@ -1278,13 +1278,13 @@
           </div>
           <div
             id="qrCode"
-            style="width: 22%;height:97px;
+            style="width: 22%;height:90px;
             margin-top: 20px;
             overflow-y: scroll;display: flex;
             justify-content: center;
             position: relative;"
           >
-            <!--            <div id="qrCode0" ref="qrCodeDiv0" />-->
+            <div id="qrCode0" ref="qrCodeDiv0" />
           </div>
           <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
           <div
@@ -2673,12 +2673,12 @@
             res3.forEach(i => {
               this.bindQRCode(i.seq, i.stepqrcode, 'small')
             })
-            // this.bindQRCode('0', this.formApprove.mesordercode, 'big')
+            this.bindQRCode('0', this.formApprove.mesordercode, 'big')
 
             const div = document.getElementById('qrCode')
             // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁$畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉$殑楂樺害涓哄灏�
-            // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
-            div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
+            div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+            // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
           })
           this.dialogVisibleApprove = true
         }

--
Gitblit v1.9.3