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

src/api/drug/drug_stock.js

@@ -428,6 +428,15 @@ export function getDrugAutoMaticList(params){
 }
 
 
+export function getDrugWarehouseOrderInfo(params){
+   
+  return request({
+    url:"/api/drugstock/getdrugwarehouseorderinfo",
+    method:"get",
+    params:params
+  })
+}
+
 
 
 

src/api/schedule.js

@@ -8,6 +8,15 @@ export function getWeekPanels(t,patitionId) {
   })
 }
 
+
+export function getWeekPanelsOne(t,patitionId){
+  
+  return request({
+    url: '/api/schedule/weekpanelone?data=' + t+"&patitionid="+patitionId,
+    method: 'get'
+  })
+}
+
 export function getSchedules(params) {
   return request({
     url: '/api/schedule/schedules',
@@ -16,6 +25,14 @@ export function getSchedules(params) {
   })
 }
 
+export function getSchedulesOne(params){
+  return request({
+    url: '/api/schedule/schedulesone',
+    method: 'get',
+    params:params,
+  })
+}
+
 export function getSchedulePatients(params) {
   return request({
     url: '/api/schedule/patients',
@@ -167,4 +184,40 @@ export function getRemindPrintList(params){
     method:"get",
     params:params
   })
+}
+
+export function getScheduleList(params){
+  
+  return request({
+    url:"/api/schedule/getbloodschedulelist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getPrintList(params){
+   
+  return request({
+    url:"/api/schedule/getprintlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getAllZoneList(params){
+  
+  return request({
+    url:"/api/schedule/getallzonelist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientSheduleCount(params){
+   
+  return request({
+    url:"/api/schedule/getpatientschedulecount",
+    method:"get",
+    params:params
+  })
 }

src/api/stock.js

@@ -610,4 +610,12 @@ export function getInitializtion(params){
     method:"get",
     params:params
   })
-}
+}
+
+export function getWarehouseOrderInfoList(params){
+   return request({
+      url:"/api/good/getwarehouseorderinfolist",
+      method:"get",
+      params:params
+   })
+} 

src/router/modules/dialysis.js

@@ -58,6 +58,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/signPrint',
+      component: () => import('@/xt_pages/dialysis/signPrint'),
+      name: '标签打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '标签打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/consumableDrugs',
       component: () => import('@/xt_pages/dialysis/consumableDrugs'),

src/router/modules/workforce.js

@@ -82,16 +82,27 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/schedule/remind/print/setting',
-    //   component: () => import('@/xt_pages/workforce/remind_print_setting'),
-    //   name: 'remind_print_setting',
-    //   hidden: true,
-    //   is_menu: false,
-    //   meta: {
-    //     title: 'remind_print_setting',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/schedule/remind/print/setting',
+      component: () => import('@/xt_pages/workforce/remind_print_setting'),
+      name: 'remind_print_setting',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: 'remind_print_setting',
+        noCache: true
+      }
+    },
+    {
+      path: '/scheduleTablePrint',
+      component: () => import('@/xt_pages/workforce/scheduleTablePrint'),
+      name: 'scheduleTablePrint',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: 'scheduleTablePrint',
+        noCache: true
+      }
+    },
   ]
 }

src/views/layout/Layout.vue

@@ -123,7 +123,7 @@ export default {
   },
   created(){
     console.log('permission_routers',this.permission_routers);
-    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','hospitalStation'];
+    let menzhen = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];

src/views/layout/components/Sidebar/index.vue

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == '门诊管理'){
-          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','hospitalStation'];
+          let nameArr = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/dialysis/batch_print/batch_print_order_fifteen.vue

@@ -56,7 +56,7 @@
                                     <label-box showValue="住院" :isChecked="record.receive_assessment.condition == 1 ? true : false"></label-box>
                                 </td>
                                 <td style="padding-left:5px;width:25%;text-align:left;border-left:none;border-right:none;">其他</td>
-                                
+
                             </tr>
                         </table>
                         <table class="table-box" border="1" style="border:none;border-color:#000;border-collapse: collapse;">
@@ -221,8 +221,8 @@
                                     </span>
                                 </span>
                             <!-- </span> -->
-                            
-                            
+
+
                         </span>
                     </td>
                     <td>
@@ -282,7 +282,7 @@
                         <p style="height:20px;line-height:20px">电导率</p>
                         <p style="height:20px;line-height:20px">ms/cm</p>
                     </th>
-                    
+
                     <th style="min-width:60px">
                         <p style="height:20px;line-height:20px">温度</p>
                         <p style="height:20px;line-height:20px">℃</p>
@@ -332,7 +332,7 @@
                         </span>
                     </td>
 
-                    
+
                     </tr>
                 </table>
                 <table class="print-table" border="1">
@@ -444,9 +444,9 @@
                     </tr>
                     </tbody>
                 </table>
-                
+
                 <table class="print-table" border="1">
-                    
+
                 </table>
 
 
@@ -575,7 +575,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
   },
   mounted() {
-    console.log(this.records)
+    // console.log(this.records)
     this.loading = true
     var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
     if (ids.length == 0) {

src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue

@@ -154,6 +154,8 @@
                                          
                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '人造血管')" showValue="人造血管"></label-box>
                                         &nbsp;
+                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '扣眼')" showValue="扣眼"></label-box>
+                                        &nbsp;
                                     </div>
                                 </td>
                                 <td width='20'></td>

src/xt_pages/dialysis/components/dialysisDrugs.vue

@@ -510,7 +510,7 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-            console.log("过年9999999999",this.scheduleMap)
+           
            }
          
   

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -138,7 +138,7 @@ export default {
     }
   },
   created() {
-    this.dialysis_time = parseTime(this.$route.query.date, '{y}-{m}-{d}')
+    this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
   }
 }
 </script>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -106,8 +106,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -323,6 +323,22 @@
           <span class="content">{{this.prescription.amylaceum}}</span>
         </li>
 
+        <li v-if="isShow('单超时长')">
+          <label>单超时长(h): </label>
+          <span class="content">{{this.prescription.single_time}}</span>
+        </li>
+
+        <li v-if="isShow('单超脱水')">
+          <label>单超脱水(L): </label>
+          <span class="content">{{this.prescription.single_water}}</span>
+        </li>
+
+
+         <li v-if="isShow('置换流量')">
+          <label>置换流量(L/h): </label>
+          <span class="content">{{this.prescription.replacement_flow}}</span>
+        </li>
+
       </ul>
     </div>
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -83,6 +83,9 @@
           <span class="content">{{sickCondition}} </span>
         </li>
 
+
+       
+
         <li v-if="isShow('风险程度')">
           <label>风险程度:</label>
           <span class="content">{{ dangerLevel }}</span>
@@ -103,7 +106,14 @@
             this.record.psychological_assessment_other
           }}</span>
         </li>
-
+        
+       <li v-if="isShow('是否跌倒')">
+          <label>是否跌倒:</label>
+          <span class="content">
+            <span v-if="this.record.tumble == 1">是</span>
+            <span v-if="this.record.tumble == 2">否</span>
+          </span>
+        </li>
 
       </ul>
 

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>
@@ -300,6 +300,14 @@
           <label>KT/V: </label>
           <span class="content" >{{ this.record.ktv ? this.record.ktv : ""  }}</span>
         </li>
+        <li v-if="isShow('意识')">
+          <label>意识: </label>
+          <span class="content" >{{ getConsciousness(this.record.consciousness)}}</span>
+        </li>
+        <li v-if="isShow('跌倒风险')">
+          <label>跌倒风险: </label>
+          <span class="content" >{{ getFallrisk(this.record.fallrisk)}}</span>
+        </li>
       </ul>
     </div>
     <div class="note">
@@ -640,7 +648,8 @@ export default {
         return ''
       }
       return this.record.in_advance_reason_other
-    }
+    },
+   
   },
   methods: {
     getInternal: function() {
@@ -775,6 +784,27 @@ export default {
         }
       }
       return false
+    },
+     getConsciousness:function(id){
+       var consciousnessList = getDataConfig("hemodialysis","consciousness")
+     
+       var name = ""
+       for(let i=0;i<consciousnessList.length;i++){
+         if(id == consciousnessList[i].id){
+           name= consciousnessList[i].name
+         }
+      }
+      return name
+    },
+    getFallrisk:function(id){
+      var fallriskList = getDataConfig("hemodialysis","fallrisk")
+      var name = ""
+      for(let i=0;i<fallriskList.length;i++){
+        if(id == fallriskList[i].id){
+           name = fallriskList[i].name
+        }
+      }
+      return name
     }
   }
 }

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -588,7 +588,7 @@
               <el-input v-model="form.dosage_of_anticoagulants"></el-input>
           </el-form-item>
         </el-col>
-        
+
 
         <el-col :span="8" v-if="isShow('并发症其他')">
           <el-form-item label="并发症其他: ">
@@ -603,21 +603,23 @@
         </el-col>
         <el-col :span="8" v-if="isShow('透析相关高血压')">
             <el-form-item label="透析相关高血压：">
+
              <el-select v-model="form.hypertenison">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in option"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-             </el-select>
+            </el-select>
             </el-form-item>
         </el-col>
          <el-col :span="8" v-if="isShow('透析相关低血压')">
             <el-form-item label="透析相关低血压">
              <el-select v-model="form.hypopiesia">
               <el-option
-                v-for="item in option"
+                v-for="item in optionOne"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -649,13 +651,37 @@
              </el-select>
             </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="isShow('意识')">
+            <el-form-item label="意识">
+             <el-select v-model="form.consciousness">
+              <el-option
+                v-for="item in consciousnessList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('跌倒风险')">
+            <el-form-item label="跌倒风险">
+             <el-select v-model="form.fallrisk">
+              <el-option
+                v-for="item in fallriskList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
+            </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>
         </el-col>
       </el-form>
-         
+
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="hide">取 消</el-button>
@@ -739,7 +765,10 @@ export default {
       dialogCruorTitle: '凝血',
       sealing_fluid_special_name: '',
       option:[
-        {id:0,name:"请选择"},
+        {id:"1",name:"有"},
+        {id:"2",name:"无"},
+      ],
+       optionOne:[
         {id:"1",name:"有"},
         {id:"2",name:"无"},
       ],
@@ -814,9 +843,17 @@ export default {
         other_complication:'',
         ktv:"",
         urr:"",
+        hypertenison:"",
+        hypopiesia:"",
+        leave_office_method:"",
+        lapse:"",
+        consciousness:"",
+        fallrisk:"",
       },
       lapseList:[],
-      leaveOfficeMethod:[]
+      leaveOfficeMethod:[],
+      consciousnessList:[],
+      fallriskList:[]
     }
   },
   watch: {
@@ -1025,6 +1062,8 @@ export default {
       data["hypopiesia"] = parseInt(this.form.hypopiesia)
       data["leave_office_method"] = this.form.leave_office_method
       data["lapse"] = this.form.lapse
+      data["consciousness"] = this.form.consciousness
+      data["fallrisk"] = this.form.fallrisk
       console.log("Paramsquery",data)
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
@@ -1170,13 +1209,26 @@ export default {
 
     // 数据开始
     show(predialysis,last_after) {
+      console.log("predialysis",predialysis)
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
       this.form.inpatient_department = predialysis.inpatient_department
       this.form.observation_content_other = predialysis.observation_content_other
-      this.form.hypertenison = predialysis.hypertenison.toString()
-      this.form.hypopiesia = predialysis.hypopiesia.toString()
+      if(predialysis.id > 0){
+        this.form.hypertenison = predialysis.hypertenison.toString()
+      }
+      if(predialysis.id > 0){
+        this.form.hypopiesia = predialysis.hypopiesia.toString()
+      }
+      if(predialysis.id > 0){
+         this.form.hypertenison = predialysis.hypertenison.toString()
+      }
+      if(predialysis.id > 0){
+        this.form.hypopiesia = predialysis.hypopiesia.toString()
+      }
+
+
       this.form.leave_office_method = predialysis.leave_office_method
       this.form.lapse = predialysis.lapse
       // console.log("透后", predialysis);
@@ -1292,11 +1344,14 @@ export default {
     this.sealingFluidDisposeOptions = getDataConfig('hemodialysis', 'sealing_fluid_dispose')
     this.lapseList = getDataConfig('hemodialysis', 'lapse')
     this.leaveOfficeMethod = getDataConfig('hemodialysis','leave_office_method')
+    this.consciousnessList = getDataConfig("hemodialysis","consciousness")
+    this.fallriskList = getDataConfig("hemodialysis","fallrisk")
     this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
     this.patientGoseOptions = this.$store.getters.patient_gose
     this.observationContentOptions = this.$store.getters.observation_content
     this.template_id = this.$store.getters.xt_user.template_info.template_id
     this.channels = this.$store.getters.channels
+
     var date = this.$route.query && this.$route.query.date
     this.record_date = uParseTime(date, '{y}-{m}-{d}')
   },

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -229,6 +229,17 @@
           v-model="receiveTreatmentAsses.psychological_other"
         ></el-input>
       </el-form-item>
+        <el-form-item label="是否跌倒: " v-if="isShow('是否跌倒')">
+        <el-radio
+          v-model="receiveTreatmentAsses.tumble"
+          label="1"
+          >是</el-radio>
+        <el-radio
+          v-model="receiveTreatmentAsses.tumble"
+          label="2"
+          >否
+        </el-radio>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
@@ -281,7 +292,8 @@ export default {
         precaution: "",
         precaution_other: "",
         admission_number: "",
-        diacrisis:""
+        diacrisis:"",
+        tumble:"",
       },
       precautionTwo: []
     };
@@ -301,6 +313,10 @@ export default {
       return false;
     },
     show(accepts) {
+      console.log("accepts333333",accepts)
+      if(accepts.id > 0){
+        accepts.tumble = accepts.tumble.toString()
+      }
       this.accepts = accepts;
       // console.log("accepts", accepts);
       var arr = [];

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -828,6 +828,12 @@
           if (this.lastPredialysisEvaluation.is_infect == 2) {
             this.lastPredialysisEvaluation.is_infect = "2"
           }
+          if(this.lastPredialysisEvaluation.period == 1){
+             this.lastPredialysisEvaluation.period = "1"
+          }
+          if(this.lastPredialysisEvaluation.period == 2){
+             this.lastPredialysisEvaluation.period = "2"
+          }
         }
 
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -96,8 +96,10 @@
             </el-form-item>
           </el-col>
 
+
+
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -106,6 +108,19 @@
             </el-form-item>
           </el-col>
 
+
+          <el-col :span="8" v-if="isShows('单超时长')">
+             <el-form-item label="单超时长(h)：">
+                <el-input v-model="dialysisPrescription.single_time"></el-input>
+             </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('单超脱水')">
+             <el-form-item label="单超脱水(L)：">
+                <el-input v-model="dialysisPrescription.single_water"></el-input>
+             </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('透析液配方')">
             <el-form-item label="透析液配方：">
               <!-- <el-input type="number" v-model="dialysisPrescription.dialysate_formulation"></el-input> -->
@@ -325,14 +340,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('葡萄糖')">
+          <!-- <el-col :span="8" v-if="isShows('葡萄糖')">
             <el-form-item label="葡萄糖(mmol/L)：">
               <el-input
                 type="number"
                 v-model="dialysisPrescription.glucose"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8" v-if="isShows('透析液流量')">
             <el-form-item label="透析液流量(ml/min)：">
               <el-input
@@ -547,6 +562,15 @@
              </el-form-item>
           </el-col>
 
+         
+
+
+          <el-col :span="8" v-if="isShows('置换流量')">
+             <el-form-item label="置换流量(L/h)：">
+                <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
+             </el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row :gutter="20">
@@ -1042,6 +1066,9 @@
           displace_speed:"",
           illness:"",
           amylaceum:"",
+          single_time:"",
+          single_water:"",
+          replacement_flow:"",
         },
 
         anticoagulant: {

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -2,7 +2,8 @@
   <el-dialog title="双人核对"
              :visible.sync="isVisibility"
              :modal-append-to-body="false"
-             width="854px">
+             width="854px"
+            >
 
     <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       
@@ -202,9 +203,9 @@
         blood_access_part_opera_id:"通路类型:"
       }
     }, methods: {
+      
       show() {
-        console.log(this.double_check)
-
+        
         this.isVisibility = true
         if (this.double_check.id > 0) {
 
@@ -252,9 +253,11 @@
         }
       },
       hide() {
+      
         this.isVisibility = false
       },
       handleCancle: function() {
+      
         this.isVisibility = false
 
       }, 
@@ -776,6 +779,7 @@
       GetDialysateFormulationById(val) {
          this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
          console.log("透析液配方",this.dialysate_formulation_options)
+        
         let name = ''
         let dfl = this.dialysate_formulation_options.length
         for (let index = 0; index < dfl; index++) {
@@ -924,24 +928,37 @@
     },
     watch: {
       isVisibility(val) {
-      
+        
         if(this.prescription!=null && this.prescription.id!=0){
+
           this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+          this.prescription.dialyzer_perfusion_apparatus = ""
           this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
-         
+          // this.prescription.dialysate_formulation = ""
           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
-         
+          this.prescription.kalium = ""
           this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          this.prescription.calcium = ""
           this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
-          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysate_formulation:"")
+          this.prescription.mode_id= ""
+          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysis_duration:"")
+          this.prescription.dialysis_duration=""
           this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          this.prescription.target_ultrafiltration = ""
           this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+          this.prescription.anticoagulant=""
           this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          this.prescription.anticoagulant_shouji = ""
           this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
-          this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
-          this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+         this.prescription.anticoagulant_weichi=""
+         this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+         this.prescription.anticoagulant_zongliang = ""
+         this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+          this.prescription.displace_liqui_part
           this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          this.prescription.replacement_total= ""
           this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+          this.prescription.dialysate_flow= ""
         }
         if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
           this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -165,6 +165,8 @@
                   template_id == 34 ||
                   template_id == 35 ||
                   template_id == 36 ||
+                  template_id == 38 ||
+                  template_id == 39 ||
                   org_id == 9555)
             "
           >
@@ -206,6 +208,8 @@
                 template_id != 34 &&
                 template_id != 35 &&
                 template_id != 36 &&
+                template_id != 38 &&
+                template_id != 39 &&
                 org_id!=9555
             "
           >
@@ -223,7 +227,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -234,7 +238,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -2,13 +2,24 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+       <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="signPrintAction"
+          type="primary"
+          style="float:right"
+        >标签打印
+      </el-button>
       <el-button
           size="small"
           icon="el-icon-printer"
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >打印</el-button>
+          >医嘱打印
+      </el-button>
+   
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -111,6 +122,11 @@
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
           </template>
         </el-table-column>
+        <el-table-column  label="分区床位" width="100">
+          <template slot-scope="scope" >
+              {{scope.row.zone_name}}/{{scope.row.number}}
+          </template>
+        </el-table-column>
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
@@ -513,6 +529,8 @@ export default {
                     it.zoneId = item.device_number.zone.id
                     it.dialysis_no = item.patient.dialysis_no
                     it.mode_id = item.mode_id
+                    it.number = item.device_number.number
+                    it.zone_name = item.device_number.zone.name
                     arr.push(it)
                 })
             })
