From b78a68c80711aec88f2f13a3c3fec473698244b9 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Wed, 17 Mar 2021 18:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E8=84=82=E6=8C=87=E5=AF=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PhysicalSignsDialog/index.vue  | 30 ++++++++++++++-----
 .../PhysicalSignsGuidance/index.vue           | 13 +++++---
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 2d7f4c080..bbbea6ca8 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -4,8 +4,10 @@
     :title="title"
     append-to-body
     @closed="onClosed"
+    :width="dialogWidth"
   >
-    <div v-if="showFlag">
+    <div style="display:flex;flex-direction:row">
+    <div v-if="showFlag" style="float: left;width: 900px">
       <div
         style="float: right; margin-top: -10px; margin-bottom: 10px"
         v-show="dataList.length > 0"
@@ -100,7 +102,7 @@
           </el-table>
         </div>
         <!-- 其他信息 -->
-        <div style="height: 400px; overflow: auto">
+        <div style="height: 390px; overflow: auto">
           <div
             v-for="(item, index) in dataList.slice(1, 10)"
             style="margin-bottom: 50px"
@@ -217,6 +219,15 @@
         </div>
       </div>
     </div>
+    <div style="width: 200px;" v-show="guidanceShow">
+      <!-- 编辑减脂指导 -->
+      <physicalSigns-guidance
+        ref="physicalSignsGuidanceDialog"
+        @close="editGuidanceShow(false)"
+        @refreshHealthyData="getCustomerHealthyByCusId()"
+      ></physicalSigns-guidance>
+    </div>
+    </div>
     <!-- 编辑 -->
     <physicalSigns-edit
       ref="physicalSignsEditDialog"
@@ -227,11 +238,7 @@
       ref="physicalSignsRemarkDialog"
       @refreshHealthyData="getCustomerHealthyByCusId()"
     ></physicalSigns-remark>
-    <!-- 编辑减脂指导 -->
-    <physicalSigns-guidance
-      ref="physicalSignsGuidanceDialog"
-      @refreshHealthyData="getCustomerHealthyByCusId()"
-    ></physicalSigns-guidance>
+
   </el-dialog>
 </template>
 <script>
@@ -401,6 +408,9 @@ export default {
       ],
       copyValue: "",
       detailHealthy: null,
+      dialogWidth: "950px",
+      guidanceShow : false
+
     };
   },
   methods: {
@@ -457,6 +467,7 @@ export default {
       this.detailHealthy = null;
       //this.enc_id = "";
       this.copyValue = "";
+      this.editGuidanceShow(false);
     },
     //对体征信息进行处理
     getDataListBySignMessage(sign) {
@@ -843,11 +854,16 @@ export default {
       );
     },
     handleEditGuidanceClick() {
+      this.editGuidanceShow(true);
       this.$refs["physicalSignsGuidanceDialog"].showDialog(
         this.data,
         this.healthyData
       );
     },
+    editGuidanceShow(flag){
+      this.guidanceShow = flag;
+      this.dialogWidth = flag ? "1200px" : "950px";
+    }
   },
 };
 </script>
diff --git a/stdiet-ui/src/components/PhysicalSignsGuidance/index.vue b/stdiet-ui/src/components/PhysicalSignsGuidance/index.vue
index fc3356095..44b2ddf62 100644
--- a/stdiet-ui/src/components/PhysicalSignsGuidance/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsGuidance/index.vue
@@ -1,10 +1,13 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="title" width="500px" append-to-body @closed="onClosed">
+  <!--<el-dialog :visible.sync="visible" :title="title" width="500px" append-to-body @closed="onClosed">-->
+  <div style="margin-left: 20px">
+    <h3 style="width: 200px;">{{title}}</h3>
     <el-form ref="form" :model="form" :rules="rules" label-position="top" label-width="100px">
       <el-form-item label="" prop="guidance" >
         <el-input
+          style="width: 230px"
           type="textarea"
-          :rows="8"
+          :rows="25"
           maxlength="300"
           show-word-limit
           placeholder="请输入减脂指导"
@@ -12,11 +15,12 @@
         </el-input>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" style="float: right">
       <el-button type="primary" @click="submit()">确 定</el-button>
       <el-button @click="onClosed()">取 消</el-button>
     </div>
-  </el-dialog>
+  </div>
+  <!--</el-dialog>-->
 </template>
 <script>
 import { getCustomerPhysicalSignsByCusId } from "@/api/custom/customer";
@@ -51,6 +55,7 @@ export default {
     onClosed() {
       this.visible = false;
       this.data = null;
+      this.$emit('close');
     },
     submit(){
       this.$refs.form.validate((valid) => {