From 1295f31ece67c9d798029853248f394db89d7a5e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 1 Mar 2023 14:08:19 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 13 +++++++++++++ .../IParamsCollectManifestEOService.java | 3 +++ .../ParamsCollectManifestEOServiceImpl.java | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 831ba4f35..d983996b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -673,4 +673,17 @@ public class ParamsCollectManifestEOController extends JeroController certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) { return this.paramsCollectManifestEOService.certifiedEngineerUpdateDreBatch(paramsCollectManifestVO); } + + /** + * 认证工程师-批量编辑截止时间 + * + * @param paramsCollectManifestVO + * @return + */ + @AutoLog(value = "参数项收集清单-认证工程师-批量编辑截止时间") + @ApiOperation(value="参数项收集清单-认证工程师-批量编辑截止时间", notes="参数项收集清单-认证工程师-批量编辑截止时间") + @PostMapping(value = "/batchEditDeadline") + public Result batchEditDeadline(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { + return this.paramsCollectManifestEOService.batchEditDeadline(paramsCollectManifestVO); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index b4978b2fd..a7d0a23e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -197,4 +197,7 @@ public interface IParamsCollectManifestEOService extends IService queryConditionVOList, StringBuilder sqlJoin); + + // 认证工程师-批量编辑截止时间 + Result batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 4f27f21e2..4f366e93b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -174,6 +174,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO) { + if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) { + throw new JeroBootException("参数不能为空！"); + } + + String paramsCollectManifestIds = paramsCollectManifestVO.getIds(); + List paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")).stream().distinct().collect(Collectors.toList()); + + LambdaUpdateWrapper manifestUpdateWrap = new LambdaUpdateWrapper<>(); + manifestUpdateWrap.set(ParamsCollectManifestEO::getDeadline,paramsCollectManifestVO.getDeadline()); + manifestUpdateWrap.in(ParamsCollectManifestEO::getId,paramsCollectManifestIdList); + this.update(manifestUpdateWrap); + + return Result.OK("批量编辑截止时间成功！"); + } } From 66f8eb023550d98b75a676abdf6758d574c5cd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 1 Mar 2023 15:06:39 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E6=8E=A5=E5=8F=A3?= 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 + .../ParameterItemCollectionList.vue | 475 ++++++++++-------- .../components/batchUpdateDeadline.vue | 196 ++++++++ 4 files changed, 450 insertions(+), 223 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/batchUpdateDeadline.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e2f58b10f..bba7da106 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1383,4 +1383,5 @@ module.exports = { beforedate:'In... Before date', beforedatein:'In... Before date (inclusive)', inRecentMonthsin6:'Within 6 months (implemented)', + batchUpdateDeadline:'Batch update deadline', } \ 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 ed71ce96b..938c70910 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1484,4 +1484,5 @@ module.exports = { beforedate:'在...日期之前', beforedatein:'在...日期之前（包含）', inRecentMonthsin6:'近6个月内（已实施）', + batchUpdateDeadline:'批量更新截止时间', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 7377522cc..b8020cc00 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -44,57 +44,57 @@ :triggerChange="false" :dictCode="'duty_territory'"/> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -130,11 +130,11 @@ {{$t('addTo')}} - - - - - + + + + +
@@ -161,25 +161,28 @@ {{$t('Updateparametercolumn')}}
-
+
{{$t('SynchronousReportLibrary')}}
- - - - + + + +
{{$t('BatchDelete')}}
-
+
{{$t('bringInTheProjectInterface')}}
-
+
{{$t('Adjustareasofresponsibility')}}
@@ -188,14 +191,21 @@ {{$t('Assignedby')}}
+ +
+ + {{$t('batchUpdateDeadline')}} +
- -
+ +
...{{ $t('more') }}
-
+
{{$t('distributionAndCollection')}}
@@ -233,7 +243,8 @@
- +
- + {{$t('CompulsoryWithdrawal')}}
@@ -258,9 +269,9 @@
- + + @GetgetTableList='GetgetTableList' + @GetgetLoginUserType='GetgetLoginUserType' + @areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' + @areaVisible='areaVisibleAssignedbyhomo = false'/> - - - + + + - - - - + + + + + @GetgetTableList='GetgetTableList' + @AdjustareasofresponAll='AdjustareasofresponAll'/> @@ -373,9 +385,9 @@ + :templateTitle='templatetitle' + :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url' + :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'> @@ -444,7 +456,8 @@
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? - $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}} + $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept') + : $t('Datastatusis')}} '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' @@ -484,7 +497,7 @@

