From 80ceeb55d8ea7beaa7c0711234152e1b4b346777 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 6 Aug 2021 15:56:53 +0800
Subject: [PATCH] =?UTF-8?q?el-form-item=20=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/global.scss                  | 10 ++++++++++
 src/views/common/login.vue                   |  2 +-
 src/views/modules/sys/user-add-or-update.vue | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index a468312..747b763 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -100,3 +100,13 @@
 /* el-dialog  end*/
 
 
+/* el-form-item 间距 start*/
+.el-form-item__content {
+  line-height: 40px;
+  position: relative;
+  font-size: 14px;
+  margin-top: -20px;
+}
+/* el-form-item 间距 end*/
+
+
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 375306f..e945f9f 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -81,7 +81,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   .site-wrapper.site-page--login {
     position: absolute;
     top: 0;
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 2ccf068..fa4a23f 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -6,7 +6,7 @@
     :close-on-click-modal="false"
     :visible.sync="visible">
     <!-- 取消    :rules="dataRule"-->
-    <el-form :model="dataForm"  ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+    <el-form :model="dataForm" label-position="top"  ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
       <el-form-item label="用户名" prop="userName">
         <el-input v-model="dataForm.userName" placeholder="登录帐号"></el-input>
       </el-form-item>
@@ -22,6 +22,11 @@
       <el-form-item label="手机号" prop="mobile">
         <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
       </el-form-item>
+      <el-form-item label="工厂" size="mini" prop="site">
+        <el-checkbox-group v-model="dataForm.site">
+          <el-checkbox v-for="item in factorys" :key="item.id" :label="role.roleId">{{ role.roleName }}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
       <el-form-item label="角色" size="mini" prop="roleIdList">
         <el-checkbox-group v-model="dataForm.roleIdList">
           <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{ role.roleName }}</el-checkbox>
@@ -43,6 +48,7 @@
 
 <script>
   import { isEmail, isMobile } from '@/utils/validate'
+  import {getFactory} from "@/api/factory";
   export default {
     data () {
       var validatePassword = (rule, value, callback) => {
@@ -78,6 +84,7 @@
       return {
         visible: false,
         roleList: [],
+        factorys: [],
         dataForm: {
           id: 0,
           userName: '',
@@ -87,7 +94,8 @@
           email: '',
           mobile: '',
           roleIdList: [],
-          status: 1
+          status: 1,
+          site: 0
         },
         dataRule: {
           userName: [
@@ -111,8 +119,15 @@
       }
     },
     methods: {
+      // 获取工厂信息
+      factoryList(){
+        getFactory().then((data) =>{
+          this.factorys = data.list
+        })
+      },
       init (id) {
         this.dataForm.id = id || 0
+        this.factoryList()
         this.$http({
           url: this.$http.adornUrl('/sys/role/select'),
           method: 'get',