diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 699604e4f..9b6002a7b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1515,5 +1515,11 @@ module.exports = { Taskresponsibilityrecognition:'Task responsibility recognition', uploadattachment:'Upload attachment', Processhistory:'Process history', - resultofhandling:'Result of handling' + resultofhandling:'Result of handling', + Listoftreatableregulations:'List of treatable regulations', + Listofuntractableregulations:'List of untractable regulations', + project:'Project', + Categoryofdeliverables:'Category of deliverables', + Taskconfirmationresult:'Task confirmation result', + Compliancetaskhandling:'Compliance task handling' } \ 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 d45812e67..2b9b9361a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1617,5 +1617,11 @@ module.exports = { Taskresponsibilityrecognition:'任务责任确认', uploadattachment:'上传附件', Processhistory:'流程历史', - resultofhandling:'处理结果' + resultofhandling:'处理结果', + Listoftreatableregulations:'可处理法规列表', + Listofuntractableregulations:'不可处理法规列表', + project:'项目', + Categoryofdeliverables:"交付物类别", + Taskconfirmationresult:'任务确认结果', + Compliancetaskhandling:'符合性任务办理' } \ 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 ea1f60304..cc97263ab 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -59,78 +59,39 @@ {{$t('basicInformation')}}
-
- {{$t('entryName')}} - {{$t('entryName')}} +
+ {{item.title}} + {{queryForm[item.value]}} + {{queryForm[item.value]}} + {{queryForm[item.value]}}
-
- {{$t('regulationNo')}} - {{$t('regulationNo')}} -
-
- {{$t('title')}} - {{$t('title')}} -
-
- {{$t('subtitle')}} - {{$t('subtitle')}} -
-
- {{$t('applicableSupplement')}} - {{$t('applicableSupplement')}} -
-
+
{{$t('TaskRequirements')}}
-
- {{$t('Sponsor')}} - {{$t('Sponsor')}} -
-
- {{$t('personLiable')}} - {{$t('personLiable')}} -
-
- {{$t('closingDate')}} - {{$t('closingDate')}} -
-
- {{$t('typeOfDeliverables')}} - {{$t('typeOfDeliverables')}} -
-
- {{$t('deliverableTemplate')}} +
+ {{item.title}} {{$t('deliverableTemplate')}} -
-
- {{$t('descriptionDeliverables')}} - {{$t('descriptionDeliverables')}} + v-if="item.type == 1" + > + + {{ $t('viewFile') }} +
@@ -169,7 +130,8 @@ {{$t('feedbackMessage')}}
- +
@@ -219,16 +181,72 @@ @@ -627,18 +661,6 @@ width: 50%; margin-bottom: 8px; - .text-field-left { - width: 124px; - display: inline-block; - font-size: 14px; - font-weight: 400; - color: #6F7385; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - margin-right: 24px; - } - .text-field-right { width: calc(100% - 200px); display: inline-block; @@ -700,15 +722,15 @@ height: 38px; width: 100%; } - - .button-text { - height: 38px; - width: calc(100% - 250px); - line-height: 38px; - background: #fff; - border: 1px #00B3BE solid; - color: #00B3BE; - } + // + //.button-text { + // height: 38px; + // width: calc(100% - 250px); + // line-height: 38px; + // background: #fff; + // border: 1px #00B3BE solid; + // color: #00B3BE; + //} .process-content { margin-top: 4px; diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index faf5ef276..2887164b3 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -78,12 +78,12 @@
-
{{$t('Taskresponsibilityrecognition')}}
-
{{$t('complianceConfirmation')}} @@ -100,6 +100,7 @@ + @@ -108,16 +109,19 @@ import dealtWith from './components/dealtWith' import doneList from './components/doneList' import SentList from './components/SentList' + import confirmationDrawer from './components/confirmationDrawer' export default { name: 'index', components: { dealtWith, doneList, - SentList + SentList, + confirmationDrawer }, data() { return { + title: '', queryParam: { projectName:this.$route.query.projectName?this.$route.query.projectName:'' }, @@ -170,6 +174,14 @@ } }, methods: { + TaskresponsibilityrecognitionClick() { + this.$refs.confirmationdrawer.confirmation(1) + // this.title = this.$t('Taskresponsibilityrecognition') + }, + complianceConfirmationClick() { + this.$refs.confirmationdrawer.confirmation(2) + // this.title = this.$t('complianceConfirmation') + }, callback(value) { this.tabActive = value },