From 57856b0d9a01c7127b32a0c97a302ccd0fb250a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 18 Jun 2026 13:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/user-add-or-update.vue | 20 ++++++++++----------
 src/views/modules/sys/user.vue               | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 3f178b0..2de7a19 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -41,16 +41,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="车间">
-            <el-select v-model="dataForm.workShopId" placeholder="请选择" style="width: 150px;"  clearable>
-              <el-option
-                v-for = "i in workShopList"
-                :key = "i.workShopId"
-                :label = "i.workShopName"
-                :value = "i.workShopId">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="车间">-->
+<!--            <el-select v-model="dataForm.workShopId" placeholder="请选择" style="width: 150px;"  clearable>-->
+<!--              <el-option-->
+<!--                v-for = "i in workShopList"-->
+<!--                :key = "i.workShopId"-->
+<!--                :label = "i.workShopName"-->
+<!--                :value = "i.workShopId">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item v-if="showSupplierPicker">
             <span slot="label" style="" @click="getBaseList(1100)"><a herf="#">{{'供应商'}}</a></span>
             <el-input v-model="dataForm.supplierNo" style="width: 150px;" placeholder="供应商"></el-input>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index a8494da..ad799ef 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -69,12 +69,12 @@
         width="180"
         :label="buttons.createTime||'创建时间'">
       </el-table-column>
-      <el-table-column
-        prop="workShopName"
-        header-align="center"
-        align="center"
-        :label="'车间'">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="workShopName"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        :label="'车间'">-->
+<!--      </el-table-column>-->
       <el-table-column
         prop="supplierNo"
         header-align="center"