From b58dc818feacbfc6bf01453b0db8ad3306c8d6dd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 20 十二月 2022 10:37:18 +0800
Subject: [PATCH] 1.table表新增show-tooltip-when-overflow属性

---
 src/views/sbgl/bybw.vue |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index 77e457c..f655403 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -10,12 +10,12 @@
         <el-form
           ref="form"
           :model="form"
-          label-width="80px"
+          label-width="100px"
           inline
           style="display: flex;justify-content: space-between"
         >
           <div class="elForm">
-            <el-form-item label="閮ㄤ綅缂栫爜" style=" display: flex;">
+            <el-form-item label-width="70px" label="閮ㄤ綅缂栫爜" style=" display: flex;">
               <el-input v-model="form.maiitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -36,18 +36,23 @@
             </el-form-item>
 
           </div>
-          <div class="bodySearchReset">
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
       </div>
 
       <div class="elTableDiv">
         <el-table
+          ref="tableDataRef"
           :data="tableData"
           :height="tableHeight+'px'"
           border
+          class="tableFixed"
           :row-class-name="tableRowClassName"
           :style="{width: 100+'%',height:tableHeight+'px',}"
           highlight-current-row
@@ -69,10 +74,12 @@
             prop="code"
             label="閮ㄤ綅缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="name"
             label="閮ㄤ綅鍚嶇О"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -89,6 +96,7 @@
           <el-table-column
             prop="isscan"
             label="閫夋嫨鎵爜"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -105,12 +113,14 @@
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -182,7 +192,12 @@
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -207,6 +222,8 @@
   },
   data() {
     return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
       form: {
@@ -246,7 +263,7 @@
       },
 
       title_value: '鏁版嵁瀵煎叆 / 淇濆吇閮ㄤ綅',
-      code: '4',
+      code: '11',
       shows: false
     }
   },
@@ -359,6 +376,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             id: this.dialogForm.id,
             maiitemcode: this.dialogForm.maiitemcode,
@@ -367,12 +385,12 @@
             isqrcode: this.dialogForm.isqrcode,
             OperType: this.operation === 'add' ? 'Add' : 'Update'
           }
-          console.log(data)
           AddUpdateDeviceMaiItem(data).then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getDeviceMaiItemSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }
@@ -384,7 +402,8 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 200
+        this.tableHeight = this.mainHeight - 195
+        this.$refs.tableDataRef.doLayout()
       })
     },
     tableRowClassName({ row, rowIndex }) {
@@ -490,6 +509,15 @@
   margin-bottom: 0;
 }
 
+.tableFixed{
+  ::v-deep .el-table__fixed-right{
+    height: 100% !important;
+  }
+  ::v-deep .el-table__fixed{
+    height: 100% !important;
+  }
+}
+
 </style>
 <style>
 

--
Gitblit v1.9.3