zhangdan 4 년 전
부모
커밋
f40b6cdff5

+ 3 - 3
src/views/SupervisionAuth/role/roleList.vue

@@ -5,7 +5,7 @@
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
             <a-form-item label="角色名称">
-              <a-input allowClear v-model.trim="queryParam.name" @pressEnter="$refs.table.refresh(true)" id="roleList-name" placeholder="请输入角色名称"/>
+              <a-input allowClear v-model.trim="queryParam.name" @pressEnter="$refs.table.refresh(true)" id="roleList-name" placeholder="请输入角色名称30个字以内"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -50,7 +50,7 @@
       <span slot="action" slot-scope="text, record">
         <a class="action-button menu-text" @click="openMenuModal(record)" v-hasPermission="'M_power_role_menu'" id="roleList-openMenuModal">菜单权限</a>
         <a class="action-button" @click="handleEdit(record)" v-hasPermission="'B_supervision_role_edit'" id="roleList-handleEdit">修改</a>
-        <a v-if="!record.isEnable" class="action-button red-text" @click="delect(record)" v-hasPermission="'B_supervision_role_del'" id="roleList-delect">删除</a>
+        <a v-if="!record.isEnable && $hasPermission('B_supervision_role_del')" class="action-button red-text" @click="delect(record)" id="roleList-delect">删除</a>
       </span>
     </s-table>
     <!-- 新增、编辑角色弹窗 -->
