Merge remote-tracking branch 'origin/dev-qingdao' into dev-qingdao

@@ -10,9 +10,11 @@ VUE_APP_Version = '1.0.0'
 #测试环境
 #测试环境
 VUE_APP_BASE_API = 'http://101.132.100.41:7023/Ecom'
 VUE_APP_BASE_API = 'http://101.132.100.41:7023/Ecom'
 
 
-VUE_APP_BASE_ROUTE = '/EcomUat'
+#VUE_APP_BASE_ROUTE = '/EcomUat'
+VUE_APP_BASE_ROUTE = '/Ecom'
 
 
-VUE_APP_BASE_LOGINOUT = '/EcomUat'
+#VUE_APP_BASE_LOGINOUT = '/EcomUat'
+VUE_APP_BASE_LOGINOUT = '/Ecom'
 
 
 #后端版本校验版本号
 #后端版本校验版本号
 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'

@@ -487,7 +487,6 @@
             class="fedexDetialTable fedexSreachTable editableTable"
             class="fedexDetialTable fedexSreachTable editableTable"
             ref="entryTable"
             ref="entryTable"
             :pagination="false"
             :pagination="false"
-            :maxHeight="350"
             :data="detailData"
             :data="detailData"
             :headerData="detialHeaderData"
             :headerData="detialHeaderData"
             :border="true"
             :border="true"
@@ -892,8 +891,12 @@
             "totalPrice": 0,
             "totalPrice": 0,
             "unit": ""
             "unit": ""
         })
         })
+        this.$nextTick(()=>{ 
+          this.expandRowKeys = [orderNum]
+        })
       },
       },
       updateRow(row){
       updateRow(row){
+        if (this.expandRowKeys.length > 0) return
         this.expandRowKeys = [row.gnum]    
         this.expandRowKeys = [row.gnum]    
         let obj = {}   
         let obj = {}   
         for (let key in row) {
         for (let key in row) {
@@ -902,8 +905,8 @@
         
         
         this.$nextTick(()=>{   
         this.$nextTick(()=>{   
             this.$refs.rowEditForm.tableRowformData = obj      
             this.$refs.rowEditForm.tableRowformData = obj      
-            const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
-            table.scrollTop = row.gnum*51+10
+            // const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
+            // table.scrollTop = row.gnum*51+10
         })
         })
       },
       },
       getTotalNumber(){
       getTotalNumber(){
@@ -923,6 +926,7 @@
         })
         })
         this.$nextTick(()=>{
         this.$nextTick(()=>{
           this.getTotalNumber()
           this.getTotalNumber()
+          this.expandRowKeys = []
         })
         })
       },
       },
       rowFormDataSave(props){
       rowFormDataSave(props){