WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_2nd_20230301' 到 'master'

Browse Source 
Fix 2nd 20230301

查看合并请求 laws-nio/laws-weilai!295
This commit is contained in:
高嵩
2023-03-09 17:39:06 +08:00
parent 259227177c e929e161dc
commit c8510aecfc
8 changed files with 489 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+13
View File
@@ -673,4 +673,17 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
public Result<?> 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);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+3
View File
@@ -197,4 +197,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 创建高级查询条件
void createAdvanceedSearchCondition(List<QueryConditionVO> queryConditionVOList, StringBuilder sqlJoin);
// 认证工程师-批量编辑截止时间
Result<?> batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+19
View File
@@ -174,6 +174,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Autowired
private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
/**
* 保存
@@ -6352,4 +6354,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
sqlJoinSb.append(" ) ");
}
}
@Override
public Result<?> batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
throw new JeroBootException("参数不能为空！");
}
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")).stream().distinct().collect(Collectors.toList());
LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();
manifestUpdateWrap.set(ParamsCollectManifestEO::getDeadline,paramsCollectManifestVO.getDeadline());
manifestUpdateWrap.in(ParamsCollectManifestEO::getId,paramsCollectManifestIdList);
this.update(manifestUpdateWrap);
return Result.OK("批量编辑截止时间成功！");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+4 -5
View File
@@ -56,11 +56,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
*/
@Override
public void editById(ProjectTaskPlanning projectTaskPlanning) {
Date now = new Date();
projectTaskPlanning.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
projectTaskPlanning.setUpdateBy(sysUser.getUsername());
saveOrUpdate(projectTaskPlanning);
if (null != projectTaskPlanning && StringUtils.isNotEmpty(projectTaskPlanning.getId())) {
deleteById(projectTaskPlanning.getId());
add(projectTaskPlanning);
}
}
/**
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1383,4 +1383,5 @@ module.exports = {
beforedate:'In... Before date',
beforedatein:'In... Before date (inclusive)',
inRecentMonthsin6:'Within 6 months (implemented)',
batchUpdateDeadline:'Batch update deadline',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1484,4 +1484,5 @@ module.exports = {
beforedate:'在...日期之前',
beforedatein:'在...日期之前（包含）',
inRecentMonthsin6:'近6个月内（已实施）',
batchUpdateDeadline:'批量更新截止时间',
}
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+252 -223
View File
@@ -44,57 +44,57 @@
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('certificationCategory')">-->
<!-- <span>{{$t('certificationCategory')}}</span>-->
<!-- </div>-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'cert_category'"/>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('certificationCategory')">-->
<!-- <span>{{$t('certificationCategory')}}</span>-->
<!-- </div>-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'cert_category'"/>-->
<!-- </div>-->
<!-- </a-col>-->
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('dre')">
<span>{{$t('dre')}}</span>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('dre')">
<span>{{$t('dre')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
v-model="formInline.dre"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
v-model="formInline.dre"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('sdt')">
<span>{{$t('sdt')}}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('sdt')">
<span>{{$t('sdt')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
v-model="formInline.sdt"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
v-model="formInline.sdt"></a-input>
</div>
</a-col>
</a-col>
</template>
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('status')">-->
<!-- <span>{{$t('status')}}</span>-->
<!-- </div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
<!-- class="box-input"-->
<!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- v-model="formInline.state">-->
<!-- <a-select-option v-for="(item, key) in statusList"-->
<!-- :key="key"-->
<!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name}}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('status')">-->
<!-- <span>{{$t('status')}}</span>-->
<!-- </div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
<!-- class="box-input"-->
<!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- v-model="formInline.state">-->
<!-- <a-select-option v-for="(item, key) in statusList"-->
<!-- :key="key"-->
<!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name}}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </div>-->
<!-- </a-col>-->
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
@@ -130,11 +130,11 @@
<a-icon type="plus"/>
{{$t('addTo')}}
</div>
<!-- &lt;!&ndash; 下发收集 &ndash;&gt;-->
<!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
<!-- <a-icon type="solution"/>-->
<!-- {{$t('distributionAndCollection')}}-->
<!-- </div>-->
<!-- &lt;!&ndash; 下发收集 &ndash;&gt;-->
<!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
<!-- <a-icon type="solution"/>-->
<!-- {{$t('distributionAndCollection')}}-->
<!-- </div>-->
<!-- 导出-->
<div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<a-icon type="export" :rotate="-90"/>
@@ -161,25 +161,28 @@
{{$t('Updateparametercolumn')}}
</div>
<!-- 同步上报库 -->
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="sync"/>
{{$t('SynchronousReportLibrary')}}
</div>
<!-- 截止时间-->
<!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
<!-- <a-icon type="bulb"/>-->
<!-- {{$t('TaskCutOffTime')}}-->
<!-- </div>-->
<!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
<!-- <a-icon type="bulb"/>-->
<!-- {{$t('TaskCutOffTime')}}-->
<!-- </div>-->
<!-- 批量删除-->
<div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="user"/>
{{$t('bringInTheProjectInterface')}}
</div>
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="setting"/>
{{$t('Adjustareasofresponsibility')}}
</div>
@@ -188,14 +191,21 @@
<a-icon type="copy"/>
{{$t('Assignedby')}}
</div>
<!-- 批量更新截止时间-->
<div @click="batchUpdateDeadlineClick" class="operator-text-title" v-if='currentPersonRole == "homo" '>
<a-icon type="profile"/>
{{$t('batchUpdateDeadline')}}
</div>
</template>
<!-- @click='morepop'-->
<div class="operator-text" style="position: relative " v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<!-- @click='morepop'-->
<div class="operator-text" style="position: relative "
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
</div>
</a-popconfirm>
<!-- 下发收集 -->
<div @click="distributionAndCollectionJurisdiction" class="operator-text" v-if='currentPersonRole == "homo"'>
<div @click="distributionAndCollectionJurisdiction" class="operator-text"
v-if='currentPersonRole == "homo"'>
<a-icon type="solution"/>
{{$t('distributionAndCollection')}}
</div>
@@ -233,7 +243,8 @@
</div>
<!-- 导入-->
<div class="operator-text" v-if='currentPersonRole == "dre"'>
<ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id' @getList='getList'/>
<ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id'
@getList='getList'/>
</div>
<!-- 填写人导出-->
<div @click="handleExportDre" class="operator-text"
@@ -244,7 +255,7 @@
<!-- 强制撤回-->
<div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<a-icon type="undo":rotate="90"/>
<a-icon type="undo" :rotate="90"/>
{{$t('CompulsoryWithdrawal')}}
</div>
@@ -258,9 +269,9 @@
</div>
<div style="width: 100%">
<!-- 表格-10控件-->
<!-- :queryParamQuery='queryParamQuery'-->
<!-- :queryParamQuery='queryParamQuery'-->
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
:formInline='formInline' :currentPersonRole='currentPersonRole'
:formInline='formInline' :currentPersonRole='currentPersonRole'
@getDataSource="getDataSource"
@handlePreservation="handlePreservation"
@value='value'
@@ -323,27 +334,28 @@
<!-- 认证分配填写人--->
<a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null">
<assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@GetgetLoginUserType='GetgetLoginUserType'
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' @areaVisible='areaVisibleAssignedbyhomo = false'/>
@GetgetTableList='GetgetTableList'
@GetgetLoginUserType='GetgetLoginUserType'
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo'
@areaVisible='areaVisibleAssignedbyhomo = false'/>
</a-modal>
<!-- 下发收集--->
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
<task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
<!-- </a-modal>-->
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
<task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
<!-- </a-modal>-->
<!-- 一键下发收集--->
<!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
<task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
<!-- </a-modal>-->
<!-- 调整责任领域-->
<!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
<task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
<!-- </a-modal>-->
<!-- 调整责任领域-->
<a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
<adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@AdjustareasofresponAll='AdjustareasofresponAll'/>
@GetgetTableList='GetgetTableList'
@AdjustareasofresponAll='AdjustareasofresponAll'/>
</a-modal>
<!-- 引用参数--->
<a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
@@ -373,9 +385,9 @@
<parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel'
@GetgetTableList='GetgetTableList'
@GetgetHeader='GetgetHeader'
:templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
:projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
:templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
:projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
</parameter-column>
</a-drawer>
@@ -444,7 +456,8 @@
<!-- 认证工程师-提示-->
<div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
{{ 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')}}
<!-- 下发收集时-->
<span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -484,7 +497,7 @@
<p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
</span>
<!-- 强制撤回-->
<span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning" >
<span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
<p style='display: inline; color: red'>'{{$t('SynchronizedLibrary')}}'</p>
{{$t('or')}}
<p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p>
@@ -506,6 +519,8 @@
</div>
</a-modal>
<JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
<batchUpdateDeadline ref="batchUpdateDeadlineRef" @batchUpdateDeadlineForm="batchUpdateDeadlineForm"/>
</div>
</template>
@@ -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;
}
</style>
<style lang='less'>
.ant-popover-message-title{
margin-bottom: -30px;
}
.ant-popover-message-title {
margin-bottom: -30px;
}
</style>
jero-web/src/views/projectManagement/components/batchUpdateDeadline.vue
+196
View File
@@ -0,0 +1,196 @@
<template>
<a-modal
:title="$t('batchUpdateDeadline')"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
@ok="handleOk"
@cancel="visible = false"
>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('Deadline')">{{$t('Deadline')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'deadline'">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('Deadline')"
:getCalendarContainer="(trigger) => trigger.parentNode"
format="YYYY-MM-DD"
v-model="formInline.deadline"
style="width: 100%"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
</template>
<script>
import moment from 'moment'
import { postAction, putAction, getAction } from '@/api/manage'
export default {
name: 'batchUpdateDeadline',
data() {
return {
visible: false,
confirmLoading: false,
formInline: {},
rules: {
deadline: [
{
required: true,
message: this.$t('Deadline') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
idList: []
}
},
mounted() {
},
methods: {
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let query = {
ids: this.idList.join(','),
deadline: moment(this.formInline.deadline).format('YYYY-MM-DD HH:mm:ss')
}
this.confirmLoading = true
postAction('/params/collectManifest/batchEditDeadline', query).then((res) => {
if (res.success) {
this.visible = false
this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('batchUpdateDeadlineForm')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
})
}
})
},
getData(data) {
this.idList = []
if (data && data.length > 0) {
data.forEach(res => {
this.idList.push(res.id)
})
this.visible = true
this.formInline = {}
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
}
}
}
</script>
<style>
.formAdd .ant-form-item-label {
width: 130px;
}
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: 100%;
}
/*.formAdd .ant-form-item {*/
/* margin-bottom: 20px;*/
/*}*/
.itemModel .ant-form-item-control-wrapper {
width: 100%;
}
.box-input .ant-select-selection--single {
height: 38px;
}
.box-input .ant-select-selection--multiple {
height: 38px;
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
margin-top: 6px;
}
.box-input .ant-calendar-picker {
line-height: 38px;
height: 38px;
}
.box-input .ant-calendar-picker-input {
height: 38px;
}
.box-input .ant-input-number-input-wrap {
line-height: 38px;
height: 38px;
}
.box-input .ant-calendar-picker-input {
padding: 4px 30px 4px 11px;
}
</style>
<style scoped>
.box-title-text {
line-height: 1.4;
display: flex;
}
.title-text {
width: 104px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-bottom: 40px;
}
.Required{
color: red;
}
</style>