From 7eaee0f58448459250b7cb0164c796ad597f9bdf Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 26 Apr 2023 13:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/reportManager/labelModal.vue | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index bfce037..2a2262f 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -3,19 +3,19 @@
         <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
             <div class="form">
                 <el-form ref="form" :model="form" label-width="80px" :rules="rule">
-                    <el-form-item label="上级标签">
+                    <el-form-item label="上级标签" prop="nodeLabel">
                         <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable >
                         </el-cascader>
                     </el-form-item>
 
                     <el-form-item label="标签名称" prop="label">
-                        <el-input v-model="form.label"></el-input>
+                        <el-input v-model="form.label" max="100"  placeholder="请输入标签名称"></el-input>
                     </el-form-item>
-                    <el-form-item label="排序">
-                        <el-input v-model="form.orderNum"></el-input>
+                    <el-form-item label="排序" prop="orderNum">
+                        <el-input v-model="form.orderNum" placeholder="请输入排序"></el-input>
                     </el-form-item>
-                    <el-form-item label="备注">
-                        <el-input v-model="form.remark"></el-input>
+                    <el-form-item label="备注" prop="remark">
+                        <el-input v-model="form.remark" max="100" placeholder="请输入备注"></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button @click="cancel" class="btn">取消</el-button>
@@ -36,6 +36,16 @@
 export default {
     name: 'labelModal',
     data() {
+      var checkNum = (rule, value, callback) => {
+        setTimeout(() => {
+          let test=/^[1-9]\d*$/
+          if (!test.test(value)) {
+            callback(new Error('请输入数字'));
+          } else {
+            callback()
+          }
+        }, 1000)
+      }
         return {
             dialogVisible: false,
             form: {
@@ -49,14 +59,17 @@ export default {
 
                 ],
             rule: {
-                name: [
+                label: [
                     { required: true, trigger: 'blur', message: '请输入标签名称' }
                 ],
-                resource: [
-                    {
-                        required: true, trigger: 'change', message: '请选择标签属性'
-                    }
-                ]
+              nodeLabel: [
+                    { required: true, trigger: 'change', message: '请选择上级标签' }
+                ],
+                orderNum: [
+                     { required: true, trigger: 'change', message: '请输入排序' },
+                     { validator:checkNum , trigger: 'change'}
+                ],
+
             },
         };
     },
@@ -88,11 +101,19 @@ export default {
                 this.$refs.form.clearValidate('name')
                 this.$forceUpdate()
             } else {
-                this.form = {}
+                this.form = {
+                  label:undefined,
+                  name:'',
+                  sort:'',
+                  orderNum:'',
+                  remark:''
+                }
+                this.$refs.form.clearValidate()
                 this.$forceUpdate()
+
             }
           })
-          
+
         },
         cancel() {
             this.dialogVisible = false