diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index e0bb51541..e968c17ff 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -58,6 +58,7 @@ {{$t('accept')}} @@ -81,6 +82,26 @@ + + +
+
+ * + {{$t('expectedDeliveryTime')}} +
+
+ + + +
+
@@ -140,6 +161,7 @@ props: {}, data() { return { + isDeliveryTime: false, titleName: '', allTitle: '', visible: false, @@ -247,19 +269,40 @@ message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } - ] + ], + deliveryTime: [ + { + required: true, + message: this.$t('expectedDeliveryTime') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], }, formInline: {}, uploadName: '' } }, methods: { + 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 } + }, + reviewResultChange(value) { + if (value.target.value == 'To be tracked') { + this.isDeliveryTime = true + } else { + this.isDeliveryTime = false + this.formInline.deliveryTime = '' + } + this.formInline = { ...this.formInline } + }, ...mapGetters(['userInfo']), confirmation(data, name) { this.visible = true this.processableList = [] this.noProcessableList = [] this.formInline = {} + this.isDeliveryTime = false data.forEach(res => { res = JSON.parse(res) if (name == this.$t('Taskresponsibilityrecognition')) { @@ -306,6 +349,9 @@ taskIds.push(res.taskId) }) let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + if (this.formInline.flag == 'To be tracked') { + this.formInline.approvalOpinion = this.formInline.approvalOpinion + ';' + this.$t('expectedDeliveryTime') + ':' + this.formInline.deliveryTime + } let query = { ...this.formInline, taskIds: taskIds.join(','), @@ -481,7 +527,7 @@ color: red; } - ::v-deep .ant-drawer-header .ant-drawer-title{ + ::v-deep .ant-drawer-header .ant-drawer-title { font-weight: bold; } \ No newline at end of file