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/kwdy.vue |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index e9a6a98..6f67058 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -25,9 +25,6 @@
             <el-form-item label="搴撲綅鎻忚堪" style=" display: flex;">
               <el-input v-model="form.description" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
-              <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
             <el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
               <el-select
                 v-model="form.stockcode"
@@ -44,6 +41,10 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+              <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+
           </div>
           <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
@@ -88,7 +89,12 @@
             prop="description"
             label="搴撲綅鎻忚堪"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description">{{ row.description }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="stock_name"
             label="鎵�灞炰粨搴�"
@@ -115,7 +121,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>
@@ -125,7 +131,6 @@
       </div>
       <!--鍒嗛〉-->
       <pagination
-        v-show="total>0"
         :total="total"
         :page.sync="form.page"
         :limit.sync="form.rows"
@@ -187,25 +192,14 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseSelect } from '@/api/wlgl'
+import { validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'KWDY',
   components: {
     Pagination
   },
   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,
@@ -236,7 +230,7 @@
       operation: '',
       dialogFormRules: {
         storagecode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         storagename: [
           { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -333,6 +327,9 @@
         DeleteStorageDef({ storagecode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getStorageDefSearch()
           }
         })

--
Gitblit v1.9.3