20190122

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -23,6 +23,7 @@
         <result column="config" property="config" jdbcType="VARCHAR"/>
         <result column="mis_child" property="misChild" jdbcType="VARCHAR"/>
         <result column="inherit_flag" property="inheritFlag" jdbcType="CHAR"/>
+        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
@@ -31,7 +32,7 @@
     <sql id="Base_Column_List">
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
         country, province, city, district, create_time, del_flag, work_number, config,
-        mis_child, inherit_flag, password
+        mis_child, inherit_flag, password, use_flag
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -114,6 +115,9 @@
             <if test="inheritFlag != null">
                 inherit_flag,
             </if>
+            <if test="useFlag != null">
+                use_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -182,6 +186,9 @@
             <if test="inheritFlag != null">
                 #{inheritFlag,jdbcType=CHAR},
             </if>
+            <if test="useFlag != null">
+                #{useFlag,jdbcType=CHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -250,6 +257,9 @@
             <if test="inheritFlag != null">
                 inherit_flag = #{inheritFlag,jdbcType=CHAR},
             </if>
+            <if test="useFlag != null">
+                use_flag = #{useFlag,jdbcType=CHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -314,6 +324,9 @@
             <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
                 and del_flag = #{record.delFlag}
             </if>
+            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
+                and use_flag = #{record.useFlag}
+            </if>
         </where>
         order by id desc
     </select>

src/main/java/com/izouma/awesomeadmin/model/UserInfo.java

@@ -61,6 +61,8 @@ public class UserInfo {
 
     private String inheritFlag;
 
+    private String useFlag;
+
     public String getToken() {
         return token;
     }
@@ -252,5 +254,13 @@ public class UserInfo {
     public void setInheritFlag(String inheritFlag) {
         this.inheritFlag = inheritFlag;
     }
+
+    public String getUseFlag() {
+        return useFlag;
+    }
+
+    public void setUseFlag(String useFlag) {
+        this.useFlag = useFlag;
+    }
 }
 

src/main/vue/src/pages/User.vue

@@ -45,8 +45,15 @@
                 <el-date-picker v-model="formData.createTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">
                 </el-date-picker>
             </el-form-item>
+
+            <el-form-item prop="useFlag" label="可用">
+                <el-switch v-model="formData.useFlag" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+            </el-form-item>
+
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
         </el-form>
@@ -75,6 +82,7 @@ export default {
                     this.formData = res.data;
 
                     this.formData.inheritFlag = this.formData.inheritFlag == 'Y' ? true : false;
+                    this.formData.useFlag = this.formData.useFlag == 'Y' ? true : false;
                 }
             })
         }
@@ -114,6 +122,7 @@ export default {
         return {
             saving: false,
             formData: {
+                useFlag: 'Y',
                 departId: []
             },
             rules: {
@@ -162,6 +171,7 @@ export default {
             this.formData.misChild = this.$refs.misChildTree.getCheckedKeys(false).join();
             var data = JSON.parse(JSON.stringify(this.formData));
             data.inheritFlag = this.formData.inheritFlag ? 'Y' : 'N';
+            data.useFlag = this.formData.useFlag ? 'Y' : 'N';
 
             this.$http.post({
                 url: this.formData.id ? '/userInfo/update' : '/userInfo/save',
@@ -174,7 +184,25 @@ export default {
                     this.$message.warning('失败')
                 }
             });
-        }
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/userInfo/del',
+                    data: { id: this.formData.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+
     }
 }
 </script>

src/main/vue/src/pages/Users.vue

@@ -43,6 +43,8 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('sex')" prop="sex" label="性别" min-width="300">
             </el-table-column>
+            <el-table-column  prop="useFlag" label="可用" min-width="100">
+            </el-table-column>
             <!-- <el-table-column v-if="isColumnShow('openId')" prop="openId" label="openId" min-width="300">
             </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right" width="200">