From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改

---
 src/views/sbgl/sbqd.vue |  511 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 299 insertions(+), 212 deletions(-)

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index f4f4875..26ed24b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -1,15 +1,28 @@
 <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-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
+          <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+          <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+        </div>
+
+        <!--        <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+      </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">
+          <div class="elForm" style="justify-content: flex-start">
             <el-form-item label="璁惧缂栫爜" style=" display: flex;">
               <el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
@@ -49,14 +62,13 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
+            <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">
               <el-select
                 v-model="form.DeviceType"
                 :popper-append-to-body="false"
                 style="width: 200px"
                 filterable
                 placeholder="璇烽�夋嫨"
-
                 @change="deviceTypeChange"
               >
                 <!--                @focus="getDeviceTypeSelect"-->
@@ -68,7 +80,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.DeviceGroup"
                 filterable
@@ -86,28 +98,43 @@
               </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-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
-        <el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
-        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
-      </div>
-      <el-divider />
-      <div class="elTableDiv">
+
+      <div class="elTableDiv" style="margin-top: 0;">
         <el-table
+          ref="tableDataRef"
           :data="tableData"
           border
-          :height="tableHeight+'px'"
-          stripe
+          class="tableFixed"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
           highlight-current-row
-          :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -120,41 +147,58 @@
             prop="RowNum"
             width="50"
             label="搴忓彿"
+            fixed
           />
           <el-table-column
             prop="code"
             label="璁惧缂栫爜"
+            min-width="110"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="name"
             label="璁惧鍚嶇О"
+            min-width="110"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="eqptype_name"
             label="璁惧绫诲瀷"
+            min-width="110"
             sortable="custom"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="eqpgroup_name"
             label="璁惧缁�"
+            show-tooltip-when-overflow
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="enable"
             label="浣跨敤鐘舵��"
             sortable="custom"
+            show-tooltip-when-overflow
             width="120"
           >
             <template slot-scope="{row}">
-              <div v-if="row.enable==='Y'">鏄�</div>
-              <div v-if="row.enable==='N'">鍚�</div>
+              <div v-if="row.enable==='Y'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鏄�
+              </div>
+              <div v-if="row.enable==='N'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                鍚�
+              </div>
             </template>
           </el-table-column>
           <el-table-column
             prop="input_date"
             label="鎶曞叆鏃ユ湡"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           >
@@ -166,6 +210,8 @@
             prop="wksp_name"
             label="鐢熶骇杞﹂棿"
             sortable="custom"
+            show-tooltip-when-overflow
+            min-width="120"
           />
           <!--          <el-table-column-->
           <!--            prop="Line_name"-->
@@ -175,11 +221,13 @@
           <el-table-column
             prop="operation_ration"
             label="绋煎姩鐜�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="100"
           >
             <template slot-scope="{row}">
-              <div>{{ row.operation_ration }}%</div>
+              <div v-if=" parseFloat(row.operation_ration)===0">/</div>
+              <div v-else>{{ row.operation_ration }}%</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -187,20 +235,28 @@
             label="鍒涘缓浜哄憳"
             sortable="custom"
             width="120"
+            show-tooltip-when-overflow
           />
           <el-table-column
             prop="lm_date"
+            width="160"
             label="鍒涘缓鏃堕棿"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             label="鎿嶄綔"
-            width="100"
+            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)">鍒犻櫎</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)" />
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -208,18 +264,18 @@
       </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="getDeviceMangerSearch"
       />
     </div>
     <!--璁惧娓呭崟鏂板缂栬緫-->
     <el-dialog
+      v-el-drag-dialog
       :close-on-click-modal="false"
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
@@ -338,14 +394,21 @@
       </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="DeviceTypeDialogVisible"
       width="800px"
@@ -355,14 +418,16 @@
       @close="handleCloseDeviceType"
     >
       <div style="margin-bottom: 20px;display: flex">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
-        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
+        <!--        <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
       </div>
       <el-table
+        ref="DeviceTypeArray"
         :data="DeviceTypeArray"
         border
         height="300"
         highlight-current-row
+        :row-class-name="tableRowClassName"
         :header-cell-style="this.$headerCellStyle"
         :cell-style="this.$cellStyle"
         @sort-change="sortChangeOfDeviceType"
@@ -371,19 +436,27 @@
           width="50"
           label="搴忓彿"
           prop="RowNum"
+          fixed
         />
         <el-table-column
           prop="code"
+          show-tooltip-when-overflow
           label="绫诲瀷缂栫爜"
           sortable="custom"
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.code"
+              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
             <div v-else> {{ row.code }}</div>
           </template>
         </el-table-column>
         <el-table-column
           prop="name"
+          show-tooltip-when-overflow
           label="绫诲瀷鍚嶇О"
           sortable="custom"
         >
@@ -396,6 +469,7 @@
           prop="remark"
           label="绫诲瀷鎻忚堪"
           sortable="custom"
+          show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
             <el-input v-if="row.isVisible===1" v-model="row.remark" placeholder="璇疯緭鍏�" />
@@ -405,50 +479,54 @@
         <el-table-column label="鎿嶄綔">
           <template slot-scope="{row}">
             <div class="operationClass">
