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 |   75 +++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 1f232de..26ed24b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -3,15 +3,15 @@
     <div class="body" :style="{height:mainHeight+'px'}">
 
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
         <div style="display: flex">
-          <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
-          <el-button icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
-          <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+          <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 type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+        <!--        <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
       </div>
 
       <div class="bodyTopFormGroup">
@@ -20,10 +20,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm" style="justify-content: flex-start">
-            <el-form-item label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
+            <el-form-item label="璁惧缂栫爜" style=" display: flex;">
               <el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="璁惧鍚嶇О" style=" display: flex;">
@@ -62,7 +62,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" 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"
@@ -98,9 +98,12 @@
               </el-select>
             </el-form-item>
           </div>
-          <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
+            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
@@ -183,11 +186,11 @@
           >
             <template slot-scope="{row}">
               <div v-if="row.enable==='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.enable==='N'">
-                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                <i class="el-icon-info" style="margin-right: 2px" />
                 鍚�
               </div>
             </template>
@@ -249,10 +252,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>
@@ -272,6 +275,7 @@
     </div>
     <!--璁惧娓呭崟鏂板缂栬緫-->
     <el-dialog
+      v-el-drag-dialog
       :close-on-click-modal="false"
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
@@ -390,8 +394,9 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
-          <el-button @click="dialogVisibleCancel">鍙� 娑�</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"
@@ -403,6 +408,7 @@
 
     <!--璁惧绫诲瀷-->
     <el-dialog
+      v-el-drag-dialog
       title="璁惧绫诲瀷"
       :visible.sync="DeviceTypeDialogVisible"
       width="800px"
@@ -412,8 +418,8 @@
       @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"
@@ -473,9 +479,9 @@
         <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>
@@ -493,14 +499,15 @@
       />
       <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"
@@ -511,7 +518,7 @@
       @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"
@@ -595,9 +602,9 @@
         <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>
@@ -615,8 +622,8 @@
       />
       <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>
@@ -648,12 +655,15 @@
 } from '@/api/sbgl'
 import { handleDatetime, validateCode } from '@/utils/global'
 import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
 
 export default {
   name: 'SBQD',
   components: {
     Pagination, ImportPicker
   },
+  directives: { elDragDialog, waves },
   data() {
     return {
       mouseHoverType: 'mouseout',
@@ -992,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 })
@@ -1075,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({

--
Gitblit v1.9.3