'{{$t('ReturnedEngineer')}}'

 - +

'{{$t('SynchronizedLibrary')}}'

{{$t('or')}}

'{{$t('CollectionInitiated')}}'

@@ -506,6 +519,8 @@
{{this.$t('pleaseWaitWhileRunning')}} + +
@@ -524,6 +539,7 @@ import AssignedBy from '@/components/AssignedBy/index' import AssignedByHomo from '@/components/AssignedByHomo/index' import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index' + import batchUpdateDeadline from './batchUpdateDeadline' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' import Vue from 'vue' @@ -543,54 +559,55 @@ ReferenceParameter, SynchronousSubmissionLibrary, TaskTime, - globalAdvancedQuery + globalAdvancedQuery, + batchUpdateDeadline }, data() { this.statusList = [ { value: '1', title: this.$t('CollectionInitiated'), - key:'1', + key: '1' }, { value: '2', title: this.$t('handledInterface'), - key:'2', + key: '2' }, { value: '3', title: this.$t('ReturnedPerson'), - key:'3', + key: '3' }, { value: '4', title: this.$t('completed'), - key:'4', + key: '4' }, { value: '5', title: this.$t('Filledreturn'), - key:'5', + key: '5' }, { value: '6', title: this.$t('Submitted'), - key:'6', + key: '6' }, { value: '7', title: this.$t('ReturnedEngineer'), - key:'7', + key: '7' }, { value: '8', title: this.$t('SynchronizedLibrary'), - key:'8', + key: '8' }, { value: '9', title: this.$t('alteration'), - key:'9', + key: '9' } ] return { @@ -682,12 +699,12 @@ value: 'dre', text: this.$t('dre'), dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, + } ], selectedRowKeys: [], textLoading: false, formInline: {}, - queryParamQuery:{}, + queryParamQuery: {}, url: { tableHeader: 'params/collectManifest/getHeader', tableList: 'params/collectManifest/list', @@ -704,7 +721,7 @@ configureareaVisible: false, // 配置的彈框 pageNo: 1, pageSize: 10, - rolename:'', + rolename: '', total: 0, selectedRowKeysArray: '', templatetitle: '', @@ -721,9 +738,9 @@ areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框 areaVisibleTaskCutOffTime: false, // 截至时间弹框 - OneclickCollection:false, - parametercolumn:false, - Adjustareasofrespon:false, + OneclickCollection: false, + parametercolumn: false, + Adjustareasofrespon: false, areaVisiblereferenceparameter: false, // 引用参数弹框 areaVisibsynchronous: false, // 同步上报库弹框 visibleoperationFailed: false, // 数据失败的弹框 @@ -756,8 +773,8 @@ NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有 NotSelectedNoEngineerValue: [], paramsManifest: {}, - timeBatch:'', - timer:'', + timeBatch: '', + timer: '' } }, props: { @@ -769,10 +786,10 @@ }, mounted() { this.handleClick() - window.addEventListener('keyup',this.handleKeyup) - window.addEventListener('click',this.handleClick) + window.addEventListener('keyup', this.handleKeyup) + window.addEventListener('click', this.handleClick) this.GetgetLoginUserType() - if(this.$route.query.type == '1'){ + if (this.$route.query.type == '1') { this.handleOkRoleSwitching() } // clearTimeout(this.timeBatch) @@ -785,26 +802,26 @@ // this.timeBatch = setInterval(() => { // this.handlePreservation(); // }, 10000); - // this.$nextTick(() => { - // var interval = setInterval(this.handlePreservation(),10000); - // /* if 5 minutes no operation then logout */ - // var maxTime = 120; // seconds - // var time = maxTime; - // $('body').on('keydown mousemove mousedown', function(e) { - // time = maxTime; // reset - // }); - // var intervalId = setInterval(function() { - // time--; - // if (time <= 0) { - // ShowInvalidLoginMessage(); - // clearInterval(intervalId); - // } - // }, 10000) - // function ShowInvalidLoginMessage() { - // // 停止定时器 - // clearInterval(interval); - // } - // }) + // this.$nextTick(() => { + // var interval = setInterval(this.handlePreservation(),10000); + // /* if 5 minutes no operation then logout */ + // var maxTime = 120; // seconds + // var time = maxTime; + // $('body').on('keydown mousemove mousedown', function(e) { + // time = maxTime; // reset + // }); + // var intervalId = setInterval(function() { + // time--; + // if (time <= 0) { + // ShowInvalidLoginMessage(); + // clearInterval(intervalId); + // } + // }, 10000) + // function ShowInvalidLoginMessage() { + // // 停止定时器 + // clearInterval(interval); + // } + // }) // } // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) this.paramsManifest = this.$route.query @@ -813,35 +830,35 @@ }, methods: { ...mapGetters(['userInfo']), - handleKeyup(){ + handleKeyup() { clearTimeout(this.timer) clearTimeout(this.timeBatch) clearTimeout(this.timerOne) - this.timer = setTimeout(()=>{ + this.timer = setTimeout(() => { if (this.currentPersonRole == 'dre') { this.handlePreservation() } - },10000) - this.timerOne = setTimeout(()=>{ + }, 10000) + this.timerOne = setTimeout(() => { clearTimeout(this.timer) clearTimeout(this.timeBatch) clearTimeout(this.timerOne) - },300000) + }, 300000) }, - handleClick(){ + handleClick() { clearTimeout(this.timer) clearTimeout(this.timeBatch) clearTimeout(this.timerOne) - this.timer = setTimeout(()=>{ + this.timer = setTimeout(() => { if (this.currentPersonRole == 'dre') { this.handlePreservation() } - },10000) - this.timerOne = setTimeout(()=>{ + }, 10000) + this.timerOne = setTimeout(() => { clearTimeout(this.timer) clearTimeout(this.timeBatch) clearTimeout(this.timerOne) - },300000) + }, 300000) }, handleToggleSearch() { @@ -867,9 +884,9 @@ }) }, handleOkRoleSwitching() { - if(this.$route.query.type == '1'){ + if (this.$route.query.type == '1') { let query = { - userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType, + userType: this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType, paramsManifestId: this.$route.query.id, projectId: this.$route.query.projectId, userId: this.userInfo().id @@ -881,8 +898,8 @@ this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType)) - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -892,7 +909,7 @@ this.$message.warning(this.$t('operationFailed')) } }) - }else { + } else { this.$refs.ruleFormRoleSwitching.validate(valid => { if (valid) { let query = { @@ -909,8 +926,8 @@ this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -926,7 +943,7 @@ }, roleSwitchingClick() { this.visibleRoleSwitching = true - this.$nextTick(()=>{ + this.$nextTick(() => { this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole this.$refs.ruleFormRoleSwitching.clearValidate() clearTimeout(this.timeBatch) @@ -939,24 +956,24 @@ // this.timeBatch = setInterval(() => { // this.handlePreservation(); // }, 10000); - // var interval = setInterval(this.handlePreservation(),10000); - // /* if 5 minutes no operation then logout */ - // var maxTime = 120; // seconds - // var time = maxTime; - // $('body').on('keydown mousemove mousedown', function(e) { - // time = maxTime; // reset - // }); - // var intervalId = setInterval(function() { - // time--; - // if (time <= 0) { - // ShowInvalidLoginMessage(); - // clearInterval(intervalId); - // } - // }, 10000) - // function ShowInvalidLoginMessage() { - // // 停止定时器 - // clearInterval(interval); - // } + // var interval = setInterval(this.handlePreservation(),10000); + // /* if 5 minutes no operation then logout */ + // var maxTime = 120; // seconds + // var time = maxTime; + // $('body').on('keydown mousemove mousedown', function(e) { + // time = maxTime; // reset + // }); + // var intervalId = setInterval(function() { + // time--; + // if (time <= 0) { + // ShowInvalidLoginMessage(); + // clearInterval(intervalId); + // } + // }, 10000) + // function ShowInvalidLoginMessage() { + // // 停止定时器 + // clearInterval(interval); + // } // } }) }, @@ -966,7 +983,7 @@ GetgetTableList() { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - GetgetHeader(){ + GetgetHeader() { this.$refs.CollectionTabel.getHeader() }, // 错误数据的弹框 @@ -1065,7 +1082,7 @@ } }, //导出 - handleExport(){ + handleExport() { this.$message.success(this.$t('Intheexport')) let long = localStorage.getItem('language') this.cut = '' @@ -1077,16 +1094,16 @@ let query = { paramsManifestId: this.paramsManifest.id, paramsTemplateId: this.$route.query.paramsTemplateId, - paramsTemplatePublishVersion:1, + paramsTemplatePublishVersion: 1, cut: this.cut, userTypes: this.currentPersonRole, - exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' + exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' - downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear) + downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) }, //填写人导出 - handleExportDre(){ + handleExportDre() { let long = localStorage.getItem('language') this.cut = '' if (long && long === 'zh-cn') { @@ -1101,17 +1118,17 @@ ...this.formInline, ...this.queryParamQuery, ids: this.selectedRowKeys.join(','), - exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' + exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')' } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' - downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear) + downloadFile('/params/collectManifest/exportDre', name, query, this.selectClear) }, - getList(){ + getList() { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - iVisible(val,num) { + iVisible(val, num) { this.importsVisible = val - if (num == 1){ + if (num == 1) { eventBUs.$emit('searchGetData') } }, @@ -1134,7 +1151,7 @@ this.queryParamQuery = sqp this.$refs.CollectionTabel.pageNo = 1 // this.$refs.CollectionTabel.getTableList(this.queryParamQuery) - eventBUs.$emit('getTableList',this.queryParamQuery) + eventBUs.$emit('getTableList', this.queryParamQuery) }, // 认证工程师 批量删除 权限 // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除 @@ -1337,8 +1354,8 @@ this.currentPersonRole = currentPersonRole || userType || val[0].value } this.RoleType = val - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ + this.RoleType.forEach((item, index) => { + if (item.value == this.currentPersonRole) { this.rolename = item.label } }) @@ -1453,18 +1470,18 @@ }) }, // 调整责任领域 - AdjustareasofresponsibilityClick(){ - if(this.selectedRowKeysValue.length == 0){ + AdjustareasofresponsibilityClick() { + if (this.selectedRowKeysValue.length == 0) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.Adjustareasofrespon = true } }, // 下发收集的权限 distributionAndCollectionJurisdiction() { - if(this.selectedRowKeysValue.length == 0){ + if (this.selectedRowKeysValue.length == 0) { this.$message.warning(this.$t('selectLeastOne')) - }else{ + } else { this.$refs.areaVisibleTaskCutOffTime.searchData() } // let homodistributionAndCollection = this.homodistributionAndCollection() @@ -1482,7 +1499,7 @@ // 一键下发收集 defOneclickCollection() { this.$refs.OneclickCollection.searchData() - // this.OneclickCollection = true + // this.OneclickCollection = true }, // 引用参数列 Referenceparametercolumn() { @@ -1494,8 +1511,8 @@ let referencesCol = [] let postDate = [] let colunmnFlag = '' - data.forEach((item,index) => { - if(!item.referencesCol){ + data.forEach((item, index) => { + if (!item.referencesCol) { this.colunmnFlag = true } referencesCol.push({ @@ -1503,7 +1520,7 @@ id: item.id }) }) - if(this.colunmnFlag){ + if (this.colunmnFlag) { this.$message.warning(this.$t('columnfirst')) return } @@ -1536,9 +1553,9 @@ postAction('/params/collectManifest/updateReferencesCol', query).then((res) => { if (res.success) { this.GetgetTableList() - this.$message.success(this.$t('OperationSuccessful')) - } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.success(this.$t('OperationSuccessful')) + } else { + this.$message.warning(this.$t('operationFailed')) } }) }, @@ -1630,7 +1647,7 @@ let selectedRowKeysValue = [] data.forEach(res => { if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Rejected by homo engineer') { + res.state == 'Rejected by homo engineer') { selectedRowKeysValue.push(res) } }) @@ -1683,24 +1700,24 @@ // this.timeBatch = setTimeout(() => { // this.handlePreservation(); // }, 10000); - // var interval = setInterval(this.handlePreservation(),10000); - // /* if 5 minutes no operation then logout */ - // var maxTime = 120; // seconds - // var time = maxTime; - // $('body').on('keydown mousemove mousedown', function(e) { - // time = maxTime; // reset - // }); - // var intervalId = setInterval(function() { - // time--; - // if (time <= 0) { - // ShowInvalidLoginMessage(); - // clearInterval(intervalId); - // } - // }, 10000) - // function ShowInvalidLoginMessage() { - // // 停止定时器 - // clearInterval(interval); - // } + // var interval = setInterval(this.handlePreservation(),10000); + // /* if 5 minutes no operation then logout */ + // var maxTime = 120; // seconds + // var time = maxTime; + // $('body').on('keydown mousemove mousedown', function(e) { + // time = maxTime; // reset + // }); + // var intervalId = setInterval(function() { + // time--; + // if (time <= 0) { + // ShowInvalidLoginMessage(); + // clearInterval(intervalId); + // } + // }, 10000) + // function ShowInvalidLoginMessage() { + // // 停止定时器 + // clearInterval(interval); + // } // } } else { if (num && num == 1) { @@ -1785,11 +1802,12 @@ this.selectedRowKeysValue.forEach((item, index) => { _array.push(item.id) }) - if(_array.length == 0){ + if (_array.length == 0) { return } let _this = this - let param = { ids: _array.join(','), + let param = { + ids: _array.join(','), currentPersonRole: this.currentPersonRole, paramsManifestId: this.$route.query.id } @@ -1847,9 +1865,9 @@ let _this = this let param = { ids: _array.join(',') } let url = '' - if(this.currentPersonRole == 'homo'){ + if (this.currentPersonRole == 'homo') { url = '/jero-boot/params/collectManifest/mandatoryWithdraw' - }else{ + } else { url = '/jero-boot/params/collectManifest/withdraw' } this.$confirm({ @@ -1893,8 +1911,8 @@ }, // 分配填写人 assignedBy() { - let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned() - // 工程接口人 + let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned() + // 工程接口人 if (sdtJurisdictionAssigned == 1) { this.areaVisibleAssignedby = true } else if (sdtJurisdictionAssigned == 0) { @@ -1913,7 +1931,16 @@ this.jurisdiction = 'SDTFPTXRHOMO' } }, - + batchUpdateDeadlineClick() { + if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) { + this.$refs.batchUpdateDeadlineRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysValue))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, + batchUpdateDeadlineForm() { + this.GetgetTableList() + }, // 分配填写人确定后弹框关闭 areaVisibleAssignedbyflag(val) { this.areaVisibleAssignedby = val @@ -1936,10 +1963,10 @@ areaVisibleTaskCutOffTimeflag(val) { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - areaVisibleTaskCutOffTimeAll(val){ + areaVisibleTaskCutOffTimeAll(val) { this.$refs.CollectionTabel.getTableList(this.queryParamQuery) }, - AdjustareasofresponAll(val){ + AdjustareasofresponAll(val) { console.log(val) this.Adjustareasofrespon = val this.$refs.CollectionTabel.getTableList(this.queryParamQuery) @@ -1987,7 +2014,7 @@ handleDel() { let param = { ids: this.selectedRowKeysArray, - paramsManifestId:this.$route.query.id + paramsManifestId: this.$route.query.id } if (this.selectedRowKeys.length > 0) { let _this = this @@ -2100,6 +2127,7 @@ cursor: pointer; border-radius: 4px; } + .operator-text-title { cursor: pointer; margin-right: 22px; @@ -2245,12 +2273,13 @@ } } } - .text-wraning{ + + .text-wraning { word-break: break-word; } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/batchUpdateDeadline.vue b/jero-web/src/views/projectManagement/components/batchUpdateDeadline.vue new file mode 100644 index 000000000..df10263db --- /dev/null +++ b/jero-web/src/views/projectManagement/components/batchUpdateDeadline.vue @@ -0,0 +1,196 @@ + + + + + + + \ No newline at end of file From e929e161dca020a16a54af2ff0c44282b608d2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 9 Mar 2023 17:38:52 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84/?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectTaskPlanningServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 6de8959a8..ff6b5abb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -56,11 +56,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Wed, 15 Mar 2023 10:14:24 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=B8=A6=E6=9C=89/=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 4ce6816a3..12e4e7161 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -2315,7 +2315,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Wed, 15 Mar 2023 10:39:36 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 507e800ba..dadfbaa12 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -931,24 +931,24 @@ key: 3, moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', }, - { - sort: '', - name: this.$t('listConfirmationStatus'), - headFieldCn:'清单确认状态', - headFieldEn:'List Confirmation Status', - field: 'inventoryAffirmStatusName', - key: 4, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', - }, - { - sort: '', - name: this.$t('taskAffirmStatus'), - headFieldCn:'任务确认状态', - headFieldEn:'Task Confirmation Status', - field: 'taskAffirmStatusName', - key: 5, - moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', - }, + // { + // sort: '', + // name: this.$t('listConfirmationStatus'), + // headFieldCn:'清单确认状态', + // headFieldEn:'List Confirmation Status', + // field: 'inventoryAffirmStatusName', + // key: 4, + // moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + // }, + // { + // sort: '', + // name: this.$t('taskAffirmStatus'), + // headFieldCn:'任务确认状态', + // headFieldEn:'Task Confirmation Status', + // field: 'taskAffirmStatusName', + // key: 5, + // moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单', + // }, { sort: '', name: this.$t('zoneOfApplication'), From 8faba8790863616f19e854d39117012d1c04d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 10:50:31 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 8 ++++---- .../projectRegulationTasks/components/dealtWith.vue | 6 +++--- .../projectRegulationTasks/components/doneList.vue | 8 ++++---- .../regulatoryAssessmentTasks/components/SentList.vue | 8 ++++---- .../regulatoryAssessmentTasks/components/dealtWith.vue | 6 +++--- .../regulatoryAssessmentTasks/components/doneList.vue | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9398cb80a..34ad20f6f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -83,28 +83,28 @@ align: 'left', dataIndex: 'lastAssigneeName', ellipsis: true, - width: 170 + width: 150 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 150 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 189f86557..3bfb19f25 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -84,14 +84,14 @@ align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170, + width: 150, scopedSlots: { customRender: 'endTime' } }, { @@ -99,7 +99,7 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 26d9d7611..b9f133f34 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -89,28 +89,28 @@ align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 150 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index bef67c63d..95b9daac0 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -74,28 +74,28 @@ align: 'left', dataIndex: 'lastAssigneeName', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 150 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index a52e15bc7..c3809f009 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -72,14 +72,14 @@ align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170, + width: 150, scopedSlots: { customRender: 'endTime' } }, { @@ -87,7 +87,7 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index b47816e1e..558c55730 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -71,28 +71,28 @@ align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('CurrentProcessor'), align: 'left', dataIndex: 'assigneeName', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 170 + width: 150 }, { title: this.$t('taskStatus'), align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('operation'), From 0c3d9f86adf05a18628b914b2fb94eab94d270c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:04:32 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 14 +++++++------- .../projectRegulationTasks/components/doneList.vue | 4 ++-- .../components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 4 ++-- .../components/doneList.vue | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 34ad20f6f..59c4e4bbb 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -61,7 +61,7 @@ dataIndex: 'projectName', scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('standardInformation'), @@ -69,7 +69,7 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 170 + width: 330 }, { title: this.$t('taskType'), diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 3bfb19f25..0a27f290b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -62,7 +62,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 170 + width: 110 }, { title: this.$t('standardInformation'), @@ -70,28 +70,28 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 170 + width: 260 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 120 }, { title: this.$t('Sponsor'), align: 'left', dataIndex: 'createBy', ellipsis: true, - width: 130 + width: 100 }, { title: this.$t('TaskCutOffTime'), align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 150, + width: 110, scopedSlots: { customRender: 'endTime' } }, { @@ -99,13 +99,13 @@ align: 'left', dataIndex: 'statusShow', ellipsis: true, - width: 130 + width: 80 }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 120, + width: 80, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index b9f133f34..3ac60c76d 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -67,7 +67,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 170 + width: 130 }, { title: this.$t('standardInformation'), @@ -75,7 +75,7 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 170 + width: 330 }, { title: this.$t('taskType'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 95b9daac0..f19f702a1 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -60,14 +60,14 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 170 + width: 330 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('LastProcessor'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index c3809f009..2d54fcac8 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -58,14 +58,14 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 170 + width: 330 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('Sponsor'), diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 558c55730..f421926a9 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -57,14 +57,14 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 170 + width: 330 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, - width: 170 + width: 130 }, { title: this.$t('Sponsor'), From 9de23336533781c670efe8f6ef1d095a6a9aac1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:13:26 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=89=88=E6=9C=AC=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=A4=E4=BD=8D=E6=95=B0=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/addModel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 40418ac3a..55ea1a3e5 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -76,8 +76,8 @@ {{$t('projectVersion')}}
- From d17ae70ca210d51935f95aa5b2f303d864ac48f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 11:27:08 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=88=86=E7=B1=BB=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=94=B9=E4=B8=BA=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= 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 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bba7da106..b29e0dee6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1240,9 +1240,9 @@ module.exports = { dre: 'Dre', applicableInstructionsMarketList: 'Applicable instructions of market list', pleaseSelectTheDataCompared: 'Please select the data to be compared', - problemLabel: 'Topic Tag', + problemLabel: 'classification', personCharge: 'Person in charge', - addLabel: 'Add Tag', + addLabel: 'New Classification', editLabel: 'Edit Label', applicableMarket: 'Applicable Market', templateMaintenance: 'Template Maintenance', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 938c70910..a9f9a9b68 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1342,9 +1342,9 @@ module.exports = { dre: '填写人', applicableInstructionsMarketList: '市场清单适用说明', pleaseSelectTheDataCompared: '请选择需要对比的数据', - problemLabel: '问题标签', + problemLabel: '分类', personCharge: '负责人', - addLabel: '新增标签', + addLabel: '新增分类', editLabel: '编辑标签', applicableMarket: '适用市场', templateMaintenance: '模板维护', From 516fa722b81213a57fd91b74d91dcfc670256695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Mar 2023 13:40:15 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=88=97=E8=A1=A8=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=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/externalReports/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 81a329dbf..920677cbc 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -143,10 +143,10 @@ :columns="columns" > - {{ text && text.length > 20 ? text.slice(0, 18) + '...' : text }} + {{ text }} - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} @@ -382,6 +382,7 @@ { title: this.$t('fileName'), align: 'left', + ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, width: 200 @@ -389,6 +390,7 @@ { title: this.$t('fileDeclaration'), align: 'left', + ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, width: 300 @@ -396,6 +398,7 @@ { title: this.$t('uploadedBy'), align: 'left', + ellipsis: true, dataIndex: 'createBy', width: 150 }, @@ -407,6 +410,7 @@ { title: this.$t('uploadTime'), align: 'left', + ellipsis: true, dataIndex: 'createTime', width: 250 }, @@ -414,6 +418,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', + ellipsis: true, width: 250, scopedSlots: { customRender: 'operation' } } @@ -1123,7 +1128,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 41b6745b5..fe8ef3d12 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -6,7 +6,7 @@
- {{$t('entryName')}} + {{ $t('entryName') }}
@@ -15,37 +15,38 @@
- {{$t('targetMarket')}} + {{ $t('targetMarket') }}
+ :triggerChange="false" :dictCode="'region'" />
- {{$t('brand')}} + {{ $t('brand') }}
+ :triggerChange="false" :dictCode="'brand'" />
- {{$t('query')}} - {{$t('reset')}} + {{ $t('query') }} + {{ $t('reset') }}
- {{$t('regulatoryCertificationTaskPlan')}} - {{$t('fullScreenView')}} + {{ $t('regulatoryCertificationTaskPlan') }} + {{ $t('fullScreenView') }}
- {{$t('determine')}} + {{ $t('determine') }}
@@ -68,13 +69,21 @@
-
{{item}}
+
{{ item }}
-
- {{item.projectName}} + + + {{ item.projectName }} +
@@ -83,12 +92,12 @@
-
{{val.name}}
-
{{val.name}} +
{{ val.name }}
+
{{ val.name }}
@@ -104,17 +113,17 @@
- {{handlingTime}} + {{ handlingTime }}
- {{this.$t('dataLoading')}} + {{ this.$t('dataLoading') }}
- {{$t('projectStatusAndProgress')}} - {{$t('fullScreenView')}} + {{ $t('projectStatusAndProgress') }} + {{ $t('fullScreenView') }}
- {{this.$t('CurrentStatusOfTheProject')}}
- {{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+'/'+$t('blue')+')'}} + {{ this.$t('CurrentStatusOfTheProject') }}
+ {{ '(' + $t('red') + '/' + $t('yellow') + '/' + $t('green') + '/' + $t('blue') + ')' }} - {{this.$t('CertificationProgress')}}
- {{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}} + {{ this.$t('CertificationProgress') }}
+ {{ '(' + $t('notInvolved') + '/' + $t('toBeStarted') + '/' + $t('inProgress') + '/' + $t('experimentFailed') + '/' + $t('experimentPassed') + ')' + }} - {{this.$t('listConfirmation')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('listConfirmation') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }} - {{this.$t('taskAffirm')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('taskAffirm') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }} - {{this.$t('designComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('designComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }} - {{this.$t('preHomeConfirmation')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('preHomeConfirmation') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }} - {{this.$t('verificationComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('verificationComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }}
@@ -161,589 +176,609 @@ \ No newline at end of file From e370d479aa2731ed69e4f0f9e0bcc5fcba5d1ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 16 Mar 2023 18:04:30 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index bbe2428c9..3614ab30c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2775,13 +2775,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); From 658f1ded2f88f19446a629684d4fedb33c6aca2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 17 Mar 2023 15:12:51 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BussDocumentLibraryEO.java | 14 ++++++ .../BussDocumentLibraryEOServiceImpl.java | 45 +++++++++++++++++++ .../components/Standardselection/index.vue | 24 +++++----- .../src/components/libraryAddForm/index.vue | 10 +++-- 4 files changed, 79 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 8ad2c2c07..5a8aa9b66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + + /**代替标准*/ + @ApiModelProperty(value = "代替标准") + @Dict(dicCode ="replace_standard") + private java.lang.String replaceStandard; + + + /**被代替标准*/ + @ApiModelProperty(value = "被代替标准") + @Dict(dicCode ="replaced_standard") + private java.lang.String replacedStandard; + + + @TableField(exist = false) private java.lang.String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3614ab30c..30304c593 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1726,6 +1726,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) { - let content = JSON.parse(JSON.stringify(this.selectedRowKeys)) - // this.content.forEach(res => { - // content.push(res.serial_number) - // replace_standard_id.push(res.id) - // }) - this.$emit('input', content.join(',')) - // this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) + // let content = JSON.parse(JSON.stringify(this.selectedRowList)) + this.selectedRowList.forEach(res => { + serial_number.push(res.serial_number) + replace_standard_id.push(res.id) + }) + this.$emit('input', serial_number.join(',')) + console.log(replace_standard_id) + this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) // this.$emit('changecontent', this.content) this.visible = false } else { @@ -168,9 +170,11 @@ indexclick(event) { this.$emit('input', event.target.value) }, - onSelectChange(value) { + onSelectChange(value,row) { console.log(value) + console.log(row) this.selectedRowKeys = value + this.selectedRowList = row // this.content = [] // value.forEach(val => { // this.dataList.forEach((res) => { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 86cd81291..c99abc593 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -169,6 +169,7 @@
@@ -494,10 +495,11 @@ this.type = 'add' this.getForm() }, - // StandardselectionChange(value, id) { - // this.formInline[value + '_id'] = id - // this.formInline = { ...this.formInline } - // }, + StandardselectionChange(value, id) { + console.log(id) + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id this.formInline = { ...this.formInline } From 810eaf817360aa63c86f897c6bfe1b3630492ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 09:17:49 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B7=B3=E8=BD=AC=E7=9F=A5=E8=AF=86=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/whole.vue | 503 +++++++++--------- .../components/changeExtensionModel.vue | 3 +- 2 files changed, 255 insertions(+), 251 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index a0f74948c..f4b548eb6 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -1,7 +1,7 @@