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

Merge branch 'master' into dev_2nd_LCYH

Browse Source 
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
This commit is contained in:
高嵩
2023-03-24 16:56:38 +08:00
parent 1daf1dcad0 eddac9197c
commit e115fc742e
30 changed files with 2081 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+102 -84
View File
@@ -44,17 +44,17 @@
: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">
@@ -202,6 +202,11 @@
<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 "
@@ -525,6 +530,8 @@
</div>
</a-modal>
<JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
<batchUpdateDeadline ref="batchUpdateDeadlineRef" @batchUpdateDeadlineForm="batchUpdateDeadlineForm"/>
</div>
</template>
@@ -543,6 +550,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'
@@ -562,7 +570,8 @@
ReferenceParameter,
SynchronousSubmissionLibrary,
TaskTime,
globalAdvancedQuery
globalAdvancedQuery,
batchUpdateDeadline
},
data() {
this.statusList = [
@@ -775,8 +784,8 @@
NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
NotSelectedNoEngineerValue: [],
paramsManifest: {},
timeBatch:'',
timer:'',
timeBatch: '',
timer: ''
}
},
props: {
@@ -788,8 +797,8 @@
},
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()
console.log(this.currentPersonRole)
if (this.$route.query.type == '1') {
@@ -805,26 +814,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
@@ -833,35 +842,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() {
@@ -959,24 +968,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);
// }
// }
})
},
@@ -1754,24 +1763,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) {
@@ -1918,7 +1927,7 @@
this.selectedRowKeysValue.forEach((item, index) => {
_array.push(item.id)
})
if(_array.length == 0){
if (_array.length == 0) {
return
}
let _this = this
@@ -2047,7 +2056,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
jero-web/src/views/projectManagement/components/addModel.vue
+2 -2
View File
@@ -76,8 +76,8 @@
<span class="title-text-text" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
</div>
<a-form-model-item class="itemModel" prop="projectVersion">
<a-input class="box-input"
:disabled="true"
<a-input class="box-input" oninput="javascript:this.value=this.value.replace(/[^\d]$/g,'')"
:maxLength="2"
v-model="formInline.projectVersion"
:placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
</a-form-model-item>
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>
jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue
+2 -1
View File
@@ -19,7 +19,8 @@
</div>
<a-form-model-item class="itemModel" prop="projectVersion">
<a-input class="box-input"
:disabled="true"
oninput="javascript:this.value=this.value.replace(/[^\d]$/g,'')"
:maxLength="2"
v-model="formInline.projectVersion"
:placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
</a-form-model-item>
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+614 -475
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+615 -580
View File
File diff suppressed because it is too large Load Diff