导出

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',
@@ -194,4 +211,13 @@ export function getAllZoneList(params){
     method:"get",
     params:params
   })
+}
+
+export function getPatientSheduleCount(params){
+   
+  return request({
+    url:"/api/schedule/getpatientschedulecount",
+    method:"get",
+    params:params
+  })
 }

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

@@ -325,14 +325,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

src/xt_pages/workforce/appointment.vue

@@ -68,8 +68,8 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
-          <el-button @click="printTable">打印表格</el-button>
           <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>
@@ -228,7 +228,7 @@
     },
     methods: {
       printTable(){
-        this.$router.push({path: '/scheduleTablePrint'})
+        this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
       },
       generateTxt: function(log) {
         var content = ''

src/xt_pages/workforce/components/tableData.vue

@@ -2,7 +2,7 @@
   <div id="table_data">
     <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,6 +10,7 @@
           :value="item.id">
          </el-option>
         </el-select>
+      
        <!-- <span style="margin-left:100px">班次：</span>
        <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
         <el-option
@@ -623,10 +624,10 @@ import {
   ChangeSchedule,
   CreateSchedule,
   getSchedulePatients,
-  getSchedules,
+  getSchedulesOne,
   getSearchResult,
   getUrgentScheduleInitData,
-  getWeekPanels,
+  getWeekPanelsOne,
   getAllZones,
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
@@ -760,7 +761,7 @@ export default {
       ],
       partition_id:0,
       schedule_type:"",
-      zones:[{id:0,name:"全部"}],
+      zones:[],
       theType:"",
       scheduleZone:[],
       theWeek: {
@@ -769,6 +770,8 @@ export default {
         nextWeek: 0,
         nextTwoWeek: 0
       },
+      zoneIdList:[],
+      strArr:""
     };
   },
 
@@ -797,14 +800,25 @@ export default {
   },
   methods: {
        getWeekPanels() {
-        this.scheduleZone=[]
-        getWeekPanels(1,this.partition_id).then(response => {
+         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
-          console.log("分区",partitions)
-          console.log("scheduleZoneRow",this.scheduleZoneRow)
+        
           this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -818,10 +832,7 @@ export default {
               that.scheduleZoneRow.push(partition.jihaos.length)
 
               that.partitions[partition.id] = partition
-              
-              console.log("partition",partition)
-
-             
+                
               partition.jihaos.forEach(function(jihao) {
                 var thisPa = {
                   area: partition.name,
@@ -978,12 +989,13 @@ export default {
                   },
                   total: 0
                 }
-                // tha.scheduleZone = []
+               
                 that.scheduleZone.push(thisPa)
+               
               })
             })
-            console.log("分区列表22222222222222",this.scheduleZone)
           }
+            console.log("34455555566666",this.scheduleZone)
         })
      },
     cellClass({ row, column, rowIndex, columnIndex }) {
@@ -1058,6 +1070,7 @@ export default {
       return sums;
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    
       var that = this;
       var rowNum = 0;
       rowNumber = 0;
@@ -1102,24 +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;
           
-          // console.log("分区2222222222",this.scheduleZone)
-          
-        
           var that = this;
-          console.log('that.scheduleZonethat.scheduleZone',that.scheduleZone)
+          
           this.scheduleZone.forEach(function(zone, index) {
            
             that.scheduleZone[index].Mon_M = {
@@ -1254,7 +1273,7 @@ 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
@@ -2192,8 +2211,14 @@ 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()
          }
       })
     },
@@ -2216,7 +2241,7 @@ export default {
   mounted() {
   
     this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
-    console.log(this.tableContainHeight);
+   
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
     const that = this;
@@ -2235,7 +2260,8 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
-    this.getWeekPanels()
+    this.getAllZones()
+ 
     this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
@@ -2260,7 +2286,7 @@ export default {
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-    this.getAllZones()
+   
   }
 };
 </script>

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -12,6 +12,7 @@
                 <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>
@@ -165,6 +166,7 @@
                         <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</div>
                     </span>
                 </td>
+                <td>{{item.total}}</td>
             </tr>
         </table>
     </div>
@@ -173,7 +175,7 @@
 
 
 <script>
-import {getSchedules,getWeekPanels} from "@/api/schedule";
+import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones} from "@/api/schedule";
 import print from 'print-js'
 export default {
     props:{
@@ -191,33 +193,65 @@ export default {
             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.getWeekPanels()
+        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.scheduleZoneRow = []
-            // this.scheduleZone = []
-            getWeekPanels(1,this.partition_id).then(response => {
+             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
-                // 在控制变量改变的时候进行 强制渲染更新
-                // let childrenRefs = this.$refs.elTabs.$children
-                // this.$nextTick(() => {
-                //     childrenRefs.forEach(child => child.$forceUpdate())
-                // })
-
+                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) {
@@ -391,20 +425,39 @@ export default {
             })
         },
         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:this.theType,
-                partition_id:this.partition_id,
+                weekTime:theType,
+                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;
                     that.scheduleZone.forEach(function(zone, index) {
                         
@@ -570,8 +623,149 @@ export default {
                                 
                             });
                         }
-                        console.log('that.scheduleZone',that.scheduleZone)
+                       
                     });
+                    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("网络错误");
@@ -609,6 +803,46 @@ export default {
             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>