Merge pull request #159 from wsczx/dev

新增本地用户过期时间设置

web/src/pages/user/List.vue

@@ -87,7 +87,8 @@
             width="70">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 1" type="success">可用</el-tag>
-            <el-tag v-else type="danger">停用</el-tag>
+            <el-tag v-if="scope.row.status === 0" type="danger">停用</el-tag>
+            <el-tag v-if="scope.row.status === 2" >过期</el-tag>
           </template>
         </el-table-column>
 
@@ -182,6 +183,17 @@
           <el-input v-model="ruleForm.pin_code" placeholder="不填由系统自动生成"></el-input>
         </el-form-item>
 
+        <el-form-item label="过期时间" prop="limittime">
+          <el-date-picker
+            v-model="ruleForm.limittime"
+            type="date"
+            size="small"
+            align="center"
+            style="width:130px"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        
         <el-form-item label="禁用OTP" prop="disable_otp">
           <el-switch
               v-model="ruleForm.disable_otp">
@@ -208,6 +220,7 @@
           <el-radio-group v-model="ruleForm.status">
             <el-radio :label="1" border>启用</el-radio>
             <el-radio :label="0" border>停用</el-radio>
+            <el-radio :label="2" border>过期</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -264,7 +277,6 @@ export default {
           {required: true, message: '请输入用户邮箱', trigger: 'blur'},
           {type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change']}
         ],
-
         password: [
           {min: 6, message: '长度大于 6 个字符', trigger: 'blur'}
         ],