diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 327c809ed..0512e7b97 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1327,4 +1327,7 @@ module.exports = {
completednum: 'Quantity to be filled',
filledBynum:'Filled by',
parameterToBeInitiatednum:'Parameter to be initiated',
+ listToConfirm:'List to confirm',
+ toSubmit:'To submit',
+ toAudit:'To audit',
}
\ 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 8ee9717a9..be0b822e1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1428,4 +1428,7 @@ module.exports = {
completednum: '待填写数量',
filledBynum:'待分配填写人数量',
parameterToBeInitiatednum:'参数待发起数量',
+ listToConfirm:'待确认',
+ toSubmit:'待提交',
+ toAudit:'待审核',
}
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 8e110122d..111ca9a60 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -43,49 +43,49 @@
{
title: this.$t('RelatedItems'),
align: 'center',
- dataIndex: 'RelatedItems',
+ dataIndex: 'projectName',
ellipsis: true,
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'standardInformation',
+ dataIndex: 'serialNumber',
ellipsis: true,
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
- dataIndex: 'taskType',
+ dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('LastProcessor'),
align: 'center',
- dataIndex: 'LastProcessor',
+ dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
- dataIndex: 'CurrentProcessor',
+ dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
- dataIndex: 'TaskCutOffTime',
+ dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
- dataIndex: 'taskStatus',
+ dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
@@ -102,11 +102,14 @@
pageNo:1,
total:0,
url:{
- list:'',
+ list:'/todoCenter/projectProcess/issuedProcess',
},
queryParam:{},
}
},
+ mounted() {
+ this.getList()
+ },
methods:{
viewClick(val){
@@ -163,5 +166,9 @@
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 101a5c019..7edbe9926 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -1,107 +1,111 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index a12ef8680..4b9bacacb 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -40,56 +40,56 @@
dataSource:[],
loading:false,
url:{
- list:'',
+ list:'/todoCenter/projectProcess/doneProcess',
},
queryParam:{},
columns:[
{
title: this.$t('RelatedItems'),
align: 'center',
- dataIndex: 'RelatedItems',
+ dataIndex: 'projectName',
ellipsis: true,
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'standardInformation',
+ dataIndex: 'serialNumber',
ellipsis: true,
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
- dataIndex: 'taskType',
+ dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
- dataIndex: 'Sponsor',
+ dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
- dataIndex: 'CurrentProcessor',
+ dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
- dataIndex: 'TaskCutOffTime',
+ dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
- dataIndex: 'taskStatus',
+ dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
@@ -107,6 +107,9 @@
total:0,
}
},
+ mounted() {
+ this.getList()
+ },
methods:{
viewClick(val){
@@ -163,5 +166,9 @@
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index ac1792af7..8975a4fcb 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -9,7 +9,7 @@
{{$t('RelatedItems')}}
+ v-model="queryParam.projectName">
@@ -18,7 +18,7 @@
{{$t('standardInformation')}}
+ v-model="queryParam.serialNumber">
@@ -30,7 +30,7 @@
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
- v-model="queryParam.taskType">
+ v-model="queryParam.flowType">
@@ -51,7 +51,7 @@
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
- v-model="queryParam.flowStatus">
+ v-model="queryParam.status">
@@ -117,26 +117,47 @@
taskTypeList: [
{
name:this.$t('confirmationOfRegulationsList'),
- value:'1',
+ value:'10',
},
{
name:this.$t('listTaskConfirmation'),
- value:'2',
+ value:'1',
},
{
name:this.$t('designComplianceReview'),
- value:'3',
+ value:'2',
},
{
name:this.$t('preHomeConfirmation'),
- value:'4',
+ value:'3',
},
{
name:this.$t('verificationComplianceReview'),
- value:'5',
+ value:'4',
+ },
+ ],
+ taskStatusList: [
+ {
+ name:this.$t('listToConfirm'),
+ value:'List to confirm',
+ },
+ {
+ name:this.$t('Finished'),
+ value:'Completed',
+ },
+ {
+ name:this.$t('inquiry'),
+ value:'Inquiry',
+ },
+ {
+ name:this.$t('toSubmit'),
+ value:'To submit',
+ },
+ {
+ name:this.$t('toAudit'),
+ value:'To audit',
},
],
- taskStatusList: [],
tabActive: this.$t('toDoProcess')
}
},