From adb74c51618faf025fe1d46bf6b22db895c2608f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期日, 12 二月 2023 11:16:14 +0800
Subject: [PATCH] 1.提交

---
 src/views/jcsz/yhqd.vue | 1014 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 621 insertions(+), 393 deletions(-)

diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index db4f7be..141ce53 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,13 +1,23 @@
 <template>
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
-      <div style="padding: 10px 5px 0 0">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
+
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+
+        <div style="display: flex">
+          <el-button v-waves icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
+          <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        </div>
+      </div>
+
+      <div class="bodyTopFormGroup">
         <el-form
           ref="form"
           :model="form"
-          label-width="80px"
+          label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
             <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
@@ -44,7 +54,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
               <el-select
                 v-model="form.Enable"
                 :popper-append-to-body="false"
@@ -61,145 +71,241 @@
               </el-select>
             </el-form-item>
           </div>
-          <div style="display: flex;align-items: start;margin-top: 5px;">
-            <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
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
       </div>
-      <el-divider />
-      <div style="margin-left: 10px;display: flex">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-        <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
-        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
-      </div>
-      <el-divider />
+
       <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
         <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
           :data="tableData"
-          border
-          stripe
-          :height="tableHeight+'px'"
+          class="tableFixed"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
           highlight-current-row
-          :style="{width: 100+'%',height:tableHeight+'px'}"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
           :header-cell-style="this.$headerCellStyle"
+          :row-class-name="tableRowClassName"
           :cell-style="this.$cellStyle"
+          border
           @sort-change="sortChange"
         >
+
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row[item.prop]==='1'&&row.wagetype">璁℃椂鍒�</div>
+              <div v-else-if="row[item.prop]==='2'&&row.wagetype">璁′欢鍒�</div>
+              <div v-else-if="row[item.prop]==='Y'&& item.prop==='enable'"><i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />鍦ㄨ亴</div>
+              <div v-else-if="row[item.prop]==='N'&& item.prop==='enable'"><i class="el-icon-info" style="margin-right: 2px" />绂昏亴</div>
+              <div v-else-if="row[item.prop]==='Y'&& item.prop==='is_role'"><i class="el-icon-share" :style="{color:$store.state.settings.theme}" @click="roleClick({row})" /></div>
+              <div v-else-if="row[item.prop]==='N'&& item.prop==='is_role'"><i class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" /></div>
+              <div v-else-if="!row[item.prop]">/</div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
           <!--          <el-table-column-->
           <!--            type="selection"-->
           <!--            width="50"-->
           <!--          />-->