@@ -203,7 +203,7 @@ export default {
       }
       updateEnableStatus(_data).then(res => {
         if (res.status == 200) {
-          this.$message.success('修改成功')
+          this.$message.success(res.message)
         } else {
           // this.$message.error(res.message)
           record.isEnable = !record.isEnable

+ 4 - 4
src/views/SupervisionAuth/role/roleModal.vue

@@ -10,7 +10,7 @@
             :maxLength="30"
             id="roleModal-name"
             v-decorator="['formData.name', {
-              initialValue: formData.name,
+              initialValue: formData.name,getValueFromEvent: $filterEmpty,
               rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
           />
         </a-form-item>
@@ -36,12 +36,12 @@
             id="roleModal-remarks"
             v-decorator="[
               'formData.remarks',
-              { initialValue: formData.remarks,
+              { initialValue: formData.remarks,getValueFromEvent: $filterEmpty,
                 rules: [] },
             ]"
             style="min-height: 60px;"
-            placeholder="输入内容512个字以内"
-            :maxLength="512"
+            placeholder="输入内容500个字以内"
+            :maxLength="500"
             autosize />
         </a-form-item>
 

+ 213 - 245
src/views/SupervisionAuth/user/userList.vue

@@ -1,252 +1,220 @@
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="员工姓名">
-              <a-input
-                allowClear
-                v-model.trim="queryParam.name"
-                id="userList-name"
-                :maxLength="30"
-                @pressEnter="$refs.table.refresh(true)"
-                placeholder="请输入员工姓名" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="手机号码">
-              <a-input
-                allowClear
-                v-model.trim="queryParam.phone"
-                id="userList-phone"
-                :maxLength="11"
-                @pressEnter="$refs.table.refresh(true)"
-                placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="状态">
-              <v-select code="ENABLE_FLAG" id="userList-loginFlag" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" style="margin-right: 10px;" id="userList-handSubmit">查询</a-button>
-            <a-button @click="reset" id="userList-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <a-divider />
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" v-hasPermission="'B_supervision_user_add'" id="userList-openModal">新建</a-button>
-    </div>
-    <s-table
-      :columns="columns"
-      :data="loadData"
-      ref="table"
-      size="default"
-      rowKey="id"
-      bordered>
-      <template slot="loginFlag" slot-scope="text">
-        <span :style="{ color: text == '1' ? '#12b512' : 'red' }">{{ text == '1' ? '已启用' : '已禁用' }}</span>
-      </template>
-      <span slot="action" slot-scope="text, record">
-        <!-- 点检关联门店 -->
-        <a-tooltip placement="bottom">
-          <template slot="title">
-            <span>编辑</span>
-          </template>
-          <a-icon type="edit" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record)" v-hasPermission="'B_supervision_user_edit'"/>
-        </a-tooltip>
-        <a-tooltip placement="bottom" v-if="record.storeSetFlag==1">
-          <template slot="title">
-            <span>关联点检门店</span>
-          </template>
-          <a-icon type="apartment" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="selectStore(record)" v-hasPermission="'M_supervision_user_spotCheckStore'"/>
-        </a-tooltip>
-        <a-tooltip placement="bottom" v-if="record.loginFlag==1">
-          <template slot="title">
-            <span>重置密码</span>
-          </template>
-          <a-icon type="unlock" style="font-size: 20px;color: #08c0de;padding: 0 10px;" @click="resetPassword(record)" v-hasPermission="'B_supervision_user_restPwd'"/>
-        </a-tooltip>
-        <a-tooltip placement="bottom">
-          <template slot="title">
-            <span>删除</span>
-          </template>
-          <a-icon type="delete" style="font-size: 20px;color: red;padding: 0 10px;" @click="delect(record)" v-hasPermission="'B_supervision_user_delete'"/>
-        </a-tooltip>
-      </span>
-    </s-table>
-    <!-- 新增用户弹窗 -->
-    <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :data="itemData" @close="showModal = false"></userModal>
-    <!-- 点检门店弹窗 已选门店 -->
-    <usedStoreModal :visible="showStoreModal" :userId="userId" @close="showStoreModal=false"></usedStoreModal>
-  </a-card>
+	<a-card :bordered="false">
+		<div class="table-page-search-wrapper">
+			<a-form layout="inline">
+				<a-row :gutter="48">
+					<a-col :md="6" :sm="24">
+						<a-form-item label="员工姓名">
+							<a-input allowClear v-model.trim="queryParam.name" id="userList-name" :maxLength="30" @pressEnter="$refs.table.refresh(true)"
+							 placeholder="请输入员工姓名30个字以内" />
+						</a-form-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-form-item label="手机号码">
+							<a-input allowClear v-model.trim="queryParam.phone" id="userList-phone" :maxLength="11" @pressEnter="$refs.table.refresh(true)"
+							 placeholder="请输入手机号码" />
+						</a-form-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-form-item label="状态">
+							<v-select code="ENABLE_FLAG" id="userList-loginFlag" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
+						</a-form-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-button type="primary" @click="$refs.table.refresh(true)" style="margin-right: 10px;" id="userList-handSubmit">查询</a-button>
+						<a-button @click="reset" id="userList-reset">重置</a-button>
+					</a-col>
+				</a-row>
+			</a-form>
+		</div>
+		<a-divider />
+		<div class="table-operator">
+			<a-button type="primary" icon="plus" @click="openModal" v-hasPermission="'B_supervision_user_add'" id="userList-openModal">新建</a-button>
+		</div>
+		<s-table :columns="columns" :data="loadData" ref="table" size="default" rowKey="id" bordered>
+			<template slot="loginFlag" slot-scope="text">
+				<span :style="{ color: text == '1' ? '#12b512' : 'red' }">{{ text == '1' ? '已启用' : '已禁用' }}</span>
+			</template>
+			<template slot="action" slot-scope="text, record">
+				<!-- 点检关联门店 -->
+				<a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)"
+				 v-hasPermission="'B_supervision_user_edit'" />
+				<a-icon type="apartment" title="关联点检门店" v-if="record.storeSetFlag==1" v-hasPermission="'M_supervision_user_spotCheckStore'"
+				 :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="selectStore(record)" />
+				<a-icon type="unlock" title="重置密码" v-if="record.loginFlag==1" v-hasPermission="'B_supervision_user_restPwd'" :style="{fontSize: '20px',color:' #08c0de',padding: '0 10px'}"
+				 @click="resetPassword(record)" />
+				<a-icon type="delete" title="删除" :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}" @click="delect(record)"
+				 v-hasPermission="'B_supervision_user_delete'" />
+			</template>
+		</s-table>
+		<!-- 新增用户弹窗 -->
+		<userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :data="itemData" @close="showModal = false"></userModal>
+		<!-- 点检门店弹窗 已选门店 -->
+		<usedStoreModal :visible="showStoreModal" :userId="userId" @close="showStoreModal=false"></usedStoreModal>
+	</a-card>
 </template>
 
 <script>
