From 3007cbf86ea42756be4d5bf4f81e0d56d6150c67 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 00:52:48 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/console/workstation/Dialog.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 3520765..1c6de53 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -323,9 +323,10 @@
Object.keys(this.form).forEach(key => {
this.form[key] = params[key]
})
- if (this.form.calendarCode) this.form.calendarCodeWaiting = this.form.calendarCodeWaiting || this.form.calendarCode
+
this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${params.id}`).then(res => {
this.form = res?.data
+ if (this.form.calendarCode && !this.form.calendarCodeWaiting) this.form.calendarCodeWaiting = this.form.calendarCode
this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
this.form.workbenchVOList = res?.data?.workstationList || []
})
--
Gitblit v1.9.3