From 9179bb148443b849a709ffc83464cd316c47eef1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:28:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/b1-sample.vue |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index 429f833..c5feab2 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -34,6 +34,7 @@
     width: calc(100% - 40px);
     height: calc(100% - 60px - 80px - 10px - 40px);
     padding: 20px;
+    overflow-y: auto;
   }
 
   .el-form-item {
@@ -291,7 +292,7 @@
         <el-button type="primary" @click="confirmExport" :loading="upLoadExport">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px">
+    <el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px" :append-to-body="true">
       <el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
         :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
         @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible"
@@ -301,7 +302,7 @@
             <el-col :span="20">
               <span><i
                   :class="`node_i ${node.level<2 ? 'el-icon-folder-opened': 'el-icon-tickets'}`"></i>
-                {{ data.name }}{{ node.level }}</span>
+                {{ data.name }}</span>
             </el-col>
             <el-col :span="4" v-if="node.level<3">
               <el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
@@ -852,7 +853,7 @@
         isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
         isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
         currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
-        tableLoading:true,
+        tableLoading:false,
         sampleCode:'',
         currentId:null,
         searchSampleCode:''
@@ -889,6 +890,12 @@
           })
           if(!this.entity.warehouseId&&this.warehouse.length>0){
             this.entity.warehouseId = this.warehouse[0].id
+            this.warehouseChange(this.entity.warehouseId)
+            if(this.shelf.length>0){
+              this.entity.shelfId = this.shelf[0].id
+              this.handleShelf(this.entity.shelfId)
+            }
+          }else if(this.warehouse.length>0){
             this.warehouseChange(this.entity.warehouseId)
             if(this.shelf.length>0){
               this.entity.shelfId = this.shelf[0].id
@@ -978,6 +985,7 @@
 				}).then(res => {
             this.upLoadWarehouse = false;
             this.warehouseVisible = false
+            // this.keepVisible = false
             this.currentEdit = null;
             if (res.code == 201) {
               this.$message.error('淇敼澶辫触')
@@ -985,6 +993,8 @@
             }
             this.$message.success('淇敼鎴愬姛')
             this.selectList()
+            this.name = ''
+            this.warehouseChange(this.entity.warehouseId)
           })
         }else{
           // 鏂板浠撳簱
@@ -999,10 +1009,10 @@
             }
             this.$message.success('娣诲姞鎴愬姛')
             this.selectList()
+            this.name = ''
+            this.warehouseChange(this.entity.warehouseId)
           })
         }
-        this.name = ''
-        this.warehouseChange(this.entity.warehouseId)
       },
       // 娣诲姞/淇敼璐ф灦
       confirmShelves() {
@@ -1030,11 +1040,12 @@
 				}).then(res => {
             this.upLoadShelves = false;
             this.shelvesVisible = false
+            // this.keepVisible = false
             if (res.code == 201) {
-              this.$message.error('娣诲姞澶辫触')
+              this.$message.error('淇敼澶辫触')
               return
             }
-            this.$message.success('娣诲姞鎴愬姛')
+            this.$message.success('淇敼鎴愬姛')
             this.selectList()
             this.currentEdit ={};
           })
@@ -1069,6 +1080,7 @@
       },
       nodeOpen(data, node, el) {
         $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+        this.selectTree[node.level-1] = data.id;
       },
       nodeClose(data, node, el) {
         $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')

--
Gitblit v1.9.3