From 3931e2728f618d0090f129b2665bc1285c4440c3 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 17:27:32 +0800
Subject: [PATCH] update
---
src/views/console/workstation/Dialog.vue | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 4e0ddc4..5e44b5f 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -41,13 +41,33 @@
<scUpload v-model="form.avatar" title="宸ヤ綅鍥剧墖"></scUpload>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-show="!form.id">
<el-form-item label="鐢熶骇鏃ュ巻" prop="calendarCode">
<el-select v-model="form.calendarCode" style="width: 240px">
<el-option v-for="item in options.calendarList" :key="item.id" :label="item.name"
- :value="item.id" />
+ :value="item.code" />
</el-select>
</el-form-item>
+ </el-col>
+ <!-- 淇敼鐨勬鏃ョ敓鏁� -->
+ <el-col :span="11" v-show="form.id">
+ <el-form-item label="鐢熶骇鏃ュ巻" prop="calendarCode">
+ <el-select v-model="form.calendarCodeWaiting" style="width: 240px">
+ <el-option v-for="item in options.calendarList" :key="item.id" :label="item.name"
+ :value="item.code" />
+ </el-select>
+ </el-form-item>
+
+ </el-col>
+ <el-col :span="1" v-show="form.id">
+ <div style="display: flex;align-items: center;height: 32px;margin-bottom: 18px;">
+ <el-tooltip class="box-item" effect="dark" content="淇敼鍚庣殑鏃ュ巻娆℃棩鐢熸晥" placement="top-start">
+ <el-icon>
+ <el-icon-warning-filled style="vertical-align: middle" />
+ </el-icon>
+ </el-tooltip>
+ </div>
+
</el-col>
<el-col :span="24" style="padding:12px 0;" v-if="form.type == 0">
鏈哄櫒淇℃伅
@@ -68,7 +88,8 @@
filterable>
<el-option v-for="item in options.listnoband" :key="item.id" :label="item.machineName"
:value="item.id">
- {{ `${item?.machineCode}-${item?.machineName}-${item?.brand}` }}</el-option>
+ {{ `${item?.machineCode}-${item?.machineName}${item?.brand ? '-' + item.brand : ''}`
+ }}</el-option>
</el-select>
<el-input v-if="form.id" :disabled="form.id" v-model="form.machineName"></el-input>
</el-form-item>
@@ -88,7 +109,7 @@
<el-form-item label="鍔犲伐灞炴��" prop="properties">
<el-select v-model="form.properties" style="width: 240px">
<el-option v-for="item in options.machining_type" :key="item.dictKey"
- :label="item.dictValue" :value="item.dictKey" />
+ :label="item.dictValue" :value="item.dictKey - 0" />
</el-select>
</el-form-item>
</el-col>
@@ -116,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>
@@ -131,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-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>
@@ -198,6 +219,7 @@
status: '',
avatar: '',
calendarCode: '',
+ calendarCodeWaiting: '',
linkWay: '',
machineId: '',
machineCode: '',
@@ -301,9 +323,11 @@
Object.keys(this.form).forEach(key => {
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
- this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
+ 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 || []
})
})
--
Gitblit v1.9.3