From fb1205e22778115caadfe954e60720be852cceba Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期二, 25 二月 2025 15:28:14 +0800
Subject: [PATCH] gx

---
 src/views/home/components/editDietary.vue |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/home/components/editDietary.vue b/src/views/home/components/editDietary.vue
index 6f9001b..49992ca 100644
--- a/src/views/home/components/editDietary.vue
+++ b/src/views/home/components/editDietary.vue
@@ -2,7 +2,7 @@
     <div class="dietarySurvey-item">
         <el-dialog  v-model="state.dialogTableVisible" title="膳食生活调查表" :fullscreen="true" width="100%">
             <div class="container" style="width: 100%; height: 100%;overflow: auto;">
-                <div id="printFrom1">
+                <div id="sahnshishenghuo">
                     <div>
                         <el-form size="small">
                             <div style="width: 100%">
@@ -217,7 +217,7 @@
                                         </td>
                                         <td colspan="5">
                                                 <el-form-item>
-                                                <input style="width: 250px;" v-model="state.tableData.常吃的水果.食用份量"/> ;
+                                                <input style="width: 250px;" v-model="state.tableData.常吃的水果.input"/> ;
                                                 &nbsp;&nbsp;
                                                     &nbsp;&nbsp;
                                                     <span>食用份量</span>
@@ -276,7 +276,7 @@
                                         <td colspan="5">
                                           
                                                 <el-form-item>
-                                                <input style="width: 250px;" v-model="state.tableData.坚果摄入量.食用份量"/> ;
+                                                <input style="width: 250px;" v-model="state.tableData.坚果摄入量.type"/> ;
                                                 &nbsp;&nbsp;
                                                     &nbsp;&nbsp;
                                                     <span>食用份量</span>
@@ -481,7 +481,7 @@
                                                        
                                                     </el-checkbox-group>
                                                     <span>
-                                                        <input style="width: 100px;" v-model="state.tableData.零食及其他.备注"/>
+                                                        <input style="width: 250px;" v-model="state.tableData.零食及其他.备注"/>
                                                     </span>
                                                    
                                             </el-form-item>   
@@ -741,7 +741,14 @@
                                                         v-model="state.tableData.饮酒习惯.type">
                                                         <el-radio value="是">是 
                                                             <span>
-                                                                <input style="width: 50px;" v-model="state.tableData.饮酒习惯.食用频次1"/> 根/天
+                                                                酒类
+                                                            </span>
+                                                            <span>
+                                                                <input style="width: 200px;" v-model="state.tableData.饮酒习惯.备注"/> 
+                                                            </span>
+                                                            食用频次：
+                                                            <span>
+                                                                <input style="width: 50px;" v-model="state.tableData.饮酒习惯.食用频次1"/> ml/天
                                                             </span>
                                                             <span>
                                                                 <input style="width: 50px;" v-model="state.tableData.饮酒习惯.食用频次2"/> 次/周
@@ -750,12 +757,7 @@
                                                         <el-radio value="否">否
                                                         </el-radio>
                                                     </el-radio-group>
-                                                    <span>
-                                                        酒类
-                                                    </span>
-                                                    <span>
-                                                        <input style="width: 200px;" v-model="state.tableData.饮酒习惯.备注"/> 
-                                                    </span>
+                                                    
                                             </el-form-item>   
                                         </td>
                                     </tr>
@@ -902,7 +904,7 @@
                     <el-button type="primary" @click="onSubmit">
                         保存
                     </el-button>
-                    <el-button v-if="state.viewInfo.id" type="primary" v-print="'#printFrom1'">
+                    <el-button v-if="state.viewInfo.id" type="primary" v-print="'#sahnshishenghuo'">
                         <el-icon><Printer /></el-icon>
                         打印
                     </el-button>
@@ -981,7 +983,7 @@
         常吃的水果: {
             食用份量: '',
             食用频次: '',
-            input3: ''
+            input: ''
         },
         
         常吃的大豆及其制品是: {
@@ -1139,7 +1141,7 @@
     
 }
 const generatePDF=()=> {
-      const element = document.getElementById('printFrom1');
+      const element = document.getElementById('sahnshishenghuo');
       const opt = {
         margin: 10,
         filename: `${state.tableData.表名}.pdf`,
@@ -1225,7 +1227,7 @@
         常吃的水果: {
             食用份量: '',
             食用频次: '',
-            input3: ''
+            input: ''
         },
         常吃的大豆及其制品是: {
             type: '',

--
Gitblit v1.8.0