diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue index 48821c688..104927578 100644 --- a/jero-web/src/views/processCenter/components/footerProcess.vue +++ b/jero-web/src/views/processCenter/components/footerProcess.vue @@ -3,6 +3,7 @@
+ {{$t('terminationProcess')}} @@ -13,10 +14,13 @@ {{$t('sendBack')}} + {{$t('submit')}} {{$t('Resubmit')}} {{$t('submit')}} + {{$t('confirm')}} + {{$t('cancel')}}
@@ -65,6 +69,14 @@ type: Boolean, default: false }, + isCancel:{ + type: Boolean, + default: false + }, + isConfirm:{ + type: Boolean, + default: false + } }, methods: { terminationProcess() { @@ -95,7 +107,15 @@ adopt() { let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') this.$emit('adopt', handlingTime) - } + }, + cancel(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('cancel', handlingTime) + }, + confirm(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('confirm', handlingTime) + }, } } diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index be337f0b4..6ea6ef846 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -80,6 +80,7 @@ }, mounted() { this.queryForm = this.standardContentQuery + console.log(this.queryForm) }, methods: { urlClick(val) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 8f6117bb9..264068267 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -45,208 +45,30 @@ @showSizeChange="SizeChange" /> - -
-
- {{$t('basicInformation')}} -
-
-
- {{item.title}} - {{queryForm[item.value]}} - {{queryForm[item.value]}} - {{queryForm[item.value]}} -
-
-
-
-
- {{$t('TaskRequirements')}} -
-
-
- {{item.title}} - - - {{ $t('viewFile') }} - -
-
-
-
-
- {{$t('personLiableConfirm')}} -
-
-
- * - {{$t('reviewResults')}} -
- - - - {{$t('accord')}} - - - {{$t('nonConformity')}} - - - {{$t('Tracked')}} - - - {{$t('notInvolved')}} - - - {{$t('turnToDo')}} - - - -
-
-
- * - {{$t('feedbackMessage')}} -
- - - -
-
-
- {{$t('enclosure')}} -
- - {{$t('uploadattachment')}} - -
-
-
-
- {{$t('circulationHistory')}} -
-
-
-
- - - -
-
-
-
-
-
-
- - - -
-
- {{$t('cancel')}} - {{$t('sendBack')}} - {{$t('adopt')}} -
-
+ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue new file mode 100644 index 000000000..c833c2255 --- /dev/null +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -0,0 +1,313 @@ + + + + + + \ No newline at end of file