From a6be82e54ea0368cecac5d5aae5ebe38a9e0af4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Mon, 24 Oct 2022 18:09:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/clock_record.vue | 2 +- src/views/wf/allwork.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/hrm/clock_record.vue b/src/views/hrm/clock_record.vue index d857b504..3cfb3bd2 100644 --- a/src/views/hrm/clock_record.vue +++ b/src/views/hrm/clock_record.vue @@ -2,7 +2,7 @@
- + { this.$message.success("任务执行下发成功"); }); From ee492a21591b7260571f12cae2b649911a8cc136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Mon, 24 Oct 2022 18:59:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=88=9B=E5=BB=BA/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ehsSelect/userselect.vue | 2 +- src/views/hrm/clock_record.vue | 17 ++++++++--------- src/views/hrm/ep_form.vue | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue index 73e26379..78de549c 100644 --- a/src/components/ehsSelect/userselect.vue +++ b/src/components/ehsSelect/userselect.vue @@ -321,7 +321,7 @@ export default { // }, rowClick(row, column, event){ if(!this.multiple){ - this.choseData = {'id': row.id, 'name': row.name} + this.choseData = row; this.$emit("submit", this.choseData); this.dialoguser=false } diff --git a/src/views/hrm/clock_record.vue b/src/views/hrm/clock_record.vue index 3cfb3bd2..84337d19 100644 --- a/src/views/hrm/clock_record.vue +++ b/src/views/hrm/clock_record.vue @@ -58,22 +58,21 @@ -