From 5eeb8864bebb1dc4f97f2feef32b742d8a9a10d5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 14 九月 2022 15:43:04 +0800
Subject: [PATCH] 1.新增报表管理菜单

---
 src/views/wlgl/ckdy.vue |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 0e9d923..f58855d 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -2,14 +2,17 @@
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
 
-      <div class="bodyTopButtonGroup">
+      <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
-          icon="el-icon-refresh-right"
-          @click="syncSeaveSearchWhareHouseLocation"
-        >鍚屾浠撳簱/搴撲綅
-        </el-button>
-        <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        <div style="display: flex">
+          <el-button
+            icon="el-icon-refresh-right"
+            @click="syncSeaveSearchWhareHouseLocation"
+          >鍚屾浠撳簱/搴撲綅
+          </el-button>
+          <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        </div>
+
       </div>
 
       <div class="bodyTopFormGroup">
@@ -103,7 +106,7 @@
                 <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
                   <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                 </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
                   <i class="el-icon-delete" @click="del(row)" />
                 </el-tooltip>
               </div>
@@ -162,25 +165,14 @@
 import { AddUpdateWareHouseDef, DeleteWareHouseDef, WareHouseDefSearch } from '@/api/wlgl'
 import { SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
 import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'CKDY',
   components: {
     Pagination, ImportPicker
   },
   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 {
       mainHeight: 0,
       tableHeight: 0,
@@ -207,7 +199,7 @@
       operation: '',
       dialogFormRules: {
         warehousecode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         warehousename: [
           { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -322,6 +314,9 @@
         DeleteWareHouseDef({ warehousecode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getWareHouseDefSearch()
           }
         })

--
Gitblit v1.9.3