-          <el-table-column
-            prop="RowNum"
-            width="50"
-            label="搴忓彿"
-            fixed
-          />
-          <el-table-column
-            prop="usercode"
-            label="鐢ㄦ埛缂栫爜"
-            min-width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="username"
-            label="鐢ㄦ埛鍚嶇О"
-            min-width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="password"
-            label="鐢ㄦ埛瀵嗙爜"
-            min-width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="org_name"
-            label="鎵�灞炵粍缁�"
-            min-width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="group_name"
-            label="鐢熶骇鐝粍"
-            min-width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="wagetype"
-            label="宸ヨ祫绫诲瀷"
-            sortable="custom"
-            width="110"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
-              <div v-if="row.wagetype==='2'">璁′欢鍒�</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="mobile"
-            label="鑱旂郴鏂瑰紡"
-            min-width="110"
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.mobile===''">/</div>
-              <div v-else>{{ row.mobile }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="email"
-            label="鐢靛瓙閭"
-            sortable="custom"
-            min-width="110"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.email===''">/</div>
-              <div v-else>{{ row.email }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="enable"
-            label="鍦ㄨ亴鐘舵��"
-            width="110"
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.enable==='Y'">鍦ㄨ亴</div>
-              <div v-if="row.enable==='N'">绂昏亴</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="lm_user"
-            label="鍒涘缓浜哄憳"
-            width="110"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="lm_date"
-            label="鍒涘缓鏃堕棿"
-            width="160"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="is_role"
-            label="鍏宠仈瑙掕壊"
-            width="110"
-          >
-            <template slot-scope="{row}">
-              <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
-              <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
-            </template>
-          </el-table-column>
+
+          <!--          <el-table-column-->
+          <!--            prop="RowNum"-->
+          <!--            width="50"-->
+          <!--            label="搴忓彿"-->
+          <!--            fixed-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="usercode"-->
+          <!--            label="鐢ㄦ埛缂栫爜"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            min-width="110"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="username"-->
+          <!--            label="鐢ㄦ埛鍚嶇О"-->
+          <!--            min-width="110"-->
+          <!--            sortable="custom"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="password"-->
+          <!--            label="鐢ㄦ埛瀵嗙爜"-->
+          <!--            min-width="110"-->
+          <!--            sortable="custom"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="org_name"-->
+          <!--            label="鎵�灞炵粍缁�"-->
+          <!--            min-width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.org_name">{{ row.org_name }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="group_name"-->
+          <!--            label="鐢熶骇鐝粍"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            min-width="110"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.group_name">{{ row.group_name }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="wagetype"-->
+          <!--            label="宸ヨ祫绫诲瀷"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--            width="110"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.wagetype==='1'">璁℃椂鍒�</div>-->
+          <!--              <div v-if="row.wagetype==='2'">璁′欢鍒�</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="mobile"-->
+          <!--            label="鑱旂郴鏂瑰紡"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            min-width="110"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.mobile===''">/</div>-->
+          <!--              <div v-else>{{ row.mobile }}</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="email"-->
+          <!--            label="鐢靛瓙閭"-->
+          <!--            sortable="custom"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            min-width="110"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.email===''">/</div>-->
+          <!--              <div v-else>{{ row.email }}</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="enable"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            label="鍦ㄨ亴鐘舵��"-->
+          <!--            width="110"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.enable==='Y'">-->
+          <!--                &lt;!&ndash;                <svg-icon icon-class="circleYes" style="margin-right: 2px" />&ndash;&gt;-->
+          <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+          <!--                鍦ㄨ亴-->
+          <!--              </div>-->
+          <!--              <div v-if="row.enable==='N'">-->
+          <!--                &lt;!&ndash;/*                <svg-icon icon-class="circleNo" style="margin-right: 2px" />*/&ndash;&gt;-->
+          <!--                <i class="el-icon-info" style="margin-right: 2px" />-->
+          <!--                绂昏亴-->
+          <!--              </div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="lm_user"-->
+          <!--            label="鍒涘缓浜哄憳"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            width="110"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="lm_date"-->
+          <!--            label="鍒涘缓鏃堕棿"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            width="160"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="is_role"-->
+          <!--            label="鍏宠仈瑙掕壊"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            width="110"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <i-->
+          <!--                v-if="row.is_role==='Y'"-->
+          <!--                :style="{color:$store.state.settings.theme}"-->
+          <!--                class="el-icon-share"-->
+          <!--                @click="roleClick({row})"-->
+          <!--              />-->
+          <!--              <i-->
+          <!--                v-if="row.is_role==='N'"-->
+          <!--                class="el-icon-share"-->
+          <!--                style="color: rgb(180 ,181, 185)"-->
+          <!--                @click="roleClick({row})"-->
+          <!--              />-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column
             label="鎿嶄綔"
             fixed="right"
+            width="120"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
-                <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <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 :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -207,12 +313,11 @@
       </div>
       <!--鍒嗛〉-->
       <pagination
-        v-show="total>0"
         :total="total"
         :page.sync="form.page"
         :limit.sync="form.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        layout="total ,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getUserSearch"
       />
@@ -220,6 +325,7 @@
 
     <!--    鐢ㄦ埛娓呭崟鏂板銆佺紪杈�-->
     <el-dialog
+      v-el-drag-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="800px"
@@ -307,19 +413,26 @@
       </el-form>
       <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 v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
 
     <!--    鍏宠仈瑙掕壊-->
     <el-dialog
+      v-el-drag-dialog
       title="鍏宠仈瑙掕壊"
       :visible.sync="dialogVisibleRoles"
       width="800px"
-      top="15vh"
-      :fullscreen="isFullscreen"
+      :top="isIpad?'3vh':'15vh'"
+      :fullscreen="isIpad"
       :close-on-click-modal="false"
       class="dialogVisibleRoles"
       @closed="handleCloseRoles"
@@ -328,38 +441,50 @@
       <!--      @opened="handleOpenedRoles"-->
 
       <div>
-        <i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
+        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
       </div>
       <el-divider />
       <div>
         <div style="margin-bottom:20px">
-          <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
+          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊绫诲瀷闆嗗悎锛�
         </div>
         <div class="myCheckboxGroup">
           <div
             v-for="item in dialogFormRoles.rolesArr"
             :key="item.code"
-            :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+            :style="{border:item.isSelected1?'1px solid '+ $store.state.settings.theme :'1px solid #eee'}"
             class="myCheckbox"
             @click="myCheckboxClick(item)"
           >
-            <input
-              class="myCheckboxInput"
-              type="checkbox"
-              :value="item.code"
-              :name="item.name"
-              :style="{color:item.isSelected2?'#42b983':'#fff'}"
-              @click="myCheckboxInputClick(item)"
-            >{{ item.name }}
+            <!--            <input-->
+            <!--              class="myCheckboxInput"-->
+            <!--              type="checkbox"-->
+            <!--              :value="item.code"-->
+            <!--              :name="item.name"-->
+            <!--              :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+            <!--              @click="myCheckboxInputClick(item)"-->
+            <!--            >{{ item.name }}-->
             <!--            鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
             <!--            onClick="event.cancelBubble = true"-->
+            <el-checkbox
+              :key="item.code"
+              v-model="item.isSelected2"
+              class="myCheckboxInput"
+              :value="item.code"
+              :name="item.name"
+              :label="item.name"
+              :checked="item.isSelected2"
+              @change="myCheckboxInputClick(item)"
+            />
+            <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
           </div>
         </div>
       </div>
       <el-divider />
       <div>
         <div style="margin-bottom:20px">
-          <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
+          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊锛�
         </div>
         <el-tree
           ref="roleTree"
@@ -367,7 +492,7 @@
           show-checkbox
           node-key="code"
           default-expand-all
-          style="height: 300px"
+          style="height: 300px;overflow-y: scroll"
           :props="defaultPropsOfRoleTree"
           @check="checkBoxClick"
         />
@@ -376,14 +501,21 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="rolesDialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="rolesDialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button v-waves @click="rolesDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="rolesDialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
 
     <!--    浜х粍鎸夐挳瀵硅瘽妗�-->
     <el-dialog
+      v-el-drag-dialog
       title="鐢熶骇鐝粍"
       :visible.sync="workingDialogVisible"
       width="800px"
@@ -392,17 +524,24 @@
       class="workingDialogVisible"
       @close="handleCloseWorking"
     >
+      <!--      <div style="margin-bottom: 10px; padding: 10px 0; background-color: #f8f8fa; display: flex">-->
+      <!--        <el-button style="margin-left: 10px;" type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>-->
+      <!--        &lt;!&ndash;        <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>&ndash;&gt;-->
+      <!--      </div>-->
+
       <div style="margin-bottom: 20px;display: flex">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>
         <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
       </div>
       <el-table
+        ref="workingTableData"
         :data="workingTableData"
         border
-        height="300"
+        height="377"
         highlight-current-row
         :header-cell-style="this.$headerCellStyle"
         :cell-style="this.$cellStyle"
+        :row-class-name="tableRowClassName"
         @sort-change="sortChangeOfWorking"
       >
         <!--        :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
@@ -420,9 +559,15 @@
           prop="group_code"
           label="鐝粍缂栫爜"
           sortable="custom"
+          show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.group_code"
+              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
             <div v-else> {{ row.group_code }}</div>
           </template>
         </el-table-column>
@@ -430,6 +575,7 @@
           prop="group_name"
           label="鐝粍鍚嶇О"
           sortable="custom"
+          show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
             <el-input v-if="row.isVisible===1" v-model="row.group_name" placeholder="璇疯緭鍏�" />
@@ -438,6 +584,7 @@
         </el-table-column>
         <el-table-column
           prop="description"
+          show-tooltip-when-overflow
           label="鐝粍鎻忚堪"
           sortable="custom"
         >
@@ -449,34 +596,41 @@
         <el-table-column label="鎿嶄綔">
           <template slot-scope="{row}">
             <div class="operationClass">
-              <el-button v-if="row.isVisible===0" type="text" @click="delWorking(row)">鍒犻櫎</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="saveWorking(row)">淇濆瓨</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="cancelWorking(row)">鍙栨秷</el-button>
+              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delWorking(row)">鍒犻櫎</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveWorking(row)">淇濆瓨</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelWorking(row)">鍙栨秷</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
       <!--鍒嗛〉-->
       <pagination
-        v-show="workingTableDataLength>0"
         :total="workingTableDataLength"
         :page.sync="formWorking.page"
         :limit.sync="formWorking.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        style="margin-top: 10px"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getUserGroupSearch"
       />
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="WorkingDialogVisibleCancel">杩斿洖</el-button>
+          <el-button v-waves @click="WorkingDialogVisibleCancel">杩斿洖</el-button>
           <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
 
     <!--瀵煎叆缁勪欢-->
-    <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+    <import-picker
+      ref="importPickerFunc"
+      class="importPickerClass"
+      :shows.sync="shows"
+      :title="title_value"
+      :colos="colos"
+      :code="code"
+    />
 
   </div>
 </template>
@@ -484,6 +638,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import ImportPicker from '@/components/ImportPicker'
+import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
 
 import {
   AddUpdateUser,
@@ -498,27 +653,18 @@
 } from '@/api/jcsz'
 import { getCookie } from '@/utils/auth'
 import $ from 'jquery'
-import clearAllChildren from '@/utils/global'
+import clearAllChildren, { validateCode } from '@/utils/global'
 import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
+import elDragDialog from '@/directive/el-drag-dialog'
+import TableColumnSettings from '@/components/TableColumnSettings'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'YYQD',
   components: {
-    Pagination, ImportPicker
+    Pagination, ImportPicker, TableColumnSettings
   },
+  directives: { elDragDialog, waves },
   data() {
-    const validateName = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
-      } else {
-        if (SER_HZ.test(value)) {
-          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
-        } else {
-          callback()
-        }
-      }
-    }
     const validateMobile = (rule, value, callback) => {
       if (!value) {
         callback()
@@ -548,9 +694,10 @@
         }
       }
     }
