From 8a1be345b519bb221e1a79695a87b971e021568a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 22 Jul 2022 10:37:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/exportTree/index.vue | 125 -- jero-web/src/views/externalReports/index.vue | 1387 ++++++++++++++---- 2 files changed, 1113 insertions(+), 399 deletions(-) delete mode 100644 jero-web/src/components/exportTree/index.vue diff --git a/jero-web/src/components/exportTree/index.vue b/jero-web/src/components/exportTree/index.vue deleted file mode 100644 index fa269e4b0..000000000 --- a/jero-web/src/components/exportTree/index.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - \ No newline at end of file diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 329442c47..f261141e4 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -1,47 +1,106 @@ - + + \ No newline at end of file From 6a916e0037bd0bcafb6d41ea4384a403ccbfb879 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 22 Jul 2022 10:48:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B-=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/modules/UserModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index fe741c908..d0ddf3695 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -156,7 +156,7 @@ + v-decorator="[ 'telephone', validatorRules.telephone]"/> From dc41b5411a30e538e093552985dcedfd4c83a7e6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 22 Jul 2022 11:00:00 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/RetrieveFilesList.vue | 365 +++++++++++++++++ .../components/addModel.vue | 366 ++++++++++++++++++ .../components/standardData.vue | 318 +++++++++++++++ .../documentTranslation/index.vue | 103 ++++- 6 files changed, 1144 insertions(+), 16 deletions(-) create mode 100644 jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue create mode 100644 jero-web/src/views/documentTools/documentTranslation/components/addModel.vue create mode 100644 jero-web/src/views/documentTools/documentTranslation/components/standardData.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 423f7bcbd..5e7d60cdb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1168,4 +1168,8 @@ module.exports = { fullTextComments:'Full text comments', fileDeclaration:'file Declaration', FileForDetails:'File For Details', + Converting:'Converting', + convertNetwork:'Convert Network', + convertFailed:'Convert Failed', + standardData:'Standard Data', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 30aeaec72..d07a240f5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1172,4 +1172,8 @@ module.exports = { fullTextComments:'全文评论', fileDeclaration:'文件说明', FileForDetails:'文件详情', + Converting:'转换中', + convertNetwork:'转换完成', + convertFailed:'转换失败', + standardData:'标准数据', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue new file mode 100644 index 000000000..7237ce8f6 --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -0,0 +1,365 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue new file mode 100644 index 000000000..2838e708c --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -0,0 +1,366 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue new file mode 100644 index 000000000..9ba6c282c --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue @@ -0,0 +1,318 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 28593c4e6..fddde2cf3 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -23,15 +23,15 @@
-
- {{$t('releaseSituation')}} +
+ {{$t('translationResults')}}
- - + @@ -41,19 +41,53 @@
+ {{$t('query')}} {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + +
-
- - {{$t('initiateComparison')}} +
+ + {{$t('upload1')}} +
+
+ + {{$t('RetrieveFiles')}} +
+
+ + {{$t('BatchDelete')}}
@@ -93,24 +127,32 @@ />
+ + From b98d32966a07bd4fe56ae6455f52e2068c27f4a8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 22 Jul 2022 12:02:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?-=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/SysUserMapper.java | 2 ++ .../system/mapper/xml/SysUserMapper.xml | 22 +++++++++++++++++++ .../service/impl/SysUserServiceImpl.java | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 9bacd0c8d..2bd69698c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -151,4 +151,6 @@ public interface SysUserMapper extends BaseMapper { List queryByDepIds(@Param("departIds")List departIds,@Param("username") String username); List getPPEmployeeList(@Param("thirdType") String thirdType); + + void updateByIdPP (SysUser sysUser); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 6c22a7661..ee3c91cde 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -200,4 +200,26 @@ select * from sys_user where third_type = #{thirdType} + + UPDATE + sys_user + SET + username = #{username}, + realname = #{realname}, + status = #{status}, + del_flag = #{delFlag}, + third_id = #{thirdId}, + work_no = #{workNo}, + worker_type = #{workerType}, + create_time = #{createTime}, + update_time = #{updateTime}, + job_code = #{jobCode}, + job_title = #{jobTitle}, + org_code = #{orgCode}, + email = #{email}, + telephone = #{telephone} + WHERE + id = #{id} + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index e457b8b91..9ea7b911d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -562,7 +562,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } - updateById(sysUser); + this.baseMapper.updateByIdPP(sysUser); } From c7dbf58f6856cb92e1ac33d2cfefc693b69d4b59 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 22 Jul 2022 15:30:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/views/system/UserList.vue | 49 +++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 423f7bcbd..bfdf0cd66 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1168,4 +1168,5 @@ module.exports = { fullTextComments:'Full text comments', fileDeclaration:'file Declaration', FileForDetails:'File For Details', + Theorganization:'The Organization', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 30aeaec72..c369d321b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1172,4 +1172,5 @@ module.exports = { fullTextComments:'全文评论', fileDeclaration:'文件说明', FileForDetails:'文件详情', + Theorganization:'组织机构', } \ No newline at end of file diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 45f381221..93c62e384 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -57,6 +57,28 @@ + +
+
+ {{ $t('Theorganization') }} +
+ + + + + +
+ @@ -141,7 +163,7 @@ import DepartmentAllocation from './modules/departmentAllocation' import UserModal from './modules/UserModal' import PasswordModal from './modules/PasswordModal' - import { putAction, getFileAccessHttpUrl } from '@/api/manage' + import {getAction, putAction, getFileAccessHttpUrl } from '@/api/manage' import { frozenBatch } from '@/api/api' import { JeroListMixin } from '@/mixins/JeroListMixin' import JInput from '@/components/jero/JInput' @@ -174,6 +196,18 @@ departmentvisible: false, // 部门配置得弹框 selectedRowKeys: [], selectedRowKeysvalue: [], + CategoryTreeList:[], + ipagination: { + current: 1, + pageSize: 10, + pageSizeOptions: ['10', '30', '50', '100'], + showTotal: (total, range) => { + return range[0] + '-' + range[1] + ' 共' + total + '条' + }, + showQuickJumper: true, + showSizeChanger: true, + total: 0 + }, columns: [ { title: this.$t('serialNumber'), @@ -259,6 +293,7 @@ list: '/sys/user/page', delete: '/sys/user/delete', deleteBatch: '/sys/user/deleteBatch', + getSysCategoryTree: '/sys/sysDepart/queryTreeList', exportXlsUrl: '/sys/user/exportXls', importExcelUrl: 'sys/user/importExcel' } @@ -269,6 +304,9 @@ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` } }, + mounted() { + this.getSysCategoryTree() + }, methods: { // 重置密码 resetPassword(val) { @@ -368,6 +406,15 @@ }) } }, + getSysCategoryTree() { + getAction(this.url.getSysCategoryTree, {}).then((res) => { + if (res.success) { + this.CategoryTreeList = res.result + } else { + this.CategoryTreeList = [] + } + }) + }, handleMenuClick(e) { if (e.key == 1) { this.batchDel() From 52e3945af56f118686621570f6361aea453a7dbb Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 22 Jul 2022 15:43:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/views/system/UserList.vue | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8422c9267..c1c5b2d4a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -38,7 +38,7 @@ module.exports = { serialNumber: 'Number', userAccount: 'User Account', userName: 'User Name', - Department: 'Department', + department: 'Department', status: 'Status', Operation: 'Operation', aRcord: 'A Rcord', diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 93c62e384..3e6482650 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -59,8 +59,8 @@
-
- {{ $t('Theorganization') }} +
+ {{ $t('department') }}
From c2f828377ea4b8b7e2d40f5f3a26ce6d9132161c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 22 Jul 2022 17:30:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=B1=95=E5=BC=80=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/UserList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index 3e6482650..b44f2bb1a 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -84,7 +84,7 @@ {{$t('query')}} {{$t('reset')}} - {{ toggleSearchStatus ? $t('open') : $t('away') }} + {{ toggleSearchStatus ? $t('away') : $t('open') }}