From 9cb5bf025cf9440de0a0ac7f1b5ae7685210bb2f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 11 Jan 2022 17:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E8=AE=B0=E5=BD=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9c9abd963c92e55ea800c2701b24107950ca7148) --- src/views/modules/events/item-deal-handle.vue | 10 +- src/views/modules/events/item-deal-list.vue | 271 ++++++++++-------- .../events/item-delay-check-dialog.vue | 90 ++++++ .../modules/events/item-delay-dialog.vue | 114 ++++++++ .../modules/events/item-delay-log-dialog.vue | 63 ++++ .../itemfusingdelayrecord-add-or-update.vue | 159 ++++++++++ .../modules/events/itemfusingdelayrecord.vue | 94 ++++++ 7 files changed, 670 insertions(+), 131 deletions(-) create mode 100644 src/views/modules/events/item-delay-check-dialog.vue create mode 100644 src/views/modules/events/item-delay-dialog.vue create mode 100644 src/views/modules/events/item-delay-log-dialog.vue create mode 100644 src/views/modules/events/itemfusingdelayrecord-add-or-update.vue create mode 100644 src/views/modules/events/itemfusingdelayrecord.vue diff --git a/src/views/modules/events/item-deal-handle.vue b/src/views/modules/events/item-deal-handle.vue index affba143..c2e5901e 100644 --- a/src/views/modules/events/item-deal-handle.vue +++ b/src/views/modules/events/item-deal-handle.vue @@ -49,14 +49,14 @@ export default { itemId: '', state: '', reason: '', - delayStartTime:'', - delayEndTime:'' + delayStartTime: '', + delayEndTime: '' }, time: [], isAble: false, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.delayEndTime; + let beginDateVal = this.dataForm.delayEndTime if (beginDateVal) { return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } @@ -64,12 +64,12 @@ export default { }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.delayStartTime; + let EndDateVal = this.dataForm.delayStartTime if (EndDateVal) { return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } - }, + } } }, computed: { diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue index 6ff35124..bb3fccd9 100644 --- a/src/views/modules/events/item-deal-list.vue +++ b/src/views/modules/events/item-deal-list.vue @@ -191,7 +191,9 @@ >{{ $t('deal') }} - {{ '操作' }} + + {{ '延期' }} + {{ '延期记录' }} @@ -206,138 +208,155 @@ > - + + + diff --git a/src/views/modules/events/item-delay-check-dialog.vue b/src/views/modules/events/item-delay-check-dialog.vue new file mode 100644 index 00000000..2453eabd --- /dev/null +++ b/src/views/modules/events/item-delay-check-dialog.vue @@ -0,0 +1,90 @@ + + + diff --git a/src/views/modules/events/item-delay-dialog.vue b/src/views/modules/events/item-delay-dialog.vue new file mode 100644 index 00000000..039fa71b --- /dev/null +++ b/src/views/modules/events/item-delay-dialog.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/views/modules/events/item-delay-log-dialog.vue b/src/views/modules/events/item-delay-log-dialog.vue new file mode 100644 index 00000000..774099c6 --- /dev/null +++ b/src/views/modules/events/item-delay-log-dialog.vue @@ -0,0 +1,63 @@ + + + diff --git a/src/views/modules/events/itemfusingdelayrecord-add-or-update.vue b/src/views/modules/events/itemfusingdelayrecord-add-or-update.vue new file mode 100644 index 00000000..f773f48c --- /dev/null +++ b/src/views/modules/events/itemfusingdelayrecord-add-or-update.vue @@ -0,0 +1,159 @@ + + + diff --git a/src/views/modules/events/itemfusingdelayrecord.vue b/src/views/modules/events/itemfusingdelayrecord.vue new file mode 100644 index 00000000..f06de7ab --- /dev/null +++ b/src/views/modules/events/itemfusingdelayrecord.vue @@ -0,0 +1,94 @@ + + +