-import {
-  STable,
-  VSelect
-} from '@/components'
-import userModal from './userModal.vue'
-import usedStoreModal from './usedStoreModal.vue'
-import {
-  resetPSD,
-  getPowerUserList,
-  delectUserPower
-} from '@/api/supervision-user.js'
-export default {
-  name: 'UserList',
-  components: {
-    STable,
-    VSelect,
-    userModal,
-    usedStoreModal
-  },
-  data () {
-    return {
-      // 查询参数
-      queryParam: {
-        name: '', // 员工姓名
-        phone: '',	// 手机号码
-        loginFlag: ''	// 状态
-      },
-      showModal: false, // 新增弹框showModal控制打开或关闭  false--默认关闭  true--打开
-      showStoreModal: false,	// 点检门店弹框showStoreModal控制打开或关闭  false--默认关闭  true--打开
-      itemData: {}, // 编辑行数据
-      userId: '', // 用户id
-      columns: [{
-        title: '序号',
-        dataIndex: 'no',
-        width: 60,
-        align: 'center'
-      },
-      {
-        title: '创建时间',
-        dataIndex: 'createDate',
-        width: 200,
-        align: 'center'
-      },
-      {
-        title: '员工姓名',
-        dataIndex: 'name',
-        width: 150,
-        align: 'center'
-      },
-      {
-        title: '手机号码',
-        dataIndex: 'phone',
-        width: 150,
-        align: 'center'
-      },
-      {
-        title: '角色',
-        dataIndex: 'roleNames',
-        width: 200,
-        align: 'center'
-      },
-      {
-        title: '启用状态',
-        dataIndex: 'loginFlag',
-        width: 150,
-        align: 'center',
-        scopedSlots: {
-          customRender: 'loginFlag'
-        }
-      },
-      {
-        title: '操作',
-        dataIndex: 'action',
-        width: 200,
-        align: 'center',
-        scopedSlots: {
-          customRender: 'action'
-        }
-      }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-          }
-          return res.data
-        })
-      },
-      optionAlertShow: false
-    }
-  },
-  methods: {
-    // 刷新列表
-    refreshTable () {
-      this.$refs.table.refresh(true)
-    },
-    //  重置
-    reset () {
-      this.queryParam = {
-        name: '',
-        phone: '',
-        loginFlag: ''
-      }
-      this.$refs.table.refresh(true)
-    },
-    // 新建
-    openModal () {
-      this.itemData = {}
-      this.showModal = true
-    },
-    // 选择点检门店
-    selectStore (row) {
-      this.userId = row.id
-      this.showStoreModal = true
-    },
-    // 重置密码
-    resetPassword (row) {
-      resetPSD({
-        id: row.id
-      }).then(res => {
-        if (res.status == 200) {
-          this.$message.success(res.message)
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-    },
-    // 删除
-    delect (row) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '删除后数据无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          delectUserPower({
-            id: row.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.refreshTable()
-            } else {
-              _this.$message.error(res.message)
-            }
-          })
-        }
-      })
-    },
-    // 编辑
-    handleEdit (row) {
-      this.itemData = row
-      console.log(this.itemData)
-      this.showModal = true
-    }
-  }
-}
+	import {
+		STable,
+		VSelect
+	} from '@/components'
+	import userModal from './userModal.vue'
+	import usedStoreModal from './usedStoreModal.vue'
+	import {
+		resetPSD,
+		getPowerUserList,
+		delectUserPower
+	} from '@/api/supervision-user.js'
+	export default {
+		name: 'UserList',
+		components: {
+			STable,
+			VSelect,
+			userModal,
+			usedStoreModal
+		},
+		data() {
+			return {
+				// 查询参数
+				queryParam: {
+					name: '', // 员工姓名
+					phone: '', // 手机号码
+					loginFlag: '' // 状态
+				},
+				showModal: false, // 新增弹框showModal控制打开或关闭  false--默认关闭  true--打开
+				showStoreModal: false, // 点检门店弹框showStoreModal控制打开或关闭  false--默认关闭  true--打开
+				itemData: {}, // 编辑行数据
+				userId: '', // 用户id
+				columns: [{
+						title: '序号',
+						dataIndex: 'no',
+						width: 60,
+						align: 'center'
+					},
+					{
+						title: '创建时间',
+						dataIndex: 'createDate',
+						width: 200,
+						align: 'center'
+					},
+					{
+						title: '员工姓名',
+						dataIndex: 'name',
+						width: 150,
+						align: 'center'
+					},
+					{
+						title: '手机号码',
+						dataIndex: 'phone',
+						width: 150,
+						align: 'center'
+					},
+					{
+						title: '角色',
+						dataIndex: 'roleNames',
+						width: 200,
+						align: 'center'
+					},
+					{
+						title: '启用状态',
+						dataIndex: 'loginFlag',
+						width: 150,
+						align: 'center',
+						scopedSlots: {
+							customRender: 'loginFlag'
+						}
+					},
+					{
+						title: '操作',
+						dataIndex: 'action',
+						width: 200,
+						align: 'center',
+						scopedSlots: {
+							customRender: 'action'
+						}
+					}
+				],
+				// 加载数据方法 必须为 Promise 对象
+				loadData: parameter => {
+					return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
+						const no = (res.data.pageNo - 1) * res.data.pageSize
+						for (let i = 0; i < res.data.list.length; i++) {
+							const _item = res.data.list[i]
+							_item.no = no + i + 1
+						}
+						return res.data
+					})
+				},
+				optionAlertShow: false
+			}
+		},
+		methods: {
+			// 刷新列表
+			refreshTable() {
+				this.$refs.table.refresh(true)
+			},
+			//  重置
+			reset() {
+				this.queryParam = {
+					name: '',
+					phone: '',
+					loginFlag: ''
+				}
+				this.$refs.table.refresh(true)
+			},
+			// 新建
+			openModal() {
+				this.itemData = {}
+				this.showModal = true
+			},
+			// 选择点检门店
+			selectStore(row) {
+				this.userId = row.id
+				this.showStoreModal = true
+			},
+			// 重置密码
+			resetPassword(row) {
+				resetPSD({
+					id: row.id
+				}).then(res => {
+					if (res.status == 200) {
+						this.$message.success(res.message)
+					} else {
+						this.$message.error(res.message)
+					}
+				})
+			},
+			// 删除
+			delect(row) {
+				const _this = this
+				this.$confirm({
+					title: '提示',
+					content: '删除后数据无法恢复,确认删除?',
+					okText: '确定',
+					cancelText: '取消',
+					onOk() {
+						delectUserPower({
+							id: row.id
+						}).then(res => {
+							if (res.status == 200) {
+								_this.$message.success(res.message)
+								_this.refreshTable()
+							} else {
+								_this.$message.error(res.message)
+							}
+						})
+					}
+				})
+			},
+			// 编辑
+			handleEdit(row) {
+				this.itemData = row
+				console.log(this.itemData)
+				this.showModal = true
+			}
+		}
+	}
 </script>
 <style scoped>
 	.table-page-search-wrapper .ant-form-inline .ant-form-item {

+ 2 - 2
src/views/SupervisionAuth/user/userModal.vue

@@ -16,7 +16,7 @@
                 placeholder="请输入员工姓名30个字以内"
                 id="userModal-name"
                 v-decorator="['formData.name', {
-                  initialValue: formData.name,
+                  initialValue: formData.name,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入员工姓名30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
                 allowClear />
             </a-form-item>
@@ -29,7 +29,7 @@
                 :maxLength="11"
                 id="userModal-phone"
                 v-decorator="['formData.phone', {
-                  initialValue: formData.phone,
+                  initialValue: formData.phone,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]"
                 allowClear />
             </a-form-item>

