From b01fba286e42022e39fde27763b641145c089d0e Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Wed, 5 Feb 2025 17:38:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A5=E4=BD=9C=E7=AB=99?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9=E4=B8=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9C=E6=89=80=E5=B1=9E=E8=BD=A6=E9=97=B4=E2=80=9D=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=E3=80=82=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E4=B8=AD=E7=9A=84=E2=80=9C=E6=89=80=E5=B1=9E=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=E2=80=9D=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/machinerySelect/single.vue | 11 ++++++++++-
 src/views/mes/dv/machinery/index.vue      | 10 ++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/machinerySelect/single.vue b/src/components/machinerySelect/single.vue
index 934a54c..c5b6051 100644
--- a/src/components/machinerySelect/single.vue
+++ b/src/components/machinerySelect/single.vue
@@ -52,6 +52,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="所属车间" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+              placeholder="请输入所属车间"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -68,7 +77,7 @@
           <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
           <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
           <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
-          <el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName"  :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
           <el-table-column label="设备状态" align="center" key="status" prop="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index 53e64c4..35b6e2c 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -123,7 +123,7 @@
           <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
           <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
           <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
-          <el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName"  :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
           <el-table-column label="设备状态" align="center" key="status" prop="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
@@ -218,7 +218,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="所属车间" prop="workshopId">
-                  <el-select v-model="form.workshopId" placeholder="请选择车间">
+                  <el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间">
                     <el-option
                         v-for="item in workshopOptions"
                         :key="item.workshopId"
@@ -412,6 +412,12 @@ export default {
     this.getTreeselect();
   },
   methods: {
+    changeWorkshop(val) {
+      const workshop = this.workshopOptions.filter(item => item.workshopId == val)
+      this.form.workshopId = workshop[0].workshopId
+      this.form.workshopName = workshop[0].workshopName
+      this.form.workshopCode = workshop[0].workshopCode
+    },
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;