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/zlgl/qxdy.vue |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 1c9e717..d23a90f 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -2,7 +2,7 @@
   <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-download" @click="upload">瀵煎叆</el-button>
       </div>
@@ -68,7 +68,12 @@
             prop="descr"
             label="缂洪櫡鎻忚堪"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.descr">{{ row.descr }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
@@ -148,25 +153,14 @@
 import Pagination from '@/components/Pagination'
 import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/zlgl'
 import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'QXDY',
   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('浠g爜涓嶈兘涓轰腑鏂�'))
-        } else {
-          callback()
-        }
-      }
-    }
     return {
       mainHeight: 0,
       tableHeight: 0,
@@ -190,7 +184,7 @@
       operation: '',
       dialogFormRules: {
         defectcode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         defectname: [
           { required: true, message: '璇疯緭鍏ョ己闄峰悕绉�', trigger: ['blur', 'change'] }
@@ -279,6 +273,9 @@
         DeleteDedect({ defectcode: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getDedectSearch()
           }
         })

--
Gitblit v1.9.3