diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0bfb1cb9a..b91a8764e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1831,4 +1831,6 @@ module.exports = { proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility', contentsearch:'Content Search', masterProject:'Master Project', + deliveryTime:'Delivery Time', + expectedDeliveryTime:'Expected Delivery Time', } \ 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 f7055ac72..73a1e186f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1932,4 +1932,6 @@ module.exports = { proportionWithInTheAreaOfResponsibility:'责任领域内占比', contentsearch:'内容搜索', masterProject:'主项目', + deliveryTime:'交付时间', + expectedDeliveryTime:'预计交付时间', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index f79762644..fa30a9871 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -298,7 +298,7 @@ { title: this.$t('statisticalNodes'), align: 'left', - dataIndex: 'statNode', + dataIndex: 'firstLevelDutyTerritory', ellipsis: true, width: 100 }, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 81e29ade2..ea6dbae30 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -2,7 +2,8 @@
- {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw' + {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == + 'dezrrtjjfw' ? $t('personLiableConfirm'):$t('sponsorReview')}}
@@ -58,6 +59,26 @@ + + +
+
+ * + {{$t('expectedDeliveryTime')}} +
+
+ + + +
+
+
@@ -105,6 +126,7 @@ import { getAction, postAction, putAction, deleteAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import SelectedBy from '@/components/SelectedBy/index' + import moment from 'moment' export default { name: 'reviewedByThePersonInCharge', @@ -117,6 +139,7 @@ return { formInline: {}, isPersonnel: false, + isDeliveryTime: false, reviewResult: { 'launch': this.$t('Launch'), 'Compliance': this.$t('accord'), @@ -135,6 +158,13 @@ trigger: 'change' } ], + deliveryTime: [ + { + required: true, + message: this.$t('expectedDeliveryTime') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], approvalOpinion: [ { required: true, @@ -188,6 +218,11 @@ submit(callBack) { this.$refs.ruleForm.validate(valid => { if (valid) { + if (this.formInline.disposeResult == 'To be tracked') { + if (this.query.TaskKey == 'zrrtjjfw' || this.query.TaskKey == 'dezrrtjjfw') { + this.formInline.approvalOpinion = this.formInline.approvalOpinion + ';' + this.$t('expectedDeliveryTime') + ':' + this.formInline.deliveryTime + } + } callBack(this.formInline) } }) @@ -202,10 +237,18 @@ } else { this.$refs.SelectedByRef.visible = false this.isPersonnel = false + this.isDeliveryTime = false this.formInline.secondChargePersonUserId = '' this.formInline.dezrrSubmitUserName = '' this.formInline.dezrrSubmitUserId = '' } + if (value.target.value == 'To be tracked') { + this.isDeliveryTime = true + } else { + this.isDeliveryTime = false + this.formInline.deliveryTime = '' + } + this.formInline = { ...this.formInline } }, //转办接口 SelectedByForm(userIds, name) { @@ -248,6 +291,10 @@ this.$nextTick(() => { this.$refs.ruleForm.validateField([this.uploadName]) }) + }, + dateChange(item) { + this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' + this.formInline = { ...this.formInline } } } }