From 908328b13be01bdedba01d528bbd8ae4078bc0c7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 12 十二月 2023 13:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/basic/workstation/workstation-form.vue |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 9947e12..7366bbb 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -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,7 +137,7 @@
             @change="handleChangeInspectionLocation"
           >
           </el-transfer>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
           <el-transfer
             filterable
@@ -160,7 +160,7 @@
           >
           </el-transfer>
         </el-tab-pane> -->
-        <el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
+        <!-- <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