소스 검색

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

陈少旭 4 달 전
부모
커밋
77be6e5e9e
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue
  2. 3 3
      src/xt_pages/user/templateSummaryPrint.vue

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue 파일 보기

1162
                         <div class="under_line"
1162
                         <div class="under_line"
1163
                           style="width: 70px; text-align: center"
1163
                           style="width: 70px; text-align: center"
1164
                         >
1164
                         >
1165
-                          <span v-if="predialysis.weight_before !=0 && afterdialysis.weight_after !=0">
1165
+                          <span v-if="record.assessment_before_dislysis.weight_before !=0 && record.assessment_after_dislysis.weight_after !=0">
1166
                            {{ record.assessment_after_dislysis &&
1166
                            {{ record.assessment_after_dislysis &&
1167
                             record.assessment_after_dislysis.weight_loss
1167
                             record.assessment_after_dislysis.weight_loss
1168
                               ? record.assessment_after_dislysis.weight_loss
1168
                               ? record.assessment_after_dislysis.weight_loss

+ 3 - 3
src/xt_pages/user/templateSummaryPrint.vue 파일 보기

8
       <div class="order-yy-name"></div>
8
       <div class="order-yy-name"></div>
9
       <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
9
       <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
10
       
10
       
11
-      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;" v-if="org_id !=10013 &&org_id !=10014">
11
+      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
12
          <span>姓名:{{patientList.patient.name}}</span>  
12
          <span>姓名:{{patientList.patient.name}}</span>  
13
          <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
13
          <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
14
          <span style="margin-left:20px;">性别:
14
          <span style="margin-left:20px;">性别:
17
          </span> 
17
          </span> 
18
          <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
18
          <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
19
       </div>
19
       </div>
20
-      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;" v-if="org_id !=10013 &&org_id !=10014">
20
+      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
21
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
21
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
22
       </div>
22
       </div>
23
        <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
23
        <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
46
           </div>
46
           </div>
47
         </div>
47
         </div>
48
       </div> -->
48
       </div> -->
49
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;" v-if="org_id !=10013 &&org_id !=10014">
49
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
50
         <span style="font-weight:bold;">阶段小结总结:</span>
50
         <span style="font-weight:bold;">阶段小结总结:</span>
51
           <!-- {{patientList.template_summary_content}} -->
51
           <!-- {{patientList.template_summary_content}} -->
52
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word" 
52
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word"