diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 85af32664..17cd6db8c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -707,6 +707,7 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'enclosure',
// 认证
+ checkTheDeadline: 'Select the collection deadline of the parameter item',
accountNumber: 'account Number',
fullName: 'full Name',
configurationInformation: 'configuration Information',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 7308948ce..8a48b73a3 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -717,6 +717,7 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
+ checkTheDeadline: '选中参数项收集截止时间',
accountNumber: '账号',
fullName: '姓名',
configurationInformation: '配置信息',
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
new file mode 100644
index 000000000..44086b7ea
--- /dev/null
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 17d6483c7..70f486201 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -83,6 +83,11 @@
{{$t('CompulsoryWithdrawal')}}
+
+
+
+ {{$t('TaskCutOffTime')}}
+
...{{ $t('more') }}
@@ -163,6 +168,10 @@
+
+
+
+
@@ -170,16 +179,19 @@
import TableCollection from '@/components/tableCollection/index'
import { getAction,postAction } from '../../../api/manage'
import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+import TaskCutOffTime from '@/components/TaskCutOffTime/index'
import AssignedBy from '@/components/AssignedBy/index'
import axios from 'axios'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
+import moment from 'moment'
export default {
name: 'ParameterItemCollectionList',
components:{
TableCollection,
ParameterLibraryAdd,
- AssignedBy
+ AssignedBy,
+ TaskCutOffTime
},
data(){
return{
@@ -263,6 +275,7 @@ export default {
Dateline: {},
areaVisibleFreeze: false, // 冻结配置
areaVisibleAssignedby: false, // 分配填写人弹框
+ areaVisibleTaskCutOffTime: false, // 截至时间弹框
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
@@ -566,9 +579,18 @@ export default {
assignedBy() {
this.areaVisibleAssignedby = true
},
+ // 分配填写人确定后弹框关闭
areaVisibleAssignedbyflag(val) {
this.areaVisibleAssignedby = val
},
+ // 截止时间
+ TaskCutOffTime() {
+ this.areaVisibleTaskCutOffTime = true
+ },
+ // 截至时间确定弹框关闭
+ areaVisibleTaskCutOffTimeflag(val) {
+ this.areaVisibleTaskCutOffTime = val
+ },
handleModule() {
},