@@ -575,6 +593,8 @@ export default {
                     it.zoneId = item.device_number.zone.id
                     it.dialysis_no = item.patient.dialysis_no
                     it.mode_id = item.mode_id
+                    it.number = item.device_number.number
+                    it.zone_name = item.device_number.zone.name
                     arr.push(it)
                 })
             })
@@ -662,7 +682,7 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].patient_id);
       }
-    //   console.log("sch_ids",sch_ids)
+  
       this.$store.dispatch("SetAdviceIDs", sch_ids);
        var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
@@ -675,6 +695,31 @@ export default {
        }
       this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
 
+    },
+    signPrintAction:function(){
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
+      // 模板ID为6
+      var sch_ids = [];
+
+      for (let index = 0; index < this.selecting_schs.length; index++) {
+        sch_ids.push(this.selecting_schs[index].patient_id);
+      }
+  
+      this.$store.dispatch("SetAdviceIDs", sch_ids);
+       var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+       }
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+
     },
     batchPrintActionOne: function() {
       if (this.selecting_schs.length === 0) {
@@ -868,7 +913,8 @@ export default {
     handleSelectionChange(val){
         // console.log('val',val)
         this.selecting_schs = val;
-    }
+    },
+    
   },
   components: {
     BreadCrumb

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -543,6 +543,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 39">
+        <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"-->
@@ -813,6 +823,11 @@
             v-if="org_template_info.template_id == 38"
           >
           </DialysisPrintOrderThirtyEight>
+          <DialysisPrintOrderThirtyNine
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 39"
+          >
+          </DialysisPrintOrderThirtyNine>
         </div>
       </el-container>
     </div>
@@ -870,9 +885,11 @@ import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFiv
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
 import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
 import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
+import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyNine,
     DialysisPrintOrderThirtyEight,
     DialysisPrintOrderThirtySeven,
     DialysisPrintOrderThirtySix,
@@ -1342,6 +1359,13 @@ export default {
           style: style8,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 39) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/signPrint.vue

@@ -0,0 +1,692 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;" v-show="show">
+            <div id="dialysisTable">
+                <div v-for="(item, index) in list" :key="index">
+                    <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>姓名:{{item.patient.name}}</div>  
+                        <div>医嘱内容:{{ it.advice_name }}</div>  
+                        <div>给药途径:{{it.execution_frequency}}</div>  
+                        <div>执行频率:{{it.delivery_way}}</div>  
+                        <div>打印时间:{{time}}</div>   
+                    </div>  
+                </div>
+            </div>
+        </div>
+
+          <div class="app-container" style="background-color: white;" v-show="showOne">
+            <div id="dialysisTable">
+                <div v-for="(item, index) in list" :key="index">
+                    <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>姓名:{{item.patient.name}}</div>  
+                        <div>医嘱内容:{{getAdvice(item.doctor_advice)}}</div>  
+                        <div>给药途径:{{item.doctor_advice[0].execution_frequency}}</div>  
+                        <div>执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
+                        <div>打印时间:{{time}}</div>   
+                    </div>  
+                  
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getSchedualDoctors } from '@/api/advice'
+import { parseTime } from '@/utils'
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: '耗材药品' },
+                { path: false, name: '打印' }
+            ],
+            tableData:[],
+            start_time:"",
+            end_time:"",
+            print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+
+            zone_selected: 0,
+            scheduleMap:[],
+            time:'',
+            show:true,
+            showOne:false,
+            delivery_way:"",
+            list:[]
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
+
+            printJS({
+            printable: 'dialysisTable',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        requestSchedualDoctors (time) {
+            let newTime =  moment(time).format('YYYY-MM-DD')
+            getSchedualDoctors({
+            date: newTime,
+            patient_type: 0,
+            advice_type: 2,
+            delivery_way:this.delivery_way,
+            }).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                this.admin_user = resp.data.adminUser
+                var config = resp.data.config
+                if(config.is_open == 0 || config.is_open == 2){
+                
+                   var schedulesArr = resp.data.scheduals
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
+                   if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+                    
+                })
+               
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+           
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+               
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+                  
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+                
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+               
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =schedule.device_number.zone}
+                }
+
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
+                }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                 }
+                console.log("scheduleMap999999999999",schedules)
+                  this.list = schedules
+                }
+               
+                 if(config.is_open == 1){
+                   var schedulesArr = resp.data.hisAdvices
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
+                    if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+                    
+                })
+               
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+           
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+               
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+                  
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+                
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+               
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =
+                        schedule.device_number.zone
+                    }
+                }
+             
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
+                }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                 }
+                
+                     this.list = schedules
+                     this.scheduleMap = scheduleMap  
+                 }
+                console.log("this.list",this.list)
+                
+                }
+            })
+        },
+        compare (property) {
+            return function (a, b) {
+                var value1 = a[property]
+                var value2 = b[property]
+                return value1 - value2
+            }
+        },
+        parseTime: function (time, layout) {
+            if (time == 0) {
+                return ''
+            }
+            return parseTime(time, layout)
+        },
+        getName (val) {
+            for (let i = 0; i < this.admin_user.length; i++) {
+                if (this.admin_user[i].id == val) {
+                    return this.admin_user[i].name
+                }
+            }
+        },
+        getAdvice: function(doctor_advice) {
+          if (doctor_advice.length > 0) {
+            let name = "";
+            for (let i = 0; i < doctor_advice.length; i++) {
+            let prescribing_number = "";
+            let single_dose = "";
+            let drug_spec = "";
+
+            if (doctor_advice[i].prescribing_number > 0) {
+                prescribing_number =
+                doctor_advice[i].prescribing_number +
+                doctor_advice[i].prescribing_number_unit;
+            }
+            if (doctor_advice[i].single_dose > 0) {
+                single_dose =
+                " 单次用量 " +
+                doctor_advice[i].single_dose +
+                doctor_advice[i].single_dose_unit;
+            }
+
+            if (doctor_advice[i].drug_spec > 0) {
+                drug_spec =
+                doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+            }
+
+            name =
+                name +
+                doctor_advice[i].advice_name +
+                " " +
+                drug_spec +
+                " " +
+                prescribing_number +
+                " " +
+                single_dose +
+                " " +
+                doctor_advice[i].delivery_way +
+                " " +
+                doctor_advice[i].execution_frequency +
+                " " +
+                doctor_advice[i].remark +
+                "\n";
+
+            // if (doctor_advice[i].child.length > 0) {
+            //     for (let a = 0; a < doctor_advice[i].child.length; a++) {
+            //     if (doctor_advice[i].child[a].prescribing_number > 0) {
+            //         doctor_advice[i].child[a]["presc"] =
+            //         doctor_advice[i].child[a].prescribing_number +
+            //         doctor_advice[i].child[a].prescribing_number_unit;
+            //     } else {
+            //         doctor_advice[i].child[a]["presc"] = "";
+            //     }
+
+            //     if (doctor_advice[i].child[a].single_dose > 0) {
+            //         doctor_advice[i].child[a]["single"] =
+            //         " " +
+            //         " 单次用量 " +
+            //         " " +
+            //         doctor_advice[i].child[a].single_dose +
+            //         doctor_advice[i].child[a].single_dose_unit;
+            //     } else {
+            //         doctor_advice[i].child[a]["single"] = "";
+            //     }
+
+            //     name =
+            //         name +
+            //         "▲" +
+            //         doctor_advice[i].child[a].advice_name +
+            //         "" +
+            //         doctor_advice[i].child[a].advice_desc +
+            //         doctor_advice[i].child[a].drug_spec_unit +
+            //         doctor_advice[i].child[a].presc +
+            //         doctor_advice[i].child[a].single +
+            //         "\n";
+            //     }
+            // }
+        }
+        return name;
+      }else{
+        return ""
+      }
+    },
+    },
+    computed: {
+    filtedScheduals: function () {
+        var scheduleMap = new Object()
+        if (this.zone_selected == 0) {
+            for (const key in this.scheduleMap) {
+            scheduleMap[key] = this.scheduleMap[key]
+            }
+        } else {
+            var zone_name = this.zones[this.zone_selected].text
+            scheduleMap[zone_name] = this.scheduleMap[zone_name]
+        }
+
+        if (this.schedule_type_selected != 0) {
+            var _scheduleMap = {}
+            for (const key in scheduleMap) {
+            var origin_schedules = scheduleMap[key]
+            var schedules = []
+            for (let index = 0; index < origin_schedules.length; index++) {
+                const schedule = origin_schedules[index]
+                if (schedule.schedule_type == this.schedule_type_selected) {
+                schedules.push(schedule)
+                }
+            }
+            if (schedules.length > 0) {
+                _scheduleMap[key] = schedules
+            }
+            }
+
+            scheduleMap = _scheduleMap
+        }
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            mapArr[i]['new_advice'] = []
+            }
+        }
+
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            var maps = mapArr[i]
+            var resp_advices = maps.doctor_advice
+            if (resp_advices.length > 0) {
+                var newGroupObject = function () {
+                return Object.assign(
+                    {},
+                    {
+                    group_no: 0,
+                    advices: []
+                    }
+                )
+                }
+                var initGroupBlock = function (group, advice) {
+                group.group_no = advice.groupno
+                }
+
+                var advice_groups = []
+                var group = newGroupObject()
+                for (let index = 0; index < resp_advices.length; index++) {
+                const advice = resp_advices[index]
+                if (advice.groupno == 0) {
+                    // 老版本的医嘱
+                    if (advice.parent_id > 0) {
+                    if (advice_groups.length > 0) {
+                        var parent_group = advice_groups[advice_groups.length - 1]
+                        if (parent_group.advices.length > 0) {
+                        if (parent_group.advices[0].id == advice.parent_id) {
+                            parent_group.advices.push(advice)
+                        }
+                        }
+                    }
+                    continue
+                    } else {
+                    if (group.group_no > 0) {
+                        advice_groups.push(group)
+                        group = newGroupObject()
+                    }
+
+                    initGroupBlock(group, advice)
+                    group.advices.push(advice)
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    continue
+                    }
+                } else {
+                    if (group.group_no > 0 && group.group_no != advice.groupno) {
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    }
+                    if (group.group_no == 0) {
+                    initGroupBlock(group, advice)
+                    }
+                    if (group.group_no == advice.groupno) {
+                    group.advices.push(advice)
+                    }
+                }
+                }
+                if (group.group_no > 0) {
+                // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                advice_groups.push(group)
+                }
+                advice_groups = advice_groups
+            } else {
+                advice_groups = []
+            }
+            maps.new_advice = advice_groups
+            }
+        }
+        console.log("222222",scheduleMap)
+        return scheduleMap
+        },
+    
+    },
+    created(){
+      var time = this.$route.query.time
+      var delivery_way = this.$route.query.delivery_way
+      console.log("delivery_Way",delivery_way)
+      this.delivery_way = delivery_way
+      this.time = moment(time).format('YYYY-MM-DD')
+      console.log(11,this.$route.query)
+      this.requestSchedualDoctors(time)
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.signPrint{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+}
+.dialysisTable{
+    width:960px;
+    margin: 0 auto;
+    text-align: center;
+    border-collapse: collapse;
+}
+.order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+}
+.dialysisTable tr{
+    padding: 10px 0;
+}
+.dialysisTable th {
+    color: #000;
+    padding: 0;
+    margin: 0;
+    height: 30px;
+}
+.dialysisTable tr td {
+    padding: 12px 0;
+}
+.subadvice_content {
+    text-align: left;
+    padding-left: 25px !important;
+    padding-right: 5px !important;
+}
+.advice_content {
+    text-align: left;
+    padding-left: 5px !important;
+    padding-right: 5px !important;
+    padding: 15px 5px !important;
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -35,7 +35,7 @@
         <span v-else>出血部位：无</span>
       </div>
       <div class="lineHeight">
-          <div class="widthLength25">是否跌倒：暂无</div>
+          <div class="widthLength25">是否跌倒：{{ receiverTreatmentAccess.tumble == 1 ? '是' : '否' }}</div>
           <div class="widthLength25">跌倒预防措施：{{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '/' }}</div>
           <div class="widthLength25">跌倒风险：
               <span v-if="receiverTreatmentAccess.danger_level == 1">无</span>
@@ -69,7 +69,7 @@
       </div>
       <div class="lineHeight">
           <div class="widthLength25">T：{{ predialysis.temperature ? predialysis.temperature : '' }} ℃</div>
-          <div class="widthLength25">P：{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : '' }}</div>
+          <div class="widthLength25">P：{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : '' }} 次/分</div>
           <div class="widthLength25">意识：
             <span v-for="(item, index) in consciousness_arr" :key="index">
               <span v-if="receiverTreatmentAccess.consciousness == item.id">{{ item.name }}</span>
@@ -95,11 +95,18 @@
           <div class="widthLength25">BP：{{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
             {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }} mmHg
           </div>
-          <div class="widthLength25">T：{{ afterdialysis.temperature ? afterdialysis.temperature : '' }}</div>
+          <div class="widthLength25">T：{{ afterdialysis.temperature ? afterdialysis.temperature : '' }}℃</div>
           <div class="widthLength25">意识：
-
+            <span v-for="(item, index) in consciousness_arr" :key="index">
+              <span v-if="afterdialysis.consciousness == item.id">{{ item.name }}</span>
+            </span>
+          </div>
+          <div class="widthLength25">跌倒风险：
+            <span v-if="afterdialysis.fallrisk == 1">无</span>
+            <span v-if="afterdialysis.fallrisk == 2">低风险</span>
+            <span v-if="afterdialysis.fallrisk == 3">中度风险</span>
+            <span v-if="afterdialysis.fallrisk == 4">高风险</span>
           </div>
-          <div class="widthLength25">跌倒风险：</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">实际进食量：{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
@@ -133,19 +140,21 @@
           <div class="widthLength25">治疗总时长：{{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : 0 }}小时
             {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : 0 }}分钟
           </div>