+ 0 - 2
src/views/power/role/menuModal.vue

@@ -2,7 +2,6 @@
   <div>
     <a-modal class="modalBox" :title="roleName" v-model="isshow" @cancle="cancel">
       <a-form class="form-box" style="max-height: 600px;" :form="form" @submit="handleSubmit">
-
         <a-tree
           checkable
           @check="onCheck"
@@ -12,7 +11,6 @@
           v-model="checkedKeys"
           :treeData="treeData"
         />
-
       </a-form>
       <a-form-item :wrapper-col="{ offset: 15 }">
         <a-button type="primary" @click="handleSubmit()" id="menuModal-handleSubmit">

+ 6 - 5
src/views/power/role/roleList.vue

@@ -11,7 +11,7 @@
                 @pressEnter="$refs.table.refresh(true)"
                 :maxLehgth="30"
                 id="roleList-name"
-                placeholder="请输入角色名称"/>
+                placeholder="请输入角色名称30个字以内"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -51,7 +51,7 @@
           unCheckedChildren="禁用"
           id="roleList-changeFlagHandle"
           v-model="record.isEnable"
-          @change="changeFlagHandle(record)"
+          @change="changeFlagHandle(text,record)"
           v-hasPermission="'B_power_role_enable'"/>
       </span>
       <!-- 角色描述 -->
