diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2eb508aaa..a8866045f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -902,6 +902,7 @@ module.exports = { systemPrompt:'System Prompt', loginExpired:'Login Expired', reportNotUploaded:'Report not uploaded', + position: 'position', // 认证权限状态 CollectionInitiated: 'Collection to be initiated、', handledInterface: 'To be handled by the project interface、', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 309bb34df..503ded6cc 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -857,57 +857,58 @@ module.exports = { totalTable: '总数', applicableSupplement: '适用增补件', taskDescription: '任务说明', - descriptionDeliverables: '交付物说明', - startMonth: '开始日期', - endMonth: '结束日期', - Importing: '导入中...', - projectDeliveryDescription: '工程交付说明', - cancelConfirm: '取消确认', - currentInformation: '当前信息', - deliveryHistory: '交付历史', - projectDeliveryRequirements: '工程交付说明', - personLiableConfirm: '责任人确认', - complianceResults: '符合性结果', - noData: '暂无数据', - confirmOperation: '确认操作', - sponsorReview: '发起人审查', - fillInProjectDelivery: '填写工程交付', - Resubmit: '重新提交', - Quantity: '数量', - pleaseConfirmationResults: '请根据工程确认结果选择符合性状态', - pleaseReviewTask: '请您添加对该条审查任务的工程确认信息', - pleaseWillBeReturned: '请对工程确认结果和责任人审查结果进行再次确认,若符合要求则进行提交,否则进行退回', - pleaseSubmitStatus: '请把工程确认的数据都点为确认状态进行提交', - modelName: '车型名称', - modelYear: '年款', - NoteConfirmTheChange: '注意:变更后该条清单变为未审查状态,将从内部审查工作开始从头进行,历史数据都将丢弃是否确认变更', - onlyDataChanged: '只能变更任务确认状态为接受的数据', - inquiry: '询问', - ConfirmationDeadline: '确认截止时间', - regulatoryCertificationTaskConfirmation: '法规认证任务确认', - confirmationEngineeringInterfacePerson: '工程接口人确认', - engineerReply: '工程师回复', - catalogFile: '目录文件', - testScheme: '试验方案', - testReportLocation: '检测报告位置', - explain: '说明', - dataCannotEmpty: '数据不能为空', - documentDynamics: '文档动态', - theNumberAgain: '编号已存在不能重复添加', - myList: '我的待办', - myNews: '我的消息', - monthlyReportRegulations: '法规月报', - Pending: '待处理', - custom: '自定义', - notSelected: '未选择', - ExportReport: '导出报告', - basicInformation: '基础信息', - replyFromProjectContact: '工程接口人回复', - pleaseUpload: '请上传', - fullScreenView: '全屏查看', - systemPrompt: '系统提示', - loginExpired: '登录已过期', - reportNotUploaded: '报告未上传', + descriptionDeliverables:'交付物说明', + startMonth:'开始日期', + endMonth:'结束日期', + Importing:'导入中...', + projectDeliveryDescription:'工程交付说明', + cancelConfirm:'取消确认', + currentInformation:'当前信息', + deliveryHistory:'交付历史', + projectDeliveryRequirements:'工程交付说明', + personLiableConfirm:'责任人确认', + complianceResults:'符合性结果', + noData:'暂无数据', + confirmOperation:'确认操作', + sponsorReview:'发起人审查', + fillInProjectDelivery:'填写工程交付', + Resubmit:'重新提交', + Quantity:'数量', + pleaseConfirmationResults:'请根据工程确认结果选择符合性状态', + pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', + pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认,若符合要求则进行提交,否则进行退回', + pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交', + modelName:'车型名称', + modelYear:'年款', + NoteConfirmTheChange:'注意:变更后该条清单变为未审查状态,将从内部审查工作开始从头进行,历史数据都将丢弃是否确认变更', + onlyDataChanged:'只能变更任务确认状态为接受的数据', + inquiry:'询问', + ConfirmationDeadline:'确认截止时间', + regulatoryCertificationTaskConfirmation:'法规认证任务确认', + confirmationEngineeringInterfacePerson:'工程接口人确认', + engineerReply:'工程师回复', + catalogFile:'目录文件', + testScheme:'试验方案', + testReportLocation:'检测报告位置', + explain:'说明', + dataCannotEmpty:'数据不能为空', + documentDynamics:'文档动态', + theNumberAgain:'编号已存在不能重复添加', + myList:'我的待办', + myNews:'我的消息', + monthlyReportRegulations:'法规月报', + Pending:'待处理', + custom:'自定义', + notSelected:'未选择', + ExportReport:'导出报告', + basicInformation:'基础信息', + replyFromProjectContact:'工程接口人回复', + pleaseUpload:'请上传', + fullScreenView:'全屏查看', + systemPrompt:'系统提示', + loginExpired:'登录已过期', + reportNotUploaded:'报告未上传', + position: '职位', // 认证权限状态 CollectionInitiated: '待发起收集、', handledInterface: '待工程接口人处理、', diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue index 4f05b219b..f4b775639 100644 --- a/jero-web/src/views/system/modules/DeptUserInfo.vue +++ b/jero-web/src/views/system/modules/DeptUserInfo.vue @@ -52,7 +52,6 @@ size="middle" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" :loading="loading" @change="handleTableChange"> @@ -84,6 +83,16 @@ +
+ + +
@@ -155,12 +164,27 @@ }, loading:false, dataSource:[], + total: 0, + pageSize: 10, + pageNo: 1, } }, created() { }, methods: { + pageOnChange(page, pageSize) { + this.pageNo = page + this.loadDataIndex(page) + }, + SizeChange(page, pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.loadDataIndex(page,pageSize) + }, + handleTableChange(page) { + this.loadDataIndex(page) + }, searchReset() { this.queryParam = {} this.loadDataIndex(1); @@ -169,7 +193,7 @@ this.loadDataIndex(1); }, loadData(){}, - loadDataIndex(arg) { + loadDataIndex(arg,pageSize) { if (!this.url.list) { this.$message.error(this.$t('setURLListAttribute')) return @@ -182,11 +206,15 @@ //if (this.currentDeptId === '') return; let params = this.getQueryParams();//查询条件 params.depId = this.currentDeptId; + params.pageNo = arg + if(pageSize !== undefined) { + params.pageSize = pageSize + } getAction(this.url.list, params).then((res) => { this.loading = false if (res.success && res.result) { this.dataSource = res.result.records || []; - this.ipagination.total = res.result.total; + this.total = res.result.total; }else{ this.dataSource = [] } @@ -345,4 +373,7 @@ margin-top: -16px; margin-bottom: 16px; } + /deep/.ant-table-pagination{ + display: none; + } \ No newline at end of file diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index f4de4be92..af9eac8dc 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -42,6 +42,9 @@ + + + @@ -378,7 +381,7 @@ that.visible = true that.model = Object.assign({}, record) that.$nextTick(() => { - that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post')) + that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle','email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post')) }) //身份为上级显示负责部门,否则不显示 if (this.model.userIdentity == '2') {