Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

             <tr>
               <td colspan="7">
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                     上机护士：
                     <div class="under_line" style="width: 80px;text-align: center">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
                       <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                     核对人员：
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                     下机护士：
                     <div class="under_line" style="width: 80px;text-align: center">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                       <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                     治疗医生：
                     <div class="under_line" style="width: 80px;text-align: center">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.prescription_doctor) == ''">

src/xt_pages/user/templateSummary.vue

                         :row-class-name="tableRow"
               >
                 <el-table-column type="selection" width="40" align="center"></el-table-column>
-                <el-table-column label="阶段小结名称" align="center">
+                <el-table-column label="检查项目" align="center">
                   <template slot-scope="scope">
                      {{scope.row.title}}
                   </template>
                 </el-table-column>
-                <el-table-column label="记录时间" align="center">
-                  <template slot-scope="scope">
-                     {{getTime(scope.row.record_time)}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="记录医生" align="center">
-                  <template slot-scope="scope">
-                     {{getDoctor(scope.row.admin_user_id)}}
-                  </template>
-                </el-table-column>
               </el-table>
             </el-col>
             <el-col :span="14">
                   <span style="margin-right:10px;line-height:20px;">透前血压（mmHg):{{editObj.befor_pressure}}</span>
                   <span style="margin-right:10px;line-height:20px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
                 </div>
-              
-                <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:{{editObj.template_summary_content}}</div> 
-
-                <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段化验结果:{{editObj.template_inspection_content}}</div>   
-             
+                <!-- <el-divider></el-divider> -->
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:
+                  <div>
+                    <div v-for="item in editObj.template_inspection_content">
+                    <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }}</p>
+                    <div style="display:flex;flex-wrap: wrap;">
+                      <div v-for="it in item.arr" style="width:33%;">
+                        {{ it.item_name }} {{ it.inspect_value }}
+                      </div>
+                    </div>
+                  </div>
+                  </div>
+                </div>  
+                <!-- <el-divider></el-divider> -->
                 <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:{{editObj.template_plan_content}}</div>
               </div>
             </el-col>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" v-model="form.template_inspection_content"></el-input> -->
                      <div class="borderBox">
                        <div v-for="item in form.template_inspection_content">
                         <p>{{ item.project_name }}</p>
         getTemplateSummaryList(params).then(response=>{
            if(response.data.state ==1){
               var list = response.data.data.list
-              console.log("数据时什么",list)
               this.inspectionList = list
               this.$refs.inspection_table.setCurrentRow(this.inspectionList[0])
               this.getCurrentRecordDetail(this.inspectionList[0].id)
            if(response.data.state == 1){
               var list = response.data.data.list
               console.log("🔎3232322323232332",list)
+              let arr = list.template_inspection_content ? JSON.parse(list.template_inspection_content) : []
+              list.template_inspection_content = arr
               this.editObj = list
 
            }
             befor_pressure:parseInt(this.form.befor_pressure),
             template_summary_content:this.form.template_summary_content,
             template_plan_content:this.form.template_plan_content,
-            template_inspection_content:this.form.template_inspection_content,
+            template_inspection_content:JSON.stringify(this.form.template_inspection_content),
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
           }
         });
         return lastData;
-      },
-      getDoctor(id){
-        var user_name = ""
-        for(let i=0;i<this.docList.length;i++){
-          if(id == this.docList[i].admin_user_id){
-             user_name = this.docList[i].user_name
-          }
-        }
-        return user_name
       }
     },
   //  watch: {

src/xt_pages/user/templateSummaryPrint.vue

 <template>
+<div>
+  <div style="float:right">
+    <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
+  </div>
   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}&nbsp;&nbsp;&nbsp;血液透析患者诊疗阶段小结</div>
-      <div style="float:right">
-         <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
-      </div>
-      <div>
+      
+      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
          <span>姓名:{{patientList.patient.name}}</span>  
          <span>年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
          <span>性别:
          </span> 
          <span>诊断:{{patientList.patient.diagnose}}</span> 
       </div>
-      <div class="under-line"></div>
-      <div>
+      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
       </div>