@@ -60,10 +60,10 @@
 
       </template>
       <span slot="action" slot-scope="text, record">
-        <template>
+        <template>  
           <a class="action-button menu-text" @click="openMenuModal(record)" id="roleList-openMenuModal" v-hasPermission="'M_power_role_menu'">菜单权限</a>
           <a class="action-button" @click="handleEdit(record)" id="roleList-handleEdit" v-hasPermission="'B_power_role_edit'">修改</a>
-          <a v-if="!record.isEnable" class="action-button red-text" id="roleList-delect" @click="delect(record)" v-hasPermission="'B_power_role_del'">删除</a>
+          <a v-if="!record.isEnable && $hasPermissions('B_power_role_del')" class="action-button red-text" id="roleList-delect" @click="delect(record)">删除</a>
         </template>
       </span>
     </s-table>
@@ -216,13 +216,14 @@ export default {
     },
     // 修改状态
     changeFlagHandle (text, record) {
+		console.log(record)
       const _data = {
         id: record.id,
         flag: record.isEnable ? '1' : '0'
       }
       updateEnableStatus(_data).then(res => {
         if (res.status == 200) {
-          this.$message.success('修改成功')
+          this.$message.success(res.message)
         } else {
           // this.$message.error(res.message)
           record.isEnable = !record.isEnable

+ 155 - 144
src/views/power/role/roleModal.vue

@@ -1,164 +1,175 @@
 <template>
-	<div>
-		<a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="45%">
-			<a-form :form="form" @submit="handleSubmit">
-				<!-- 用户名称 -->
-				<a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-					<a-input 
-					placeholder="请输入角色名称30个字以内"allowClear :maxLength="30" 
-					id="roleModal-name" v-decorator="['formData.name', {
-              initialValue: formData.name,
+  <div>
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="45%">
+      <a-form :form="form" @submit="handleSubmit">
+        <!-- 用户名称 -->
+        <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+          <a-input
+            placeholder="请输入角色名称30个字以内"
+            allowClear
+            :maxLength="30"
+            id="roleModal-name"
+            v-decorator="['formData.name', {
+              initialValue: formData.name,getValueFromEvent: $filterEmpty,
               rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]" />
-				</a-form-item>
-				<!-- 状态 -->
-				<a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-					<a-radio-group name="radioGroup" id="roleModal-isEnable" v-decorator="[
+        </a-form-item>
+        <!-- 状态 -->
+        <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+          <a-radio-group
+            name="radioGroup"
+            id="roleModal-isEnable"
+            v-decorator="[
               'formData.isEnable',
               {
                 initialValue: formData.isEnable,
                 rules: [{ required: true, message: '请选择状态!' }] },
             ]">
-						<a-radio :value="1">启用</a-radio>
-						<a-radio :value="0">禁用</a-radio>
-					</a-radio-group>
-				</a-form-item>
-				<a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-					<a-textarea id="roleModal-remarks" v-decorator="[
+            <a-radio :value="1">启用</a-radio>
+            <a-radio :value="0">禁用</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+          <a-textarea
+            id="roleModal-remarks"
+            v-decorator="[
               'formData.remarks',
-              { initialValue: formData.remarks,
+              { initialValue: formData.remarks,getValueFromEvent: $filterEmpty,
                 rules: [] },
             ]"
-					 style="min-height: 60px;" placeholder="输入内容512个字以内" :maxLength="512" autosize />
-				</a-form-item>
+            style="min-height: 60px;"
+            placeholder="输入内容500个字以内"
+            :maxLength="500"
+            autosize />
+        </a-form-item>
 
-				<a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-					<a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit">
-						保存
-					</a-button>
-					<a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="roleModal-handleCancel">
-						取消
-					</a-button>
-				</a-form-item>
-			</a-form>
+        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
+          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit">
+            保存
+          </a-button>
+          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="roleModal-handleCancel">
+            取消
+          </a-button>
+        </a-form-item>
+      </a-form>
 
-		</a-modal>
-	</div>
+    </a-modal>
+  </div>
 </template>
 
 <script>
-	import {
-		STable,
-		VSelect
-	} from '@/components'
-	import {
-		saveRolePower
-	} from '@/api/power-role.js'
-	export default {
-		name: 'RoleModal',
-		components: {
-			STable,
-			VSelect
-		},
-		props: {
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			data: {
-				type: Object,
-				default: function() {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				titleText: '添加角色',
-				isshow: this.visible,
-				formLayout: 'horizontal',
-				form: this.$form.createForm(this, {
-					name: 'roleModal'
-				}),
-				formData: {
-					name: '',
-					isEnable: '', // 活动状态
-					remarks: ''
-				}
+import {
+  STable,
+  VSelect
+} from '@/components'
+import {
+  saveRolePower
+} from '@/api/power-role.js'
+export default {
+  name: 'RoleModal',
+  components: {
+    STable,
+    VSelect
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      titleText: '添加角色',
+      isshow: this.visible,
+      formLayout: 'horizontal',
+      form: this.$form.createForm(this, {
+        name: 'roleModal'
+      }),
+      formData: {
+        name: '',
+        isEnable: '', // 活动状态
+        remarks: ''
+      }
 
-			}
-		},
-		methods: {
-			cancel(e) {
-				this.clear()
-				this.$emit('close')
-			},
-			// 保存提交
-			handleSubmit() {
-				const _this = this
-				this.form.validateFields((err, values) => {
-					if (!err) {
-						saveRolePower(Object.assign(this.formData, values.formData)).then(res => {
-							if (res.status == 200) {
-								this.$message.success(res.message ? res.message : '保存成功')
-								this.$emit('refresh')
-								setTimeout(function() {
-									_this.cancel()
-								}, 300)
-							} else {
-								// this.$message.error(res.message)
-							}
-						})
-					}
-				})
-			},
-			// 取消
-			handleCancel() {
-				const _this = this
-				this.$confirm({
-					title: '提示',
-					content: '确定取消吗?',
-					okText: '确定',
-					cancelText: '取消',
-					onOk() {
-						_this.clear()
-						_this.cancel()
-					}
-				})
-			},
-			clear() {
-				this.form.resetFields()
-				delete this.formData.id
-				this.formData.name = ''
-				this.formData.isEnable = ''
-				this.formData.remarks = ''
-			}
+    }
+  },
+  methods: {
+    cancel (e) {
+      this.clear()
+      this.$emit('close')
+    },
+    // 保存提交
+    handleSubmit () {
+      const _this = this
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          saveRolePower(Object.assign(this.formData, values.formData)).then(res => {
+            if (res.status == 200) {
+              this.$message.success(res.message ? res.message : '保存成功')
+              this.$emit('refresh')
+              setTimeout(function () {
+                _this.cancel()
+              }, 300)
+            } else {
+              // this.$message.error(res.message)
+            }
+          })
+        }
+      })
+    },
+    // 取消
+    handleCancel () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确定取消吗?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          _this.clear()
+          _this.cancel()
+        }
+      })
+    },
+    clear () {
+      this.form.resetFields()
+      delete this.formData.id
+      this.formData.name = ''
+      this.formData.isEnable = ''
+      this.formData.remarks = ''
+    }
 
