WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理、角色管理导出

Browse Source
This commit is contained in:
qq787203167
2022-03-04 14:32:59 +08:00
parent dc51b10621
commit c4a3f9fa76
5 changed files with 121 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -35,7 +35,7 @@ module.exports = {
freezePassword: 'Are you sure to freeze?', freezePassword: 'Are you sure to freeze?',
youThaw: 'Are you sure to thaw?', youThaw: 'Are you sure to thaw?',
freezePasManagementPage: 'This is the user management page?', freezePasManagementPage: 'This is the user management page?',
serialNumber: 'serial number', serialNumber: 'number',
userAccount: 'user account', userAccount: 'user account',
userName: 'User name', userName: 'User name',
department: 'department', department: 'department',
jero-web/src/views/system/DepartList.vue
+48 -42
View File
@@ -102,27 +102,33 @@
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
:label="$t('OrganizationType')"> :label="$t('OrganizationType')">
<template v-if="orgCategoryDisabled"> <j-dict-select-tag class="box-input"
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" v-decorator="['orgCategory',validatorRules.orgCategory]"
:disabled="disable" :disabled="disable"
:placeholder="$t('PleaseSelectOrganizationType')"> :placeholder="$t('pleaseSelect')+$t('OrganizationType')"
<a-radio value="1"> :type="'select'"
{{$t('company')}} triggerChange dictCode="org_category"/>
</a-radio> <!-- <template v-if="orgCategoryDisabled">-->
</a-radio-group> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"-->
</template> <!-- :disabled="disable"-->
<template v-else> <!-- :placeholder="$t('PleaseSelectOrganizationType')">-->
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" <!-- <a-radio value="1">-->
:disabled="disable" <!-- {{$t('company')}}-->
:placeholder="$t('PleaseSelectOrganizationType')"> <!-- </a-radio>-->
<a-radio value="2"> <!-- </a-radio-group>-->
{{$t('department')}} <!-- </template>-->
</a-radio> <!-- <template v-else>-->
<a-radio value="3"> <!-- <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"-->
{{$t('post')}} <!-- :disabled="disable"-->
</a-radio> <!-- :placeholder="$t('PleaseSelectOrganizationType')">-->
</a-radio-group> <!-- <a-radio value="2">-->
</template> <!-- {{$t('department')}}-->
<!-- </a-radio>-->
<!-- <a-radio value="3">-->
<!-- {{$t('post')}}-->
<!-- </a-radio>-->
<!-- </a-radio-group>-->
<!-- </template>-->
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
@@ -130,27 +136,27 @@
:label="$t('sort')"> :label="$t('sort')">
<a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/> <a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
</a-form-item> </a-form-item>
<a-form-item <!-- <a-form-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
:label="$t('phoneNumber')"> <!-- :label="$t('phoneNumber')">-->
<a-input :disabled="disable" :placeholder="$t('enterMobileNumber')" <!-- <a-input :disabled="disable" :placeholder="$t('enterMobileNumber')"-->
v-decorator="['mobile', {'initialValue':''}]"/> <!-- v-decorator="['mobile', {'initialValue':''}]"/>-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item <!-- <a-form-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
:label="$t('address')"> <!-- :label="$t('address')">-->
<a-input :disabled="disable" :placeholder="$t('enterAddress')" <!-- <a-input :disabled="disable" :placeholder="$t('enterAddress')"-->
v-decorator="['address', {'initialValue':''}]"/> <!-- v-decorator="['address', {'initialValue':''}]"/>-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item <!-- <a-form-item-->
:labelCol="labelCol" <!-- :labelCol="labelCol"-->
:wrapperCol="wrapperCol" <!-- :wrapperCol="wrapperCol"-->
:label="$t('remarks')"> <!-- :label="$t('remarks')">-->
<a-textarea :disabled="disable" :placeholder="$t('enterComments')" <!-- <a-textarea :disabled="disable" :placeholder="$t('enterComments')"-->
v-decorator="['memo', {'initialValue':''}]"/> <!-- v-decorator="['memo', {'initialValue':''}]"/>-->
</a-form-item> <!-- </a-form-item>-->
</a-form> </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>-->
jero-web/src/views/system/RoleUserList.vue
+50 -12
View File
@@ -6,18 +6,20 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('roleName')"> <div class="box-title-text">
<a-input placeholder="" v-model="queryParam.roleName"></a-input> <div class="title-text" :title="$t('roleName')">
</a-form-item> <span>{{$t('roleName')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('roleName')"
v-model="queryParam.roleName"></j-input>
</div>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button type="primary" @click="searchQuery" icon="search" <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
style="margin-left: 21px">{{$t('query')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" </a-col>
style="margin-left: 8px">{{$t('reset')}}</a-button> </span>
</a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
@@ -28,7 +30,10 @@
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">{{$t('import')}}</a-button>--> <!-- <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
<!-- </a-upload>--> <!-- </a-upload>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls($t('RoleManagement'))">{{$t('export')}}</a-button>--> <div @click="handleExportXls($t('RoleManagement'))" class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{$t('export')}}
</div>
</div> </div>
<!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">--> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
@@ -364,4 +369,37 @@
.ant-btn { .ant-btn {
margin-left: 8px margin-left: 8px
} }
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 20%;
min-width: 90px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
</style> </style>
jero-web/src/views/system/UserList.vue
+11 -7
View File
@@ -10,8 +10,8 @@
<div class="title-text" :title="$t('account')"> <div class="title-text" :title="$t('account')">
<span>{{$t('account')}}</span> <span>{{$t('account')}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('account')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('account')"
v-model="queryParam.username"></a-input> v-model="queryParam.username"></j-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -19,8 +19,8 @@
<div class="title-text" :title="$t('RealName')"> <div class="title-text" :title="$t('RealName')">
<span>{{$t('RealName')}}</span> <span>{{$t('RealName')}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RealName')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RealName')"
v-model="queryParam.realname"></a-input> v-model="queryParam.realname"></j-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -28,8 +28,8 @@
<div class="title-text" :title="$t('EmployeeNumber')"> <div class="title-text" :title="$t('EmployeeNumber')">
<span>{{$t('EmployeeNumber')}}</span> <span>{{$t('EmployeeNumber')}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('EmployeeNumber')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('EmployeeNumber')"
v-model="queryParam.workNo"></a-input> v-model="queryParam.workNo"></j-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -67,13 +67,17 @@
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="border-top: 5px"> <div class="table-operator">
<!-- <a-button @click="handleAdd" type="primary" icon="plus" >{{$t('addUser')}}</a-button>--> <!-- <a-button @click="handleAdd" type="primary" icon="plus" >{{$t('addUser')}}</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls($t('userInformation'))">{{$t('export')}}</a-button>--> <!-- <a-button type="primary" icon="download" @click="handleExportXls($t('userInformation'))">{{$t('export')}}</a-button>-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">{{$t('import')}}</a-button>--> <!-- <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
<!-- </a-upload>--> <!-- </a-upload>-->
<!-- <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>--> <!-- <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>-->
<div @click="handleExportXls($t('userInformation'))" class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{$t('export')}}
</div>
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
jero-web/src/views/system/modules/DeptUserInfo.vue
+11 -11
View File
@@ -7,7 +7,7 @@
<a-row :gutter="10"> <a-row :gutter="10">
<a-col :md="10" :sm="12"> <a-col :md="10" :sm="12">
<a-form-item :label="$t('userAccount')" style="margin-left:8px"> <a-form-item :label="$t('userAccount')" style="margin-left:8px">
<a-input :placeholder="$t('enterAccountNumber')" v-model="queryParam.username"></a-input> <j-input :placeholder="$t('enterAccountNumber')" v-model="queryParam.username"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;margin-top: 1px" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;margin-top: 1px" class="table-page-search-submitButtons">
@@ -129,16 +129,16 @@
align: "center", align: "center",
dataIndex: 'orgCode' dataIndex: 'orgCode'
}, },
{ // {
title: this.$t('Gender'), // title: this.$t('Gender'),
align: "center", // align: "center",
dataIndex: 'sex_dictText' // dataIndex: 'sex_dictText'
}, // },
{ // {
title: this.$t('phoneNumber'), // title: this.$t('phoneNumber'),
align: "center", // align: "center",
dataIndex: 'phone' // dataIndex: 'phone'
}, // },
// { // {
// title: this.$t('operation'), // title: this.$t('operation'),
// dataIndex: 'action', // dataIndex: 'action',