ysy %!s(int64=2) %!d(string=hai) anos
pai
achega
929a586664

+ 12 - 5
src/views/login/index.vue

@@ -19,7 +19,7 @@
           clearable
           v-model="form.loginName"
           prefix-icon="el-icon-user"
-          :placeholder="$t('login.loginName')"
+          placeholder="请输入登录账号"
         />
       </el-form-item>
       <el-form-item prop="loginPwd">
@@ -27,7 +27,7 @@
           show-password
           v-model="form.loginPwd"
           prefix-icon="el-icon-lock"
-          :placeholder="$t('login.loginPwd')"
+          placeholder="请输入登录密码"
         />
       </el-form-item>
       <!-- <el-form-item prop="code">
@@ -123,9 +123,9 @@
         loading: false,
         // 表单数据
         form: {
-          loginName: 'aaa',
-          loginPwd: '123456',
-          remember: true
+          loginName: localStorage.getItem('accountInfo') ? JSON.parse(localStorage.getItem('accountInfo')).loginName : '',
+          loginPwd:localStorage.getItem('accountInfo') ?  JSON.parse(localStorage.getItem('accountInfo')).loginPwd: '',
+          remember: localStorage.getItem('accountInfo') ?  JSON.parse(localStorage.getItem('accountInfo')).remember : false,
         },
         // 验证码base64数据
         captcha: '',
@@ -179,6 +179,13 @@
               this.$store.commit('user/setUserInfo', res.data);
               this.loading = false;
               this.$message.success(res.message);
+
+              if(this.form.remember) {
+                localStorage.setItem('accountInfo', JSON.stringify(this.form));
+              } else {
+                localStorage.removeItem('accountInfo');
+              }
+
               this.goHome();
             })
             .catch((e) => {

+ 12 - 8
src/views/system/organization/components/org-user-edit.vue

@@ -46,6 +46,15 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="岗位:" prop="postName">
+            <el-input
+              clearable
+              :maxlength="100"
+              v-model="form.postName"
+              placeholder="请输入岗位"
+            />
+          </el-form-item>
+
           <el-form-item label="工种:" prop="workTypeId">
             <DictSelection dictName="工种" clearable filterable v-model="form.workTypeId">
             </DictSelection>
@@ -131,6 +140,7 @@
               clearable
               class="ele-block"
               v-model="form.accountId"
+              filterable
               placeholder="请选择用户账号"
               v-else
             >
@@ -169,14 +179,7 @@
               onkeyup="value=value.replace(/[^\d.]/g,'')"
             />
           </el-form-item>
-          <el-form-item label="岗位名称:" prop="postName">
-            <el-input
-              clearable
-              :maxlength="100"
-              v-model="form.postName"
-              placeholder="请输入岗位名称"
-            />
-          </el-form-item>
+
         </el-col>
       </el-row>
     </el-form>
@@ -236,6 +239,7 @@
             { pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur' }
           ],
           phone: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
             { pattern: phoneReg, message: '手机号格式不正确', trigger: 'blur' }
           ],
           jobNumber: [