-          <div class="widthLength25">透析器：{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : '' }}</div>
+          <div class="widthLength25">透析器：{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : '' }} 
+            <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
+          </div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "" }} ml/min</div>
-          <div class="widthLength25">设定UF量：{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L</div>
-          <div class="widthLength25">实际UF量：{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }} L</div>
+          <div class="widthLength25">设定UF量：{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} ml</div>
+          <div class="widthLength25">实际UF量：{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }} ml</div>
           <div class="widthLength25">分区：{{ patientInfo.DialysisSchedule.device_zone.name }}</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">透析液温度：{{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "" }} ℃</div>
           <div class="widthLength25">透析液流量：{{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} ml/min</div>
           <div class="widthLength25">碳酸氢根：{{ prescription.bicarbonate ? prescription.bicarbonate : "" }} mmol/L</div>
-          <div class="widthLength25">血管通路：{{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name : '' }}</div>
+          <div class="widthLength25">血管通路：{{ prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name : '' }}</div>
       </div>
       <div class="lineHeight">
           透析液浓度(mmol/L)：Ca： {{ prescription.calcium ? prescription.calcium : "" }}  &nbsp; Na： {{ prescription.sodium ? prescription.sodium : "" }} &nbsp;  K： {{ prescription.kalium ? prescription.kalium : "" }} &nbsp; 葡萄糖：{{ prescription.amylaceum ? prescription.amylaceum : "" }}
@@ -714,9 +723,11 @@ export default {
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           );
+          
           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) {
@@ -979,6 +990,9 @@ export default {
           this.prescription.dialysate_formulation_name = this.dialysateFormulationName(
             this.prescription.dialysate_formulation
           );
+          this.prescription.blood_access_part_opera_name = this.bloodAccessParOperaName(
+            this.prescription.blood_access
+          );
 
           var paLen = this.perfusionApparatus.length;
           this.prescription.perfusion_apparatus_name = "";

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1267,7 +1267,8 @@
             <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
             
-            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
+            <td style="line-height:20px;" width="100">抗凝剂</td>
             <td style="line-height:20px;" width="">病情变化及处理</td>
             <td style="line-height:20px;" width="60">签名</td>
           </tr>
@@ -1305,11 +1306,24 @@
             <td>
               &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
             </td>
-            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</span></td>
             <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
 
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
+            <td>&nbsp;
+              <span v-if="monitor.monitor_anticoagulant == 0"></span>
+              <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
+              <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
+              <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+              <span v-if="monitor.monitor_anticoagulant_value!=undefined && monitor.monitor_anticoagulant_value!='' ">({{monitor.monitor_anticoagulant_value}})</span>
+            </td>
             <td style="text-align:left;line-height:20px;">
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -176,7 +176,8 @@
                     <td width="100">体液过多症状:</td>
                     <td width="50">
                       <div>
-                        <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box>
+                         <label-box :isChecked="prescription.body_fluid == 1 ? true : false" showValue="无"></label-box>
+                        <!-- <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box> -->
                       </div>
                     </td>
                     <td width="180">

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,7 +13,8 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne :paramsObj="invoiceParams"></printOne>
+            <printOne v-if="org_id != 10106" :paramsObj="invoiceParams"></printOne>
+            <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
         </div>
     </div>
   </div>
@@ -21,10 +22,12 @@
 
 <script>
 import printOne from './invoiceTemplate/printOne'
+import printTwo from './invoiceTemplate/printTwo'
 export default {
   name: "invoicePrint",
   components: {
-    printOne
+    printOne,
+    printTwo
   },
   props:{
     invoiceParams:Object
@@ -32,7 +35,8 @@ export default {
   data() {
     return {
       childResponse: {},
-    //   invoiceParams:{}
+    //   invoiceParams:{},
+     org_id:''
       
 
     };
@@ -61,8 +65,7 @@ export default {
       return "";
     },
     printThisPage() {
-
-      const style =
+        const style =
         '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "invoice-print",
@@ -70,6 +73,7 @@ export default {
             style: style,
             scanStyles: false
         });
+      
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -83,6 +87,7 @@ export default {
   },
   created() {
       console.log('this.invoiceParams',this.invoiceParams)
+      this.org_id = this.$store.getters.xt_user.org_id
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -0,0 +1,221 @@
+<template>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <div style="position: absolute;top:30px;left:70px;">{{ list.order_number }}</div>
+            <!-- <div>{{ list.id_card_no }}</div> -->
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <!-- <div>{{ list.department_name }}</div> -->
+            <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div>
+            <div></div>
+            <div>
+                <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
+                <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
+                <span style="position: absolute;left:660px;top:40px;">{{ printDate.slice(8,11) }}</span>
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:60px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:60px;left:210px;">√</div>
+            <!-- <div>{{ list.pay_way }}</div> -->
+            <div style="position: absolute;top:60px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:60px;left:640px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
+            <div style="position: absolute;top:90px;left:290px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:90px;left:460px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:140px;left:40px">西药</div>
+            <div style="position: absolute;top:140px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:140px;left:200px">检查费</div>
+            <div style="position: absolute;top:140px;left:280px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:140px;left:380px">治疗费</div>
+            <div style="position: absolute;top:140px;left:460px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:140px;left:560px">床位费</div>
+            <div style="position: absolute;top:140px;left:640px">{{ list.bedCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:170px;left:40px">中成药</div>
+            <div style="position: absolute;top:170px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:170px;left:200px">化验费</div>
+            <div style="position: absolute;top:170px;left:280px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:170px;left:380px">手术费</div>
+            <div style="position: absolute;top:170px;left:460px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:170px;left:560px">其他费</div>
+            <div style="position: absolute;top:170px;left:640px">{{ list.otherCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:200px;left:40px"></div>
+            <div style="position: absolute;top:200px;left:110px"></div>
+            <div style="position: absolute;top:200px;left:200px"></div>
+            <div style="position: absolute;top:200px;left:280px"></div>
+            <div style="position: absolute;top:200px;left:380px">材料费</div>
+            <div style="position: absolute;top:200px;left:460px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:200px;left:560px"></div>
+            <div style="position: absolute;top:200px;left:640px"></div>
+        </div>
+        <div>
+            <span>
+            <span style="position: absolute;top:250px;left:200px">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:260px">
+                <span v-if="zhongwen.indexOf('仟') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:320px">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:380px">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:440px">
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:500px">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:560px">
+                <span v-if="zhongwen.indexOf('分') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            </span>
+            <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
+        </div>
+        <div style="position: absolute;top:280px;left:460px">现金：{{ list.psn_cash_money }}</div>
+        <div>
+            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
+            <div v-if="org_id == 10106" style="position: absolute;top:320px;left:460px">林美华</div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:''
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                console.log('res',res)
+                this.list = res.data.data
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                this.smalltoBIG(this.totalPrice)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";  
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+
+            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            console.log(this.zhongwen)
+        },
+
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                }
+                this.getInvoice(params)
+
+            },
+            deep:true
+        }
+    }
+}
+</script>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -464,4 +464,4 @@
   .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
-</style>
+</style>

src/xt_pages/outpatientCharges/summary.vue

@@ -85,7 +85,9 @@
           <template slot-scope="scope">{{scope.row.department_name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope"> {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}</template>
+          <template slot-scope="scope">
+            {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费员">
           <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
@@ -104,6 +106,10 @@
                        v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
               结算单
             </el-button>
+            <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
+                       v-if="scope.row.order_status == 2&& scope.row.result.id == 0">
+              上传结算清单
+            </el-button>
             <el-button size="mini" type="primary"
                        v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
                        @click="settlementPrint(scope.row)">结算单
@@ -235,6 +241,40 @@
       }
     },
     methods: {
+      uploadInfo(row) {
+        var that = this;
+        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
+          }
+        }).then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false
+          } else {
+
+            if (response.data.data.failed_code == -10) {
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.$message.success("上传成功");
+              row.result.id = response.data.data.result.id
+            }
+
+
+          }
+        }).catch(function (error) {
+        })
+      },
+
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then(response => {
           if (response.data.state == 1) {
@@ -431,6 +471,38 @@
                 time = this.getTimes(order.settle_accounts_date)
               }
 
+              var hifmi_pay = 0.00;
+
+              if(order.setl_detail.length > 0){
+                var jsonObj = JSON.parse(order.setl_detail);
+                for (let i = 0; i < jsonObj.length; i++) {
+                  if (order.insutype == '310') {
+                    if (jsonObj[i].fund_pay_type == '310300') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+
+                  } else if (order.insutype == '390')
+                    if (order.fund_pay_type == '390200') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                }
+              }
+              var hifmi_pay = 0.00;
+
+              if(order.setl_detail.length > 0){
+                var jsonObj = JSON.parse(order.setl_detail);
+                for (let i = 0; i < jsonObj.length; i++) {
+                  if (order.insutype == '310') {
+                    if (jsonObj[i].fund_pay_type == '310300') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                  }
+                  if (order.insutype == '390')
+                    if (jsonObj[i].fund_pay_type == '390200') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                }
+              }
 
               let obj = {
                 '就诊号': order.mdtrt_id,
@@ -441,7 +513,7 @@
                 '实收金额': order.medfee_sumamt,
                 '医保统筹金额': order.hifp_pay,
                 '大额基金金额': order.hifob_pay,
-                '大病基金金额': order.hifmi_pay,
+                '大病基金金额': hifmi_pay,
                 '补充保险基金金额': order.hifes_pay,
                 '医疗救助基金金额': order.maf_pay,
                 '公务员基金': order.cvlserv_pay,
@@ -461,11 +533,12 @@
                 '收费状态': order_status,
                 '退费日期': ''
               };
+
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
-              const filterVal = ['就诊号', '患者姓名','开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const tHeader = ['就诊号', '患者姓名', '开处时间', '险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '开处时间', '险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
               const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -361,7 +361,7 @@
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
                 <div style="width: 100%;flex:1;overflow-y: auto;">
-                  <el-table :data="tabPrjectTeam" border
+                  <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
                             :row-style="{ color: '#303133' }"
                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -2092,7 +2092,6 @@
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min);
-
         this.prescriptions.push({
           id: 0,
           name: newTabName,
@@ -2100,7 +2099,8 @@
           advices: [],
           project: [],
           addition: [],
-          pre_time: nowTime
+          pre_time: this.prescriptions[0].pre_time
+          // pre_time: nowTime
 
         });
         this.editableTabsValue = newTabName;
@@ -2589,6 +2589,9 @@
              this.hisList = hisprojectlist
           }
         })
