Browse Source

合并带嘛

csx 2 years ago
parent
commit
8ffc183618

+ 2 - 2
src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue View File

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

File diff suppressed because it is too large
+ 2204 - 2204
src/xt_pages/workforce/appointment.vue


+ 41 - 41
src/xt_pages/workforce/components/tableData.vue View File

10
           :value="item.id">
10
           :value="item.id">
11
          </el-option>
11
          </el-option>
12
         </el-select>
12
         </el-select>
13
-      
13
+
14
        <!-- <span style="margin-left:100px">班次:</span>
14
        <!-- <span style="margin-left:100px">班次:</span>
15
        <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
15
        <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
16
         <el-option
16
         <el-option
21
          </el-option>
21
          </el-option>
22
        </el-select> -->
22
        </el-select> -->
23
     </div>
23
     </div>
24
-   
24
+
25
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
25
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
26
       <el-input
26
       <el-input
27
         size="small"
27
         size="small"
37
         type="primary"
37
         type="primary"
38
         icon="el-icon-search"
38
         icon="el-icon-search"
39
         @click="search"
39
         @click="search"
40
-       
40
+
41
         >搜索</el-button
41
         >搜索</el-button
42
       >
42
       >
43
     </div>
43
     </div>
44
-    
45
-    
44
+
45
+
46
 
46
 
47
     <el-dialog :visible.sync="searchTableVisible" width="80%">
47
     <el-dialog :visible.sync="searchTableVisible" width="80%">
48
       <el-table
48
       <el-table
86
           </template>
86
           </template>
87
         </el-table-column>
87
         </el-table-column>
88
         <el-table-column label="操作" align="center" width="300">
88
         <el-table-column label="操作" align="center" width="300">
89
-          
89
+
90
            <template slot-scope="scope">
90
            <template slot-scope="scope">
91
             <span v-if="now_time>scope.row.schedule_date">
91
             <span v-if="now_time>scope.row.schedule_date">
92
               <el-button
92
               <el-button
112
               </el-button>
112
               </el-button>
113
            </span>
113
            </span>
114
           </template>
114
           </template>
115
-         
116
-         
115
+
116
+
117
           <template slot-scope="scope">
117
           <template slot-scope="scope">
118
             <span v-if="now_time <=scope.row.schedule_date">
118
             <span v-if="now_time <=scope.row.schedule_date">
119
               <el-button
119
               <el-button
138
               调整模式
138
               调整模式
139
             </el-button>
139
             </el-button>
140
             </span>
140
             </span>
141
-           
141
+
142
           </template>
142
           </template>
143
         </el-table-column>
143
         </el-table-column>
144
       </el-table>
144
       </el-table>
845
          this.scheduleZone=[]
845
          this.scheduleZone=[]
846
          var partionStr = this.partition_id
846
          var partionStr = this.partition_id
847
          var arr = this.zoneIdList.join(',')
847
          var arr = this.zoneIdList.join(',')
848
-         
848
+
849
          var str = ""
849
          var str = ""
850
          if(partionStr == 0){
850
          if(partionStr == 0){
851
             str = arr
851
             str = arr
853
          if(partionStr != 0){
853
          if(partionStr != 0){
854
             str = partionStr.join(',')
854
             str = partionStr.join(',')
855
          }
855
          }
856
-       
857
-      
856
+
857
+
858
         getWeekPanelsOne(1,str).then(response => {
858
         getWeekPanelsOne(1,str).then(response => {
859
           if (response.data.state == 0) {
859
           if (response.data.state == 0) {
860
             return false
860
             return false
875
               that.scheduleZoneRow.push(partition.jihaos.length)
875
               that.scheduleZoneRow.push(partition.jihaos.length)
876
 
876
 
877
               that.partitions[partition.id] = partition
877
               that.partitions[partition.id] = partition
878
-                
878
+
879
               partition.jihaos.forEach(function(jihao) {
879
               partition.jihaos.forEach(function(jihao) {
880
                 var thisPa = {
880
                 var thisPa = {
881
                   area: partition.name,
881
                   area: partition.name,
1033
                   },
1033
                   },
1034
                   total: 0
1034
                   total: 0
1035
                 }
1035
                 }
1036
-                 
1036
+
1037
                 that.scheduleZone.push(thisPa)
1037
                 that.scheduleZone.push(thisPa)
1038
-               
1038
+
1039
               })
1039
               })
1040
             })
1040
             })
1041
           }
1041
           }
1043
            this.scheduleZone.sort(this.compare('sort'))
1043
            this.scheduleZone.sort(this.compare('sort'))
1044
         })
1044
         })
1045
      },
1045
      },
