From afe9bb8abcb3aa46a657c4994fdc0f010fc5162d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 21 Jul 2025 17:25:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E5=B7=A5=E5=BA=8F=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prodInputScanInfo/index.vue     |  2 +-
 src/views/mes/technologyInfo/formingIndex.vue | 25 +++++++++++--------
 src/views/mes/technologyInfo/index.vue        | 25 +++++++++++--------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
index 3d1472d..13cee42 100644
--- a/src/views/mes/prodInputScanInfo/index.vue
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -245,7 +245,7 @@ const columns = ref<FieldOption[]>([
   { key: 7, label: `物料`, visible: true },
   { key: 8, label: `投料工位`, visible: true },
   { key: 9, label: `扫描结果`, visible: true },
-  { key: 10, label: `记录人名称`, visible: true },
+  { key: 10, label: `记录人名称`, visible: false },
   { key: 11, label: `备注`, visible: false },
   { key: 12, label: `创建部门`, visible: false },
   { key: 13, label: `记录人`, visible: false },
diff --git a/src/views/mes/technologyInfo/formingIndex.vue b/src/views/mes/technologyInfo/formingIndex.vue
index 8a5b799..79c322b 100644
--- a/src/views/mes/technologyInfo/formingIndex.vue
+++ b/src/views/mes/technologyInfo/formingIndex.vue
@@ -57,11 +57,7 @@
           <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
           <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
           <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
-          <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
-            <template #default='scope'>
-              <dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
-            </template>
-          </el-table-column>
+          <el-table-column label='机台类型' align='center' prop='deviceTypeName' v-if='columns[4].visible' />
           <el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
             <template #default='scope'>
               <dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
@@ -130,11 +126,11 @@
           <el-form-item label='机台类型' prop='machineType'>
             <el-select v-model='form.machineType' placeholder='请选择机台类型'>
               <el-option
-                v-for='dict in mes_machine_type'
-                :key='dict.value'
-                :label='dict.label'
-                :value='dict.value'
-              ></el-option>
+                v-for='item in deviceTypeList'
+                :key='item.deviceTypeId'
+                :label='item.deviceTypeName'
+                :value='item.deviceTypeId'
+              />
             </el-select>
           </el-form-item>
           <el-form-item label='工艺类型' prop='technologyType'>
@@ -348,6 +344,7 @@ import {
 import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
+import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -394,6 +391,13 @@ const getProcessInfoListSelect = async () => {
   processInfoList.value = res.data;
 };
 
+/** 查询机台类型下拉框结构 */
+const deviceTypeList = ref([]);
+const getSelectBaseDeviceTypeList = async () => {
+  let res = await getBaseDeviceTypeList({ deviceCategoryId: 2 });
+  deviceTypeList.value = res.data;
+};
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `主键标识`, visible: false },
@@ -655,6 +659,7 @@ const handleProdLineSelectionChange = (selection) => {
 
 onMounted(() => {
   getProcessInfoListSelect();
+  getSelectBaseDeviceTypeList();
   getList();
 });
 </script>
diff --git a/src/views/mes/technologyInfo/index.vue b/src/views/mes/technologyInfo/index.vue
index 90f037d..b1123d1 100644
--- a/src/views/mes/technologyInfo/index.vue
+++ b/src/views/mes/technologyInfo/index.vue
@@ -81,11 +81,7 @@
         <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
         <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
         <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
-        <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
-          <template #default='scope'>
-            <dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
-          </template>
-        </el-table-column>
+        <el-table-column label='机台类型' align='center' prop='deviceTypeName' v-if='columns[4].visible' />
         <el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
           <template #default='scope'>
             <dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
@@ -154,11 +150,11 @@
         <el-form-item label='机台类型' prop='machineType'>
           <el-select v-model='form.machineType' placeholder='请选择机台类型'>
             <el-option
-              v-for='dict in mes_machine_type'
-              :key='dict.value'
-              :label='dict.label'
-              :value='dict.value'
-            ></el-option>
+              v-for='item in deviceTypeList'
+              :key='item.deviceTypeId'
+              :label='item.deviceTypeName'
+              :value='item.deviceTypeId'
+            />
           </el-select>
         </el-form-item>
         <el-form-item label='工艺类型' prop='technologyType'>
@@ -347,6 +343,7 @@ import {
 import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
+import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -392,6 +389,13 @@ const getProcessInfoListSelect = async () => {
   processInfoList.value = res.data;
 };
 
+/** 查询机台类型下拉框结构 */
+const deviceTypeList = ref([]);
+const getSelectBaseDeviceTypeList = async () => {
+  let res = await getBaseDeviceTypeList({ deviceCategoryId: 1 });
+  deviceTypeList.value = res.data;
+};
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `主键标识`, visible: false },
@@ -651,6 +655,7 @@ const handleProdLineSelectionChange = (selection) => {
 };
 
 onMounted(() => {
+  getSelectBaseDeviceTypeList();
   getProcessInfoListSelect();
   getList();
 });