From 963754a29e51e3958e8d3064dc9a589165c99e0f Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 26 Apr 2023 14:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=B1=95=E7=A4=BA=E5=BD=A2=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/reportManager/labelModal.vue | 69 +++++++++++--------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index 2a2262f..df35a73 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -2,16 +2,16 @@
     <div>
         <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="上级标签" prop="nodeLabel">
+                <el-form ref="form" :model="form" label-width="80px" >
+                    <el-form-item label="上级标签" prop="nodeLabel" required>
                         <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-form-item label="标签名称" prop="label" required>
                         <el-input v-model="form.label" max="100"  placeholder="请输入标签名称"></el-input>
                     </el-form-item>
-                    <el-form-item label="排序" prop="orderNum">
+                    <el-form-item label="排序" prop="orderNum" required>
                         <el-input v-model="form.orderNum" placeholder="请输入排序"></el-input>
                     </el-form-item>
                     <el-form-item label="备注" prop="remark">
@@ -36,16 +36,7 @@
 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: {
@@ -58,22 +49,42 @@ export default {
             cascaderOptions:[
 
                 ],
-            rule: {
-                label: [
-                    { required: true, trigger: 'blur', message: '请输入标签名称' }
-                ],
-              nodeLabel: [
-                    { required: true, trigger: 'change', message: '请选择上级标签' }
-                ],
-                orderNum: [
-                     { required: true, trigger: 'change', message: '请输入排序' },
-                     { validator:checkNum , trigger: 'change'}
-                ],
-
-            },
+            // rule: {
+            //     label: [
+            //         { required: true, trigger: 'blur', message: '请输入标签名称' }
+            //     ],
+            //     nodeLabel: [
+            //         { required: true, trigger: 'change', message: '请选择上级标签' }
+            //     ],
+            //     orderNum: [
+            //          { required: true, trigger: 'change', message: '请输入排序' },
+            //          { validator:checkNum , trigger: 'change'}
+            //     ],
+            //
+            // },
         };
     },
     methods: {
+      // 必填项
+      checkReportF() {
+        let test=/^[1-9]\d*$/
+        if (!this.form.label) {
+          return this.$message.warning('请检查标签名称') && false;
+        }
+        if (!this.form.nodeLabel) {
+          return this.$message.warning('请检查上级标签') && false;
+        }
+        if (!this.form.orderNum) {
+          return this.$message.warning('请检查排序') && false;
+        }
+        if (!this.form.orderNum) {
+          return this.$message.warning('请检查排序') && false;
+        }
+        if(!test.test(this.form.orderNum)){
+          return this.$message.warning('排序只能输入数字！') && false;
+        }
+        return true;
+      },
         handleClose(done) {
             // this.$confirm('确认关闭？')
             //   .then(_ => {
@@ -119,8 +130,7 @@ export default {
             this.dialogVisible = false
         },
         submitForm() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
+          if (this.checkReportF()) {
                     this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1]
                     delete this.form.nodeLabel
                     if(!this.form.id){
@@ -147,7 +157,6 @@ export default {
                     }
                     this.dialogVisible = false
                 }
-            })
         }
     }
 }