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/plan/manufacturingorder/auto-operationtask.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/plan/manufacturingorder/auto-operationtask.vue b/src/views/plan/manufacturingorder/auto-operationtask.vue
index 0fc3bb8..79dfcbd 100644
--- a/src/views/plan/manufacturingorder/auto-operationtask.vue
+++ b/src/views/plan/manufacturingorder/auto-operationtask.vue
@@ -74,7 +74,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="locationId" label="搴撲綅" align="center">
+     <!--  <el-table-column prop="locationId" label="搴撲綅" align="center">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.locationId"
@@ -92,7 +92,7 @@
             </el-option>
           </el-select>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="partNo"
         label="闆朵欢鍙�"
@@ -124,7 +124,7 @@
       </el-table-column>
       <el-table-column prop="sunit" label="鍗曚綅2" align="center">
       </el-table-column> -->
-      <el-table-column prop="reelSpec" label="杞藉叿瑙勬牸" align="center">
+     <!--  <el-table-column prop="reelSpec" label="杞藉叿瑙勬牸" align="center">
         <template slot-scope="scope">
           <el-input v-model="scope.row.reelSpec"></el-input>
         </template>
@@ -133,7 +133,7 @@
         <template slot-scope="scope">
           <el-input v-model="scope.row.discNum"></el-input>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="remark" label="澶囨敞" align="center">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark"></el-input>

--
Gitblit v1.9.3