From ea183f380aaea6a87d05d60d304afa83cfafa3a4 Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Wed, 17 Apr 2019 17:28:26 +0800
Subject: [PATCH] =?UTF-8?q?1.7=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                       |  6 +--
 src/views/system/dept/module/form.vue       | 15 +++++--
 src/views/system/dictDetail/module/form.vue | 15 ++++---
 src/views/system/job/module/form.vue        | 30 +++++++------
 src/views/system/menu/module/form.vue       |  8 ++--
 src/views/system/user/module/form.vue       | 48 ++++++++++-----------
 6 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1d6f369..3a08658 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -127,10 +127,10 @@ a:hover {
 
 .logo-con{
   height: 60px;
-  padding: 12px 0px 0px;
+  padding: 13px 0px 0px;
   img{
-    height: 35px;
-    width: 138px;
+    height: 32px;
+    width: 135px;
     display: block;
     margin: 0 auto;
   }
diff --git a/src/views/system/dept/module/form.vue b/src/views/system/dept/module/form.vue
index d694d28..aea5b8d 100644
--- a/src/views/system/dept/module/form.vue
+++ b/src/views/system/dept/module/form.vue
@@ -61,10 +61,17 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
+          if (this.form.pid) {
+            this.loading = true
+            if (this.isAdd) {
+              this.doAdd()
+            } else this.doEdit()
+          } else {
+            this.$message({
+              message: '上级部门不能为空',
+              type: 'warning'
+            })
+          }
         }
       })
     },
diff --git a/src/views/system/dictDetail/module/form.vue b/src/views/system/dictDetail/module/form.vue
index a6c34d5..ad1278e 100644
--- a/src/views/system/dictDetail/module/form.vue
+++ b/src/views/system/dictDetail/module/form.vue
@@ -7,8 +7,8 @@
       <el-form-item label="字典值">
         <el-input v-model="form.value" style="width: 370px;"/>
       </el-form-item>
-      <el-form-item label="排序">
-        <el-input v-model="form.sort" style="width: 370px;"/>
+      <el-form-item label="排序" prop="sort">
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -42,11 +42,14 @@ export default {
         id: '',
         label: '',
         value: '',
-        sort: '999'
+        sort: 999
       },
       rules: {
         label: [
           { required: true, message: '请输入字典标签', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
         ]
       }
     }
@@ -110,6 +113,8 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 </style>
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index bea5d15..ad3fbe9 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -5,7 +5,7 @@
         <el-input v-model="form.name" style="width: 370px;"/>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input v-model.number="form.sort" placeholder="序号越小越靠前" style="width: 370px;"/>
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
       </el-form-item>
       <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
         <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
@@ -68,22 +68,22 @@ export default {
       this.resetForm()
     },
     doSubmit() {
-      if (this.deptId === null || this.deptId === undefined) {
-        this.$message({
-          message: '所属部门不能为空',
-          type: 'warning'
-        })
-      } else {
-        this.form.dept.id = this.deptId
-        this.$refs['form'].validate((valid) => {
-          if (valid) {
+      this.form.dept.id = this.deptId
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.deptId === null || this.deptId === undefined) {
+            this.$message({
+              message: '所属部门不能为空',
+              type: 'warning'
+            })
+          } else {
             this.loading = true
             if (this.isAdd) {
               this.doAdd()
             } else this.doEdit()
           }
-        })
-      }
+        }
+      })
     },
     doAdd() {
       add(this.form).then(res => {
@@ -137,6 +137,8 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 </style>
diff --git a/src/views/system/menu/module/form.vue b/src/views/system/menu/module/form.vue
index cdde4b7..aa77000 100644
--- a/src/views/system/menu/module/form.vue
+++ b/src/views/system/menu/module/form.vue
@@ -18,7 +18,7 @@
         <el-input v-model="form.name" placeholder="名称" style="width: 460px;"/>
       </el-form-item>
       <el-form-item label="菜单排序" prop="sort">
-        <el-input v-model.number="form.sort" placeholder="序号越小越靠前" style="width: 460px;"/>
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 460px;"/>
       </el-form-item>
       <el-form-item label="内部菜单" prop="iframe">
         <el-radio v-model="form.iframe" label="false">是</el-radio>
@@ -141,6 +141,8 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 </style>
diff --git a/src/views/system/user/module/form.vue b/src/views/system/user/module/form.vue
index 3e2c814..9e918d0 100644
--- a/src/views/system/user/module/form.vue
+++ b/src/views/system/user/module/form.vue
@@ -110,26 +110,26 @@ export default {
       this.resetForm()
     },
     doSubmit() {
-      if (this.deptId === null || this.deptId === undefined) {
-        this.$message({
-          message: '部门不能为空',
-          type: 'warning'
-        })
-      } else if (this.jobId === null) {
-        this.$message({
-          message: '岗位不能为空',
-          type: 'warning'
-        })
-      } else if (this.roleIds.length === 0) {
-        this.$message({
-          message: '角色不能为空',
-          type: 'warning'
-        })
-      } else {
-        this.form.dept.id = this.deptId
-        this.form.job.id = this.jobId
-        this.$refs['form'].validate((valid) => {
-          if (valid) {
+      this.form.dept.id = this.deptId
+      this.form.job.id = this.jobId
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.deptId === null || this.deptId === undefined) {
+            this.$message({
+              message: '部门不能为空',
+              type: 'warning'
+            })
+          } else if (this.jobId === null) {
+            this.$message({
+              message: '岗位不能为空',
+              type: 'warning'
+            })
+          } else if (this.roleIds.length === 0) {
+            this.$message({
+              message: '角色不能为空',
+              type: 'warning'
+            })
+          } else {
             this.loading = true
             this.form.roles = []
             const _this = this
@@ -140,11 +140,11 @@ export default {
             if (this.isAdd) {
               this.doAdd()
             } else this.doEdit()
-          } else {
-            return false
           }
-        })
-      }
+        } else {
+          return false
+        }
+      })
     },
     doAdd() {
       add(this.form).then(res => {