-		},
-		beforeCreate() {
-			this.form = this.$form.createForm(this, {
-				name: 'roleModal'
-			})
-		},
-		watch: {
-			visible(newValue, oldValue) {
-				this.isshow = newValue
-			},
-			isshow(newValue, oldValue) {
-				if (newValue) {
-					if (this.data.id) { // 编辑
-						this.titleText = '编辑角色'
-						this.formData = Object.assign({}, this.data)
-						delete this.formData.no
-						this.formData.isEnable = Number(this.formData.isEnable)
-					} else {
-						this.titleText = '添加角色'
-					}
-				} else {
-					this.cancel()
-				}
-			}
-		}
-	}
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this, {
+      name: 'roleModal'
+    })
+  },
+  watch: {
+    visible (newValue, oldValue) {
+      this.isshow = newValue
+    },
+    isshow (newValue, oldValue) {
+      if (newValue) {
+        if (this.data.id) { // 编辑
+          this.titleText = '编辑角色'
+          this.formData = Object.assign({}, this.data)
+          delete this.formData.no
+          this.formData.isEnable = Number(this.formData.isEnable)
+        } else {
+          this.titleText = '添加角色'
+        }
+      } else {
+        this.cancel()
+      }
+    }
+  }
+}
 </script>
 
 <style>