-
     return {
-      isFullscreen: false,
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      isIpad: false,
       mainHeight: 0,
       tableHeight: 0,
       form: {
@@ -578,12 +725,96 @@
       ], // 鍦ㄨ亴鐘舵��
       total: 10,
       tableData: [],
+
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false },
+        { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'usercode',
+          label: '鐢ㄦ埛缂栫爜',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'username',
+          label: '鐢ㄦ埛鍚嶇О',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        { minWidth: 110, width: false, prop: 'password', label: '鐢ㄦ埛瀵嗙爜', id: 5, show: true, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'stu_torgcode', label: '缁勭粐缂栫爜', id: 6, show: false, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'org_name', label: '鎵�灞炵粍缁�', id: 7, show: true, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'group_code', label: '鐝粍缂栫爜', id: 8, show: false, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'group_name', label: '鐢熶骇鐝粍', id: 9, show: true, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'wagetype', label: '宸ヨ祫绫诲瀷', id: 10, show: true, fixed: false, sortable: 'custom' },
+        { minWidth: 110, width: false, prop: 'mobile', label: '鑱旂郴鏂瑰紡', id: 11, show: true, fixed: false, sortable: 'custom' },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'email',
+          label: '鐢靛瓙閭',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: 'custom'
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'enable',
+          label: '鍦ㄨ亴鐘舵��',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: 'custom'
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'lm_user',
+          label: '鍒涘缓浜哄憳',
+          id: 14,
+          show: true,
+          fixed: false,
+          sortable: 'custom'
+        },
+        {
+          minWidth: 160,
+          width: false,
+          prop: 'lm_date',
+          label: '鍒涘缓鏃堕棿',
+          id: 15,
+          show: true,
+          fixed: false,
+          sortable: 'custom'
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'is_role',
+          label: '鍏宠仈瑙掕壊',
+          id: 16,
+          show: true,
+          fixed: false,
+          sortable: false
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
       dialogVisible: false,
       dialogForm: {
         id: '',
         UserCode: '',
         UserName: '',
-        Password: '',
+        Password: '123456',
         Enable: 'Y',
         StuOrg: '',
         Mobile: '',
@@ -591,7 +822,7 @@
         groupcode: '',
         Operator: '',
         OperType: '',
-        wagetype: ''
+        wagetype: '2'
       },
       usergroupArr: [], // 鐢熶骇鐝粍鏁扮粍
       wagetypeArr: [
@@ -601,7 +832,7 @@
       operation: '',
       dialogFormRules: {
         UserCode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         UserName: [
           { required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�', trigger: ['blur', 'change'] }
@@ -675,6 +906,13 @@
     this.getHeight()
   },
   methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
     handleRequest() {
       this.getUserSearch().then(res => {
         if (res.code === '200') {
@@ -786,6 +1024,9 @@
         DeleteUser({ Userid: id }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getUserSearch()
           }
         })
@@ -798,14 +1039,14 @@
       this.dialogForm.UserCode = ''
       this.dialogForm.UserCode = ''
       this.dialogForm.UserName = ''
-      this.dialogForm.Password = ''
+      this.dialogForm.Password = '123456'
       this.dialogForm.Enable = 'Y'
       this.$refs.dialogCascader.checkedValue = ''
       this.dialogForm.StuOrg = ''
       this.dialogForm.Mobile = ''
       this.dialogForm.Email = ''
       this.dialogForm.groupcode = ''
-      this.dialogForm.wagetype = ''
+      this.dialogForm.wagetype = '2'
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
@@ -816,6 +1057,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             id: this.dialogForm.id,
             UserCode: this.dialogForm.UserCode,
@@ -833,11 +1075,13 @@
           }
           AddUpdateUser(data).then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getUserSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+              this.$store.state.app.buttonIsDisabled = false
             }
           })
         }
@@ -845,67 +1089,83 @@
     },
     // 鑾峰彇椤甸潰楂樺害
     getHeight() {
-      console.log(window.innerHeight)
-      console.log(window.innerWidth)
       this.$nextTick(() => {
-        this.mainHeight = window.innerHeight - 250
-        this.tableHeight = this.mainHeight - 100
-        // this.isFullscreen = window.innerHeight < 800
-        if (window.innerHeight < 800) {
-          this.tableHeight = this.tableHeight - 50
+        // this.mainHeight = window.innerHeight - 250
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 255
+        if (window.innerHeight < 769) {
+          this.tableHeight = this.tableHeight - 40
         }
+        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+        this.$refs.tableDataRef.doLayout()
       })
     },
     // 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
-    async roleClick({ row }) {
+    roleClick({ row }) {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
       this.dialogFormRoles.rolesArrSelectedArr = []
       this.dialogFormRoles.rolesArr = []
       this.dialogFormRoles.roleTreeSelectedArr = []
-      this.dialogVisibleRoles = true
+
       this.dialogFormRoles.username = row.username
       this.dialogFormRoles.usercode = row.usercode
-      const { data: res } = await UserAssociationRole({ usercode: row.usercode })
-      this.rolesAll = res
+      UserAssociationRole({ usercode: row.usercode }).then(res => {
+        if (res.code === '200') {
+          setTimeout(() => {
+            loading.close()
 
-      const nodeKey = []// 鏍戝舰鍥炴樉key
-      res.forEach((item, index) => {
-        this.dialogFormRoles.rolesArr.push({
-          code: item.code,
-          name: item.name,
-          flag: item.flag,
-          isSelected1: false,
-          isSelected2: false
-        })
-        if (item.flag === 'Y') {
-          this.dialogFormRoles.rolesArr[index].isSelected2 = true
-          this.$nextTick(() => {
-            // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-            $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-          })
-          this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
-          if (item.children && item.children.length > 0) {
-            const Data = []
-            item.children.forEach(it => {
-              if (it.flag === 'Y') {
-                nodeKey.push(it.code)
-                Data.push(it.code)
+            this.dialogVisibleRoles = true
+            this.rolesAll = res.data.filter(item => item.children.length !== 0)
+
+            const nodeKey = []// 鏍戝舰鍥炴樉key
+            this.rolesAll.forEach((item, index) => {
+              this.dialogFormRoles.rolesArr.push({
+                code: item.code,
+                name: item.name,
+                flag: item.flag,
+                isSelected1: false,
+                isSelected2: false
+              })
+              if (item.flag === 'Y') {
+                this.dialogFormRoles.rolesArr[index].isSelected2 = true
+                this.$nextTick(() => {
+                  // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+                  $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+                })
+                this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
+                if (item.children && item.children.length > 0) {
+                  const Data = []
+                  item.children.forEach(it => {
+                    if (it.flag === 'Y') {
+                      nodeKey.push(it.code)
+                      Data.push(it.code)
+                    }
+                  })
+                  this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
+                }
               }
             })
-            this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
-          }
+
+            this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
+
+            this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
+            this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+
+            this.$nextTick(() => {
+              this.$refs.roleTree.setCheckedKeys(nodeKey)
+            })
+          }, 1000)
+        } else {
+          loading.close()
         }
       })
-      console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
-      console.log(this.dialogFormRoles.rolesArr, 888)
-
-      this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
-      // this.dialogFormRoles.rolesArr[0].name = '鍏ㄩ儴'
-
-      this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
-      this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
-      // this.dialogFormRoles.rolesArr
-      console.log(nodeKey, 1)
-      this.$refs.roleTree.setCheckedKeys(nodeKey)
     },
     // 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
     handleCloseRoles() {
@@ -918,12 +1178,15 @@
     },
     // 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
     async rolesDialogVisibleConfirm() {
-      console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
+      this.$store.state.app.buttonIsDisabled = true
       const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
       if (res.code === '200') {
+        this.dialogVisibleRoles = false
         this.$message.success('淇濆瓨鎴愬姛锛�')
         await this.getUserSearch()
-        this.dialogVisibleRoles = false
+        this.$store.state.app.buttonIsDisabled = false
+      } else {
+        this.$store.state.app.buttonIsDisabled = false
       }
     },
     // 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
@@ -1086,7 +1349,7 @@
     },
     // myCheckBoxInput鐐瑰嚮浜嬩欢  灏忕洅瀛愮偣鍑�(input)
     myCheckboxInputClick(item) {
-      item.isSelected2 = !item.isSelected2
+      item.isSelected2 = !!item.isSelected2
       this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
       if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
         console.log('浠庢病閫変腑鍒伴�変腑')
@@ -1146,6 +1409,10 @@
     workingTramClick() {
       this.workingDialogVisible = true
       this.getUserGroupSearch()
+      // 椤甸潰鍔犺浇瀹屽悗閲嶆柊娓叉煋琛ㄦ牸
+      this.$nextTick(() => {
+        this.$refs.workingTableData.doLayout()
+      })
     },
     // 鐢熶骇鐝粍瀵硅瘽妗嗗叧闂簨浠�
     handleCloseWorking() {
@@ -1180,6 +1447,10 @@
     },
     // 鏂板
     addWorking() {
+      if (this.workingTableData.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴琛岃褰曪紒')
+      }
+
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
       const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
@@ -1195,6 +1466,9 @@
         UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
+              this.formWorking.page--
+            }
             this.getUserGroupSearch()
           }
         })
@@ -1235,145 +1509,23 @@
     // 鐢熶骇鐝粍杩斿洖鎸夐挳
     WorkingDialogVisibleCancel() {
       this.workingDialogVisible = false
+    },
+    tableRowClassName({ row, rowIndex }) {
+      // console.log(row, rowIndex, 12)
+      // if (rowIndex === 1) {
+      //   return 'warning-row'
+      // } else if (rowIndex === 3) {
+      //   return 'success-row'
+      // }
+      return 'custom-row'
     }
+
   }
 }
 </script>
 
 <style lang="scss" scoped>
 $main_color: #42b983;
-::v-deep .el-button--primary {
-  background-color: $main_color !important;
-  height: 30px;
-  display: flex;
-  align-items: center;
-  //border: 1px solid $main_color;
-  border: none;
-  padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
-  border: none;
-}
-
-::v-deep .el-button--info {
-  //background-color: $main_color !important;
-  height: 30px;
-  display: flex;
-  align-items: center;
-  padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
-  display: flex;
-  justify-content: flex-end;
-}
-
-.footerButton {
-  display: flex;
-  justify-content: end;
-}
-
-::v-deep .el-button--default {
-  background-color: #ffffff !important;
-  height: 30px;
-  display: flex;
-  align-items: center;
-  padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
-  color: #606266;
-}
-
-::v-deep .el-dialog__body {
-  padding: 20px 100px !important;
-}
-
-.workingDialogVisible ::v-deep .el-dialog__body {
-  padding: 20px 20px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
-  background-color: $main_color;
-  border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
-  color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
-  border-color: $main_color;
-  background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
-  height: 30px;
-  line-height: 30px;
-}
-
-::v-deep .el-table .caret-wrapper {
-  transform: scale(0.8);
-}
-
-::v-deep .cell {
-  display: flex !important;
-  align-items: center !important;
-  justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
-  color: $main_color;
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.operationClass {
-  height: 23px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.el-icon-share {
-  color: $main_color;
-  cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
-  border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
-  border-color: $main_color;
-  background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  border-color: $main_color;
-  background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
-  color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
-  margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
-  color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
-  margin: 10px 30px 0px 0;
-}
 
 .dialogVisibleRoles {
   .myCheckboxGroup {
@@ -1388,12 +1540,20 @@
       margin: 10px 30px 0 0;
       border-radius: 5px;
       cursor: default;
+      position: relative;
 
       .myCheckboxInput {
         margin: 1px 5px 0 0;
         cursor: pointer;
       }
 
+      .myCheckboxInputLabel {
+        position: absolute;
+        left: 29px;
+        padding: 5px;
+        top: 6px;
+        color: transparent;
+      }
     }
 
     input[type=checkbox] {
@@ -1429,6 +1589,94 @@
   }
 }
 
+.workingDialogVisible ::v-deep .el-dialog__body {
+  padding: 20px 20px !important;
+}
+</style>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-button--text {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
 .body ::v-deep .el-divider {
   border: 1px solid #eee;
   width: 99%;
@@ -1439,47 +1687,27 @@
   margin-bottom: 0;
 }
 
-::v-deep .el-input__inner:focus {
-  border-color: $main_color;
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
 }
 
-::v-deep .el-select .el-input__inner:focus {
-  border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
-  color: $main_color;
-}
-
-::v-deep .el-input__inner:focus {
-  border-color: #42b983 !important;
-}
-
-//::v-deep   .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
-//  border-color: #42b983 !important;
-//}
 </style>
-<style lang="scss">
-.elCascader {
-  //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
-  //  color: #42b983 ;
-  //}
-  .el-cascader-node.is-selectable.in-checked-path {
-    color: #42b983;
-  }
+<style>
+.osloading {
+  font-size: 26px !important;
+}
 
-  .el-radio__input.is-checked .el-radio__inner {
-    background-color: #42b983;
-    border-color: #42b983;
-  }
+.el-loading-text {
+  font-size: 26px !important;
+}
 
-  .el-radio__input.is-checked .el-radio__inner:hover {
-    border-color: #42b983;
-  }
-
-  .el-input__inner {
-    border-color: #42b983 !important;
-  }
-
+.el-table .custom-row {
+  background: #f8f8fa;
 }
 </style>

--
Gitblit v1.9.3