111

src/store/index.js

@@ -14,6 +14,7 @@ export default new Vuex.Store({
     // 所选择的farmId
     farmId: '',
     farmList: [],
+    userName: '',
   },
   mutations: {
     setColor(state, data) {
@@ -30,6 +31,9 @@ export default new Vuex.Store({
     },
     SET_FARMLIST(state, data) {
       state.farmList = data;
+    },
+    SET_USERNAME(state, data) {
+      state.userName = data;
     }
   },
   actions: {
@@ -42,6 +46,9 @@ export default new Vuex.Store({
     setFarmIdAsync(context,data) {
       context.commit('SET_FARMID', data)
     },
+    setUserNameAsync(context, data) {
+      context.commit('SET_USERNAME', data)
+    },
     // 获取用户按钮权限
     GetButtons({ commit }) {
       return new Promise((resolve, reject) => {

src/views/MainLayout.vue

@@ -51,7 +51,7 @@ export default {
     ...mapState(['color'])
   },
   methods: {
-    ...mapActions(['setModeAsync', 'setColorAsync', 'GetButtons', 'GetFarm']),
+    ...mapActions(['setModeAsync', 'setColorAsync', 'GetButtons', 'GetFarm', 'setUserNameAsync']),
     init() {
       let params = {
         id: localStorage.getItem('UserId'),
@@ -60,6 +60,7 @@ export default {
         if(res.code === 10000) {
           this.setModeAsync(res.data.mode);
           this.setColorAsync(res.data.color);
+          this.setUserNameAsync(res.data.userName)
         }
       })
     },

src/views/SystemAdmin/UserAdmin.vue

@@ -34,9 +34,6 @@
               prop="id"
               label="用户ID"
               width="80"></el-table-column>
-<!--          <el-table-column-->
-<!--              prop="userName"-->
-<!--              label="用户姓名"></el-table-column>-->
           <el-table-column prop="account" label="登录名"></el-table-column>
 <!--          <el-table-column label="性别">-->
 <!--            <template slot-scope="scope">-->
@@ -45,6 +42,7 @@
 <!--            </template>-->
 <!--          </el-table-column>-->
           <el-table-column prop="password" label="密码"></el-table-column>
+          <el-table-column prop="userName" label="用户姓名"></el-table-column>
 <!--          <el-table-column-->
 <!--              prop="birthday"-->
 <!--              label="出生日期"></el-table-column>-->
@@ -107,11 +105,14 @@
       <div>
         <el-form ref="form" :model="forms" label-width="80px" :rules="rules">
           <el-form-item label="登录名" prop="account">
-            <el-input v-model="forms.account" placeholder="默认手机号为登录名，如没有填写手机号则是用户姓名为登录名"></el-input>
+            <el-input v-model="forms.account" placeholder=""></el-input>
           </el-form-item>
-          <el-form-item label="密码" prop="account">
+          <el-form-item label="密码" prop="password">
             <el-input type="password" v-model="forms.password" ></el-input>
           </el-form-item>
+          <el-form-item label="用户姓名" prop="userName">
+            <el-input  v-model="forms.userName" ></el-input>
+          </el-form-item>
 <!--          <el-form-item label="性别">-->
 <!--            <el-radio-group v-model="forms.male">-->
 <!--              <el-radio :label="0">女</el-radio>-->
@@ -195,6 +196,7 @@ export default {
       size: 20,
       pageNum: 1,
       forms: {
+        userName: '',
         account: '',
         password: '',
         remark: '',
@@ -207,6 +209,8 @@ export default {
       },
       selectList: '',
       rules: {
+        account: [ { required: true, message: '请输入登录名', trigger: 'blur' },],
+        password: [ { required: true, message: '请输入密码', trigger: 'blur' },],
         userName: [ { required: true, message: '请输入用户姓名', trigger: 'blur' },]
       },
       dialogFarm: false,
@@ -297,6 +301,7 @@ export default {
         if (valid) {
           if(this.showType) {
             let params = {};
+            params.userName = this.forms.userName;
             params.account = this.forms.account;
             params.password = this.forms.password;
             params.male = this.forms.male;
@@ -319,6 +324,7 @@ export default {
                 })
           } else {
             let params = {};
+            params.userName = this.forms.userName;
             params.account = this.forms.account;
             params.password = this.forms.password;
             params.male = this.forms.male;
@@ -348,6 +354,7 @@ export default {
     // 重置
     reset() {
       this.forms = {
+        userName: '',
         account: '',
         password: '',
         remark: '',