+ 13 - 11
src/views/power/user/userList.vue

@@ -9,7 +9,7 @@
                 allowClear
                 v-model.trim="queryParam.name"
                 @pressEnter="$refs.table.refresh(true)"
-                placeholder="请输入用户名称"
+                placeholder="请输入用户名称30个字以内"
                 :maxLength="30"
                 id="userList-name"/>
             </a-form-item>
@@ -56,7 +56,13 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)" v-hasPermission="'B_power_user_enable'"/>
+        <a-switch
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          id="userList-loginFlag"
+          v-model="record.loginFlag"
+          @change="changeFlagHandle(text, record)"
+          v-hasPermission="'B_power_user_enable'"/>
       </span>
       <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
@@ -67,7 +73,7 @@
           <div >
             <a class="action-button" @click="handleEdit(record)" v-hasPermission="'B_power_user_edit'">修改</a>
             <a v-if="record.loginFlag" class="action-button reset-text" @click="resetPassword(record)" v-hasPermission="'B_power_user_resetPsd'">重置密码</a>
-            <a v-if="!record.loginFlag" class="action-button red-text" @click="delect(record)" v-hasPermission="'B_power_user_del'">删除</a>
+            <a v-if="!record.loginFlag && $hasPermissions('B_power_user_del')" class="action-button red-text" @click="delect(record)">删除</a>
           </div>
         </template>
       </span>
@@ -197,13 +203,9 @@ export default {
             id: row.id
           }).then(res => {
             if (res.status == 200) {
-              _this.$message.success('删除成功')
+              _this.$message.success(res.message)
               _this.$refs.table.refresh()
-            } else {
-              _this.$message.error(res.message)
             }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
           })
         }
       })
@@ -235,10 +237,10 @@ export default {
         flag: record.loginFlag ? '1' : '0'
       }
       updateEnableStatus(_data).then(res => {
-        if (res.status + '' === '200') {
-          this.$message.success('修改成功')
+        if (res.status == 200) {
+          this.$message.success(res.message)
         } else {
-          this.$message.error(res.message)
+          // this.$message.error(res.message)
           record.loginFlag = !record.loginFlag
         }
       })

+ 5 - 5
src/views/power/user/userModal.vue

@@ -11,7 +11,7 @@
                 allowClear
                 id="userModal-name"
                 v-decorator="['formData.name', {
-                  initialValue: formData.name,
+                  initialValue: formData.name,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入用户名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多20个字符'}] }]" />
             </a-form-item>
           </a-col>
@@ -24,7 +24,7 @@
                 :maxLength="11"
                 id="userModal-phone"
                 v-decorator="['formData.phone', {
-                  initialValue: formData.phone,
+                  initialValue: formData.phone,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入手机号码!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的手机号码!'}] }]" />
             </a-form-item>
           </a-col>
@@ -89,15 +89,15 @@
             <a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
               <a-textarea
                 id="userModal-remarks"
-                :maxLength="512"
+                :maxLength="500"
                 v-decorator="[
                   'formData.remarks',
                   {
-                    initialValue: formData.remarks,
+                    initialValue: formData.remarks,getValueFromEvent: $filterEmpty,
                     rules: [] },
                 ]"
                 style="min-height: 50px;"
-                placeholder="输入内容为512个字以内"
+                placeholder="输入内容为500个字以内"
                 autosize />
             </a-form-item>
           </a-col>