From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/console/workstation/Dialog.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 5e44b5f..c610b05 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -129,7 +129,7 @@
</el-select>
</el-form-item>
</el-col> -->
- <el-col :span="12" v-if="form.ftpDirectoryType == 1">
+ <!-- <el-col :span="12" v-if="form.ftpDirectoryType == 1">
<el-form-item label="鍏宠仈鐩綍" prop="directoryId">
<el-select v-model="form.directoryId" style="width: 240px">
<el-option v-for="item in options.directorys" :key="item.id" :label="item.name"
@@ -137,7 +137,7 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="4">
+ <el-col :span="4">
<span>宸ヤ綔鍙�</span>
</el-col>
@@ -151,7 +151,7 @@
<el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">娣诲姞宸ヤ綔鍙�</el-button>
</el-col> -->
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺" prop="createDept">
+ <el-form-item label="鎵�灞為儴闂�" prop="createDept">
<el-tree-select :props="{
label: 'title',
id: 'id',
@@ -327,9 +327,9 @@
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/smis/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
- this.form.workbenchVOList = res?.data?.workstationList || []
- })
+ //this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
+ // this.form.workbenchVOList = res?.data?.workstationList || []
+ //})
})
} else {
this.form.id = ''
@@ -394,10 +394,10 @@
this.form.machineId = row.id
this.form.machineName = row.machineName
}
- this.$HTTP.get(`/api/blade-dnc/ftp-director/get-machine-of-workstation-ftp?id=${this.form.machineId}`).then(res => {
- this.directorys = res.data
- })
- console.log(row)
+ // this.$HTTP.get(`/api/blade-dnc/ftp-director/get-machine-of-workstation-ftp?id=${this.form.machineId}`).then(res => {
+ // this.directorys = res.data
+ // })
+ // console.log(row)
},
nodeClick(node) {
console.log(node)
--
Gitblit v1.9.3