-              <el-button v-if="row.isVisible===0" type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
+              <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
       <!--鍒嗛〉-->
       <pagination
-        v-show="DeviceTypeTotal>0"
         :total="DeviceTypeTotal"
         :page.sync="formDeviceType.page"
         :limit.sync="formDeviceType.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        style="margin-top: 10px"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getDeviceTypeSearchDialog"
       />
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
-          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
+          <!--          <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
 
     <!--璁惧缁�-->
     <el-dialog
+      v-el-drag-dialog
       title="璁惧缁�"
       :visible.sync="DeviceGroupDialogVisible"
       width="800px"
       :close-on-click-modal="false"
       top="15vh"
+
       class="DeviceTypeDialogVisible"
       @close="handleCloseDeviceGroup"
     >
       <div style="margin-bottom: 20px;display: flex">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
       </div>
       <el-table
+        ref="DeviceGroupArray"
         :data="DeviceGroupArray"
         border
         highlight-current-row
         height="300"
+        :row-class-name="tableRowClassName"
         :header-cell-style="this.$headerCellStyle"
         :cell-style="this.$cellStyle"
         @sort-change="sortChangeOfDeviceGroup"
@@ -456,20 +534,28 @@
         <el-table-column
           width="50"
           label="搴忓彿"
+          fixed
           prop="RowNum"
         />
         <el-table-column
           prop="code"
           label="鍒嗙粍缂栫爜"
           sortable="custom"
+          show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.code"
+              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
             <div v-else> {{ row.code }}</div>
           </template>
         </el-table-column>
         <el-table-column
           prop="name"
+          show-tooltip-when-overflow
           label="鍒嗙粍鍚嶇О"
           sortable="custom"
         >
@@ -482,6 +568,7 @@
           prop="eqptype_name"
           label="鎵�灞炶澶囩被鍨�"
           sortable="custom"
+          show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
             <el-select
@@ -503,6 +590,7 @@
         </el-table-column>
         <el-table-column
           prop="remark"
+          show-tooltip-when-overflow
           label="鍒嗙粍鎻忚堪"
           sortable="custom"
         >
@@ -514,43 +602,50 @@
         <el-table-column label="鎿嶄綔">
           <template slot-scope="{row}">
             <div class="operationClass">
-              <el-button v-if="row.isVisible===0" type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
-              <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
+              <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
+              <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
       <!--鍒嗛〉-->
       <pagination
-        v-show="DeviceGroupTotal>0"
         :total="DeviceGroupTotal"
         :page.sync="formDeviceGroup.page"
         :limit.sync="formDeviceGroup.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        style="margin-top: 10px"
+        layout="total, prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getDeviceGroupSearchDialog"
       />
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
-          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+          <el-button v-waves @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
+          <!--          <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
         </div>
       </span>
     </el-dialog>
 
     <!--瀵煎叆-->
+    <import-picker
+      ref="importPickerFunc"
+      class="importPickerClass"
+      :shows.sync="shows"
+      :title="title_value"
+      :colos="colos"
+      :code="code"
+    />
 
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
 import {
   AddUpdateDeviceGroup, AddUpdateDeviceManger,
-  AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
+  AddUpdateDeviceType, DeleteDeviceGroup, DeleteDeviceManger, DeleteDeviceType,
   DeviceGroupSearch,
   DeviceMangerSearch,
   DeviceTypeSearch,
@@ -558,27 +653,21 @@
   DeviceTypeSelectGroup,
   WorkShopSelect, WorkShopSelectLine
 } from '@/api/sbgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, validateCode } from '@/utils/global'
+import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'SBQD',
   components: {
-    Pagination
+    Pagination, ImportPicker
   },