1046
-   
1046
+
1047
     cellClass({ row, column, rowIndex, columnIndex }) {
1047
     cellClass({ row, column, rowIndex, columnIndex }) {
1048
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
1048
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
1049
         return "";
1049
         return "";
1135
       return sums;
1135
       return sums;
1136
     },
1136
     },
1137
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
1137
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
1138
-    
1138
+
1139
       var that = this;
1139
       var that = this;
1140
       var rowNum = 0;
1140
       var rowNum = 0;
1141
       rowNumber = 0;
1141
       rowNumber = 0;
1194
           patitionid:str,
1194
           patitionid:str,
1195
           schedule_type:this.schedule_type,
1195
           schedule_type:this.schedule_type,
1196
         }
1196
         }
1197
-     
1197
+
1198
       getSchedulesOne(params).then(response => {
1198
       getSchedulesOne(params).then(response => {
1199
         if (response.data.state == 1) {
1199
         if (response.data.state == 1) {
1200
           this.weekTitle = response.data.data.weekTitle;
1200
           this.weekTitle = response.data.data.weekTitle;
1202
           this.weekDays = response.data.data.days;
1202
           this.weekDays = response.data.data.days;
1203
           this.toDay = response.data.data.today;
1203
           this.toDay = response.data.data.today;
1204
           var theSchedules = response.data.data.schdules;
1204
           var theSchedules = response.data.data.schdules;
1205
-          
1205
+
1206
           var that = this;
1206
           var that = this;
1207
-          
1207
+
1208
           this.scheduleZone.forEach(function(zone, index) {
1208
           this.scheduleZone.forEach(function(zone, index) {
1209
-           
1209
+
1210
             that.scheduleZone[index].Mon_M = {
1210
             that.scheduleZone[index].Mon_M = {
1211
               mode_id: 0,
1211
               mode_id: 0,
1212
               mode_name: "",
1212
               mode_name: "",
1339
               theSchedules.forEach(function(schedule, sindex) {
1339
               theSchedules.forEach(function(schedule, sindex) {
1340
 
1340
 
1341
                 if (zone.jihao_id == schedule.bed_id) {
1341
                 if (zone.jihao_id == schedule.bed_id) {
1342
-                
1342
+
1343
                   var weekPath = that.weekPath(
1343
                   var weekPath = that.weekPath(
1344
                     schedule.schedule_week,
1344
                     schedule.schedule_week,
1345
                     schedule.schedule_type
1345
                     schedule.schedule_type
1346
                   );
1346
                   );
1347
 
1347
 
1348
                   if (weekPath.length == 2) {
1348
                   if (weekPath.length == 2) {
1349
-                   
1349
+
1350
 
1350
 
1351
                     var weekPathKey = weekPath[0] + "_" + weekPath[1];
1351
                     var weekPathKey = weekPath[0] + "_" + weekPath[1];
1352
                     that.scheduleZone[index][weekPathKey] = {
1352
                     that.scheduleZone[index][weekPathKey] = {
1362
                           : that.modeOptions[schedule.mode_id].name
1362
                           : that.modeOptions[schedule.mode_id].name
1363
                     };
1363
                     };
1364
                     that.scheduleZone[index].total += 1;
1364
                     that.scheduleZone[index].total += 1;
1365
-                    
1365
+
1366
                   }
1366
                   }
1367
                 }
1367
                 }
1368
               });
1368
               });
1369
             }
1369
             }
1370
 
1370
 
1371
           });
1371
           });
1372
-          
1372
+
1373
         } else {
1373
         } else {
1374
           this.$message.error("网络错误");
1374
           this.$message.error("网络错误");
1375
           return false;
1375
           return false;
1561
     clickThis(row, column, cell, event) {
1561
     clickThis(row, column, cell, event) {
1562
       // debugger
1562
       // debugger
1563
       var week = this.weekDay(column.property);
1563
       var week = this.weekDay(column.property);
1564
-  
1564
+
1565
 
1565
 
1566
       if (week[0] == -1 || week[1] == -1) {
1566
       if (week[0] == -1 || week[1] == -1) {
1567
         return false;
1567
         return false;
1578
 
1578
 
1579
       this.currentData.type_name = this.dayType(week[1]);
1579
       this.currentData.type_name = this.dayType(week[1]);
1580
       this.currentData.zone_name = row.area;
1580
       this.currentData.zone_name = row.area;
1581
-      
1581
+
1582
       this.currentData.bed_name = row.cut;
1582
       this.currentData.bed_name = row.cut;
1583
       this.currentData.partition_type = row.zone_type;
1583
       this.currentData.partition_type = row.zone_type;
1584
 
1584
 
1801
 
1801
 
1802
             this.zone_names = Object.keys(this.zone_device_map);
1802
             this.zone_names = Object.keys(this.zone_device_map);
1803
             // console.log('8989898989898989',this.zone_names)
1803
             // console.log('8989898989898989',this.zone_names)
1804
-            
1804
+
1805
             // console.log(this.current_devices);
1805
             // console.log(this.current_devices);
1806
 
1806
 
1807
             if (this.zone_names.length > 0) {
1807
             if (this.zone_names.length > 0) {
1809
               this.current_devices = this.zone_device_map[this.zone_name];
1809
               this.current_devices = this.zone_device_map[this.zone_name];
1810
               this.device_id = this.current_devices[0].id;
1810
               this.device_id = this.current_devices[0].id;
1811
             }
1811
             }
1812
-         
1812
+
1813
 
1813
 
1814
             this.zone_device_options = [
1814
             this.zone_device_options = [
1815
               { values: this.zone_names },
1815
               { values: this.zone_names },
2154
       }else if(this.weekTime == 'nextTwoWeek'){
2154
       }else if(this.weekTime == 'nextTwoWeek'){
2155
         week_type = 3
2155
         week_type = 3
2156
       }
2156
       }
2157
-     
2157
+
2158
       const params = {
2158
       const params = {
2159
         keywords: this.keywords,
2159
         keywords: this.keywords,
2160
         week_type: week_type,
2160
         week_type: week_type,
2295
            }
2295
            }
2296
           this.zones.push(...zones)
2296
           this.zones.push(...zones)
2297
           var strArr =  this.zoneIdList.join(",")
2297
           var strArr =  this.zoneIdList.join(",")
2298
-         
2298
+
2299
           this.strArr = strArr
2299
           this.strArr = strArr
2300
           this.getWeekPanels()
2300
           this.getWeekPanels()
2301
          }
2301
          }
2306
       this.partition_id = val
2306
       this.partition_id = val
2307
       this.getWeekPanels()
2307
       this.getWeekPanels()
2308
       this.getSchedules()
2308
       this.getSchedules()
2309
-    
2309
+
2310
     },
2310
     },
2311
     changeSchedule_type(val){
2311
     changeSchedule_type(val){
2312
      this.$emit('event2', val)
2312
      this.$emit('event2', val)
2318
     ScheduleItem
2318
     ScheduleItem
2319
   },
2319
   },
2320
   mounted() {
2320
   mounted() {
2321
-  
2321
+
2322
     this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
2322
     this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
2323
-   
2323
+
2324
     // var theType = this.weekType(this.weekTime);
2324
     // var theType = this.weekType(this.weekTime);
2325
     // this.getSchedules(theType);
2325
     // this.getSchedules(theType);
2326
     const that = this;
2326
     const that = this;
2352
     }
2352
     }
2353
     var nowDate = year + "-" + month + "-" + day
2353
     var nowDate = year + "-" + month + "-" + day
2354
     var date = new Date(nowDate + " 00:00:00")
2354
     var date = new Date(nowDate + " 00:00:00")
2355
-    console.log("date23232323232323",date.getTime()/1000) 
2355
+    console.log("date23232323232323",date.getTime()/1000)
2356
     this.now_time = date.getTime()/1000
2356
     this.now_time = date.getTime()/1000
2357
     this.getAllZones()
2357
     this.getAllZones()
2358
- 
2358
+
2359
     this.changeScheduleType(1)
2359
     this.changeScheduleType(1)
2360
     rowNumber = 0;
2360
     rowNumber = 0;
2361
     this.modeOptions = this.$store.getters.treatment_mode;
2361
     this.modeOptions = this.$store.getters.treatment_mode;
2362
- 
2362
+
2363
     this.partitions = this.partitionsProp;
2363
     this.partitions = this.partitionsProp;
2364
 
2364
 
2365
-    
2365
+
2366
     var contagions = this.$store.getters.contagions;
2366
     var contagions = this.$store.getters.contagions;
2367
     if (contagions.length > 0) {
2367
     if (contagions.length > 0) {
2368
       var that = this;
2368
       var that = this;
2372
         }
2372
         }
2373
       });
2373
       });
2374
     }
2374
     }
2375
-  
2375
+
2376
     this.scheduleZoneRow = this.scheduleZoneRowProp;
2376
     this.scheduleZoneRow = this.scheduleZoneRowProp;
2377
-    
2377
+
2378
 
2378
 
2379
     this.weekday = new Date().getDay();
2379
     this.weekday = new Date().getDay();
2380
     if (this.weekday == 0) {
2380
     if (this.weekday == 0) {
2381
       this.weekday = 7;
2381
       this.weekday = 7;
2382
     }
2382
     }
2383
-   
2383
+
2384
   }
2384
   }
2385
 };
2385
 };
2386
 </script>
2386
 </script>