From 0ca551a6c0f88aaa3b3ab61bb74fbf3c2b4ac770 Mon Sep 17 00:00:00 2001 From: Romesum Date: Wed, 27 May 2020 02:49:05 +0800 Subject: [PATCH] =?UTF-8?q?[feat][v]:=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6=E5=AF=B9=E6=8E=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- element-vue/src/components/manager/applyDetailDialog.vue | 4 ++++ element-vue/src/pages/manager/applyRecord.vue | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/element-vue/src/components/manager/applyDetailDialog.vue b/element-vue/src/components/manager/applyDetailDialog.vue index f3673d5..22642bf 100644 --- a/element-vue/src/components/manager/applyDetailDialog.vue +++ b/element-vue/src/components/manager/applyDetailDialog.vue @@ -61,12 +61,16 @@ }).then(async ({ value }) => { this.data.refuseReason = value await post('lb/labrecord/refuse',this.data) + this.$emit('complete') + this.show = false showSuccess('已拒绝申请!',this) }).catch(()=>{}) }, async commit(){ await showDialog('确定同意吗?',this) await post('lb/labrecord/commit',this.data) + this.$emit('complete') + this.show = false showSuccess('已同意申请!',this) } diff --git a/element-vue/src/pages/manager/applyRecord.vue b/element-vue/src/pages/manager/applyRecord.vue index 2b81565..b6ac854 100644 --- a/element-vue/src/pages/manager/applyRecord.vue +++ b/element-vue/src/pages/manager/applyRecord.vue @@ -44,7 +44,7 @@ - + @@ -64,8 +64,10 @@ } }, methods:{ + async load(){ + this.tableData = await get('/lb/labrecord/getRecordList') + }, async showDetail(item){ - const data = await get('lb/labrecord/getRecordDetail',item) data.create_time = new Date(data.create_time).toLocaleString( ) data.weeks = arr2shortString(data.weeks)?'第'+arr2shortString(data.weeks)+'周':'' @@ -74,7 +76,7 @@ } }, async mounted() { - this.tableData = await get('/lb/labrecord/getRecordList') + await this.load() } }