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); } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bfdf0cd66..8422c9267 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1168,5 +1168,9 @@ module.exports = { fullTextComments:'Full text comments', fileDeclaration:'file Declaration', FileForDetails:'File For Details', + Converting:'Converting', + convertNetwork:'Convert Network', + convertFailed:'Convert Failed', + standardData:'Standard Data', 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 c369d321b..43142beb5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1172,5 +1172,9 @@ module.exports = { fullTextComments:'全文评论', fileDeclaration:'文件说明', FileForDetails:'文件详情', + Converting:'转换中', + convertNetwork:'转换完成', + convertFailed:'转换失败', + standardData:'标准数据', Theorganization:'组织机构', } \ 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 @@ />
+ +