-      <div class="under-line"></div>
-       <div>
-        <span>阶段小结概要:</span>  
-        <div>
-          <span>干体重:{{patientList.patient.dry_weight}}(kg)</span>  
-          <span>共透析:{{patientList.patient.dialysis_count}}</span>  
-          <span>HD:{{patientList.hd_count}}</span>  
-          <span>HDF:{{patientList.hdf_count}}</span>  
-          <span>HP:{{patientList.hp_count}}</span>  
-          <span>其他:{{patientList.other_count}}</span> 
-          <span>透析器:{{patientList.dialzer_apparatus}}</span>  
-          <span>抗凝剂:{{patientList.anticoagulant}}</span>  
-          <span>透析液(钾:{{patientList.kalium}} 钙:{{patientList.autunite}} Na:{{patientList.natrium}} ):</span> 
-          <span>每次透析(小时):{{patientList.hour}}时{{patientList.minute}}分</span>
-          <span>透前体重:{{patientList.befor_weight}}</span>
-          <span>透后体重:{{patientList.after_weight}}</span>
-          <span>透前血压:{{patientList.befor_pressure}}</span>
-          <span>透后血压:{{patientList.after_pressure}}</span>
+       <div style="padding:20px 0;border-bottom:1px solid #000;">
+        <span style="font-weight:bold;">阶段小结概要:</span>  
+        <div style="margin-top:20px;">
+          <div style="display:flex;justify-content: space-between;">
+            <span>干体重:{{patientList.patient.dry_weight}}(kg)</span>  
+            <span>共透析:{{patientList.patient.dialysis_count}}</span>  
+            <span>HD:{{patientList.hd_count}}</span>  
+            <span>HDF:{{patientList.hdf_count}}</span>  
+            <span>HP:{{patientList.hp_count}}</span>  
+            <span>其他:{{patientList.other_count}}</span> 
+          </div>
+          <div style="display:flex;justify-content: space-between;margin-top:10px;">
+            <span>透析器:{{patientList.dialzer_apparatus}}</span>  
+            <span>抗凝剂:{{patientList.anticoagulant}}</span>  
+            <span>透析液(钾:{{patientList.kalium}} 钙:{{patientList.autunite}} Na:{{patientList.natrium}} ):</span> 
+            <span>每次透析(小时):{{patientList.hour}}时{{patientList.minute}}分</span>
+          </div>
+          <div style="display:flex;justify-content: space-between;margin-top:10px;">
+            <span>透前体重:{{patientList.befor_weight}}</span>
+            <span>透后体重:{{patientList.after_weight}}</span>
+            <span>透前血压:{{patientList.befor_pressure}}</span>
+            <span>透后血压:{{patientList.after_pressure}}</span>
+          </div>
         </div>
       </div>
-      <div class="under-line"></div>
-      <div>
-        <span>阶段小结总结:{{patientList.template_summary_content}}</span>  
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
+        <span style="font-weight:bold;">阶段小结总结:</span><div>{{patientList.template_summary_content}}</div>  
+      </div>
+     <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;">
+        <span style="font-weight:bold;">阶段小结化验结果:</span>
+        <div class="borderBox">
+          <div v-for="item in patientList.template_inspection_content">
+            <p>{{ item.project_name }}</p>
+            <div style="display:flex;flex-wrap: wrap;">
+              <div v-for="it in item.arr" style="width:33%;">
+                {{ it.item_name }} {{ it.inspect_value }}
+              </div>
+            </div>
+          </div>
+        </div> 
       </div>
-     <div class="under-line"></div>
-     <div>
-        <span>阶段小结化验结果:{{patientList.template_inspection_content}}</span>  
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
+        <span style="font-weight:bold;">阶段小结个性化方案:</span>
+        <div>{{patientList.template_plan_content}}</div>
       </div>
-     <div class="under-line"></div>
-     <div>阶段小结个性化方案:{{patientList.template_plan_content}}</div>
-     <div class="under-line"></div>
-     <div>
+     <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
        <span>记录时间:{{getTime(patientList.record_time)}}</span>  
      </div>
     </div>
   </div>
+</div>
 </template>
 
 <script>
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',
         if(response.data.state == 1){
           var list = response.data.data.list
           console.log("listw23222323",list)
+          let arr = JSON.parse(list.template_inspection_content)
+          list.template_inspection_content = arr
           this.patientList = list
           var doctorList = response.data.data.doctorList
           console.log("doctorlsit",doctorList)
          }
       }
       return name
-    }
+    },
     
   },
  
 </script>
 
 <style>
+.borderBox  p{
+  font-weight: bold;
+  margin: 10px 0;
+}
 .dialysis-print-order {
   width: 960px;
   margin: 0 auto;