From b99e457b37235d7731b4f4514f16d92541779329 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 23 Aug 2023 17:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86-=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E9=85=8D=E6=96=B9=E7=AE=A1=E7=90=86-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/technology/recipe/content.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/technology/recipe/content.vue b/src/views/technology/recipe/content.vue
index 3138502a..0b9800a2 100644
--- a/src/views/technology/recipe/content.vue
+++ b/src/views/technology/recipe/content.vue
@@ -52,8 +52,10 @@
       <el-table-column label="步骤说明" width="300px" align="center" prop="contentText" :show-overflow-tooltip="true"/>
       <el-table-column label="辅助设备" align="center" prop="device" :show-overflow-tooltip="true"/>
       <el-table-column label="BOM材料" align="center" prop="material" :show-overflow-tooltip="true"/>
-      <el-table-column label="用量" align="center" prop="device" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="material" :show-overflow-tooltip="true"/>
+      <el-table-column label="用量" align="center" prop="dosage" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column label="安全用量" align="center" prop="safeDosage" :show-overflow-tooltip="true"/>
+      <el-table-column label="控制参数" align="center" prop="controlParameters" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" width="100px" v-if="optType !='view'" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -74,7 +76,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -113,25 +115,25 @@
         </el-row>
         <el-row>
             <el-col :span="12">
-                <el-form-item label="用量" prop="device">
-                    <el-input v-model="form.device" placeholder="请输入用量" />
+                <el-form-item label="用量" prop="dosage">
+                    <el-input v-model="form.dosage" placeholder="请输入用量" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="单位" prop="material">
-                    <el-input v-model="form.material" placeholder="请输入单位" />
+                <el-form-item label="单位" prop="unit">
+                    <el-input v-model="form.unit" placeholder="请输入单位" />
                 </el-form-item>
             </el-col>
         </el-row>
         <el-row>
             <el-col :span="12">
-                <el-form-item label="控制参数" prop="device">
-                    <el-input v-model="form.device" placeholder="请输入控制参数" />
+                <el-form-item label="控制参数" prop="controlParameters">
+                    <el-input v-model="form.controlParameters" placeholder="请输入控制参数" />
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="安全设置" prop="material">
-                    <el-input v-model="form.material" placeholder="安全设置" />
+                <el-form-item label="安全用量" prop="safeDosage">
+                    <el-input v-model="form.safeDosage" placeholder="安全设置" />
                 </el-form-item>
             </el-col>
         </el-row>