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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.616"
+  "version": "1.1.634"
 }

src/main.js

@@ -114,7 +114,7 @@ Vue.use(ElementUI);
 Vue.config.productionTip = false;
 
 /* eslint-disable no-new */
-new Vue({
+var vue = new Vue({
   el: "#app",
   router,
   store,
@@ -123,5 +123,6 @@ new Vue({
   },
   template: "<App/>"
 });
+export default vue
 
 // eslint-disable-next-line no-undef

src/pages/home/index.vue

@@ -82,12 +82,12 @@
             <div>首页</div>
           </van-tabbar-item>
         </router-link>
-        <router-link to="/active">
-          <van-tabbar-item>
-            <i class="iconfont icon-jishiben iconOne"></i>
-            <div>致敬医护</div>
-          </van-tabbar-item>
-        </router-link>
+        <!--<router-link to="/active">-->
+          <!--<van-tabbar-item>-->
+            <!--<i class="iconfont icon-jishiben iconOne"></i>-->
+            <!--<div>致敬医护</div>-->
+          <!--</van-tabbar-item>-->
+        <!--</router-link>-->
         <!--<router-link to="/service">-->
           <!--<van-tabbar-item>-->
             <!--<i class="iconfont icon-fuwu2 iconOne"></i>-->

src/pages/homeIndex/index.vue

@@ -264,6 +264,7 @@ export default {
           // });
         } else {
           Toast(response.data.msg);
+
         }
       });
     },

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>
             {{'/'}}
@@ -879,11 +879,19 @@
                 </div>
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
-                  <div class="under_line" style="width: 80px;text-align: center">
+                  <div class="under_line" style="width: 150px;text-align: center">
+                    <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
                     <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>
                   </div>
                 </div>
+
+                <div class="inline_block" style="flex:1;">
+                  患者签名：
+                  <div class="under_line" style="width: 80px;text-align: center">
+                    <span></span>
+                  </div>
+                </div>
               </div>
             </td>
           </tr>

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

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

src/utils/request.js

@@ -2,6 +2,9 @@ import axios from "axios";
 // import { Toast } from 'mint-ui'
 import { Toast } from "vant";
 
+import context from '../../src/main.js'
+
+
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
@@ -9,6 +12,7 @@ const service = axios.create({
   withCredentials: true
 });
 
+var self = this;
 // respone interceptor
 service.interceptors.response.use(
   // response => response,
@@ -16,17 +20,28 @@ service.interceptors.response.use(
     const res = response.data;
     if (res.state !== 1) {
       if (res.code === 20049) {
-        location.reload();
-        return Promise.reject("error");
-      } else if (res.code == 20035){
+        // this.$router.replace("/")
+        // this.$router.replace({ path: "/" });
+        // window.location.href=window.location.href+
+        // window.location.href = location.href+'?time='+((new Date()).getTime());
+        // this.$router.go(0)
+        // this.refresh()
+        context.$router.replace({ path: "/" })
+
+        // return
+      } else if (res.code === 20035){
         Toast("你已经被管理员禁用,无法使用该系统");
-        location.reload();
-        return Promise.reject("error");
-      }else if(res.code == 6001){
+        context.$router.replace({ path: "/" })
+        return
+      }else if(res.code === 6001){
         Toast("登录超时");
-        location.reload();
-        window.androidinfo.showInfoFromJs("1233");
-        return Promise.reject("error");
+        context.$router.replace({ path: "/" })
+        return
+      }else if(res.code === 6002){
+        Toast("登录信息丢失,正在刷新页面");
+        context.$router.replace({ path: "/" })
+        return
+
       }else {
         return response;
       }