From 39aa829a125a9b6e2688baffd43dd3157c491dc5 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 15 May 2025 16:05:56 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=BA=E5=8F=B0=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prodBaseMachineInfo/index.vue | 23 ++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/prodBaseMachineInfo/index.vue b/src/views/mes/prodBaseMachineInfo/index.vue
index 0f2a1cf..fe357cd 100644
--- a/src/views/mes/prodBaseMachineInfo/index.vue
+++ b/src/views/mes/prodBaseMachineInfo/index.vue
@@ -108,6 +108,11 @@
         <el-table-column label='数据编码格式' align='center' prop='dataEncoding' v-if='columns[24].visible' width='120' />
         <el-table-column label='请求间隔（毫秒）' align='center' prop='requestInterval' v-if='columns[25].visible'
                          width='130' />
+        <el-table-column label='入库类型' align='center' prop='instockType' v-if='columns[26].visible' >
+          <template #default='scope'>
+            <dict-tag :options='mes_instock_type' :value='scope.row.instockType' />
+          </template>
+        </el-table-column>
         <el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
         <el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[11].visible' />
         <el-table-column label='创建人' align='center' prop='createBy' v-if='columns[12].visible' />
@@ -235,6 +240,16 @@
         <el-form-item label='请求间隔（毫秒）' prop='requestInterval'>
           <el-input-number v-model='form.requestInterval' placeholder='请输入请求间隔' style='width: 220px;' />
         </el-form-item>
+        <el-form-item label='入库类型' prop='instockType'>
+          <el-radio-group v-model='form.instockType'>
+            <el-radio
+              v-for='dict in mes_instock_type'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label='备注' prop='remark'>
           <el-input v-model='form.remark' placeholder='请输入备注' />
         </el-form-item>
@@ -321,8 +336,9 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
   machine_status,
   machine_data_type,
-  machine_data_encoding
-} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding'));
+  machine_data_encoding,
+  mes_instock_type
+} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding', 'mes_instock_type'));
 
 const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -393,7 +409,8 @@ const columns = ref<FieldOption[]>([
   { key: 22, label: `数据类型`, visible: true },
   { key: 23, label: `数据长度`, visible: true },
   { key: 24, label: `数据编码格式`, visible: true },
-  { key: 25, label: `请求间隔`, visible: true }
+  { key: 25, label: `请求间隔`, visible: true },
+  { key: 26, label: `入库类型`, visible: true },
 ]);
 
 const initFormData: ProdBaseMachineInfoForm = {