From 0aa4f9751aadb4abb3637bc74fb7f0b48dd7a23e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 15:01:23 +0800
Subject: [PATCH] Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new
---
src/views/console/workstation/Dialog.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 1c6de53..49df965 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -137,10 +137,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="4">
- <!-- <el-form-item label="宸ヤ綔鍙�" prop="workbenchVOList"> -->
-
- <!-- </el-form-item> -->
+ <!-- <el-col :span="4">
<span>宸ヤ綔鍙�</span>
</el-col>
@@ -152,13 +149,16 @@
</li>
</ul>
<el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">娣诲姞宸ヤ綔鍙�</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺" prop="createDept">
- <el-tree-select clearable @node-click="nodeClickTree" v-model="form.createDept" :data="tree"
+ <el-form-item label="鎵�灞為儴闂�" prop="createDept">
+ <el-tree-select :props="{
+ label: 'title',
+ id: 'id',
+ }" clearable @node-click="nodeClickTree" v-model="form.createDept" :data="tree"
:check-on-click-node="true" style="width: 240px">
- <template #default="{ data: { title } }">
- {{ title }}</template>
+ <!-- <template #default="{ data: { title } }">
+ {{ title }}</template> -->
</el-tree-select>
</el-form-item>
</el-col>
@@ -324,10 +324,10 @@
this.form[key] = params[key]
})
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${params.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/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.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
this.form.workbenchVOList = res?.data?.workstationList || []
})
})
--
Gitblit v1.9.3