+  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()
-        }
-      }
-    }
     return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
       form: {
@@ -620,7 +709,7 @@
       operation: '',
       dialogFormRules: {
         devicecode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         devicename: [
           { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -661,27 +750,53 @@
         prop: 'code',
         order: 'desc'
       },
-      DeviceGroupTotal: 0
+      DeviceGroupTotal: 0,
+
+      title_value: '鏁版嵁瀵煎叆 / 璁惧娓呭崟',
+      code: '9',
+      shows: false
+    }
+  },
+  watch: {
+    shows() {
+      if (!this.shows) {
+        this.getDeviceMangerSearch()
+      }
     }
   },
   created() {
-    // 鑾峰彇璁惧娓呭崟鍒楄〃
-    this.getDeviceMangerSearch()
-    // 鑾峰彇璁惧绫诲瀷涓嬫媺
-    this.getDeviceTypeSelect()
-    // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
-    this.getWorkShopSelect()
+    this.handleRequest()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
   },
   methods: {
+    // 璁惧娓呭崟瀵煎叆
+    upload() {
+      this.shows = true
+      this.$refs.importPickerFunc.newDataFunc()
+    },
+    colos() {
+      this.shows = false
+    },
+    handleRequest() {
+      // 鑾峰彇璁惧娓呭崟鍒楄〃
+      this.getDeviceMangerSearch().then(res => {
+        if (res.code === '200') {
+          // 鑾峰彇璁惧绫诲瀷涓嬫媺
+          this.getDeviceTypeSelect()
+          // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+          this.getWorkShopSelect()
+        }
+      })
+    },
     // 鑾峰彇璁惧娓呭崟鍒楄〃
     async getDeviceMangerSearch() {
       const res = await DeviceMangerSearch(this.form)
       this.tableData = res.data
       this.total = res.count
+      return { code: res.code }
     },
     // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
     async getWorkShopSelect() {
@@ -717,11 +832,6 @@
     search() {
       this.getDeviceMangerSearch()
     },
-    // 瀵煎叆
-    upload() {
-
-    },
-
     // 閲嶇疆
     reset() {
       this.form.DeviceCode = ''
@@ -767,6 +877,9 @@
         DeleteDeviceManger({ devicecode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getDeviceMangerSearch()
           }
         })
@@ -808,6 +921,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             id: this.dialogForm.id,
             devicecode: this.dialogForm.devicecode,
@@ -824,9 +938,10 @@
           }
           AddUpdateDeviceManger(data).then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getDeviceMangerSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
             }
@@ -837,11 +952,12 @@
     // 鑾峰彇椤甸潰楂樺害
     getHeight() {
       this.$nextTick(() => {
-        this.mainHeight = window.innerHeight - 250
-        this.tableHeight = this.mainHeight - 100
-        if (window.innerHeight < 800) {
-          this.tableHeight = this.tableHeight - 50
-        }
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 245
+        this.$refs.tableDataRef.doLayout()
+        // if (window.innerHeight < 769) {
+        //   this.tableHeight = this.tableHeight - 50
+        // }
       })
     },
 
@@ -850,6 +966,9 @@
     deviceTypeButton() {
       this.DeviceTypeDialogVisible = true
       this.getDeviceTypeSearchDialog()
+      this.$nextTick(() => {
+        this.$refs.DeviceTypeArray.doLayout()
+      })
     },
     async getDeviceTypeSearchDialog() {
       const res = await DeviceTypeSearch(this.formDeviceType)
@@ -883,6 +1002,10 @@
     },
     // 鏂板鎸夐挳
     addDeviceType() {
+      if (this.DeviceTypeArray.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+      }
+
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
       this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
@@ -897,6 +1020,9 @@
         DeleteDeviceType({ devicetypecode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.formDeviceType.page > 1 && this.DeviceTypeArray.length === 1) {
+              this.formDeviceType.page--
+            }
             this.getDeviceTypeSearchDialog()
           }
         })
@@ -945,6 +1071,9 @@
     deviceGroupButton() {
       this.DeviceGroupDialogVisible = true
       this.getDeviceGroupSearchDialog()
+      this.$nextTick(() => {
+        this.$refs.DeviceGroupArray.doLayout()
+      })
     },
     // 璁惧缁勫璇濇鍏抽棴浜嬩欢
     handleCloseDeviceGroup() {
@@ -960,6 +1089,9 @@
     },
     // 鏂板
     addDeviceGroup() {
+      if (this.DeviceGroupArray.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+      }
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
       this.DeviceGroupArray.unshift({
@@ -1008,6 +1140,9 @@
         DeleteDeviceGroup({ devicegroupcode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.formDeviceGroup.page > 1 && this.DeviceGroupArray.length === 1) {
+              this.formDeviceGroup.page--
+            }
             this.getDeviceGroupSearchDialog()
           }
         })
@@ -1048,37 +1183,68 @@
           this.DeviceGroupArray.splice(index, 1)
         }
       })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .DeviceTypeDialogVisible .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;
-  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-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 {
@@ -1086,116 +1252,30 @@
   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;
-}
-
-.DeviceTypeDialogVisible {
-  ::v-deep .el-dialog__body {
-    padding: 20px 20px !important;
-  }
-
-  ::v-deep .el-select .el-input .el-select__caret {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-}
-
-::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 {
-  //float: right;
   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;
+  justify-content: space-between;
 }
 
-.el-icon-share {
-  color: $main_color;
-  cursor: pointer;
+::v-deep .el-table::before {
+  height: 0;
 }
 
-.el-checkbox.is-bordered.is-checked {
-  border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
 }
 
-::v-deep .el-radio__input.is-checked .el-radio__inner {
-  border-color: $main_color;
-  background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
 }
 
-::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;
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
 }
 
 .body ::v-deep .el-divider {
@@ -1208,22 +1288,29 @@
   margin-bottom: 0;
 }
 
-::v-deep .el-input__inner:focus {
-  border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+  margin-bottom: 0;
 }
 
-::v-deep .el-select .el-input__inner:focus {
-  border-color: $main_color;
+::v-deep .el-select__caret {
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
-::v-deep .el-select-dropdown__item.selected {
-  color: $main_color;
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
 }
 </style>
-<style lang="scss">
-.dateStyle {
-  .el-date-table td.today span {
-    color: #42b983;
-  }
+<style>
+
+.el-table .custom-row {
+  background: #f8f8fa;
 }
 </style>

--
Gitblit v1.9.3