+      },
+      clearSelection(){
+        this.$refs.tabProjectTeam.clearSelection()
       }
     }, mounted() {
       this.request_record_date = this.record_date

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -0,0 +1,939 @@
+<template>
+  <div class="main-contain">
+
+    <div
+      class="loadingBox"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+    <div style="padding-top: 56px;width:100%;">
+
+      <nav-igation
+        ref="nav"
+        title="弹窗导航"
+        @advice="adviceFunc"
+        :patient="patient"
+        :schedual="schedual"
+        :prescription="prescription"
+        :solution="solution"
+        :receiver_treatment_access="receiver_treatment_access"
+        :predialysis_evaluation="predialysis_evaluation"
+        :doctor_advices="doctor_advices"
+        :double_check="double_check"
+        :assessment_after_dislysis="assessment_after_dislysis"
+        :treatment_summary="treatment_summary"
+        :monitor_records="monitor_records"
+        :dialysis_order="dialysis_order"
+        :admin_users="admin_users"
+        :devices="devices"
+        :device_numbers="device_numbers"
+        :admin_user_map="admin_user_map"
+        :device_map="device_map"
+        :device_number_map="device_number_map"
+        :niprocart_info="niprocart_info"
+        :jms_info="jms_info"
+        :fistula_needle_set_info="fistula_needle_set_info"
+        :fistula_needle_set_16_info="fistula_needle_set_16_info"
+        :hemoperfusion_info="hemoperfusion_info"
+        :dialyser_sterilised_info="dialyser_sterilised_info"
+        :filtryzer_info="filtryzer_info"
+        :dialyzers_info="dialyzers_info"
+        :injector_info="injector_info"
+        :bloodlines_info="bloodlines_info"
+        :tubingHemodialysis_info="tubingHemodialysis_info"
+        :safe_package_info="safe_package_info"
+        :aliquid_info="aliquid_info"
+        :config="config"
+        :longAdvices="longAdvices"
+        :waitUploadAdvices="waitUploadAdvices"
+        :is_open="is_open"
+        :last_predialysis_evaluation="lastPredialysisEvaluation"
+        :last_monitor_record="lastMonitorRecord"
+        :last_assessment_after_dislysis="lastAssessmentAfterDislysis"
+        :last_dialysis_prescribe="lastDialysisPrescribe"
+        :last_dryWeight_dislysis="lastDryWeightDislysis"
+        :special_premission="headNurses"
+        @assessmentAfterDislysis="assessmentAfterDislysisFunc"
+        :system_prescribe="system_prescribe"
+        :his_is_open="his_is_open"
+        :lastAssessment="lastAssessment"
+        :stockType="stockType"
+      >
+      </nav-igation>
+
+
+
+      <basic-infor
+        :patient="patient"
+        :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
+        :steps="steps"
+        title="基本信息"
+      ></basic-infor>
+
+      <dialysis-prescription
+        :prescription="prescription"
+        :solution="solution"
+        :device_map="device_map"
+        :preparestock="preparestock"
+        title="透析处方"
+      ></dialysis-prescription>
+
+
+
+    <!-- <past-data class="往期数据"></past-data> -->
+      <div style="height: 20px;background-color: #f6f8f9"></div>
+      <accepts-assessment
+        :record="receiver_treatment_access"
+        title="接诊评估"
+      ></accepts-assessment>
+
+      <assessment-before
+        :record="predialysis_evaluation"
+        ref="assessment_before"
+        title="透前评估"
+      ></assessment-before>
+
+      <stat-order
+        ref="stat_order"
+        :advices="doctor_advices"
+        :doctor_map="admin_user_map"
+        title="临时医嘱"
+      ></stat-order>
+
+      <double-check
+        ref="double_check"
+        :record="double_check"
+        :admin_map="admin_user_map"
+        title="双人核对 "
+      ></double-check>
+
+      <dialysis-computer
+        ref="dialysis_computer"
+        :record="dialysis_order"
+        :admin_map="admin_user_map"
+        :device_number_map="device_number_map"
+        title="透析上机 "
+      ></dialysis-computer>
+
+      <dialysis-monitoring
+        ref="monitoring"
+        :monitores="monitor_records"
+        title="透析监测"
+      ></dialysis-monitoring>
+
+
+      <dialysis-off
+        ref="dialysis_off"
+        :record="dialysis_order"
+        :admin_map="admin_user_map"
+        title="透析下机 "
+      ></dialysis-off>
+
+      <assessment-after
+        ref="assessment_after"
+        :record="assessment_after_dislysis"
+        title="透后评估"
+      ></assessment-after>
+
+      <treatment-of
+        ref="treatment_of"
+        :record="treatment_summary"
+        title="治疗小结"
+      ></treatment-of>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+const moment = require('moment')
+import axios from 'axios'
+import NavIgation from '@/xt_pages/dialysis/details/NavIgation'
+import BasicInfor from '@/xt_pages/dialysis/details/BasicInfor'
+import DialysisPrescription from '@/xt_pages/dialysis/details/DialysisPrescription'
+import PastData from '@/xt_pages/dialysis/details/pastData'
+import AcceptsAssessment from '@/xt_pages/dialysis/details/acceptsAssessment'
+import AssessmentBefore from '@/xt_pages/dialysis/details/assessmentBefore'
+import StatOrder from '@/xt_pages/dialysis/details/statOrder'
+import DialysisComputer from '@/xt_pages/dialysis/details/dialysisComputer'
+import DoubleCheck from '@/xt_pages/dialysis/details/doubleCheck'
+import DialysisMonitoring from '@/xt_pages/dialysis/details/dialysisMonitoring'
+import DialysisOff from '@/xt_pages/dialysis/details/dialysisOff'
+import AssessmentAfter from '@/xt_pages/dialysis/details/assessmentAfter'
+import TreatmentOf from '@/xt_pages/dialysis/details/treatmentOf'
+import OperationStaff from '@/xt_pages/dialysis/details/operationStaff'
+import {
+  getDialysisScheduleDetail,
+  getLongAdvice,
+  getDialysisRecordInitData,
+  getDialysisSchedules
+} from '@/api/dialysis_record'
+import { parseTime } from '@/utils'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+export default {
+  name: 'index',
+  components: {
+    NavIgation,
+    BasicInfor,
+    DialysisPrescription,
+    PastData,
+    AcceptsAssessment,
+    AssessmentBefore,
+    StatOrder,
+    DialysisComputer,
+    DoubleCheck,
+    DialysisMonitoring,
+    DialysisOff,
+    AssessmentAfter,
+    TreatmentOf,
+    OperationStaff,
+    BreadCrumb
+  },
+  props:{
+    record_date:String,
+    patientid:String
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '透析管理' },
+        { path: false, name: '透析记录' },
+        { path: false, name: '透析单' }
+      ],
+      dialogFormVisible: false,
+      orders: false,
+      loading: false,
+      patient_id: 0,
+      date: 0,
+
+      longAdvices: [],
+      waitUploadAdvices: [],
+      is_open: 0,
+      targetAdvices: [],
+
+      patient: { id: 0 }, // 患者信息
+      schedual: { id: 0 }, // 患者排班信息
+      prescription: { id: 0 }, // 透析处方
+      solution: { id: 0 }, // 透析方案
+      system_prescribe: { id: 0 },
+      receiver_treatment_access: { id: 0 }, // 接诊评估
+      predialysis_evaluation: { id: 0 }, // 透前评估
+      doctor_advices: [], // 临时医嘱
+      double_check: { id: 0 }, // 双人核对
+      assessment_after_dislysis: { id: 0 }, // 透后评估
+      treatment_summary: { id: 0 }, // 治疗小结
+      monitor_records: [], // 透析监测
+      dialysis_order: { id: 0 }, // 透析记录
+      admin_users: [], // 系统用户列表
+      devices: [], // 设备
+      device_numbers: [], // 床位号
+
+      admin_user_map: {}, // {user_id: admin_user object}
+      device_map: {}, // {device_id: device}
+      device_number_map: {}, // {device_number_id: device_number}
+
+      niprocart_info: [],
+      jms_info: [],
+      fistula_needle_set_info: [],
+      fistula_needle_set_16_info: [],
+      hemoperfusion_info: [],
+      dialyser_sterilised_info: [],
+      filtryzer_info: [],
+      dialyzers_info: [],
+      injector_info: [],
+      bloodlines_info: [],
+      tubingHemodialysis_info: [],
+      safe_package_info: [],
+      aliquid_info: [],
+      config: {},
+
+      his_is_open:0,
+
+      lastPredialysisEvaluation: { id: 0 },
+      lastMonitorRecord: { id: 0 },
+      lastAssessmentAfterDislysis: { id: 0 },
+      lastDryWeightDislysis: { id: 0 },
+      lastAssessment:{id:0},
+      headNurses: [],
+      lastDialysisPrescribe: { id: 0 },
+      //
+      activeName: 'first',
+      selected_date: new Date(),
+      // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
+      search_keyword: '', // 确定用于搜索的关键字
+      search_input: '', // 输入中的关键字
+      patient_state: [
+        { value: 0, label: '全部患者' },
+        { value: 1, label: '已签到' },
+        { value: 2, label: '未签到' },
+        { value: 3, label: '已上机' },
+        { value: 4, label: '已下机' }
+      ],
+      patientStateVal: 0,
+      treat_state: [
+        { value: 0, label: '全部治疗' },
+        { value: 1, label: '待开处方' },
+        { value: 2, label: '待开小结' },
+        { value: 3, label: '待医嘱核对' },
+      ],
+      treatStateVal: 0,
+      schedule_options: [
+        { value: 0, label: '全部班' },
+        { value: 1, label: '上午' },
+        { value: 2, label: '下午' },
+        { value: 3, label: '晚上' }
+      ],
+      scheduleStateVal: 0,
+      zone_options: [
+        { id: 0, text: '全部分区' }
+      ],
+      zoneVal: 0,
+      tableData: [],
+      tableData1: [],
+      arr: [],
+      newName: '',
+      newTime: '',
+      scheudle_mode:"",
+
+
+      showView:false,
+      curPatient:{},
+
+      queueConfig:{},
+      stockType:[],
+      preparestock:[]
+    }
+  },
+  created() {
+    var patient_id = this.patientid
+    var date = this.record_date
+    this.patient_id = patient_id
+    this.date = date
+
+    
+
+  },
+  mounted() {
+    this.getScheduleDetail()
+    this.getLongAdvice()
+  },
+  watch:{
+        patientid:{
+            handler(newVal){
+                this.patient_id = newVal
+                this.getScheduleDetail()
+                this.getLongAdvice()
+            }
+        }
+  },
+  computed: {
+    websocket() {
+      return this.$store.state.user.websocket;
+    },
+    steps: function() {
+      var steps = [
+        { title: '透析处方', finish: false },
+        { title: '接诊评估', finish: false },
+        { title: '透前评估', finish: false },
+        { title: '临时医嘱', finish: false },
+        { title: '双人核对', finish: false },
+        { title: '透析上机', finish: false },
+        { title: '透析监测', finish: false },
+        { title: '透析下机', finish: false },
+        { title: '透后评估', finish: false },
+        { title: '治疗小结', finish: false }
+      ]
+
+      steps[0].finish = this.prescription.id && this.prescription.creater > 0
+      steps[1].finish = this.receiver_treatment_access.id > 0
+      steps[2].finish =
+        this.predialysis_evaluation.id > 0 &&
+        this.predialysis_evaluation.creater > 0
+      steps[3].finish = this.doctor_advices.length > 0
+      steps[5].finish = this.dialysis_order.id > 0
+      steps[7].finish =
+        this.dialysis_order.id > 0 && this.dialysis_order.stage == 2
+
+      steps[4].finish =
+        this.double_check.id > 0 &&
+        this.double_check.creater > 0 &&
+        this.double_check.modifier > 0
+      steps[6].finish = this.monitor_records.length > 0
+      steps[8].finish =
+        this.assessment_after_dislysis.id > 0 &&
+        this.assessment_after_dislysis.creater > 0
+      steps[9].finish = this.treatment_summary.id > 0
+
+      return steps
+    },
+    filtedSchedules: function() {
+      var search_keyword = this.search_keyword
+      if (search_keyword.length > 0) {
+        var schedules = []
+        for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
+          const scheduleInfo = this.zone_schedules[o_i]
+          var originSchedules = scheduleInfo.schedules
+          if (originSchedules.length == 0) {
+            continue
+          }
+          var filtedSchedules = []
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i]
+            if (schedule.patient.name.indexOf(search_keyword) != -1) {
+              filtedSchedules.push(schedule)
+              // break
+            }
+          }
+          if (filtedSchedules.length > 0) {
+            schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
+          }
+        }
+        return schedules
+      }
+
+      // var zone_selected = this.zoneVal
+      // var timetype_selected = this.scheduleStateVal
+      // if ((zone_selected == 0 && timetype_selected == 0) || this.zone_options.length <= 1) {
+      //   var schedules = []
+      //   for (let index = 0; index < this.zone_schedules.length; index++) {
+      //     const scheduleInfo = this.zone_schedules[index]
+      //     if (scheduleInfo.schedules.length != 0) {
+      //       schedules.push(scheduleInfo)
+      //     }
+      //   }
+      //   return schedules
+      // }
+
+      // var schedules = []
+      // for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
+      //   const scheduleInfo = this.zone_schedules[o_i]
+      //   if (zone_selected == scheduleInfo.zone_id && timetype_selected == 0) {
+      //     if (scheduleInfo.schedules.length == 0) {
+      //       return []
+      //     } else {
+      //       return [scheduleInfo]
+      //     }
+      //   }
+      //   var originSchedules = scheduleInfo.schedules
+      //   if (originSchedules.length == 0) {
+      //     continue
+      //   }
+      //   var filtedSchedules = []
+      //   for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+      //     const schedule = originSchedules[s_i]
+      //     if (zone_selected != 0) {
+      //       if (zone_selected == schedule.device_number.zone.id) {
+      //         if (timetype_selected == 0 || schedule.schedule_type == timetype_selected) {
+      //           filtedSchedules.push(schedule)
+      //         }
+      //       }
+      //     } else {
+      //       if (timetype_selected == 0 || schedule.schedule_type == timetype_selected) {
+      //         filtedSchedules.push(schedule)
+      //       }
+      //     }
+      //   }
+      //   if (filtedSchedules.length > 0) {
+      //     schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
+      //   }
+      // }
+
+      // return schedules
+    }
+  },
+  beforeDestroy(){
+
+    let unObj = {
+      cmd: "queue/unjoin",
+      data: {type:3},
+    };
+    this.websocketSend(unObj)
+  },
+  methods: {
+    adviceFunc() {
+      this.getScheduleDetail()
+    },
+    getLongAdvice() {
+      const params = {
+        patient_id: this.patient_id
+      }
+      getLongAdvice(params).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+          var status = parseInt(resp.data.status)
+
+          switch (status) {
+            case 2:
+              var totalAdvice = resp.data.advices
+              var longAdvicesTwo = resp.data.advices_two
+              var waitUploadAdvices = []
+              for (let i = 0; i < totalAdvice.length; i++) {
+                totalAdvice[i]['isCheck'] = 1
+              }
+
+              for (let i = 0; i < totalAdvice.length; i++) {
+                for (let a = 0; a < longAdvicesTwo.length; a++) {
+                  if (
+                    totalAdvice[i].template_id ==
+                      longAdvicesTwo[a].template_id &&
+                    totalAdvice[i].frequency_type ==
+                      longAdvicesTwo[a].frequency_type
+                  ) {
+                    totalAdvice[i]['isCheck'] = 0
+                  }
+                }
+              }
+
+              for (let i = 0; i < totalAdvice.length; i++) {
+                if (totalAdvice[i].isCheck == 1) {
+                  waitUploadAdvices.push(totalAdvice[i])
+                }
+              }
+
+              this.is_open = resp.data.is_open_remind
+              if(this.his_is_open == 1){
+                this.is_open = 0
+              }
+              this.longAdvices = totalAdvice
+              this.waitUploadAdvices = waitUploadAdvices
+              break
+          }
+        } else {
+          this.$message.error(resp.msg)
+        }
+      })
+    },
+    assessmentAfterDislysisFunc: function(val) {
+      for (var index in val) {
+        this.$set(this.assessment_after_dislysis, index, val[index])
+      }
+    },
+    didDelMonitor(record_id) {
+      var mrl = this.monitor_records.length
+      for (let index = 0; index < mrl; index++) {
+        if (this.monitor_records[index].id == record_id) {
+          this.monitor_records.splice(index, 1)
+          break
+        }
+      }
+    },
+    getScheduleDetail: function() {
+      this.loading = true
+    //   var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      if(this.$route.query.showView == true){
+        this.loading = false
+        return
+      }
+        console.log('this.patient_id',this.patient_id)
+        console.log('this.date',this.date)
+      this.doctor_advices = []
+      getDialysisScheduleDetail(this.patient_id, this.date).then(rs => {
+
+        var resp = rs.data
+        if (resp.state == 1) {
+          var patient = resp.data.patient // 患者信息
+          var schedual = resp.data.schedual // 患者排班信息
+          console.log("排班22222222222",schedual)
+          var prescription = resp.data.prescription // 透析处方
+          if (prescription != null) {
+            if (prescription.body_fluid == -2) {
+              prescription.body_fluid = 0
+            }
+          }
+
+          var solution = resp.data.solution // 透析方案
+          console.log("透析方案22223333333333",solution)
+          var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
+
+          var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
+           console.log("透器评估",predialysis_evaluation)
+          if (predialysis_evaluation != null) {
+            if (predialysis_evaluation.blood_access_part_id == -2) {
+              predialysis_evaluation.blood_access_part_id = 0
+            }
+          }
+          var doctor_advices = resp.data.doctor_advices // 临时医嘱
+
+          var double_check = resp.data.double_check // 双人核对
+          var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
+
+          var treatment_summary = resp.data.treatment_summary // 治疗小结
+          var monitor_records = resp.data.monitor_records // 透析监测
+          var dialysis_order = resp.data.dialysis_order // 透析记录
+
+          var niprocart_info = resp.data.niprocart_info
+          var jms_info = resp.data.jms_info
+          var fistula_needle_set_info = resp.data.fistula_needle_set_info
+          var fistula_needle_set_16_info = resp.data.fistula_needle_set_16_info
+          var hemoperfusion_info = resp.data.hemoperfusion_info
+          var dialyser_sterilised_info = resp.data.dialyser_sterilised_info
+          var filtryzer_info = resp.data.filtryzer_info
+          var dialyzers_info = resp.data.dialyzers_info
+          var injector_info = resp.data.injector_info
+          var bloodlines_info = resp.data.bloodlines_info
+          var tubingHemodialysis_info = resp.data.tubingHemodialysis_info
+          var safe_package_info = resp.data.safe_package_info
+          var aliquid_info = resp.data.aliquid_info
+
+          var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
+
+          if (lastPredialysisEvaluation != null) {
+            if (lastPredialysisEvaluation.blood_access_part_id == -2) {
+              lastPredialysisEvaluation.blood_access_part_id = 0
+            }
+          }
+          var lastMonitorRecord = resp.data.lastMonitorRecord
+          var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
+          var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
+          var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
+
+          var system_prescribe = resp.data.system_prescribe
+
+          var lastAssessment =  resp.data.lastAssessment
+          console.log("最后一次血管通路",lastAssessment)
+          this.$refs.nav.setLastRecord(
+            lastPredialysisEvaluation,
+            lastMonitorRecord,
+            lastAssessmentAfterDislysis,
+            lastDialysisPrescribe,
+            lastDryWeightDislysis,
+            schedual,
+            system_prescribe,
+            lastAssessment,
+          )
+
+          var headNurses = resp.data.headNurse
+
+          var config = resp.data.config
+          this.lastPredialysisEvaluation = lastPredialysisEvaluation
+          this.lastMonitorRecord = lastMonitorRecord
+          this.lastAssessmentAfterDislysis = lastAssessmentAfterDislysis
+          this.lastDialysisPrescribe = lastDialysisPrescribe
+          this.lastDryWeightDislysis = lastDryWeightDislysis
+          this.lastAssessment = lastAssessment
+          this.headNurses = headNurses
+          this.system_prescribe = system_prescribe
+
+
+
+          this.niprocart_info = []
+          this.jms_info = []
+          this.fistula_needle_set_info = []
+          this.fistula_needle_set_16_info = []
+          this.hemoperfusion_info = []
+          this.dialyser_sterilised_info = []
+
+          this.filtryzer_info = []
+          this.dialyzers_info = []
+          this.injector_info = []
+
+          this.bloodlines_info = []
+          this.tubingHemodialysis_info = []
+          this.safe_package_info = []
+          this.aliquid_info = []
+
+
+
+
+
+          this.niprocart_info = niprocart_info
+          this.jms_info = jms_info
+          this.fistula_needle_set_info = fistula_needle_set_info
+          this.fistula_needle_set_16_info = fistula_needle_set_16_info
+          this.hemoperfusion_info = hemoperfusion_info
+          this.dialyser_sterilised_info = dialyser_sterilised_info
+          this.filtryzer_info = filtryzer_info
+          this.dialyzers_info = dialyzers_info
+          this.injector_info = injector_info
+          this.bloodlines_info = bloodlines_info
+          this.tubingHemodialysis_info = tubingHemodialysis_info
+          this.safe_package_info = safe_package_info
+          this.aliquid_info = aliquid_info
+          this.config = config
+
+          this.patient = patient
+          this.schedual = schedual == null ? { id: 0 } : schedual
+          this.prescription = prescription == null ? { id: 0 } : prescription
+          this.solution = solution == null ? { id: 0 } : solution
+          this.receiver_treatment_access =
+            receiver_treatment_access == null
+              ? { id: 0 }
+              : receiver_treatment_access
+          this.predialysis_evaluation =
+            predialysis_evaluation == null ? { id: 0 } : predialysis_evaluation
+          this.doctor_advices = doctor_advices == null ? [] : doctor_advices
+          this.double_check = double_check == null ? { id: 0 } : double_check
+          this.assessment_after_dislysis =
+            assessment_after_dislysis == null
+              ? { id: 0 }
+              : assessment_after_dislysis
+          this.treatment_summary =
+            treatment_summary == null ? { id: 0 } : treatment_summary
+          this.monitor_records = monitor_records == null ? [] : monitor_records
+          this.dialysis_order =
+            dialysis_order == null ? { id: 0 } : dialysis_order
+
+
+
+          this.admin_users = resp.data.doctors
+          this.devices = resp.data.devices
+          this.device_numbers = resp.data.device_numbers
+
+          var his_doctor_advices = resp.data.his_advices
+
+          this.his_is_open = resp.data.is_open_config.is_open
+          console.log(this.his_is_open)
+
+
+
+          var stockType =  resp.data.stockType
+          this.stockType = stockType
+          console.log("stockTYPW",stockType)
+
+          var prepare = resp.data.prepare
+          this.preparestock = prepare
+          console.log("prepare222222",prepare)
+
+          for (let i = 0; i <  this.doctor_advices.length; i++){
+            this.doctor_advices[i]['origin'] = 1
+          }
+
+          if (his_doctor_advices != null) {
+            for (let i = 0; i < his_doctor_advices.length; i++) {
+              his_doctor_advices[i]['origin'] = 2
+              his_doctor_advices[i]['way'] = 1
+              this.doctor_advices.push(his_doctor_advices[i])
+            }
+          }
+
+          const obj = {}
+          this.doctor_advices = this.doctor_advices.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          console.log(this.doctor_advices)
+
+
+          var device_map = {}
+          for (let index = 0; index < this.devices.length; index++) {
+            const device = this.devices[index]
+            device_map[device.id] = device
+          }
+          this.device_map = device_map
+
+          var admin_map = {}
+          for (let index = 0; index < this.admin_users.length; index++) {
+            const admin = this.admin_users[index]
+            admin_map[admin.id] = admin
+          }
+          this.admin_user_map = admin_map
+
+          var device_number_map = {}
+          for (let index = 0; index < this.device_numbers.length; index++) {
+            const device_number = this.device_numbers[index]
+            device_number_map[device_number.id] = device_number
+          }
+          this.device_number_map = device_number_map
+        } else {
+          this.$message.error(resp.msg)
+        }
+
+        if (this.lastDialysisPrescribe != null) {
+          delete this.lastDialysisPrescribe.target_ultrafiltration
+        }
+        if (this.solution != null) {
+          delete this.solution.target_ultrafiltration
+        }
+        if(this.predialysis_evaluation.id > 0){
+          this.newTime = parseTime(this.predialysis_evaluation.created_time, '{h}:{i}')
+        }
+
+        this.loading = false
+      })
+    },
+    printOrder() {
+      var xtdate = parseTime(this.date, '{y}-{m}-{d}')
+      this.$router.push(
+        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no
+      )
+    },
+    processedDialysisSchedules: function(schedules, zone_options) {
+      var zoneMap = {}
+      var scheduleMap = {}
+      for (let z_i = 0; z_i < zone_options.length; z_i++) {
+        const zone = zone_options[z_i]
+        if (zone.id == 0) {
+          continue
+        }
+        scheduleMap[zone.id] = []
+      }
+      for (let index = 0; index < schedules.length; index++) {
+        const schedule = schedules[index]
+        scheduleMap[schedule.device_number.zone.id].push(schedule)
+      }
+      var zone_schedules = []
+      for (let index = 0; index < zone_options.length; index++) {
+        const zone = zone_options[index]
+        if (zone.id == 0) {
+          continue
+        }
+        var schedules = scheduleMap[zone.id]
+        zone_schedules.push({ zone_id: zone.id, zone_name: zone.text, schedules: schedules })
+      }
+      return zone_schedules
+    },
+    getTime(date){
+      date = new Date(date * 1000)
+      var Y = date.getFullYear() + '-';
+      var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+      var D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate());
+      var h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours());
+      var m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes());
+      var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
+
+      let strDate = h  + ':' + m;
+      return strDate;
+    },
+    getDates(time){
+      return moment(time * 1000).format('HH:mm:ss')
+    }
+  }
+}
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+.details-bg {
+  background: #fff;
+  margin: 0 15px;
+}
+.printForm {
+  .title {
+    font-size: 30px;
+    font-weight: 500;
+    text-align: center;
+    line-height: 60px;
+  }
+  .info {
+    ul {
+      display: -webkit-box;
+      display: -moz-box;
+      display: -ms-flexbox;
+      display: -webkit-flex;
+      display: flex;
+      align-items: center;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+      -o-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+      box-sizing: border-box;
+      -webkit-justify-content: space-around;
+      -moz-justify-content: space-around;
+      -ms-justify-content: space-around;
+      -o-justify-content: space-around;
+      justify-content: space-around;
+      li {
+        display: flex;
+        box-sizing: border-box;
+        justify-content: space-around;
+        .name {
+        }
+        .InputBox {
+          padding: 0;
+          border: none;
+          border-bottom: 1px #e5e5e5 solid;
+          width: 60px;
+          outline: none;
+        }
+      }
+    }
+  }
+  .printTable {
+    tr {
+      padding: 2px;
+      th {
+        padding: 6px 4px;
+      }
+      td {
+        padding: 6px 4px;
+      }
+    }
+  }
+}
+.loadingBox{
+  display: flex;
+  .patientBox{
+    background: #fff;
+  }
+  .tip1{
+    background: #4fc7cb;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 12px;
+    display: inline-block;
+    width: 60px;
+    color: #fff;
+  }
+  .tip2{
+    background: #ee8556;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 12px;
+    display: inline-block;
+    width: 60px;
+    color: #fff;
+  }
+  .tip3{
+    background: #409eff;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 12px;
+    display: inline-block;
+    width: 60px;
+    color: #fff;
+  }
+  .tip4{
+    background: #a8b3ba;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 12px;
+    display: inline-block;
+    width: 60px;
+    color: #fff;
+  }
+  .tip5{
+    background: #7bce91;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 12px;
+    display: inline-block;
+    width: 60px;
+    color: #fff;
+  }
+}
+</style>
+
+<style lang="scss">
+.loadingBox{
+  .el-loading-spinner{
+    top:10%;
+  }
+  .el-button--small, .el-button--small.is-round{
+    padding:9px 10px;
+  }
+  .el-date-editor{
+    .el-input__inner{
+      padding-right:0px;
+    }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+  .el-table .cell{
+    padding: 0;
+  }
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -111,7 +111,7 @@
       append-to-body>
 
       <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
-      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
+      <recordPrint v-if="activeName == 'second'" ref="recordPrint" :patientid="patientid"></recordPrint>
     </el-dialog>
   </el-dialog>
 </div>
@@ -192,6 +192,7 @@
           var record_date = this.format(this.case_history.sick_date)
           this.patientid = this.patientInfo.id
           this.innerVisible = true
+          this.$refs.recordPrint.show(this.patientid)
           // this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
@@ -241,6 +242,7 @@
         let params={
           id:id,
         }
+        console.log(id)
         getHisPrescriptionInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -41,11 +41,11 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
+      <el-table-column align="center" prop="day" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
-
+          <div style="display:flex;align-items:center;">
+          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>{{'天'}}
+          </div>
         </template>
       </el-table-column>
 
@@ -57,10 +57,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+      <el-table-column align="center" prop="retail_price" width="80" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
 
         </template>
       </el-table-column>
@@ -108,10 +110,12 @@
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">

src/xt_pages/outpatientRegistration/index.vue

@@ -315,7 +315,7 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                    <el-form-item label="挂号类型：" >
                         <el-select v-model="form.register" placeholder="请选择">
                             <el-option
                                     v-for="item in his_registers"
@@ -611,7 +611,6 @@
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
           sex: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
           idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
-          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
           age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
@@ -1121,12 +1120,6 @@
           this.$message.error('患者性别不能为空')
         }
 
-        if (this.form.register == '') {
-          this.$message.error('挂号类型不能为空');
-          this.is_Name = true;
-          return
-        }
-
         if (this.form.doctor == '') {
           this.$message.error('医生不能为空');
           this.is_Name = true;
@@ -1461,7 +1454,9 @@
         this.form.certificates = 2;
         this.form.id_card_type = 1
       }else{
+        this.form.settlementValue = 1;
         this.form.registrationFee = 0;
+        this.form.medicalExpenses = 0;
         this.form.certificates = 1;
         this.form.id_card_type = 2
       }

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -256,7 +256,7 @@
                 </span>
                 <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
                  <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span> 
+                </span>
               </div>
             </div>
             <div class="infoOne">
@@ -709,7 +709,7 @@ export default {
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     
+
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -720,7 +720,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-     // console.log("本月最后一天",timeEnd)
+      // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量
@@ -745,7 +745,7 @@ export default {
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-       
+
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
@@ -929,7 +929,7 @@ export default {
     },
     //统计转归
     getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
-   
+
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
       getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
@@ -939,7 +939,7 @@ export default {
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-      
+
           this.rollOutTotal = patients.length
 
           var patienttwo = response.data.data.patienttwo
@@ -948,7 +948,7 @@ export default {
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-        
+
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
@@ -1000,7 +1000,7 @@ export default {
       getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-        
+
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
@@ -1022,7 +1022,7 @@ export default {
       getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
-          
+
            this.dialysisAge = dataage
 
          }
@@ -1153,7 +1153,7 @@ export default {
           start_time:this.start,
           end_time:this.end,
           mode_id:this.mode_id,
-          
+
         }
         this.modesData.series = []
         this.modesData.xAxis = []

src/xt_pages/stock/detail/print.vue

@@ -81,7 +81,8 @@
               <td width="633" style="line-height: 50px">合计</td>
               <td width="80" style="line-height: 50px">
                 <span v-if="type == 1">{{calTotalPrice()}}</span>
-                <span v-if="type == 3">{{getTotalPrice().toFixed(2)}}</span>
+                <span v-if="type == 3 && org_id!=10090">{{getTotalPrice().toFixed(2)}}</span>
+                <span v-if="type == 3 && org_id==10090">{{getTotalPriceOne().toFixed(2)}}</span>
               </td>
               <td></td>
             </tr>
@@ -186,18 +187,18 @@
         getPrintStockGood(this.queryParams).then(response => {
           if (response.data.state == 1) {
             var stockTotal = response.data.data.stockTotal
-            console.log("stocktOTl",stockTotal)
+          
             this.stockTotal = stockTotal
-            console.log("导出数据",response.data.data.list)
+           
             var info = response.data.data.info
-            console.log("infor2222222",info)
+           
             this.wareOutInfo = info
             var org_id = response.data.data.orgid
-            console.log("org_id",org_id)
+          
             this.org_id = org_id
 
             var informationlist = response.data.data.infomationList
-            console.log('数据列表',informationlist)
+           
             this.informationList = informationlist
             this.stockDatas = []
             for (let i = 0; i < response.data.data.list.length; i++) {
@@ -205,7 +206,7 @@
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
                 }
-
+                console.log("入库打印数据源",this.stockDatas)
               } else if (this.type == 2) {
                 if (response.data.data.list[i].query_sales_return_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
@@ -218,6 +219,7 @@
                 }
                
                 console.log("出库打印数据源",this.stockDatas)
+
                 
               } else if (this.type == 4) {
                 if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
@@ -373,14 +375,14 @@
        for(let i=0;i<this.informationList.length;i++){
         for(let j=0;j<this.wareOutInfo.length;j++){
            if(this.informationList[i].id == this.wareOutInfo[j].good_id){
-             this.wareOutInfo[j].retail_price =  this.informationList[i].retail_price 
+             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price 
            }
         }
        }
       
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
-            sum += (this.wareOutInfo[j].retail_price * this.wareOutInfo[j].count).toFixed(2)
+            sum += (this.wareOutInfo[j].buy_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
        
@@ -391,7 +393,7 @@
        var price = 0
        for(let i=0;i<this.informationList.length;i++){
           if(id == this.informationList[i].id){
-             price = this.informationList[i].retail_price
+             price = this.informationList[i].buy_price
           }
        }
        return price
@@ -403,6 +405,13 @@
        }
        return total_price
      },
+     getTotalPriceOne(){
+       var total_price = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total_price +=(this.getWareOut(this.stockDatas[i].id) * this.getReailPrice(this.stockDatas[i].id))
+       }
+       return total_price
+     },
      unique(arr) {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));

src/xt_pages/stock/detail/stockInDetail.vue

@@ -235,6 +235,8 @@ export default {
     this.goodUnit = this.$store.getters.good_unit
 
     this.getPrintStockGood()
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
+    console.log("机构ID",this.org_id)
   },
   data() {
     return {
@@ -268,7 +270,8 @@ export default {
       dealer: [],
       tableList:[],
       goodUnit:[],
-      stockTotal:[]
+      stockTotal:[],
+      org_id:0,
     };
   },
   methods: {
@@ -389,13 +392,10 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          console.log("数据源头list2222222",response.data.data.list)
-
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            // this.tableList.push(obj)
           }
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -439,7 +439,7 @@ export default {
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
-              // this.doctorOptions.push(this.adminUserOptions[index]);
+            
             }
           }
         }
@@ -642,9 +642,10 @@ export default {
        end_time:this.end_time,
        type:1,
      }
-   
+     
      getPrintStockGood(params).then(response=>{
         if(response.data.state == 1){
+          this.tableList = []
           var stockTotal =  response.data.data.stockTotal
         
           this.stockTotal = stockTotal
@@ -655,9 +656,7 @@ export default {
                this.tableList.push(list[i])
              }
           }
-         
-       
-       
+          console.log("数据源头2222222222",this.tableList)
         }
      })
    },
@@ -727,6 +726,11 @@ export default {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
       },
+      uniqueOne(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+      },
+      
       exportList(){
         var obj = {index:"合计",total:0}
         obj.total = this.calTotalPrice()
@@ -740,25 +744,48 @@ export default {
           this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
 
         }
-        var arr = this.unique(this.tableList)
-        console.log("arrrr",arr)
-        this.tableList = arr
-        this.tableList.push(obj)
-        console.log("数据222222",this.tableList)
-      
-        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-        const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+        console.log("总共条数",this.tableList)
+        if(this.org_id == 10024){
+          var arr = this.uniqueOne(this.tableList)
+          this.tableList = arr
+          this.tableList.push(obj)
+          console.log("去重后条数",this.tableList)
         
-        const data = this.formatJson(filterVal, this.tableList)
-        
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: '耗材入库明细'
-          })
-            this.downloadLoading = false
-          })
+          import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+          const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+          
+          const data = this.formatJson(filterVal, this.tableList)
+          console.log("data222222222",data)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: '耗材入库明细'
+            })
+              this.downloadLoading = false
+            })
+        }
+        if(this.org_id !=10024){
+           var arr = this.unique(this.tableList)
+            this.tableList = arr
+            this.tableList.push(obj)
+            console.log("去重后条数",this.tableList)
+          
+            import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+            const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+            
+            const data = this.formatJson(filterVal, this.tableList)
+            console.log("data222222222",data)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '耗材入库明细'
+              })
+                this.downloadLoading = false
+              })
+        }
+     
         },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -743,12 +743,11 @@ export default {
       },
 
      exportList(){
-      console.log("数据22222",this.tableList)
-      console.log("数据3333",this.goodInfoData)
+      
       for(let i=0;i<this.tableList.length;i++){
          for(let j=0;j<this.goodInfoData.length;j++){
             if(this.tableList[i].id === this.goodInfoData[j].id){
-               this.tableList[i].retail_price = this.goodInfoData[j].retail_price
+               this.tableList[i].buy_price = this.goodInfoData[j].buy_price
             }
          }
       }
@@ -760,7 +759,7 @@ export default {
         this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
         // this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].buy_price
-        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].retail_price).toFixed(2)
+        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
        var arr = this.unique(this.tableList)
