From 9adc1a40bfe384a1ac699c9f2e5693faebfb4628 Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Thu, 21 May 2020 14:15:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profile/componments/query-form/index.vue  |  9 ++++-----
 .../modules/sys/menu/menu-add-or-update.vue   | 20 ++++++++++++-------
 .../modules/sys/user/user-add-or-update.vue   | 11 ++++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/staff/profile/componments/query-form/index.vue b/src/views/modules/staff/profile/componments/query-form/index.vue
index 2ffb634..3ba627e 100644
--- a/src/views/modules/staff/profile/componments/query-form/index.vue
+++ b/src/views/modules/staff/profile/componments/query-form/index.vue
@@ -14,7 +14,7 @@
 
       <el-form-item :label="`选择时间段\n(仅对员工数量生效)`">
         <el-date-picker
-          v-model="formInline.value2"
+          v-model="formInline.value"
           type="daterange"
           align="right"
           value-format="yyyy-MM-dd"
@@ -60,7 +60,7 @@ export default {
         label: 'name'
       },
       formInline: {
-        value2: []
+        value: []
       },
       pickerOptions: {
         shortcuts: [{
@@ -107,9 +107,8 @@ export default {
   mounted () { },
   methods: {
     changeData (data) {
-      console.log('data: ', data)
-      // this.formInline.beginDate = data[0]
-      // this.formInline.endDate = data[1]
+      this.formInline.beginDate = data[0]
+      this.formInline.endDate = data[1]
     },
     // 获取侧边架构列表
     async handleGetMenuList () {
diff --git a/src/views/modules/sys/menu/menu-add-or-update.vue b/src/views/modules/sys/menu/menu-add-or-update.vue
index c0c5aae..a5a40d1 100644
--- a/src/views/modules/sys/menu/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu/menu-add-or-update.vue
@@ -65,12 +65,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type !== 2" label="排序号" prop="orderNum">
-        <el-input-number
-          v-model.number="dataForm.orderNum"
-          controls-position="right"
-          :min="0"
-          label="排序号"
-        ></el-input-number>
+        <el-input v-model.number="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input>
       </el-form-item>
 
       <el-form-item v-if="dataForm.type !== 2" label="菜单图标" prop="icon">
@@ -139,6 +134,16 @@ export default {
         callback()
       }
     }
+
+    let validatNumber = (rule, value, callback) => {
+      console.log('value: ', value)
+      console.log('rule: ', rule)
+      if (!/^[1-9]\d*$/.test(value)) {
+        callback(new Error('只能输入正整数'))
+      } else {
+        callback()
+      }
+    }
     return {
       visible: false,
       visiblePopover: false,
@@ -157,7 +162,8 @@ export default {
       dataRule: {
         name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
         parentName: [{ required: true, message: '上级菜单不能为空', trigger: 'change' }],
-        url: [{ validator: validateUrl, trigger: 'blur' }]
+        url: [{ validator: validateUrl, trigger: 'blur' }],
+        orderNum: [{ required: true, validator: validatNumber, trigger: 'blur' }]
       },
       menuList: [],
       menuListTreeProps: {
diff --git a/src/views/modules/sys/user/user-add-or-update.vue b/src/views/modules/sys/user/user-add-or-update.vue
index cd90621..17165c3 100644
--- a/src/views/modules/sys/user/user-add-or-update.vue
+++ b/src/views/modules/sys/user/user-add-or-update.vue
@@ -105,6 +105,13 @@ export default {
         callback()
       }
     }
+    let validateRole = (rule, value, callback) => {
+      if (value.length < 1) {
+        callback(new Error('至少选择一个角色。'))
+      } else {
+        callback()
+      }
+    }
     return {
       visible: false,
       roleList: [],
@@ -130,6 +137,10 @@ export default {
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
           { validator: validateMobile, trigger: 'blur' }
+        ],
+        roleIdList: [
+          { required: true, message: '至少选择一个角色类型', trigger: 'blur' },
+          { validator: validateRole, trigger: 'blur' }
         ]
       },
       apiType: '' // api类型