From c054516a38a2613a4e7399ba62694fbd99a606fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 06 一月 2023 09:10:09 +0800
Subject: [PATCH] 1.组织架构表格拖动实现demo

---
 src/views/sbgl/djbw.vue |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index 8adfe3f..69ef106 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -12,10 +12,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label-width="70px" label="閮ㄤ綅缂栫爜" style=" display: flex;">
+            <el-form-item label="閮ㄤ綅缂栫爜" style=" display: flex;">
               <el-input v-model="form.checkitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -34,7 +34,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="鐐规鍛ㄦ湡" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="鐐规鍛ㄦ湡" style=" display: flex;">
               <el-select v-model="form.cycle" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in cycleArr"
@@ -45,7 +45,10 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'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>
@@ -97,10 +100,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
@@ -118,14 +123,15 @@
             prop="isscan"
             label="閫夋嫨鎵爜"
             sortable="custom"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.isscan==='Y'">
-                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                 鏄�
               </div>
               <div v-if="row.isscan==='N'">
-                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                <i class="el-icon-info" style="margin-right: 2px" />
                 鍚�
               </div>
             </template>
@@ -133,6 +139,7 @@
           <el-table-column
             prop="cycle"
             label="鐐规鍛ㄦ湡"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -147,10 +154,12 @@
             prop="lm_user"
             label="鍒涘缓浜哄憳"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
+            show-tooltip-when-overflow
             width="160"
             sortable="custom"
           />
@@ -162,10 +171,10 @@
             <template slot-scope="{row}">
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" @click="del(row)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
                 </el-tooltip>
               </div>
             </template>

--
Gitblit v1.9.3