@@ -769,7 +768,7 @@ export default {
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','retail_price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','buy_price','total','remark']
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -456,17 +456,23 @@ export default {
         for(let i=0;i<this.tableList.length;i++){
           for(let j=0;j<this.drugList.length;j++){
              if(this.tableList[i].drug_id == this.drugList[j].id){
-               this.tableList[i].retail_price = this.drugList[j].retail_price
+               this.tableList[i].last_price = this.drugList[j].last_price
+               
              }
           }
           this.tableList[i].index = i+1
         }
+        for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].total_price = this.tableList[i].last_price * this.tableList[i].count
+        }
+       console.log("列表数据333333333",this.tableList)
+      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','retail_price','total_price','remark']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','last_price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += this.tableList[i].retail_price * this.tableList[i].count
+         obj.total_price += (this.tableList[i].last_price * this.tableList[i].count)
        }
        for(let j=0;j<this.tableList.length;j++){
           this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -56,7 +56,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -172,7 +172,7 @@
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].price
+            total += this.cancelStockDate[i].price*this.cancelStockDate[i].count 
          }
          return total
       }

src/xt_pages/stock/drugs/drugCancelOurderPrint.vue

@@ -55,7 +55,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -171,7 +171,7 @@
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].price
+            total += this.cancelStockDate[i].price*this.cancelStockDate[i].count
          }
          return total
       }

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -168,6 +168,7 @@
         limit:this.limit,
         page:this.page,
        }
+       console.log("出库数据22222",params)
       getDrugOutDetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.order
@@ -249,7 +250,7 @@
         var price = 0
         for(let i=0;i<this.drugList.length;i++){
           if(id == this.drugList[i].id){
-             price = this.drugList[i].retail_price
+             price = this.drugList[i].last_price
           }
         }
         return price

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -93,8 +93,8 @@
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
         end_time: '',
-        page: 1,
-        limit: 10000,
+        page: this.$route.query.page,
+        limit: this.$route.query.limit,
         goodType: [],
         goodInfo: [],
         tempArr: [],

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -10,7 +10,7 @@
         <div class="dialysis-print-order">
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
-         
+
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -22,7 +22,7 @@
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
               <td style="line-height:18px;" width="80">单位</td>
               <td style="line-height:18px;" width="80">进货价</td>
-              <td style="line-height:18px;" width="80">入库<br>数量</td> 
+              <td style="line-height:18px;" width="80">入库<br>数量</td>
               <td style="line-height:18px;" width="60">总价</td>
               <td style="line-height:18px;" width="80">批号</td>
               <td style="line-height:18px;" width="120">生产日期</td>
@@ -50,7 +50,7 @@
               <td style="line-height: 18px">
                    <span>{{ item.warehousing_count }}</span>
               </td>
-              
+
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
@@ -66,15 +66,19 @@
             </tr>
             </tbody>
           </table>
-        
 
-          <div style="display:flex;margin-top:1px;float:right;">
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId == 10024">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
           </div>
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId !=10024">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
+          </div>
         </div>
 
       </div>
@@ -165,7 +169,7 @@
         }
         return ''
       },
-     
+
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
@@ -177,7 +181,7 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
@@ -229,13 +233,13 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-           
+
             for(let j=0;j<this.list.length;j++){
               this.list[j].manufacturer_name = ""
             }
 
             for(let i=0;i<this.list.length;i++){
-           
+
               for(let j=0;j<this.manufacturer.length;j++){
                  if(this.list[i].manufacturer == this.manufacturer[j].id){
                     this.list[i].manufacturer_name = this.manufacturer[j].manufacturer_name
@@ -331,7 +335,7 @@
       const order_id = this.$route.query.id;
       this.GetOrderDetail(order_id);
       this.getList()
-      
+
     }
 
   }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -9,7 +9,9 @@
       <div id="dialysis-print-box">
         <div class="dialysis-print-order">
          <div class="order-yy-name" style="font-weight:bold;">{{orgName}}</div>
-          <div class="order-title" style="font-weight:none;">药品出库登记表</div>
+          <div class="order-title" style="font-weight:normal;">药品出库登记表</div>
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
@@ -22,7 +24,7 @@
               <td style="line-height: 50px" width="80">出货数量</td>
               <td style="line-height:50px" width="80">出库价格</td>
               <td style="line-height: 50px" width="">总价</td>
-              <td style="line-height: 50px" width="">批次</td>
+              <td style="line-height: 50px" width="">批号</td>
               <td style="line-height: 50px" width="">生产日期</td>
               <td style="line-height: 50px" width="">有效日期</td>
             </tr>
@@ -47,9 +49,9 @@
              <td  style="line-height:50px">
                 {{(item.count * item.price).toFixed(2)}}
              </td>
-             <td></td>
-             <td></td>
-             <td></td>
+             <td>{{getNumber(item.drug_id)}}</td>
+             <td>{{getProductDate(item.drug_id)}}</td>
+             <td>{{getExpiryDate(item.drug_id)}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
@@ -68,8 +70,8 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
-            <div style="width:70px;">科室：</div><div style="width:100px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
+            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -90,7 +92,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import {  getDrugWarehouseOutInfo } from '@/api/drug/drug_stock'
+  import {  getDrugWarehouseOutInfo,getDrugWarehouseOrderInfo } from '@/api/drug/drug_stock'
   import {getBaseDrugLibList} from '@/api/data'
   export default {
     name: 'dialysisPrintOrder',
@@ -128,7 +130,8 @@
         limit:10000,
         keywords:"",
         orgId:'',
-        orgName:""
+        orgName:"",
+        drugOrderList:[]
       }
     },
     methods: {
@@ -256,6 +259,52 @@
         });
         this.sameRowArr = sameRowArr
       },
+      getDrugWarehouseOrderInfo(){
+        getDrugWarehouseOrderInfo().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("入库单详情",list)
+             this.drugOrderList = list
+           }
+        })
+      },
+      getNumber(id){
+        var number = ""
+        for(let i=0;i<this.drugOrderList.length;i++){
+          if(id == this.drugOrderList[i].drug_id){
+              number = this.drugOrderList[i].number
+          }
+        }
+        return number
+      },
+      getProductDate(id){
+        var product_date = ""
+        for(let i=0;i<this.drugOrderList.length;i++){
+           if(id == this.drugOrderList[i].drug_id){
+             product_date = this.drugOrderList[i].product_date
+           }
+        }
+        return this.getTime(product_date)
+      },
+      getExpiryDate(id){
+         var expiry_date = ""
+         for(let i=0;i<this.drugOrderList.length;i++){
+           if(id == this.drugOrderList[i].drug_id){
+             expiry_date = this.drugOrderList[i].expiry_date
+           }
+        }
+        return this.getTime(expiry_date)
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
@@ -263,6 +312,7 @@
       this.orgId = this.$store.getters.xt_user.org.id;
       this.GetOrderDetail(order_id);
       this.getList()
+      this.getDrugWarehouseOrderInfo()
     }
 
   }

src/xt_pages/stock/drugs/query.vue

@@ -455,7 +455,7 @@
       printOrder(){
         this.$router.push({
           name: "drugQueryPrint",
-          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time}
+          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
         });
       }
     }

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -124,7 +124,7 @@
     created() {
       const order_id = this.$route.query.id
       const warehouse_out_time = this.$route.query.warehouse_out_time
-      console.log("时间搓",warehouse_out_time)
+     
       this.GetConfigInfo()
       this.GetOrderDetail(order_id)
       this.GetTotalCount(warehouse_out_time)
@@ -234,7 +234,7 @@
             }
             this.warehousingOutInfo.info = response.data.data.info
           
-            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
+          
             this.handleSpanTempArr()
           }
         })

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -41,9 +41,9 @@
                                     <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <td>{{item.price}}</td>
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
+                                    <td>{{getNumber(item.good_id)}}</td>
+                                    <td>{{getProductDate(item.good_id)}}</td>
+                                    <td>{{getExpiryDate(item.good_id)}}</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
@@ -63,7 +63,7 @@
                         <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
                           <div style="width:50px;">科室：</div><div style="width:60px;"></div>
                           <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
-                          <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
                           <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
@@ -77,9 +77,10 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList } from "@/api/stock";
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         BreadCrumb
@@ -117,6 +118,7 @@ export default {
             wareoutList:[],
             orgId:'',
             orgName:'',
+            orderInList:[]
         }
     },
     methods:{
@@ -272,7 +274,56 @@ export default {
             }
          }
         return count
-      }
+      },
+
+      getWarehouseOrderInfoList(){
+         getWarehouseOrderInfoList().then(response=>{
+             if(response.data.state == 1){
+               var list = response.data.data.list
+               console.log("入库单详情",list)
+               this.orderInList = list
+             }
+         })
+      },
+      getNumber(id){
+        var name = ""
+        for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+               name = this.orderInList[i].number
+           }
+        }
+        return name
+      },
+      getProductDate(id){
+        var product_date = ""
+         for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+               product_date =  this.orderInList[i].product_date
+           }
+         }
+         return this.getTime(product_date)
+      },
+
+      getExpiryDate(id){
+         var expiry_date = ""
+         for(let i=0;i<this.orderInList.length;i++){
+           if(id == this.orderInList[i].good_id){
+              expiry_date = this.orderInList[i].expiry_date
+           }
+         }
+         return this.getTime(expiry_date)
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+
 
     },
     created(){
@@ -284,6 +335,8 @@ export default {
       this.GetOrderDetail(order_id);
       this.GetTotalCount(warehouse_out_time);
       this.getList()
+      //获取所有入库单
+      this.getWarehouseOrderInfoList()
     }
 }
 </script>

src/xt_pages/stock/stockPrint.vue

@@ -83,8 +83,8 @@ export default {
           tableData:[],
           time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
           type_name:"",
-          limit:20,
-          page:1,
+          limit:"",
+          page:"",
           WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
@@ -173,7 +173,8 @@ export default {
       this.type_name = type_name
       var keyword = this.$route.query.keyword
       this.keyword = keyword
-
+      this.page = this.$route.query.page
+      this.limit = this.$route.query.limit
       this.getlist()
     }
 }

src/xt_pages/stock/stockQuery.vue

@@ -332,6 +332,7 @@ export default {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
+        this.start_time = val
         this.GetAllStockQuery();
       }
     },
@@ -341,6 +342,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        this.end_time = val
         this.GetAllStockQuery();
       }
      
@@ -405,7 +407,7 @@ export default {
        this.GetAllStockQuery()
       },
       toPrint(){
-        this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
+        this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
         
       },
 

src/xt_pages/workforce/appointment.vue

@@ -69,6 +69,7 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
+           <el-button @click="printTable" type="primary" size="small">打印排班</el-button>
           <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button>
@@ -121,7 +122,7 @@
       <!-- </el-col>
     </el-row> -->
 
-      <table-data :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow"
+      <table-data ref="tableData" :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition" @event2="changeSchedule"></table-data>
 
 
@@ -226,7 +227,9 @@
       UploadExcel
     },
     methods: {
-
+      printTable(){
+        this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
+      },
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -287,7 +290,7 @@
             return false
           }
           var partitions = response.data.data.partitions
-          console.log("分区",partitions)
+          // console.log("分区",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -507,14 +510,13 @@
             }
             i++
           }
-          console.log("listw22222222",list)
             var data = []
 
           this.tableList.map(item=>{
             data.push(Object.values(item))
 
           })
-          console.log("data",data)
+        
           
           const filename = '排班模版'
         
@@ -529,8 +531,6 @@
           }
           
           if(this.export_type == 1){
-
-            console.log("44444444",this.tableList)
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
             //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
@@ -566,7 +566,7 @@
               data.push(Object.values(item))
 
             })
-            console.log("data",data)
+            // console.log("data",data)
             
             const filename = '排班模版'
            
@@ -593,7 +593,7 @@
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
 
           var data = []
