修改用户管理角色管理

jero-web/src/views/system/DepartList.vue

@@ -26,6 +26,7 @@
           <template>
             <!--              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">-->
             <!--                 checkable-->
+            <!--              :expandedKeys="iExpandedKeys" -->
             <a-tree
               multiple
               style="height:600px;overflow: auto;width: 100%"
@@ -37,7 +38,6 @@
               :treeData="departTree"
               :checkStrictly="checkStrictly"
               :autoExpandParent="false"
-                :expandedKeys="iExpandedKeys"
               @expand="onExpand"/>
             <!--新增右键点击事件,和增加添加和删除功能-->
             <!--                <a-menu slot="overlay">-->
@@ -134,26 +134,29 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('phoneNumber')">
-                <a-input  :disabled="disable" :placeholder="$t('enterMobileNumber')" v-decorator="['mobile', {'initialValue':''}]"/>
+                <a-input :disabled="disable" :placeholder="$t('enterMobileNumber')"
+                         v-decorator="['mobile', {'initialValue':''}]"/>
               </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('address')">
-                <a-input  :disabled="disable" :placeholder="$t('enterAddress')" v-decorator="['address', {'initialValue':''}]"/>
+                <a-input :disabled="disable" :placeholder="$t('enterAddress')"
+                         v-decorator="['address', {'initialValue':''}]"/>
               </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('remarks')">
-                <a-textarea  :disabled="disable" :placeholder="$t('enterComments')" v-decorator="['memo', {'initialValue':''}]"/>
+                <a-textarea :disabled="disable" :placeholder="$t('enterComments')"
+                            v-decorator="['memo', {'initialValue':''}]"/>
               </a-form-item>
             </a-form>
-<!--            <div class="anty-form-btn">-->
+            <!--            <div class="anty-form-btn">-->
-<!--              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
+            <!--              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
-<!--              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
+            <!--              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
-<!--              </a-button>-->
+            <!--              </a-button>-->
-<!--            </div>-->
+            <!--            </div>-->
           </a-card>
           <a-card v-else :bordered="false" style="height:248px !important;">
             <a-empty>
@@ -280,7 +283,7 @@
           importExcelUrl: 'sys/sysDepart/importExcel'
         },
         orgCategoryDisabled: false,
-        recordTab:{},
+        recordTab: {}
       }
     },
     computed: {
@@ -423,13 +426,13 @@
         this.recordTab = record
         // this.$refs.departAuth.show(record.id)
         // 传用户信息参数
-        if (this.$refs.DeptUserInfo){
+        if (this.$refs.DeptUserInfo) {
           this.$refs.DeptUserInfo.open(record)
         }
       },
-      tabChange(event){
+      tabChange(event) {
-        if(event == 3){
+        if (event == 3) {
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.$refs.DeptUserInfo.open(this.recordTab)
           })
         }
@@ -657,7 +660,8 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
-  .box-ant{
+
-    margin-right: 0!important;
+  .box-ant {
+    margin-right: 0 !important;
   }
 </style>

jero-web/src/views/system/RoleUserList.vue

@@ -40,6 +40,7 @@
     <div style="margin-top: 15px">
       <a-table
         ref="table"
+        rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -106,22 +107,34 @@
         selectionRows2: [],
         test: {},
         rightcolval: 0,
-        columns:
+        columns: [
-          [
+          {
+            title: this.$t('serialNumber'),
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 20,
+            align: 'center',
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
           {
             title: this.$t('RoleCode'),
             align: 'center',
-              dataIndex: 'roleCode'
+            dataIndex: 'roleCode',
+            width: 180
           },
           {
             title: this.$t('roleName'),
             align: 'center',
-              dataIndex: 'roleName'
+            dataIndex: 'roleName',
+            width: 180
           },
           {
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
+            width: 180,
             sorter: true,
             customRender: (text) => {
               return moment(text).format('YYYY-MM-DD')

jero-web/src/views/system/UserList.vue

@@ -74,6 +74,7 @@
 
     <!-- table区域-begin -->
     <div>
+<!--       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
       <a-table
         ref="table"
         rowKey="id"
@@ -81,7 +82,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <template slot="avatarslot" slot-scope="text, record, index">

jero-web/src/views/system/modules/DeptUserInfo.vue

@@ -139,13 +139,14 @@
             align: "center",
             dataIndex: 'phone'
           },
-          {
+          // {
-            title: this.$t('operation'),
+          //   title: this.$t('operation'),
-            dataIndex: 'action',
+          //   dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
+          //   scopedSlots: {customRender: 'action'},
-            align: "center",
+          //   align: "center",
-            width: 150
+          //   width: 150
-          }],
+          // }
+          ],
         url: {
           list: "/sys/user/departUserList",
           edit: "/sys/user/editSysDepartWithUser",