修改打印单，和纪录透析纪录筛选条件

src/store/getters.js

@@ -22,6 +22,8 @@ const getters = {
 
   xt_permission: state => state.xt_permission,
   xt_user: state => state.xt_user,
+  schedule_type_selected: state => state.xt_user.schedule_type_selected,
+  zone_selected: state => state.xt_user.zone_selected,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/xt_user.js

@@ -14,6 +14,8 @@ import { getFiledConfigList, setFiledConfigList } from '@/utils/data_config' //
 const xt_user = {
   state: {
     org_id: 0,
+    schedule_type_selected: 0,
+    zone_selected: 0,
     app_id: 0,
     user: {
       id: 0,
@@ -59,6 +61,12 @@ const xt_user = {
   },
 
   mutations: {
+    SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
+      state.schedule_type_selected = schedule_type_selected
+    },
+    SET_ZONE_SELECTED: (state, zone_selected) => {
+      state.zone_selected = zone_selected
+    },
     SET_FILEDS_LIST: (state, configlist) => {
       state.fileds = configlist
     },
@@ -172,6 +180,12 @@ const xt_user = {
   },
 
   actions: {
+    SetScheduleTypeSelected({commit }, schedule_type_selected) {
+      commit('SET_SCHEDULE_TYPE_SELECTED', schedule_type_selected)
+    },
+    SetZoneSelected({ commit }, zone_selected) {
+      commit('SET_ZONE_SELECTED', zone_selected)
+    },
     SetSubscibePatients({
       commit,
       state

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -13,44 +13,44 @@
                 <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">血液净化治疗记录单</div>
             </div>
             <div class="row">
-                <div class="inline_block" >
+              <div class="inline_block" >
                 姓名：
                 <div class="under_line" style="width: 50px;text-align: center;">{{record.patient.name}}</div>
-                </div>
-                <div class="inline_block" style="margin-left: 10px;">
+              </div>
+              <div class="inline_block" style="margin-left: 10px;">
                 性别：
                 <div class="under_line" style="width: 30px;text-align: center;">{{record.patient.gender == 1?"男":"女"}}</div>
-                </div>
-                <div class="inline_block" style="margin-left: 10px;">
+              </div>
+              <div class="inline_block" style="margin-left: 10px;">
                 年龄：
                 <div class="under_line" style="width: 30px;text-align: center;">{{getAge(record.patient)}}</div>
                 岁
-                </div>
-                <div class="inline_block">
+              </div>
+              <div class="inline_block">
                 门诊：
-                    <div class="under_line" style="width: 30px;text-align: center;">
-                        <check-box  :checked="record.patient.source == 1 "></check-box>
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 30px;text-align: center;">
+                      <check-box  :checked="record.patient.source == 1 "></check-box>
+                  </div>
+              </div>
+              <div class="inline_block">
                 病区：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                        {{'/'}}
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                      {{'/'}}
+                  </div>
+              </div>
+              <div class="inline_block">
                 床号：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                        {{'/'}}
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                      {{'/'}}
+                  </div>
+              </div>
+              <div class="inline_block">
                 透析号：
-                    <div class="under_line" style="width: 70px;text-align: center;">
-                      {{record.patient.dialysis_no}}
-                    </div>
-                </div>
-                <div class="inline_block" style="margin-left: 5px;">
+                  <div class="under_line" style="width: 70px;text-align: center;">
+                    {{record.patient.dialysis_no}}
+                  </div>
+              </div>
+              <div class="inline_block" style="margin-left: 5px;">
                 住院号/门诊号：
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
                     {{record.patient.admission_number}}
@@ -58,21 +58,20 @@
                 <div class="under_line" style="width: 70px;text-align: left" v-else>
                     {{'/'}}
                 </div>
-                </div>
-
+              </div>
             </div>
             <div class="row" >
                 <div class="inline_block" >
-                入科方式：
-                <div class="under_line" v-if="record.receive_assessment==0" style="width: 180px;text-align: left">  </div>
-                <div class="under_line" v-if="record.receive_assessment==1" style="width: 180px;text-align: left">步行 </div>
-                <div class="under_line" v-if="record.receive_assessment==2" style="width: 180px;text-align: left">扶行 </div>
-                <div class="under_line" v-if="record.receive_assessment==3" style="width: 180px;text-align: left">轮椅 </div>
-                <div class="under_line" v-if="record.receive_assessment==4" style="width: 180px;text-align: left">平车 </div>
+                  入科方式：
+                  <div class="under_line" v-if="record.receive_assessment==0" style="width: 180px;text-align: left">  </div>
+                  <div class="under_line" v-if="record.receive_assessment==1" style="width: 180px;text-align: left">步行 </div>
+                  <div class="under_line" v-if="record.receive_assessment==2" style="width: 180px;text-align: left">扶行 </div>
+                  <div class="under_line" v-if="record.receive_assessment==3" style="width: 180px;text-align: left">轮椅 </div>
+                  <div class="under_line" v-if="record.receive_assessment==4" style="width: 180px;text-align: left">平车 </div>
                 </div>
                 <div class="inline_block" style="margin-left: 10px;">
-                诊断：
-                <div class="under_line" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
+                  诊断：
+                  <div class="under_line" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
                 </div>
             </div>
 
@@ -391,10 +390,10 @@
                                             <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:0}}</td>
 
                                             <td style="line-height:16px;padding:0px;">
-                                              <div style="height:40px;line-height:20px; overflow:hidden;">
+                                              <div style="min-height:40px;line-height:20px; overflow:hidden;">
                                                 <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                                                   <template v-if="index == 0">【开始透析】</template>
-                                                  <template v-if="monitor_record.operate_time == record.dialysis_order.end_time">【结束透析】</template>
+                                                  {{monitor_record.end}}
                                                   {{monitor_record.symptom}}  &nbsp;{{monitor_record.dispose}} &nbsp;{{monitor_record.result}}
                                                 </span>
                                               </div>
@@ -715,13 +714,11 @@
                         </tr>
                     </tbody>
                 </table>
-
-
+              </div>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-  </div>
 </template>
 
 <script>
@@ -864,6 +861,22 @@
               }
             }
 
+            var tempmonitorflag = true;
+            for (let index = 0; index < this.records[recordIndex].monitor_records.length; index++) {
+              const monitor = this.records[recordIndex].monitor_records[index];
+              this.records[recordIndex].monitor_records[index].end =""
+              if(Object.keys(monitor).length > 0 && index > 1){
+                if(monitor.operate_time == this.records[recordIndex].dialysis_order.end_time){
+                  this.records[recordIndex].monitor_records[index].end ="【结束透析】"
+                  tempmonitorflag = false
+                }
+                if(tempmonitorflag && index == this.records[recordIndex].monitor_records.length-1){
+                    this.records[recordIndex].monitor_records[index].end ="【结束透析】"
+                }
+              }
+              
+            }
+
             this.monitor_records = this.records[recordIndex].monitor_records
 
             // this.records[recordIndex].monitor_records2 = []

src/xt_pages/dialysis/schedualPatient.vue

@@ -185,11 +185,20 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     },
     created() {
+      var schedule_type_selected = this.$store.getters.schedule_type_selected
+      var zone_selected = this.$store.getters.zone_selected
+      if(schedule_type_selected){
+        this.schedule_type_selected = schedule_type_selected.schedule_type_selected
+      }
+      if(zone_selected){
+        this.zone_selected = zone_selected.zone_selected
+      }
       this.getInitData()
     },
     methods: {
       handletimeType: function(index) {
         this.schedule_type_selected = index
+        this.$store.dispatch("SetScheduleTypeSelected",{schedule_type_selected:index})
         this.search_keyword = this.search_input = ''
         // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         //   zone: this.zone_selected,
@@ -199,6 +208,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       },
       handleZoneChange: function(index) {
         this.zone_selected = index
+        this.$store.dispatch("SetZoneSelected",{zone_selected:index})
         this.search_keyword = this.search_input = ''
         // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         //   zone: this.zone_selected,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -70,7 +70,7 @@
       </div>
 
 
-      <div class="row" :style=" this.totollength > 14?'margin-bottom:400px;':''">
+      <div class="row" :style=" this.totollength > 13?'margin-bottom:400px;':''">
         <table class="proj_table" >
           <tbody>
             <tr><td colspan="2" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">透析前情况</td></tr>
@@ -479,7 +479,7 @@
           </tbody>
         </table>
       </div>
-      <template v-if="this.totollength > 14">
+      <template v-if="this.totollength > 13">
         <div style="display:inline-block;width:100%;text-align:center;">
           <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">{{orgname}}</div>
           <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">血液净化治疗记录单</div>