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