-          console.log("33333",this.tableList)
+          // console.log("33333",this.tableList)
          
          this.tableList.map(item=>{
            data.push(Object.values(item))
@@ -618,10 +618,7 @@
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
-            console.log(v)
-            console.log(j)
-            console.log(v[j])
-
+        
             if (j === 'timestamp') {
               return parseTime(v[j])
             } else {
@@ -2130,11 +2127,11 @@
               partition_id:this.partition_id,
               schedule_type:this.schedule_type
             }
-           console.log("params2222",params)
+          //  console.log("params2222",params)
          getThreeWeekList(params).then(response=>{
            if(response.data.state == 1){
              var partitions =  response.data.data.partitions
-             console.log("数据22222",this.partitions)
+            //  console.log("数据22222",this.partitions)
 
              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
               var list = []
@@ -2302,16 +2299,16 @@
               var lastWeek = []
               var next_start = this.getNextWeekOne(1)
               var nextstart = this.getTimestamp(next_start) - 28800
-              console.log("下周开始时间",nextstart)
+              // console.log("下周开始时间",nextstart)
               var next_end = this.getNextWeek(1)
               var nextend = this.getTimestamp(next_end) - 28800
-              console.log("下周结束时间",nextend)
+              // console.log("下周结束时间",nextend)
               var last_start = this.getNextWeekOne(2)
               var last_end = this.getNextWeek(2)
               var laststart = this.getTimestamp(last_start) - 28800
-              console.log("下下周数据时间",laststart)
+              // console.log("下下周数据时间",laststart)
               var lastend = this.getTimestamp(last_end) - 28800
-              console.log("下下周数据时间",lastend)
+              // console.log("下下周数据时间",lastend)
                
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
@@ -2428,7 +2425,7 @@
               }
              }
 
-             console.log("list5555555555",list)
+            //  console.log("list5555555555",list)
 
              if(nextWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
@@ -2531,7 +2528,7 @@
               }
              }
 
-             console.log("nextWeek",nextWeek)
+            //  console.log("nextWeek",nextWeek)
 
              if(lastWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
@@ -2692,7 +2689,7 @@
       
      
 
-         console.log("33333333",this.newDay)
+        //  console.log("33333333",this.newDay)
          this.export_type = 1
          this.getThreeWeekList()
        },
@@ -2770,16 +2767,16 @@
                 let weekOfday = parseInt(moment().format('d')) 
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
-                console.log("start",start_time)
-                console.log("end",end_time)
+                // console.log("start",start_time)
+                // console.log("end",end_time)
              }
             
             //本周
              if(this.form.lastweek == "2"){
                 start_time = this.getTimestamp(this.weekDayArr[0])
                 end_time = this.getTimestamp(this.weekDayArr[6])
-                console.log("start",start_time)
-                console.log("end",end_time)
+                // console.log("start",start_time)
+                // console.log("end",end_time)
              }
 
             var label = ""
@@ -2798,7 +2795,7 @@
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
-           console.log("时间",params)
+         
          
            this.$refs[formName].validate(valid=>{
               if(valid){
@@ -2817,11 +2814,11 @@
     },
     created() {
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
-     console.log("开始时间",start_time)
+   
      this.start_time = start_time
 
      var end_time = this.getNextWeek(2)
-     console.log("结束时间222222",end_time)
+   
      this.end_time = end_time
       this.getWeekPanels()
       this.getInitDate()

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -25,7 +25,8 @@
           </li>
         </ul>
       </div>
-      
+    </div>
+    <div class="cell clearfix">
       <div  class="title"><span class="name">班 次</span> :</div>
       <div class="time">
         <ul class>
@@ -40,6 +41,36 @@
         </ul>
       </div>
     </div>
+    <div class="cell clearfix">
+      <div  class="title"><span class="name">处方状态</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == pre_status ? 'active' : ''"
+            @click="selectPreList(item.id)"
+            v-for="item in preStatusList"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix">
+      <div  class="title"><span class="name">分区</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == zone ? 'active' : ''"
+            @click="selectZoneList(item.id)"
+            v-for="item in zoneList"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
     <el-table
       :row-style="{ color: '#303133' }"
       :data="scheduleData"
@@ -50,6 +81,23 @@
       }"
       style="width: 100%"
     >
+      <el-table-column label="透析处方" min-width="100" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prescription.id > 0">已确认</span>
+          <span v-if="scope.row.prescription.id == 0">未确认</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="星期" min-width="100" align="center">
+        <template slot-scope="scope">
+           <span v-if="scope.row.schedule_week == 0">周日</span>
+           <span v-if="scope.row.schedule_week == 1">周一</span>
+           <span v-if="scope.row.schedule_week == 2">周二</span>
+           <span v-if="scope.row.schedule_week == 3">周三</span>
+           <span v-if="scope.row.schedule_week == 4">周四</span>
+           <span v-if="scope.row.schedule_week == 5">周五</span>
+           <span v-if="scope.row.schedule_week == 6">周六</span>
+        </template>
+      </el-table-column>
       <el-table-column label="姓名" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.patient }}
@@ -87,27 +135,18 @@
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="抗凝剂" min-width="100" align="center">
+      <el-table-column label="抗凝剂(商品名称)" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 2"
-            >普通肝素</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 3"
-            >低分子肝素</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 4"
-            >阿加曲班</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 5"
-            >枸橼酸钠</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 6"
-            >低分子肝素钙</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 7"
-            >低分子肝素钠</span
-          >
+          <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 3" >低分子肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
+          <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
+          <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
+          <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
+         <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+             (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="总量" min-width="100" align="center">
@@ -152,9 +191,8 @@
 
       <el-table-column label="长期医嘱" min-width="440" align="center">
         <template slot-scope="scope">
-          <span style="white-space: pre">{{
-            getAdvice(scope.row.doctor_advice)
-          }}</span>
+          <span style="white-space: pre" v-if="scope.row.doctoradvice.length>0">{{getAdvice(scope.row.doctoradvice)}}</span>
+          <span style="white-space: pre" v-if="scope.row.hisdoctoradviceinfo.length>0">{{getAdviceOne(scope.row.hisdoctoradviceinfo)}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -162,7 +200,7 @@
 </template>
 
 <script>
-import { getNextScheduleWeekDay } from "@/api/schedule";
+import { getNextScheduleWeekDay,getAllZoneList } from "@/api/schedule";
 import WeekItem from "./WeekItem";
 const moment = require('moment')
 export default {
@@ -177,6 +215,7 @@ export default {
   data() {
     return {
       weekArr: [
+        { id: 0, name: "全部" },
         { id: 1, name: "周一" },
         { id: 2, name: "周二" },
         { id: 3, name: "周三" },
@@ -207,7 +246,15 @@ export default {
       },
       scheduleData: [],
       modeOptions: null,
-       org_id:0
+      org_id:0,
+      pre_status:0,
+      preStatusList:[
+        {id:0,name:"全部"},
+        {id:1,name:"已确认"},
+        {id:2,name:"未确认"},
+      ],
+      zone:"",
+      zoneList:[{id:0,name:"全部"}],
     };
   },
   watch: {
@@ -222,7 +269,7 @@ export default {
   methods: {
     printAction() {
       this.$router.push({
-        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone+"&prestatus="+this.pre_status
       });
     },
    compare(property) {
@@ -242,6 +289,7 @@ export default {
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
           week_type:this.week_type,
           week_time:this.week_time,
+          zone:this.zone,
         }
         // const params = {
         //   start_time:1609603200,
@@ -254,12 +302,37 @@ export default {
         this.scheduleData = [];
         if (response.data.state == 1) {
           var scheduleData = response.data.data.schedule;
-          for(let i=0;i<scheduleData.length;i++){
-             scheduleData[i].sort = scheduleData[i].number.sort
-           }
-          var arr =   scheduleData.sort(this.compare('sort'))
-           console.log("元旦快乐",arr)
-          this.scheduleData = arr
+          if(this.pre_status == 0){
+              for(let i=0;i<scheduleData.length;i++){
+              scheduleData[i].sort = scheduleData[i].number.sort
+            }
+            var arr =   scheduleData.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+          }
+          if(this.pre_status == 1){
+            var newList = []
+            for(let i=0;i<scheduleData.length;i++){
+              if(scheduleData.prescription.id > 0){
+                 newList.push(scheduleData[i])
+              } 
+            }
+            var arr =   newList.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+          }
+
+          if(this.pre_status == 2){
+            var newList = []
+            for(let i=0;i<scheduleData.length;i++){
+              if(scheduleData.prescription.id == 0){
+                 newList.push(scheduleData[i])
+              } 
+            }
+            var arr =   newList.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+          }
         
          
         } else {
@@ -313,7 +386,14 @@ export default {
        this.week_time = type
        this.getNextScheduleWeekDay()
     },
-
+    selectPreList(type){
+      this.pre_status = type
+      this.getNextScheduleWeekDay()
+    },
+    selectZoneList(type){
+       this.zone = type
+       this.getNextScheduleWeekDay()
+    },
     getSchedulesType: function(type) {
       let type_name = "";
       switch (type) {
@@ -407,6 +487,62 @@ export default {
         }
         return name;
       }
+    },
+      getAdviceOne: function(doctor_advice) {
+      if (doctor_advice != null) {
+        let name = "";
+        for (let i = 0; i < doctor_advice.length; i++) {
+          let prescribing_number = "";
+          let single_dose = "";
+          let drug_spec = "";
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number =
+              doctor_advice[i].prescribing_number +
+              doctor_advice[i].prescribing_number_unit;
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose =
+              " 单次用量 " +
+              doctor_advice[i].single_dose +
+              doctor_advice[i].single_dose_unit;
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =
+              doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+          }
+
+          name =
+            name +
+            doctor_advice[i].advice_name +
+            " " +
+            drug_spec +
+            " " +
+            prescribing_number +
+            " " +
+            single_dose +
+            " " +
+            doctor_advice[i].delivery_way +
+            " " +
+            doctor_advice[i].execution_frequency +
+            " " +
+            doctor_advice[i].remark +
+            "\n";
+
+          
+        }
+        return name;
+      }
+    },
+    getAllZoneList(){
+      getAllZoneList().then(response=>{
+         if(response.data.state == 1){
+            var zonelist = response.data.data.zoneList
+            this.zoneList.push(...zonelist)
+           
+         }
+      })
     }
   },
   components: {
@@ -415,13 +551,14 @@ export default {
   created() {
     this.modeOptions = this.$store.getters.treatment_mode;
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
-    console.log("抗凝机", this.anticoagulants_confit);
     this.week_type = new Date().getDay();
     if (this.week_type == 0) {
       this.week_type = 7;
     }
+    this.getAllZoneList()
     this.getNextScheduleWeekDay();
     this.org_id = this.$store.getters.xt_user.org.id
+   
   }
 };
 </script>

src/xt_pages/workforce/components/tableData.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="table_data">
-    <!-- <div style="margin-bottom:-30px">
+    <div style="margin-bottom:-30px;margin-left:300px">
       <span>分区：</span>
-       <el-select v-model="partition_id" placeholder="请选择" @change="changePartiton">
+       <el-select v-model="partition_id" multiple placeholder="请选择" @change="changePartiton">
         <el-option
           v-for="item in this.zones"
           :key="item.id"
@@ -10,7 +10,8 @@
           :value="item.id">
          </el-option>
         </el-select>
-       <span style="margin-left:100px">班次：</span>
+      
+       <!-- <span style="margin-left:100px">班次：</span>
        <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
         <el-option
           v-for="item in options"
@@ -18,8 +19,8 @@
           :label="item.name"
           :value="item.id">
          </el-option>
-       </el-select>
-    </div> -->
+       </el-select> -->
+    </div>
    
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
       <el-input
@@ -129,7 +130,6 @@
       :height="tableContainHeight"
       ref="table"
       style="width: 100%;cursor: pointer;"
-      
     >
       <el-table-column
         prop="area"
@@ -617,16 +617,17 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
+import print from 'print-js'
 
 import {
   CancelSchedule,
   ChangeSchedule,
   CreateSchedule,
   getSchedulePatients,
-  getSchedules,
+  getSchedulesOne,
   getSearchResult,
   getUrgentScheduleInitData,
-  getWeekPanels,
+  getWeekPanelsOne,
   getAllZones,
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
@@ -643,10 +644,10 @@ export default {
       type: Array,
       dafault: []
     },
-    scheduleZoneProp: {
-      type: Array,
-      dafault: []
-    },
+    // scheduleZoneProp: {
+    //   type: Array,
+    //   dafault: []
+    // },
     partitionsProp: {
       type: Object,
       dafault: {}
@@ -688,7 +689,7 @@ export default {
       tzDialogVisible: false,
       msDialogVisible: false,
       jhDialogVisible: false,
-      scheduleZone: this.scheduleZoneProp,
+     // scheduleZone: this.scheduleZoneProp,
       scheduleZoneRow: -1,
       partitions: [],
       jihaos: [],
@@ -758,17 +759,26 @@ export default {
         {id:2,name:"下午"},
         {id:3,name:"晚上"},
       ],
-      partition_id:"",
+      partition_id:0,
       schedule_type:"",
-      zones:[{id:0,name:"全部"}],
-      theType:""
+      zones:[],
+      theType:"",
+      scheduleZone:[],
+      theWeek: {
+        lastWeek: 0,
+        thisWeek: 0,
+        nextWeek: 0,
+        nextTwoWeek: 0
+      },
+      zoneIdList:[],
+      strArr:""
     };
   },
 
   watch: {
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
-      console.log("999999999",theType)
+      // console.log("999999999",theType)
       this.theType = theType
       this.getSchedules();
     },
@@ -789,6 +799,205 @@ export default {
     }
   },
   methods: {
+       getWeekPanels() {
+         this.scheduleZone=[]
+         var partionStr = this.partition_id
+         var arr = this.zoneIdList.join(',')
+         
+         var str = ""
+         if(partionStr == 0){
+            str = arr
+         }
+         if(partionStr != 0){
+            str = partionStr.join(',')
+         }
+       
+      
+        getWeekPanelsOne(1,str).then(response => {
+          if (response.data.state == 0) {
+            return false
+          }
+          var partitions = response.data.data.partitions
+        
+          this.theWeek.thisWeek = response.data.data.theWeek
+          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+          this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+          var that = this
+          if (partitions.length > 0) {
+            partitions.forEach(function(partition) {
+              if (partition.jihaos.length == 0) {
+                return false
+              }
+              that.scheduleZoneRow.push(partition.jihaos.length)
+
+              that.partitions[partition.id] = partition
+                
+              partition.jihaos.forEach(function(jihao) {
+                var thisPa = {
+                  area: partition.name,
+                  zone_id: partition.id,
+                  zone_type: partition.type,
+                  cut: jihao.number,
+                  jihao_id: jihao.id,
+                  Mon_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Mon_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Mon_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  total: 0
+                }
+               
+                that.scheduleZone.push(thisPa)
+               
+              })
+            })
+          }
+            console.log("34455555566666",this.scheduleZone)
+        })
+     },
     cellClass({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
@@ -861,6 +1070,7 @@ export default {
       return sums;
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    
       var that = this;
       var rowNum = 0;
       rowNumber = 0;
@@ -905,21 +1115,30 @@ export default {
       this.currentData.patient_id = 0;
     },
     getSchedules() {
+         var partionStr = this.partition_id
+         var arr = this.zoneIdList.join(',')
+         var str = ""
+         if(partionStr == 0){
+            str = arr
+         }
+         if(partionStr != 0){
+            str = partionStr.join(',')
+         }
         const params = {
           weekTime:this.theType,
-          partition_id:this.partition_id,
+          patitionid:str,
           schedule_type:this.schedule_type,
         }
-      getSchedules(params).then(response => {
+     
+      getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
           
-        
-        
           var that = this;
+          
           this.scheduleZone.forEach(function(zone, index) {
            
             that.scheduleZone[index].Mon_M = {
@@ -1054,14 +1273,14 @@ export default {
               theSchedules.forEach(function(schedule, sindex) {
 
                 if (zone.jihao_id == schedule.bed_id) {
-                  // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
+                
                   var weekPath = that.weekPath(
                     schedule.schedule_week,
                     schedule.schedule_type
                   );
 
                   if (weekPath.length == 2) {
-                    console.log(schedule);
+                   
 
                     var weekPathKey = weekPath[0] + "_" + weekPath[1];
                     that.scheduleZone[index][weekPathKey] = {
@@ -1077,12 +1296,14 @@ export default {
                           : that.modeOptions[schedule.mode_id].name
                     };
                     that.scheduleZone[index].total += 1;
+                    
                   }
                 }
               });
             }
 
           });
+          
         } else {
           this.$message.error("网络错误");
           return false;
@@ -1265,9 +1486,8 @@ export default {
     },
     clickThis(row, column, cell, event) {
       // debugger
-      console.log("aaa",column.property);
       var week = this.weekDay(column.property);
-      console.log("week",week);
+  
 
       if (week[0] == -1 || week[1] == -1) {
         return false;
@@ -1288,7 +1508,6 @@ export default {
       this.currentData.bed_name = row.cut;
       this.currentData.partition_type = row.zone_type;
 
-      console.log(this.currentData);
 
       if (row[column.property].schedule_id > 0) {
         this.currentData.mode_id = row[column.property].mode_id;
@@ -1329,8 +1548,6 @@ export default {
             }
           }
 
-          // console.log(this.scheduleZone)
-
           this.changeSchedule.change_action = "change_device";
           this.changeScheduleActon(formName);
 
@@ -1518,7 +1735,7 @@ export default {
               this.current_devices = this.zone_device_map[this.zone_name];
               this.device_id = this.current_devices[0].id;
             }
-            console.log(this.current_devices);
+         
 
             this.zone_device_options = [
               { values: this.zone_names },
@@ -1526,7 +1743,6 @@ export default {
               { values: this.current_devices }
             ];
 
-            console.log(this.current_devices);
           } else {
           }
         })
@@ -1604,9 +1820,6 @@ export default {
                   if (this.zone_names.length > 0) {
                     this.zone_name = this.zone_names[0];
                     this.current_devices = this.zone_device_map[this.zone_name];
-
-                    console.log(this.zone_device_map[this.zone_name]);
-
                     this.device_id = this.current_devices[0].id;
                   }
                   this.zone_device_options = [
@@ -1998,30 +2211,37 @@ export default {
       getAllZones().then(response=>{
          if(response.data.state == 1){
            var zones = response.data.data.zones
-           this.zones.push(...zones)
-           
+           for(let i=0;i<zones.length;i++){
+              this.zoneIdList.push(zones[i].id)
+           }
+          this.zones.push(...zones)
+          var strArr =  this.zoneIdList.join(",")
+         
+          this.strArr = strArr
+          this.getWeekPanels()
          }
       })
     },
     changePartiton(val){
      this.$emit('event1', val)
       this.partition_id = val
+      this.getWeekPanels()
       this.getSchedules()
+    
     },
     changeSchedule_type(val){
      this.$emit('event2', val)
      this.schedule_type = val
      this.getSchedules()
-    }
+    },
   },
   components: {
     ScheduleItem
   },
   mounted() {
-    console.log('this.tableContainHeight,',this.$refs.table.$el.offsetTop);
-    this.tableContainHeight =
-      window.innerHeight - this.$refs.table.$el.offsetTop - 120;
-    console.log(this.tableContainHeight);
+  
+    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
+   
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
     const that = this;
@@ -2040,6 +2260,8 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
+    this.getAllZones()
+ 
     this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
@@ -2064,7 +2286,7 @@ export default {
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-    this.getAllZones()
+   
   }
 };
 </script>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
     <div class="cell clearfix" style="float: right">
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="signPrint()"
+        type="primary"
+        >标签打印
+      </el-button>
       <el-button
         style="float: right"
         size="small"
@@ -10,14 +18,14 @@
         >打印
       </el-button>
 
-      <!-- <el-button
+      <el-button
        style="float: right"
        size="small"
        icon="el-icon-printer"
        @click="printActionSetting()"
        type="primary">
         打印设置
-      </el-button> -->
+      </el-button>
     </div>
 
     <div class="cell clearfix">
@@ -50,6 +58,36 @@
         </ul>
       </div>
     </div>
+    <div  class="cell clearfix">
+     <div  class="title"><span class="name">处方状态</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == pre_status ? 'active' : ''"
+            @click="selectPreStatus(item.id)"
+            v-for="item in preStatus"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix">
+      <div  class="title"><span class="name">分区</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == zone ? 'active' : ''"
+            @click="selectZoneList(item.id)"
+            v-for="item in zoneList"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
     <el-table
       :row-style="{ color: '#303133' }"
       :data="scheduleData"
@@ -60,9 +98,26 @@
       }"
       style="width: 100%"
     >
+     <el-table-column label="透析处方" min-width="100" align="center">
+        <template slot-scope="scope">
+           <span v-if="scope.row.prescription.id>0">已确定</span>
+           <span v-if="scope.row.prescription.id == 0">未确定</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="星期" min-width="100" align="center">
+        <template slot-scope="scope">
+           <span v-if="scope.row.schedule_week == 0">周日</span>
+           <span v-if="scope.row.schedule_week == 1">周一</span>
+           <span v-if="scope.row.schedule_week == 2">周二</span>
+           <span v-if="scope.row.schedule_week == 3">周三</span>
+           <span v-if="scope.row.schedule_week == 4">周四</span>
+           <span v-if="scope.row.schedule_week == 5">周五</span>
+           <span v-if="scope.row.schedule_week == 6">周六</span>
+        </template>
+      </el-table-column>
       <el-table-column label="姓名" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.patient }}
+          {{ scope.row.patient.name }}
         </template>
       </el-table-column>
       <el-table-column label="分区" min-width="70" align="center">
@@ -98,27 +153,18 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="抗凝剂" min-width="100" align="center">
+      <el-table-column label="抗凝剂(商品名称)" min-width="70" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 2"
-            >普通肝素</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 3"
-            >低分子肝素</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 4"
-            >阿加曲班</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 5"
-            >枸橼酸钠</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 6"
-            >低分子肝素钙</span
-          >
-          <span v-if="scope.row.prescription.anticoagulant === 7"
-            >低分子肝素钠</span
-          >
+          <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 3">低分子肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
+          <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
+          <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
+          <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
+          <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+             (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="总量" min-width="100" align="center">
@@ -158,14 +204,16 @@
               ? scope.row.prescription.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
+        
         </template>
       </el-table-column>
 
       <el-table-column label="长期医嘱" min-width="440" align="center">
         <template slot-scope="scope">
-          <span style="white-space: pre">{{
-            getAdvice(scope.row.doctor_advice)
-          }}</span>
+          <span style="white-space: pre">
+             <span v-if="scope.row.doctoradvice.length >0">{{ getAdvice(scope.row.doctoradvice)}}</span>
+             <span v-if="scope.row.hisdoctoradviceinfo.length>0">{{ getAdviceOne(scope.row.hisdoctoradviceinfo)}}</span>
+          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -227,7 +275,7 @@
 </template>
 
 <script>
-import { getSchedules, getScheduleWeekDay,saveRemindPrint,getRemindPrintList } from "@/api/schedule";
+import { getSchedules, getScheduleWeekDay,saveRemindPrint,getRemindPrintList,getScheduleList,getAllZoneList } from "@/api/schedule";
 import WeekItem from "./WeekItem";
 
 export default {
@@ -255,12 +303,18 @@ export default {
 
       week_type: "1",
       week_time:0,
+      pre_status:0,
       weekTimes:[
         {id:0,name:"全部"},
         {id:1,name:"上午"},
         {id:2,name:"下午"},
         {id:3,name:"晚上"},
       ],
+      preStatus:[
+        {id:0,name:"全部"},
+        {id:1,name:"已确认"},
+        {id:2,name:"未确认"}
+      ],
       weekTitle: ["", "", "", "", "", "", ""],
       weekData: {
         Monday: [],
@@ -301,7 +355,9 @@ export default {
         anticoagulant:"",
         anticoagulant_zongliang:"",
         doctor_advice:"",
-      }
+      },
+      zone:0,
+      zoneList:[{id:0,name:"全部"}]
     };
   },
   watch: {
@@ -315,9 +371,14 @@ export default {
   methods: {
     printAction() {
       this.$router.push({
-        path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time
+        path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone
       });
     },
+    signPrint(){
+      this.$router.push({
+        path:"/schedule/remind/print/setting?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone+"&prestatus="+this.pre_status
+      })
+    },
     compare(property) {
        return function (a, b) {
           var value1 = a[property];
@@ -331,7 +392,6 @@ export default {
         week_type:this.week_type,
         week_time:this.week_time,
        }
-      console.log("param22222",params)
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
@@ -342,7 +402,7 @@ export default {
           var arr = scheduleData.sort(this.compare('sort'))
 
           var arr =   scheduleData.sort(this.compare('sort'))
-        //  console.log("元旦快乐",arr)
+       
           this.scheduleData = arr
         } else {
           this.$message.error("网络错误");
@@ -351,47 +411,54 @@ export default {
       });
     },
 
-    // getSchedules(weekType) {
-    //   getSchedules(weekType).then(response => {
-    //     this.scheduleData = []
-    //     if (response.data.state == 1) {
-    //       this.weekTitle = response.data.data.weekTitle
-    //       var theSchedules = response.data.data.schdules
-    //       var that = this
-    //       theSchedules.forEach(function(schedule) {
-    //         schedule['mode_name'] = typeof (that.modeOptions[schedule.mode_id]) == 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
-    //         var weekPath = that.weekPath(schedule.schedule_week)
-    //         if (weekPath.length > 0) {
-    //           that.weekData[weekPath].push(schedule)
-    //         }
-    //       })
-    //       var rowNum = 0
-    //       console.log(that.weekData)
-    //       for (var index in that.weekData) {
-    //         var thisLen = that.weekData[index].length
-    //         rowNum = rowNum >= thisLen ? rowNum : thisLen
-    //       }
-    //       console.log(rowNum)
-    //       for (let index = 0; index < rowNum; index++) {
-    //         var dataItem = {}
-    //         for (var weekIndex in that.weekData) {
-    //           var weekItem = that.weekData[weekIndex].shift()
-    //           console.log('weekItem', weekItem)
-    //           if (typeof (weekItem) != 'undefined') {
-    //             dataItem[weekIndex] = weekItem
-    //           }
-    //         }
-    //         that.scheduleData.push(dataItem)
-    //       }
-    //
-    //       console.log(that.scheduleData)
-    //
-    //     } else {
-    //       this.$message.error('网络错误')
-    //       return false
-    //     }
-    //   })
-    // },
+    getScheduleList(){
+        const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+        }
+       
+       getScheduleList(params).then(response=>{
+         if(response.data.state ==1){
+           console.log("22333333333",this.pre_status)
+           var list = response.data.data.list
+           if(this.pre_status == 0){
+             
+            for(let i=0;i<list.length;i++){
+                list[i].sort = list[i].number.sort
+            }
+
+            var arr = list.sort(this.compare('sort'))
+              console.log("list2222999999999",list)
+            this.scheduleData = arr
+           }
+           if(this.pre_status == 1){
+              var newList = []
+              for(let i=0;i<list.length;i++){
+                if(list[i].prescription.id > 0){
+                   newList.push(list[i])
+                }
+              }
+              var arr = newList.sort(this.compare('sort'))
+              this.scheduleData = arr
+           }
+
+           if(this.pre_status == 2){
+              var newList = []
+              for(let i=0;i<list.length;i++){
+                if(list[i].prescription.id ==0){
+                   newList.push(list[i])
+                }
+              }
+              var arr = newList.sort(this.compare('sort'))
+              this.scheduleData = arr
+           }
+         
+          }
+       })
+    },
+
+   
     weekType(weekTime) {
       var theType = 2;
       switch (weekTime) {
@@ -430,16 +497,21 @@ export default {
     },
     selectWeekType(type) {
       this.week_type = type;
-      // let params = {
-      //   week_type: this.week_type
-      // };
-      this.getScheduleWeekDay();
+      this.getScheduleList()
     },
+
     selectWeekTime(type){
        this.week_time = type
-       this.getScheduleWeekDay()
+      this.getScheduleList()
+    },
+    selectPreStatus(type){
+       this.pre_status = type
+       this.getScheduleList()
+    },
+   selectZoneList(type){
+       this.zone = type
+       this.getScheduleList()
     },
-
     getSchedulesType: function(type) {
       let type_name = "";
       switch (type) {
@@ -456,7 +528,8 @@ export default {
       return type_name;
     },
     getAdvice: function(doctor_advice) {
-      if (doctor_advice != null) {
+     
+      if (doctor_advice.length > 0) {
         let name = "";
         for (let i = 0; i < doctor_advice.length; i++) {
           let prescribing_number = "";
@@ -532,6 +605,56 @@ export default {
           }
         }
         return name;
+      }else{
+        return ""
+      }
+    },
+    getAdviceOne: function(doctor_advice) {
+     
+      if (doctor_advice.length > 0) {
+        let name = "";
+        for (let i = 0; i < doctor_advice.length; i++) {
+          let prescribing_number = "";
+          let single_dose = "";
+          let drug_spec = "";
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number =
+              doctor_advice[i].prescribing_number +
+              doctor_advice[i].prescribing_number_unit;
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose =
+              " 单次用量 " +
+              doctor_advice[i].single_dose +
+              doctor_advice[i].single_dose_unit;
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =
+              doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+          }
+
+          name =
+            name +
+            doctor_advice[i].advice_name +
+            " " +
+            drug_spec +
+            " " +
+            prescribing_number +
+            " " +
+            single_dose +
+            " " +
+            doctor_advice[i].delivery_way +
+            " " +
+            doctor_advice[i].execution_frequency +
+            " " +
+            doctor_advice[i].remark +
+            "\n";
+        }
+        return name;
+      }else{
+        return ""
       }
     },
     printActionSetting(){
@@ -723,6 +846,15 @@ export default {
             this.form.id = list.id
          }
       })
+    },
+    getAllZoneList(){
+      getAllZoneList().then(response=>{
+         if(response.data.state == 1){
+            var zonelist = response.data.data.zoneList
+            this.zoneList.push(...zonelist)
+           
+         }
+      })
     }
   },
   components: {
@@ -735,12 +867,9 @@ export default {
     if (this.week_type == 0) {
       this.week_type = 7;
     }
-    // let params = {
-    //   week_type: this.week_type
-    // };
-    this.getScheduleWeekDay();
     this.org_id = this.$store.getters.xt_user.org.id
-    // this.getlist()
+    this.getScheduleList()
+     this.getAllZoneList()
   }
 };
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -25,52 +25,55 @@
             <table class="table">
               <thead>
                 <tr>
-                  <!-- <td :width="td_1_width">姓名</td>
-                  <td :width="td_1_width">分区</td>
-                  <td :width="td_1_width">班次</td>
-                  <td :width="td_1_width">机号</td>
-                  <td :width="td_1_width">透析模式</td>
-                  <td :width="td_2_width">透析器</td>
-                  <td :width="td_2_width">抗凝剂</td>
-                  <td :width="td_2_width">低分子肝素</td>
-                  <td :width="td_4_width">长期医嘱</td> -->
-                  <td width="100">姓名</td>
-                  <td width="70">分区</td>
-                  <td width="70">班次</td>
-                  <td width="70">机号</td>
-                  <td width="120">透析模式</td>
-                  <td width="100">透析器/灌流器</td>
-                  <td width="120">抗凝剂</td>
-                  <td width="100">总量</td>
-                  <td width="300">长期医嘱</td>
+                  <td width="100" v-if="printObj.week == 1">星期</td>
+                  <td width="100" v-if="printObj.name == 1">姓名</td>
+                  <td width="70" v-if="printObj.zone == 1">分区</td>
+                  <td width="70" v-if="printObj.classes == 1">班次</td>
+                  <td width="70" v-if="printObj.number == 1">机号</td>
+                  <td width="120" v-if="printObj.prescription_status == 1">透析模式</td>
+                  <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
+                  <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
+                  <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
-                <td :width="td_1_width">{{ main_collection.patient}}</td>
-                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.week == 1">
+                  <span v-if="main_collection.schedule_week == 0">周日</span>
+                  <span v-if="main_collection.schedule_week == 1">周一</span>
+                  <span v-if="main_collection.schedule_week == 2">周二</span>
+                  <span v-if="main_collection.schedule_week == 3">周三</span>
+                  <span v-if="main_collection.schedule_week == 4">周四</span>
+                  <span v-if="main_collection.schedule_week == 5">周五</span>
+                  <span v-if="main_collection.schedule_week == 6">周六</span>
+                </td>
+                <td :width="td_1_width" v-if="printObj.name == 1">{{ main_collection.patient}}</td>
+                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width" v-if="printObj.classes == 1">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.number == 1">
                   {{main_collection.number.number}}
 
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width"  v-if="printObj.prescription_status == 1">
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
                   <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
                   {{main_collection.prescription.dialysis_dialyszers}} 
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.anticoagulant==1">
                   {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
-
+                  <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
+                    (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
+                  </span>
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width"  v-if="printObj.anticoagulant_zongliang == 1">
                   <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
@@ -79,8 +82,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
-                <td :width="td_4_width" style="text-align:left" >
-                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
+                <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
+                  <span style="white-space: pre" v-if="main_collection.doctor_advice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
+                  <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
               </tr>
               </tbody>
@@ -93,7 +97,7 @@
 </template>
 
 <script>
-  import { getNextScheduleWeekDay } from '@/api/schedule'
+  import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -120,13 +124,17 @@
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
         org_id:0,
-        now_time:0
+        now_time:0,
+        zone:"",
+        pre_status:0,
+        printObj:{}
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+     this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
    
@@ -134,12 +142,14 @@
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
       this.week_time  = this.$route.query.week_time
-      
+      this.zone = this.$route.query.zone
+      this.pre_status = this.$route.query.prestatus
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
           start_time:this.start_time,
           end_time:this.end_time,
+          zone:this.zone,
         }
 
         //  const params = {
@@ -157,12 +167,37 @@
         if (resp.state == 1) {
          var scheduleData = resp.data.schedule
 
-         for(let i=0;i<scheduleData.length;i++){
-             scheduleData[i].sort = scheduleData[i].number.sort
+          if(this.pre_status == 0){
+              for(let i=0;i<scheduleData.length;i++){
+              scheduleData[i].sort = scheduleData[i].number.sort
+            }
+            var arr =   scheduleData.sort(this.compare('sort'))
+            console.log("打印",arr)
+            this.scheduleData = arr
+          }
+          if(this.pre_status == 1){
+            var newList = []
+            for(let i=0;i<scheduleData.length;i++){
+              if(scheduleData.prescription.id > 0){
+                 newList.push(scheduleData[i])
+              } 
+            }
+            var arr =   newList.sort(this.compare('sort'))
+            console.log("打印",arr)
+            this.scheduleData = arr
+          }
+
+          if(this.pre_status == 2){
+            var newList = []
+            for(let i=0;i<scheduleData.length;i++){
+              if(scheduleData.prescription.id == 0){
+                 newList.push(scheduleData[i])
+              } 
+            }
+            var arr =   newList.sort(this.compare('sort'))
+            console.log("打印",arr)
+            this.scheduleData = arr
           }
-          var arr = scheduleData.sort(this.compare('sort'))
-          console.log("打印数据",arr)
-          this.scheduleData = arr
         } else {
           this.$message.error(resp.msg)
         }
@@ -229,6 +264,39 @@
         }
 
       },
+
+      getAdviceOne:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+       
+        }
+          return name
+
+
+        }
+
+      },
+
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
@@ -318,6 +386,15 @@
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
+     getPrintList(){
+      getPrintList().then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list222222222",list)
+           this.printObj = list
+         }
+      })
+     }
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -24,52 +24,55 @@
             <table class="table">
               <thead>
                 <tr>
-                  <!-- <td :width="td_1_width">姓名</td>
-                  <td :width="td_1_width">分区</td>
-                  <td :width="td_1_width">班次</td>
-                  <td :width="td_1_width">机号</td>
-                  <td :width="td_1_width">透析模式</td>
-                  <td :width="td_2_width">透析器</td>
-                  <td :width="td_2_width">抗凝剂</td>
-                  <td :width="td_2_width">低分子肝素</td>
-                  <td :width="td_4_width">长期医嘱</td> -->
-                  <td width="100">姓名</td>
-                  <td width="70">分区</td>
-                  <td width="70">班次</td>
-                  <td width="70">机号</td>
-                  <td width="120">透析模式</td>
-                  <td width="100">透析器/灌流器</td>
-                  <td width="120">抗凝剂</td>
-                  <td width="100">总量</td>
-                  <td width="300">长期医嘱</td>
+                  <td width="100" v-if="printObj.week == 1">星期</td>
+                  <td width="100" v-if="printObj.name == 1">姓名</td>
+                  <td width="70" v-if="printObj.zone == 1">分区</td>
+                  <td width="70" v-if="printObj.classes == 1">班次</td>
+                  <td width="70" v-if="printObj.number == 1">机号</td>
+                  <td width="120" v-if="printObj.prescription_status == 1">透析模式</td>
+                  <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
+                  <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
+                  <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
-                <td :width="td_1_width">{{ main_collection.patient}}</td>
-                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.week == 1">
+                  <span v-if="main_collection.schedule_week == 0">周日</span>
+                  <span v-if="main_collection.schedule_week == 1">周一</span>
+                  <span v-if="main_collection.schedule_week == 2">周二</span>
+                  <span v-if="main_collection.schedule_week == 3">周三</span>
+                  <span v-if="main_collection.schedule_week == 4">周四</span>
+                  <span v-if="main_collection.schedule_week == 5">周五</span>
+                  <span v-if="main_collection.schedule_week == 6">周六</span>
+                </td>
+                <td :width="td_1_width" v-if="printObj.name == 1">{{ main_collection.patient.name}}</td>
+                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width" v-if="printObj.classes == 1">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.number == 1">
                   {{main_collection.number.number}}
 
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.prescription_status == 1">
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
                   {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.anticoagulant == 1">
                   {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
-
+                  <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
+                    (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
+                  </span>
                 </td>
-                <td :width="td_1_width">
+                <td :width="td_1_width" v-if="printObj.anticoagulant_zongliang == 1">
                   <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
@@ -78,8 +81,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
-                <td :width="td_4_width" style="text-align:left" >
-                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
+                <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
+                  <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
+                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
               </tr>
               </tbody>
@@ -92,7 +96,7 @@
 </template>
 
 <script>
-  import { getScheduleWeekDay } from '@/api/schedule'
+  import { getScheduleList,getPrintList } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
@@ -115,76 +119,76 @@
         modeOptions: null,
         anticoagulants_confit:null,
         currentDate:'',
-        org_id:0
+        org_id:0,
+        printObj:{},
+        week_time:0,
+        zone:0,
       }
     },
     components: {
       BreadCrumb
     },
     created() {
-     this.org_id = this.$store.getters.xt_user.org.id
+      this.getPrintList()
+      this.org_id = this.$store.getters.xt_user.org.id
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
       this.week_time  = this.$route.query.week_time
-
+      this.zone = this.$route.query.zone
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
+          zone:this.zone,
         }
        console.log("params",params)
-      getScheduleWeekDay(params).then(rs => {
-        var resp = rs.data
-        console.log(resp)
-        
-        if (resp.state == 1) {
-          var scheduleData = resp.data.schdules
-          let a = resp.data.day
-          console.log("a",a)
-          var myDate = new Date(a);
-          var year = myDate.getFullYear(); //年
-          var month = myDate.getMonth() + 1; //月
-          var day = myDate.getDate(); //日
-          var days = myDate.getDay();
-          switch(days) {
-          case 1:
-            days = '星期一';
-            break;
-          case 2:
-            days = '星期二';
-            break;
-          case 3:
-            days = '星期三';
-            break;
-          case 4:
-            days = '星期四';
-            break;
-          case 5:
-            days = '星期五';
-            break;
-          case 6:
-            days = '星期六';
-            break;
-          case 0:
-            days = '星期日';
-            break;
-        }
-        var str = year + "年" + month + "月" + day + "日  " + days;
-        this.currentDate = str
-           console.log("树",scheduleData)
-          for(let i=0;i<scheduleData.length;i++){
-             scheduleData[i].sort = scheduleData[i].number.sort
+       getScheduleList(params).then(response=>{
+         if(response.data.state ==1){
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+              list[i].sort = list[i].number.sort
+           }
+           var arr = list.sort(this.compare('sort'))
+            
+             this.scheduleData = arr
+            
+             let a = response.data.data.day
+              console.log("a",a)
+              var myDate = new Date(a);
+              var year = myDate.getFullYear(); //年
+              var month = myDate.getMonth() + 1; //月
+              var day = myDate.getDate(); //日
+              var days = myDate.getDay();
+              switch(days) {
+              case 1:
+                days = '星期一';
+                break;
+              case 2:
+                days = '星期二';
+                break;
+              case 3:
+                days = '星期三';
+                break;
+              case 4:
+                days = '星期四';
+                break;
+              case 5:
+                days = '星期五';
+                break;
+              case 6:
+                days = '星期六';
+                break;
+              case 0:
+                days = '星期日';
+                break;
           }
-          var arr = scheduleData.sort(this.compare('sort'))
-          console.log("打印数据",arr)
-          this.scheduleData = arr
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(err => {
-        this.$message.error(err)
-      })
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          this.currentDate = str
+          }
+       })
+       
+      
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -241,6 +245,38 @@
         }
 
       },
+      getAdviceOne:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+        
+        }
+          return name
+
+
+        }
+
+      },
+     
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
@@ -320,8 +356,15 @@
             return value1 - value2;
         }
       },
-    }
-
+     getPrintList(){
+      getPrintList().then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.printObj = list
+         }
+      })
+     }
+    },
   }
 </script>
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -1,3 +1,379 @@
-<div class="main-contain">
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            >打印</el-button
+          >
+        </el-col>
+      </el-row>
+    </div>
+    <div class="app-container" style="background-color: white;">
+      <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+            <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
+              <div class="signPrint">
+                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
+                <div>姓名:{{main_collection.patient.name}}</div> 
+                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}} </div> 
+                <div>总量:  
+                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                </div> 
+                <div>用法:透析备用</div> 
+                <div>打印时间:{{currentDate}}</div>
+              </div>
+           </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { parseTime } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  const moment = require('moment') 
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班提醒' },
+          { path: false, name: '排班提醒打印' }
+        ],
+        scheduleData:[],
+        week_type: 0,
+        day:'',
+        td_1_width: '10%',
+        td_2_width: '10%',
+        td_3_width: '25%',
+        td_4_width: '45%',
+        modeOptions: null,
+        anticoagulants_confit:null,
+        currentDate:'',
+        start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        org_id:0,
+        now_time:0,
+        zone:"",
+        pre_status:0,
+        printObj:{}
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+     this.getPrintList()
+     this.org_id = this.$store.getters.xt_user.org.id
+     this.currentDate = this.getCurrentDate()
    
-</div>
+      this.modeOptions = this.$store.getters.treatment_mode
+      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+      this.week_type = this.$route.query.week_type
+      this.week_time  = this.$route.query.week_time
+      this.zone = this.$route.query.zone
+      this.pre_status = this.$route.query.prestatus
+     const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+        }
+       console.log("params",params)
+       getScheduleList(params).then(response=>{
+         if(response.data.state ==1){
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+              list[i].sort = list[i].number.sort
+           }
+           var arr = list.sort(this.compare('sort'))
+            
+             this.scheduleData = arr
+            
+             let a = response.data.data.day
+              console.log("a",a)
+              var myDate = new Date(a);
+              var year = myDate.getFullYear(); //年
+              var month = myDate.getMonth() + 1; //月
+              var day = myDate.getDate(); //日
+              var days = myDate.getDay();
+              switch(days) {
+              case 1:
+                days = '星期一';
+                break;
+              case 2:
+                days = '星期二';
+                break;
+              case 3:
+                days = '星期三';
+                break;
+              case 4:
+                days = '星期四';
+                break;
+              case 5:
+                days = '星期五';
+                break;
+              case 6:
+                days = '星期六';
+                break;
+              case 0:
+                days = '星期日';
+                break;
+          }
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          this.currentDate = str
+          }
+       })
+
+      var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      console.log("now",now_time)
+      this.now_time = now_time
+    },
+    methods: {
+      getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+          if (doctor_advice[i].child.length > 0) {
+
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              } else {
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]['single'] = " " + ' 单次用量 ' + " " + doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              } else {
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+              name = name + "▲" + doctor_advice[i].child[a].advice_name + ""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single + "\n"
+            }
+
+          }
+        }
+          return name
+
+
+        }
+
+      },
+      printAction: function() {
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+        })
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
+      },
+      getCurrentDate: function () {
+        console.log(this.$route.query.week_type)
+        var myDate = new Date();
+        var year = myDate.getFullYear(); //年
+        var month = myDate.getMonth() + 1; //月
+        var day = myDate.getDate() + 7; //日
+        var newday = myDate.getDay();
+        var days = parseInt(this.$route.query.week_type);
+        var dayNum = parseInt(this.$route.query.week_type);
+        switch(days) {
+          case 1:
+            days = '星期一';
+            break;
+          case 2:
+            days = '星期二';
+            break;
+          case 3:
+            days = '星期三';
+            break;
+          case 4:
+            days = '星期四';
+            break;
+          case 5:
+            days = '星期五';
+            break;
+          case 6:
+            days = '星期六';
+            break;
+          case 7:
+            days = '星期日';
+            break;
+        }
+        if(newday > dayNum){
+          let lastDay = day - (newday - dayNum)
+          console.log("lastDay1",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else if(newday < dayNum){
+          let lastDay = day + (dayNum - newday)
+          console.log("lastDay2",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else{
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          return str;
+        }
+        
+        
+      },
+
+       compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+      }
+     },
+     getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+     getPrintList(){
+      getPrintList().then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list222222222",list)
+           this.printObj = list
+         }
+      })
+     }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.signPrint{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+</style>

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -0,0 +1,856 @@
+<template>
+    <div>
+        <el-button type="primary" @click="printAction">打印</el-button>
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
+            <tr>
+                <td rowspan="2">分区</td>
+                <td rowspan="2">机号</td>
+                <td colspan="3">周一({{ weekTitle[0] }})</td>
+                <td colspan="3">周二({{ weekTitle[1] }})</td>
+                <td colspan="3">周三({{ weekTitle[2] }})</td>
+                <td colspan="3">周四({{ weekTitle[3] }})</td>
+                <td colspan="3">周五({{ weekTitle[4] }})</td>
+                <td colspan="3">周六({{ weekTitle[5] }})</td>
+                <td colspan="3">周日({{ weekTitle[6] }})</td>
+                <td colspan="3">总数</td>
+            </tr>
+            <tr>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+            </tr>
+            <tr v-for="(item,index) in scheduleZone" :key="index">
+                <td style="min-width:50px;">{{ item.area }}</td>
+                <td style="min-width:50px;">{{ item.cut }}</td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_M.patient_id">
+                        <div>{{ item.Mon_M.patient }}</div>
+                        <div v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_A.patient_id">
+                        <div>{{ item.Mon_A.patient }}</div>
+                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_N.patient_id">
+                        <div>{{ item.Mon_N.patient }}</div>
+                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_M.patient_id">
+                        <div>{{ item.Tue_M.patient }}</div>
+                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_A.patient_id">
+                        <div>{{ item.Tue_A.patient }}</div>
+                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_N.patient_id">
+                        <div>{{ item.Tue_N.patient }}</div>
+                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Wed_M.patient_id">
+                        <div>{{ item.Wed_M.patient }}</div>
+                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Wed_A.patient_id">
+                        <div>{{ item.Wed_A.patient }}</div>
+                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;"> 
+                    <span v-if="item.Wed_N.patient_id">
+                        <div>{{ item.Wed_N.patient }}</div>
+                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_M.patient_id">
+                        <div>{{ item.Thurs_M.patient }}</div>
+                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_A.patient_id">
+                        <div>{{ item.Thurs_A.patient }}</div>
+                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_N.patient_id">
+                        <div>{{ item.Thurs_N.patient }}</div>
+                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_M.patient_id">
+                        <div>{{ item.Fri_M.patient }}</div>
+                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_A.patient_id">
+                        <div>{{ item.Fri_A.patient }}</div>
+                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_N.patient_id">
+                        <div>{{ item.Fri_N.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_M.patient_id">
+                        <div>{{ item.Sat_M.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_A.patient_id">
+                        <div>{{ item.Sat_A.patient }}</div>
+                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_N.patient_id">
+                        <div>{{ item.Sat_N.patient }}</div>
+                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_M.patient_id">
+                        <div>{{ item.Sun_M.patient }}</div>
+                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_A.patient_id">
+                        <div>{{ item.Sun_A.patient }}</div>
+                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_N.patient_id">
+                        <div>{{ item.Sun_N.patient }}</div>
+                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td>{{item.total}}</td>
+            </tr>
+        </table>
+    </div>
+</template>
+
+
+
+<script>
+import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones} from "@/api/schedule";
+import print from 'print-js'
+export default {
+    props:{
+        scheduleZoneProp: {
+            type: Array,
+            dafault: []
+        },
+    },
+    data(){
+        return{
+            schedule_type:'',
+            partition_id:'',
+            theType:2,
+            scheduleZone:[],
+            weekTitle:[],
+            scheduleZoneRow: [],
+            partitions: {},
+            theWeek: {
+              lastWeek: 0,
+              thisWeek: 0,
+              nextWeek: 0,
+              nextTwoWeek: 0
+           },
+           scheduleCountList:[],
+           total:0,
+           zones:[],
+           zoneIdList:[],
+           strArr:""
+        }
+    },
+    created(){
+        this.getAllZones()
+        this.modeOptions = this.$store.getters.treatment_mode;
+        this.partition_id = this.$route.query.partition_id
+       
+        
+    },
+    methods:{
+         getAllZones(){
+           getAllZones().then(response=>{
+             if(response.data.state == 1){
+                var zones = response.data.data.zones
+               for(let i=0;i<zones.length;i++){
+                    this.zoneIdList.push(zones[i].id)
+                }
+                this.zones.push(...zones)
+                var strArr =  this.zoneIdList.join(",")
+                
+                this.strArr = strArr
+                this.getWeekPanels()
+                //统计患者排班数量
+                this.getPatientSheduleCount()
+            }
+          })
+        },
+        getWeekPanels() {
+             this.scheduleZone = []
+              var partionStr = this.partition_id
+              var arr = this.zoneIdList.join(',')
+               var str = ""
+                if(partionStr == 0){
+                    str = arr
+                }
+                if(partionStr != 0){
+                    str = partionStr
+                }
+            getWeekPanelsOne(1,str).then(response => {
+                if (response.data.state == 0) {
+                    return false
+                }
+                var partitions = response.data.data.partitions
+                console.log("分区",partitions)
+                this.theWeek.thisWeek = response.data.data.theWeek
+                this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+                this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+                this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+                var that = this
+                if (partitions.length > 0) {
+                    partitions.forEach(function(partition) {
+                        if (partition.jihaos.length == 0) {
+                            return false
+                        }
+                        that.scheduleZoneRow.push(partition.jihaos.length)
+                        that.partitions[partition.id] = partition
+                        partition.jihaos.forEach(function(jihao) {
+                            var thisPa = {
+                            area: partition.name,
+                            zone_id: partition.id,
+                            zone_type: partition.type,
+                            cut: jihao.number,
+                            jihao_id: jihao.id,
+                            Mon_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Mon_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Mon_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            total: 0
+                            }
+                            that.scheduleZone.push(thisPa)
+
+                        })
+                    })
+                }
+                this.getSchedules()
+            })
+        },
+        getSchedules() {
+            var theType = 2;
+            if(this.$route.query.weekTime == "lastWeek"){
+               theType = 1
+            }
+           if(this.$route.query.weekTime == "thisWeek"){
+               theType = 2
+            }
+            if(this.$route.query.weekTime == "nextWeek"){
+               theType = 3
+            }
+           if(this.$route.query.weekTime == "nextTwoWeek"){
+               theType = 4
+            }
+            var partionStr = this.partition_id
+            var arr = this.zoneIdList.join(',')
+            var str = ""
+            if(partionStr == 0){
+                str = arr
+            }
+            if(partionStr != 0){
+                str = partionStr
+            }
+            const params = {
+                weekTime:theType,
+                patitionid:str,
+                schedule_type:this.schedule_type,
+            }
+            getSchedulesOne(params).then(response => {
+                if (response.data.state == 1) {
+                    this.weekTitle = response.data.data.weekTitle;
+                    this.weekDays = response.data.data.days;
+                    this.toDay = response.data.data.today;
+                    var theSchedules = response.data.data.schdules;
+                    var that = this;
+                    that.scheduleZone.forEach(function(zone, index) {
+                        
+                        that.scheduleZone[index].Mon_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Mon_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Mon_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].total = 0;
+                        
+                        if (response.data.data.schdules.length > 0) {
+                            theSchedules.forEach(function(schedule, sindex) {
+
+                                if (zone.jihao_id == schedule.bed_id) {
+                                    // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
+                                    var weekPath = that.weekPath(
+                                        schedule.schedule_week,
+                                        schedule.schedule_type
+                                    );
+
+                                    if (weekPath.length == 2) {
+                                        // console.log(schedule);
+
+                                        var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                                        that.scheduleZone[index][weekPathKey] = {
+                                        schedule_id: schedule.id,
+                                        mode_id: schedule.mode_id,
+                                        patient_id: schedule.patient_id,
+                                        patient: schedule.patient,
+                                        patient_contagions: schedule.patient_contagions,
+                                        mode_name:
+                                            typeof that.modeOptions[schedule.mode_id] ===
+                                            "undefined"
+                                            ? ""
+                                            : that.modeOptions[schedule.mode_id].name
+                                        };
+                                        that.scheduleZone[index].total += 1;
+                                        
+                                    }
+                                    
+                                }
+                                
+                            });
+                        }
+                       
+                    });
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
+                     
+                     
+                     for(let i=0;i<newArr.length;i++){
+                       for(let j=0;j<this.scheduleCountList.length;j++){
+                            newArr[i].cut = this.total
+                         //礼拜一上午
+                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
+                          } 
+                        //礼拜一下午
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
+                           
+                              newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜一晚上
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
+                          } 
+                         
+                        //礼拜二上午
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
+                          } 
+                         //礼拜二下午
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
+                          } 
+                        
+                         //礼拜二晚上
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜三上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜三下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜三晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+
+                        //礼拜四上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜四下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜四晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                        //礼拜五上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜五下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜五晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                        //礼拜六上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜六下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜六晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
+                          }
+                         
+
+                          //礼拜日上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜日下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜日晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                       }
+                     }
+                    console.log("newArr222222222",newArr)
+                    that.scheduleZone.push(...newArr)
+                    console.log('总数据77777777777',that.scheduleZone)
+                    
+                } else {
+                    this.$message.error("网络错误");
+                    return false;
+                }
+            });
+        },
+        weekPath(week, schedule_type) {
+            var weekArr = {
+                1: "Mon",
+                2: "Tue",
+                3: "Wed",
+                4: "Thurs",
+                5: "Fri",
+                6: "Sat",
+                7: "Sun"
+            };
+            var typeArr = { 1: "M", 2: "A", 3: "N" };
+            if (
+                typeof weekArr[week] === "undefined" ||
+                typeof typeArr[schedule_type] === "undefined"
+            ) {
+                return [];
+            }
+            return [weekArr[week], typeArr[schedule_type]];
+        },
+        printAction: function() {
+            const style = '@media print {#scheduleTable{font-size:14px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+
+            printJS({
+            printable: 'scheduleTable',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getPatientSheduleCount(){
+            var theType = 2;
+            if(this.$route.query.weekTime == "lastWeek"){
+               theType = 1
+            }
+           if(this.$route.query.weekTime == "thisWeek"){
+               theType = 2
+            }
+            if(this.$route.query.weekTime == "nextWeek"){
+               theType = 3
+            }
+           if(this.$route.query.weekTime == "nextTwoWeek"){
+               theType = 4
+            }
+           var partionStr = this.partition_id
+            var arr = this.zoneIdList.join(',')
+            var str = ""
+            if(partionStr == 0){
+                str = arr
+            }
+            if(partionStr != 0){
+                str = partionStr.join(',')
+            }
+            var params = {
+             weekTime:theType,
+             partition_id:str,
+
+            }
+           getPatientSheduleCount(params).then(response=>{
+               if(response.data.state == 1){
+                  var list = response.data.data.list
+                  console.log("list22222",list)
+                  
+                  this.scheduleCountList = list
+                  var total = response.data.data.total
+                  console.log("totalw222",total)
+                  this.total = total
+               }
+           }) 
+        }
+    }
+}
+</script>
+
+
+<style lang="scss">
+td{
+    text-align: center;
+    padding: 5px;
+}
+</style>