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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.2.100"
+  "version": "1.2.503"
 }

config/prod.env.js

@@ -1,8 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  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"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/api/patient/patient.js

@@ -483,7 +483,6 @@ export function GetAllProjectNameByDate (date, patientid) {
     date: date,
     patientid: patientid
   }
-  console.log('params', params)
   return request({
     url: '/m/api/patient/getallprojectname',
     method: 'Get',

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-yisheng iconOne"></i>-->
-            <!--<div>致敬医护</div>-->
-          <!--</van-tabbar-item>-->
-        <!--</router-link>-->
+        <!-- <router-link to="/active">
+          <van-tabbar-item>
+            <i class="iconfont icon-yisheng iconOne"></i>
+            <div>致敬医护</div>
+          </van-tabbar-item>
+        </router-link> -->
         <!--<router-link to="/service">-->
           <!--<van-tabbar-item>-->
             <!--<i class="iconfont icon-fuwu2 iconOne"></i>-->
@@ -147,10 +147,11 @@ export default {
     if (currenttabbar === "homeIndex") {
       this.active = 0;
     } else if (currenttabbar === "newMy") {
-      this.active = 2;
-    } else if (currenttabbar === "active") {
       this.active = 1;
     }
+    // else if (currenttabbar === "active") {
+    //   this.active = 1;
+    // }
   }
 };
 </script>

src/pages/main/PrintIndex.vue

@@ -71,6 +71,12 @@
         v-if="org_template_info.template_id == 11"
       >
       </DialysisPrintOrderEleven>
+      <DialysisPrintOrderThirteen
+        style="margin-top:60px;"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 13"
+      >
+      </DialysisPrintOrderThirteen>
 
     </div>
     <!--<side-bar :active_index="0" v-if="isShow == true"></side-bar>-->
@@ -93,9 +99,11 @@ import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
 import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
+import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 export default {
   name: "PrintIndex",
   components: {
+    DialysisPrintOrderThirteen,
     DialysisPrintOrderEleven,
     DialysisPrintOrderTen,
     DialysisPrintOrderSix,

src/pages/main/dialysis/AdviceTable.vue

@@ -1855,6 +1855,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/CourseManagement.vue

@@ -334,6 +334,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/DryWeight.vue

@@ -340,6 +340,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/LongTable.vue

@@ -1304,6 +1304,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/MissionTable.vue

@@ -528,6 +528,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/RecordTable.vue

@@ -944,6 +944,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/RescueRecord.vue

@@ -325,6 +325,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;

src/pages/main/dialysis/SchedulTable.vue

@@ -671,6 +671,7 @@ export default {
   height: 100%;
   overflow-y: auto;
   background: #fff;
+  padding-top:1.46rem;
   .toolBox {
     display: flex;
     height: 1.6rem;