合并带嘛

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -180,8 +180,8 @@
           <!-- 医疗救助 -->
         </div>
         <!-- 大病 -->
-        <div style="position: absolute;top:340px;left:500px">
-          {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
+        <div style="position: absolute;top:340px;left:400px">
+          大病补助：{{list.order.hifmi_pay?list.order.hifmi_pay:'0.00'}}
         </div>
         <!-- 其他基金支付 -->
         <div style="position: absolute;top:340px;left:560px">

src/xt_pages/workforce/components/tableData.vue

@@ -10,7 +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
@@ -21,7 +21,7 @@
          </el-option>
        </el-select> -->
     </div>
-   
+
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
       <el-input
         size="small"
@@ -37,12 +37,12 @@
         type="primary"
         icon="el-icon-search"
         @click="search"
-       
+
         >搜索</el-button
       >
     </div>
-    
-    
+
+
 
     <el-dialog :visible.sync="searchTableVisible" width="80%">
       <el-table
@@ -86,7 +86,7 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="300">
-          
+
            <template slot-scope="scope">
             <span v-if="now_time>scope.row.schedule_date">
               <el-button
@@ -112,8 +112,8 @@
               </el-button>
            </span>
           </template>
-         
-         
+
+
           <template slot-scope="scope">
             <span v-if="now_time <=scope.row.schedule_date">
               <el-button
@@ -138,7 +138,7 @@
               调整模式
             </el-button>
             </span>
-           
+
           </template>
         </el-table-column>
       </el-table>
@@ -845,7 +845,7 @@ export default {
          this.scheduleZone=[]
          var partionStr = this.partition_id
          var arr = this.zoneIdList.join(',')
-         
+
          var str = ""
          if(partionStr == 0){
             str = arr
@@ -853,8 +853,8 @@ export default {
          if(partionStr != 0){
             str = partionStr.join(',')
          }
-       
-      
+
+
         getWeekPanelsOne(1,str).then(response => {
           if (response.data.state == 0) {
             return false
@@ -875,7 +875,7 @@ export default {
               that.scheduleZoneRow.push(partition.jihaos.length)
 
               that.partitions[partition.id] = partition
-                
+
               partition.jihaos.forEach(function(jihao) {
                 var thisPa = {
                   area: partition.name,
@@ -1033,9 +1033,9 @@ export default {
                   },
                   total: 0
                 }
-                 
+
                 that.scheduleZone.push(thisPa)
-               
+
               })
             })
           }
@@ -1043,7 +1043,7 @@ export default {
            this.scheduleZone.sort(this.compare('sort'))
         })
      },
-   
+
     cellClass({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
@@ -1135,7 +1135,7 @@ export default {
       return sums;
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    
+
       var that = this;
       var rowNum = 0;
       rowNumber = 0;
@@ -1194,7 +1194,7 @@ export default {
           patitionid:str,
           schedule_type:this.schedule_type,
         }
-     
+
       getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
@@ -1202,11 +1202,11 @@ export default {
           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 = {
               mode_id: 0,
               mode_name: "",
@@ -1339,14 +1339,14 @@ export default {
               theSchedules.forEach(function(schedule, sindex) {
 
                 if (zone.jihao_id == schedule.bed_id) {
-                
+
                   var weekPath = that.weekPath(
                     schedule.schedule_week,
                     schedule.schedule_type
                   );
 
                   if (weekPath.length == 2) {
-                   
+
 
                     var weekPathKey = weekPath[0] + "_" + weekPath[1];
                     that.scheduleZone[index][weekPathKey] = {
@@ -1362,14 +1362,14 @@ export default {
                           : that.modeOptions[schedule.mode_id].name
                     };
                     that.scheduleZone[index].total += 1;
-                    
+
                   }
                 }
               });
             }
 
           });
-          
+
         } else {
           this.$message.error("网络错误");
           return false;
@@ -1561,7 +1561,7 @@ export default {
     clickThis(row, column, cell, event) {
       // debugger
       var week = this.weekDay(column.property);
-  
+
 
       if (week[0] == -1 || week[1] == -1) {
         return false;
@@ -1578,7 +1578,7 @@ export default {
 
       this.currentData.type_name = this.dayType(week[1]);
       this.currentData.zone_name = row.area;
-      
+
       this.currentData.bed_name = row.cut;
       this.currentData.partition_type = row.zone_type;
 
@@ -1801,7 +1801,7 @@ export default {
 
             this.zone_names = Object.keys(this.zone_device_map);
             // console.log('8989898989898989',this.zone_names)
-            
+
             // console.log(this.current_devices);
 
             if (this.zone_names.length > 0) {
@@ -1809,7 +1809,7 @@ export default {
               this.current_devices = this.zone_device_map[this.zone_name];
               this.device_id = this.current_devices[0].id;
             }
-         
+
 
             this.zone_device_options = [
               { values: this.zone_names },
@@ -2154,7 +2154,7 @@ export default {
       }else if(this.weekTime == 'nextTwoWeek'){
         week_type = 3
       }
-     
+
       const params = {
         keywords: this.keywords,
         week_type: week_type,
@@ -2295,7 +2295,7 @@ export default {
            }
           this.zones.push(...zones)
           var strArr =  this.zoneIdList.join(",")
-         
+
           this.strArr = strArr
           this.getWeekPanels()
          }
@@ -2306,7 +2306,7 @@ export default {
       this.partition_id = val
       this.getWeekPanels()
       this.getSchedules()
-    
+
     },
     changeSchedule_type(val){
      this.$emit('event2', val)
@@ -2318,9 +2318,9 @@ export default {
     ScheduleItem
   },
   mounted() {
-  
+
     this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
-   
+
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
     const that = this;
@@ -2352,17 +2352,17 @@ export default {
     }
     var nowDate = year + "-" + month + "-" + day
     var date = new Date(nowDate + " 00:00:00")
-    console.log("date23232323232323",date.getTime()/1000) 
+    console.log("date23232323232323",date.getTime()/1000)
     this.now_time = date.getTime()/1000
     this.getAllZones()
- 
+
     this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
- 
+
     this.partitions = this.partitionsProp;
 
-    
+
     var contagions = this.$store.getters.contagions;
     if (contagions.length > 0) {
       var that = this;
@@ -2372,15 +2372,15 @@ export default {
         }
       });
     }
-  
+
     this.scheduleZoneRow = this.scheduleZoneRowProp;
-    
+
 
     this.weekday = new Date().getDay();
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-   
+
   }
 };
 </script>