合并

VUECODE/smart-property-manage/src/views/account/user/addUser.vue

@@ -54,7 +54,7 @@ export default {
         children: 'children'
       },
       rules: {
-        roleName: [
+        userName: [
           { required: true, message: '名称', trigger: 'blur' }
         ],
         loginName: [

VUECODE/smart-property-manage/src/views/account/user/index.vue

@@ -34,8 +34,8 @@
       <el-table-column prop="createNmae" label="创建人" align="center"/>
       <el-table-column prop="createDate" label="创建时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
-          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
-          </el-table-column>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
+      </el-table-column>
     </el-table>
     <div class="block">
       <el-pagination
@@ -64,7 +64,7 @@ export default {
         createUser: '',
         updateUser: '',
         updateDate: '',
-        status : '',
+        status: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -77,6 +77,10 @@ export default {
   mounted() {
     // 获取数据
     this.dataQuery()
+    // 截取角色
+    if(this.listQuery.roleName.length>1){
+      this.listQuery.roleName = this.listQuery.roleName.slice(0,10)+'...';
+    }
   },
   methods: {
     ...mapActions('listAnnouncement', [
@@ -109,11 +113,9 @@ export default {
         this.listLoading = false
         console.log('error EmployeesList')
       })
-      
     },
     handleSelectionChange(data) {
-      // 设置为 空
-      this.deleteIds = []
+      this.deleteIds = [] // 设置为 空
       for (let i = 0; i < data.length; i++) {
         this.deleteIds.push(data[i].id)
       }