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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -427,6 +427,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 31">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -657,6 +667,11 @@
             v-if="org_template_info.template_id == 30"
           >
           </DialysisPrintOrderThirty>
+          <DialysisPrintOrderThirtyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 31"
+          >
+          </DialysisPrintOrderThirtyOne>
         </div>
       </el-container>
     </div>
@@ -706,9 +721,11 @@ import DialysisPrintOrderTwentySeven from "./template/DialysisPrintOrderTwentySe
 import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEight";
 import DialysisPrintOrderTwentyNine from "./template/DialysisPrintOrderTwentyNine";
 import DialysisPrintOrderThirty from "./template/DialysisPrintOrderThirty";
+import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyOne,
     DialysisPrintOrderThirty,
     DialysisPrintOrderTwentyNine,
     DialysisPrintOrderTwentyEight,
@@ -1116,7 +1133,14 @@ export default {
           style: style,
           scanStyles: false
         });
-      }
+      } else if (this.org_template_info.template_id == 31) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
+      } 
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -899,7 +899,7 @@ export default {
           )
           this.assessmentafter = response.data.data.assessmentAfterDislysis
           console.log('上次透后体重', this.assessmentafter)
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
           console.log('医生', tableAdvice)
           if (tableAdvice.length === 0) {

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -229,6 +229,7 @@ export default {
         this.listQuery.start_time = "";
       } else {
         this.geStatistics()
+        this.getlist()
       }
 
     },
@@ -239,6 +240,7 @@ export default {
         this.listQuery.end_time = "";
       } else {
         this.geStatistics()
+        this.getlist()
       }
     },
     getTimestamp(time) {