From 417bb768b32bd1ab3c7291c8891d5457877bd4e8 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 6 Jan 2026 16:50:59 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E9=85=8D=E6=96=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/recipe/index.ts             | 16 +++++-----
 src/views/formula/formulaType/index.vue | 40 ++++++++++++-------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/api/iot/recipe/index.ts b/src/api/iot/recipe/index.ts
index bcd4c7cf..cd41b96c 100644
--- a/src/api/iot/recipe/index.ts
+++ b/src/api/iot/recipe/index.ts
@@ -3,32 +3,32 @@ import request from '@/config/axios'
 export interface RecipeVO {
   id: number
   name: string
-  recipeType: string
-  recipeDesc: string
+  process: string
+  remark: string
 }
 
 export const RecipeApi = {
   getRecipePage: async (params: any) => {
-    return await request.get({ url: `/iot/recipe/page`, params })
+    return await request.get({ url: `/iot/recipe-type/page`, params })
   },
 
   getRecipe: async (id: number) => {
-    return await request.get({ url: `/iot/recipe/get?id=` + id })
+    return await request.get({ url: `/iot/recipe-type/get?id=` + id })
   },
 
   createRecipe: async (data: Partial<RecipeVO>) => {
-    return await request.post({ url: `/iot/recipe/create`, data })
+    return await request.post({ url: `/iot/recipe-type/create`, data })
   },
 
   updateRecipe: async (data: Partial<RecipeVO>) => {
-    return await request.put({ url: `/iot/recipe/update`, data })
+    return await request.put({ url: `/iot/recipe-type/update`, data })
   },
 
   deleteRecipe: async (id: number) => {
-    return await request.delete({ url: `/iot/recipe/delete?id=` + id })
+    return await request.delete({ url: `/iot/recipe-type/delete?id=` + id })
   },
 
   exportRecipe: async (params) => {
-    return await request.download({ url: `/iot/recipe/export-excel`, params })
+    return await request.download({ url: `/iot/recipe-type/export-excel`, params })
   }
 }
diff --git a/src/views/formula/formulaType/index.vue b/src/views/formula/formulaType/index.vue
index 45fd8787..67570ea0 100644
--- a/src/views/formula/formulaType/index.vue
+++ b/src/views/formula/formulaType/index.vue
@@ -16,9 +16,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="工序" prop="recipeType">
+      <el-form-item label="工序" prop="process">
         <el-select
-          v-model="queryParams.recipeType"
+          v-model="queryParams.process"
           placeholder="请选择工序"
           clearable
           class="!w-240px"
@@ -58,12 +58,12 @@
     >
       <el-table-column type="selection" width="55" reserve-selection />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="工序" align="center" prop="recipeType">
+      <el-table-column label="工序" align="center" prop="process">
         <template #default="scope">
-          {{ getProcessLabel(scope.row.recipeType) }}
+          {{ getProcessLabel(scope.row.process) }}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="recipeDesc" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" width="160px" fixed="right">
         <template #default="scope">
           <el-button link type="primary" @click="openDialog('update', scope.row)">编辑</el-button>
@@ -90,8 +90,8 @@
       <el-form-item label="名称" prop="name">
         <el-input v-model="dialogForm.name" placeholder="请输入名称" clearable />
       </el-form-item>
-      <el-form-item label="工序" prop="recipeType">
-        <el-select v-model="dialogForm.recipeType" placeholder="请选择工序" clearable class="!w-full">
+      <el-form-item label="工序" prop="process">
+        <el-select v-model="dialogForm.process" placeholder="请选择工序" clearable class="!w-full">
           <el-option
             v-for="option in processOptions"
             :key="option.value"
@@ -100,8 +100,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="备注" prop="recipeDesc">
-        <el-input v-model="dialogForm.recipeDesc" placeholder="请输入备注" clearable type="textarea" />
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dialogForm.remark" placeholder="请输入备注" clearable type="textarea" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -149,7 +149,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: '',
-  recipeType: ''
+  process: ''
 })
 
 const exportLoading = ref(false)
@@ -168,7 +168,7 @@ const buildQueryParams = () => {
     pageNo: queryParams.pageNo,
     pageSize: queryParams.pageSize,
     name: name ? name : undefined,
-    recipeType: queryParams.recipeType ? queryParams.recipeType : undefined
+    process: queryParams.process ? queryParams.process : undefined
   }
 }
 
@@ -223,13 +223,13 @@ const dialogLoading = ref(false)
 const dialogForm = reactive({
   id: undefined as number | undefined,
   name: '',
-  recipeType: '',
-  recipeDesc: ''
+  process: '',
+  remark: ''
 })
 
 const dialogRules = reactive({
   name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-  recipeType: [{ required: true, message: '工序不能为空', trigger: 'change' }]
+  process: [{ required: true, message: '工序不能为空', trigger: 'change' }]
 })
 
 const openDialog = (mode: DialogMode, row?: RecipeVO) => {
@@ -242,15 +242,15 @@ const openDialog = (mode: DialogMode, row?: RecipeVO) => {
   if (mode === 'create') {
     dialogForm.id = undefined
     dialogForm.name = ''
-    dialogForm.recipeType = ''
-    dialogForm.recipeDesc = ''
+    dialogForm.process = ''
+    dialogForm.remark = ''
     return
   }
 
   dialogForm.id = row?.id
   dialogForm.name = row?.name ?? ''
-  dialogForm.recipeType = row?.recipeType ?? ''
-  dialogForm.recipeDesc = row?.recipeDesc ?? ''
+  dialogForm.process = row?.process ?? ''
+  dialogForm.remark = row?.remark ?? ''
 }
 
 const submitDialog = async () => {
@@ -261,8 +261,8 @@ const submitDialog = async () => {
     const data = {
       id: dialogForm.id,
       name: dialogForm.name,
-      recipeType: dialogForm.recipeType,
-      recipeDesc: dialogForm.recipeDesc
+      process: dialogForm.process,
+      remark: dialogForm.remark
     }
     if (dialogMode.value === 'create') {
       await RecipeApi.createRecipe(data)