From ff0604306c9cf18a05e5d8a3a136432284c290bb Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 23 五月 2023 09:15:04 +0800
Subject: [PATCH] 1.递交

---
 src/views/scgl/gd.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 928d891..2e943cc 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -496,7 +496,7 @@
         </el-form-item>
 
         <el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
-          <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
+          <el-input v-model="dialogForm.mesordercode" disabled style="width: 200px"/>
         </el-form-item>
         <div style="display: flex">
           <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
@@ -560,7 +560,7 @@
             <el-option
               v-for="item in partArr"
               :key="item.partcode"
-              :label="item.partname"
+              :label="item.partname+' / '+item.partcode"
               :value="item.partcode"
             />
           </el-select>
@@ -1257,9 +1257,9 @@
                 <el-form-item label="鎵撳嵃浜哄憳:" class="formContent">
                   {{ username }}
                 </el-form-item>
-                <el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
-                  {{ formApprove.lm_date }}
-                </el-form-item>
+<!--                <el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">-->
+<!--                  {{ formApprove.lm_date }}-->
+<!--                </el-form-item>-->
               </div>
             </el-form>
           </div>
@@ -1766,6 +1766,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import {
+  AddMesOrderCodeSearch,
   AddUpdateMesOrder,
   ClosedMesOrder,
   DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison, MesBadOrderSearch,
@@ -2142,6 +2143,8 @@
     },
     // 鏂板鎸夐挳
     async add(operation) {
+      const { data: res } = await AddMesOrderCodeSearch()
+      this.dialogForm.mesordercode = res
       this.operation = operation
       this.dialogVisible = true
       this.dialogForm.planstartdate = handleDatetime(new Date())
@@ -2577,6 +2580,10 @@
           this.$nextTick(() => {
             console.log(this.qrForm.qrvalue, 3333)
             this.bindQRCode2(this.qrForm.qrvalue)
+            const div = document.getElementById('qrCode2')
+            // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁$畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉$殑楂樺害涓哄灏�
+            div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+            // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
           })
         }
       })

--
Gitblit v1.9.3