diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index 57ca0b392..bed61935b 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -23,30 +23,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,8 +94,8 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
:label="$t('OrganizationCode')">
-
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -267,10 +270,10 @@
edges: []
},
validatorRules: {
- // departName: { rules: [{ required: true, message: this.$t('EnterOrganizationDepartment') }] },
- // orgCode: { rules: [{ required: true, message: this.$t('enterOrganizationCode') }] },
- // orgCategory: { rules: [{ required: true, message: this.$t('enterOrganizationType') }] },
- // mobile: { rules: [{ validator: this.validateMobile }] }
+ // departName: { rules: [{ required: true, message: this.$t('EnterOrganizationDepartment') }] },
+ // orgCode: { rules: [{ required: true, message: this.$t('enterOrganizationCode') }] },
+ // orgCategory: { rules: [{ required: true, message: this.$t('enterOrganizationType') }] },
+ // mobile: { rules: [{ validator: this.validateMobile }] }
},
url: {
delete: '/sys/sysDepart/delete',
@@ -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){
- if(event == 3){
- this.$nextTick(()=>{
+ tabChange(event) {
+ if (event == 3) {
+ 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;
}
\ No newline at end of file
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index b595ee862..198684a45 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -40,6 +40,7 @@
{
- return moment(text).format('YYYY-MM-DD')
- }
+ columns: [
+ {
+ title: this.$t('serialNumber'),
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 20,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- // {
- // title: this.$t('operation'),
- // dataIndex: 'action',
- // align: 'center',
- // scopedSlots: { customRender: 'action' }
- // }
- ],
+ },
+ {
+ title: this.$t('RoleCode'),
+ align: 'center',
+ dataIndex: 'roleCode',
+ width: 180
+ },
+ {
+ title: this.$t('roleName'),
+ align: 'center',
+ 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')
+ }
+ }
+ // {
+ // title: this.$t('operation'),
+ // dataIndex: 'action',
+ // align: 'center',
+ // scopedSlots: { customRender: 'action' }
+ // }
+ ],
// 高级查询拼接条件
superQueryMatchType2: 'and',
url: {
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index c7d982999..a5f2b7e05 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -74,6 +74,7 @@
+
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index f526ff767..99d469784 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -139,13 +139,14 @@
align: "center",
dataIndex: 'phone'
},
- {
- title: this.$t('operation'),
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150
- }],
+ // {
+ // title: this.$t('operation'),
+ // dataIndex: 'action',
+ // scopedSlots: {customRender: 'action'},
+ // align: "center",
+ // width: 150
+ // }
+ ],
url: {
list: "/sys/user/departUserList",
edit: "/sys/user/editSysDepartWithUser",