Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -673,25 +673,25 @@
                   <tr>
                     <td width="55">并发症:</td>
                     <td width="600">
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('低血压')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('低血压')>-1?true:false"
                                  showValue='低血压'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('高血压')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('高血压')>-1?true:false"
                                  showValue='高血压'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('心律失常')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('心律失常')>-1?true:false"
                                  showValue='心律失常'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('头晕')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('头晕')>-1?true:false"
                                  showValue='头晕'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('头痛')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('头痛')>-1?true:false"
                                  showValue='头痛'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('呕吐')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('呕吐')>-1?true:false"
                                  showValue='呕吐'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('抽搐')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('抽搐')>-1?true:false"
                                  showValue='抽搐'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('出血')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('出血')>-1?true:false"
                                  showValue='出血'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('心衰')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('心衰')>-1?true:false"
                                  showValue='心衰'></label-box>
-                      <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
+                      <label-box :isChecked="afterdialysis.complication.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
 
                     </td>

src/pages/main/template/DialysisPrintOrderTen.vue

@@ -45,8 +45,8 @@
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           住院号/门诊号：
-          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
-            {{patientInfo.admission_number}}
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+            {{receiverTreatmentAccess.admission_number}}
           </div>
           <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{'/'}}
@@ -880,8 +880,15 @@
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
                   <div class="under_line" style="width: 80px;text-align: center">
-                    <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.prescription_doctor)}}</span>
-                    <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else>
+                    <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.creater)}}</span>
+                    <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else>
+                  </div>
+                </div>
+
+                <div class="inline_block" style="flex:1;">
+                  患者签名：
+                  <div class="under_line" style="width: 80px;text-align: center">
+                    <span></span>
                   </div>
                 </div>
               </div>

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -864,8 +864,8 @@
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
-                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.actual_ultrafiltration)">
-                    {{getFloat(prescription.ultrafiltration)}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
+                    {{getFloat(afterdialysis.actual_ultrafiltration)}}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{'/'}}

src/pages/my/index.vue

@@ -192,7 +192,7 @@ export default {
             this.isRouterAlive = true;
           });
           localStorage.removeItem("searchWord");
-          this.$router.replace("/login");
+          this.$router.replace("/");
         }
       });
     },

src/utils/request.js

@@ -27,6 +27,11 @@ service.interceptors.response.use(
         location.reload();
         window.androidinfo.showInfoFromJs("1233");
         return Promise.reject("error");
+      }else if(res.code == 6002){
+        Toast("登录信息丢失");
+        location.reload();
+        window.androidinfo.showInfoFromJs("1233");
+        return Promise.reject("error");
       }else {
         return response;
       }