1

config/prod.env.js

@@ -1,8 +1,13 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
+<<<<<<< .mine
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'
+=======
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  //BASE_API: '"https://api.xt.kuyicloud.com"'
+>>>>>>> .theirs
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/pages/main/dialog/OrdersDialog.vue

@@ -54,6 +54,8 @@
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 
         <div class="content clearfix">
+
+
           <div class="orderTable">
 
             <table class="table">

src/pages/main/template/DialysisPrintOrderEleven.vue

@@ -87,7 +87,7 @@
                 <div class="inline_block" style="flex:1;">
                   透析次数：
                   <div class="under_line" style="width: 70px;text-align: center">
-                    {{patientInfo.total_dialysis?patientInfo.total_dialysis:'/'}}
+                    {{patientInfo.total_dialysis + patientInfo.user_sys_before_count?patientInfo.total_dialysis+patientInfo.user_sys_before_count:'/'}}
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">

src/pages/main/template/DialysisPrintOrderSeven.vue

@@ -123,7 +123,7 @@
                   </td>
                   <td style="text-align:left;margin-left:15px" colspan="2">
                     透析次数:
-                    <span class="under-line">&nbsp;{{patientInfo.total_dialysis?patientInfo.total_dialysis:'/'}}</span>
+                    <span class="under-line">&nbsp;{{patientInfo.total_dialysis+patientInfo.user_sys_before_count?patientInfo.total_dialysis+patientInfo.user_sys_before_count:'/'}}</span>
                   </td>
                  </tr>
                   <tr>
@@ -774,7 +774,7 @@
                 压迫后内瘘震颤:
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-存在') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-存在') > -1
                       ? true
                       : false
                   "
@@ -783,7 +783,7 @@
                 &nbsp;
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-减弱') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1
                       ? true
                       : false
                   "
@@ -792,7 +792,7 @@
                 &nbsp;
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-无') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-无') > -1
                       ? true
                       : false
                   "

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -86,7 +86,7 @@
                   <div class="inline_block" style="flex:1;">
                     透析次数：
                     <div class="under_line" style="width: 70px;text-align: center">
-                      {{patientInfo.total_dialysis?patientInfo.total_dialysis:'/'}}
+                      {{patientInfo.total_dialysis + patientInfo.user_sys_before_count?patientInfo.total_dialysis+patientInfo.user_sys_before_count:'/'}}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">