From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/workstation/workstation-form.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 3b09630..f9f8c9e 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -1,10 +1,10 @@
<template>
<el-dialog
- v-diadrag
:title="!dataForm.id ? '鏂板' : '淇敼'"
:close-on-click-modal="false"
:visible.sync="visible"
- style="min-width: 2000px"
+ width="60%"
+ top="5vh"
>
<el-row>
<el-form
@@ -127,7 +127,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭寰呮搴撲綅" name="inspection">
+ <!-- <el-tab-pane label="浜у嚭寰呮搴撲綅" name="inspection">
<el-transfer
filterable
v-model="inspectionLocationIds"
@@ -137,8 +137,8 @@
@change="handleChangeInspectionLocation"
>
</el-transfer>
- </el-tab-pane>
- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
v-model="disqualifiedLocationIds"
@@ -159,8 +159,8 @@
@change="handleChangeQualifiedLocation"
>
</el-transfer>
- </el-tab-pane>
- <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
v-model="pendingLocationIds"
@@ -170,7 +170,7 @@
@change="handleChangePendingLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鎴愬搧寰呮搴撲綅" name="product">
<el-transfer
filterable
@@ -416,7 +416,6 @@
getObj(this.dataForm.id).then((response) => {
if (this.dataForm) {
this.dataForm = response.data.data
- console.log(this.dataForm)
this.allEquipList = this.dataForm.equipments
this.allFeedLocation = this.dataForm.locations
this.allLocation = JSON.parse(
--
Gitblit v1.9.3