XMLWAN 4 년 전
부모
커밋
31def621a2

+ 53 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue 파일 보기

381
           >
381
           >
382
           </el-table-column>
382
           </el-table-column>
383
 
383
 
384
+
385
+          <el-table-column
386
+            prop="heparin"
387
+            align="center"
388
+            label="抗凝剂" 
389
+            width="140"
390
+            v-if="isShow('抗凝剂')"
391
+          >
392
+            <template slot-scope="scope">
393
+             <span v-if="scope.row.monitor_anticoagulant == 1">无肝素</span> 
394
+             <span v-if="scope.row.monitor_anticoagulant == 2">普通肝素</span>
395
+             <span v-if="scope.row.monitor_anticoagulant == 3">低分子肝素</span>
396
+             <span v-if="scope.row.monitor_anticoagulant == 4">阿加曲班</span>
397
+             <span v-if="scope.row.monitor_anticoagulant == 5">枸橼酸钠</span>
398
+             <span v-if="scope.row.monitor_anticoagulant == 6">低分子肝素钙</span>
399
+             <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
400
+             <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
401
+             <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
402
+             <span v-if="scope.row.monitor_anticoagulant_value!=''">({{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }})</span>
403
+             
404
+            </template>
405
+          </el-table-column>
406
+
384
            <el-table-column
407
            <el-table-column
385
             prop="heparin"
408
             prop="heparin"
386
             align="center"
409
             align="center"
622
             </el-form-item>
645
             </el-form-item>
623
           </el-col>
646
           </el-col>
624
 
647
 
648
+           <el-col :span="8" v-if="isShow('抗凝剂')">
649
+            <el-form-item label="抗凝剂:">
650
+              <div style="display:flex;">
651
+                <el-select v-model="form.monitor_anticoagulant" placeholder="请选择" style="width:50%;">
652
+                  <el-option v-for="(item, index) in anticoagulantsConfit" :label="item.name" :key="index + 'e'" :value="item.id"></el-option>
653
+                </el-select>
654
+                <el-input v-model="form.monitor_anticoagulant_value" style="width:49%;margin-left:10px;"></el-input>
655
+                </div>
656
+            </el-form-item>
657
+          </el-col>
658
+
659
+      
625
           <!-- </el-row>
660
           <!-- </el-row>
626
 
661
 
627
           <el-row :gutter="20"> -->
662
           <el-row :gutter="20"> -->
810
         blood_oxygen_saturation: '',
845
         blood_oxygen_saturation: '',
811
         urr:'', 
846
         urr:'', 
812
         blood_sugar:'',//血糖
847
         blood_sugar:'',//血糖
848
+        monitor_anticoagulant:'',
849
+        monitor_anticoagulant_value:"",
813
       },
850
       },
814
 
851
 
815
       table_current_row: null,
852
       table_current_row: null,
822
       result_options: getDataConfig('hemodialysis', 'results'),
859
       result_options: getDataConfig('hemodialysis', 'results'),
823
       valueOne: 0,
860
       valueOne: 0,
824
       valueTwo: 0,
861
       valueTwo: 0,
825
-      valueThree: 0
862
+      valueThree: 0,
863
+      anticoagulantsConfit:{}
826
     }
864
     }
827
   },
865
   },
828
   props: {
866
   props: {
847
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
885
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
848
     this.form.operate_time = new Date().getTime()
886
     this.form.operate_time = new Date().getTime()
849
     var symptoms = getDataConfig('hemodialysis', 'symptoms')
887
     var symptoms = getDataConfig('hemodialysis', 'symptoms')
850
-    
888
+    console.log("sysmptoms3333333333",symptoms)
889
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
890
+    console.log("抗凝剂",this.anticoagulantsConfit)
851
   },
891
   },
852
   methods: {
892
   methods: {
853
     venousPressureChange(type) {
893
     venousPressureChange(type) {
1014
         this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:''
1054
         this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:''
1015
         this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:''
1055
         this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:''
1016
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:''
1056
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:''
1057
+        this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:""
1058
+        this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
1059
+
1017
       })
1060
       })
1018
     },
1061
     },
1019
 
1062
 
1075
         this.result_selecteds = []
1118
         this.result_selecteds = []
1076
         this.form.urr = ''
1119
         this.form.urr = ''
1077
         this.form.blood_sugar = ''
1120
         this.form.blood_sugar = ''
1121
+        this.form.monitor_anticoagulant = ''
1122
+        this.form.monitor_anticoagulant_value = ''
1078
       } else {
1123
       } else {
1079
         (this.form.id = monitor.id),
1124
         (this.form.id = monitor.id),
1080
         // this.form.operate_date = monitor.operate_date
1125
         // this.form.operate_date = monitor.operate_date
1110
         this.form.blood_oxygen_saturation = monitor.blood_oxygen_saturation
1155
         this.form.blood_oxygen_saturation = monitor.blood_oxygen_saturation
1111
         this.form.urr = monitor.urr?monitor.urr:''
1156
         this.form.urr = monitor.urr?monitor.urr:''
1112
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:''
1157
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:''
1158
+        this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:''
1159
+        this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:""
1113
         // 设置三个下拉框的值,直接调用事件偷懒
1160
         // 设置三个下拉框的值,直接调用事件偷懒
1114
         this.symptomTextareaBlur()
1161
         this.symptomTextareaBlur()
1115
         this.disposeTextareaBlur()
1162
         this.disposeTextareaBlur()
1148
       this.form.monitoring_date = parseInt(this.form.monitoring_date)
1195
       this.form.monitoring_date = parseInt(this.form.monitoring_date)
1149
       this.form.urr = this.form.urr
1196
       this.form.urr = this.form.urr
1150
       this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
1197
       this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
1198
+      this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
1199
+      this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
1151
       let mode = '1'
1200
       let mode = '1'
1152
       if (this.form.id > 0) {
1201
       if (this.form.id > 0) {
1153
         mode = '2'
1202
         mode = '2'
1204
             this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv)
1253
             this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv)
1205
             this.form.urr = this.form.urr
1254
             this.form.urr = this.form.urr
1206
             this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
1255
             this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
1256
+            this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
1257
+            this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
1207
             this.$message.error(resp.msg)
1258
             this.$message.error(resp.msg)
1208
           }
1259
           }
1209
         }
1260
         }

+ 13 - 0
src/xt_pages/dialysis/details/dialysisMonitoring.vue 파일 보기

30
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
30
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
31
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
31
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
32
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
32
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
33
+          <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
33
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
34
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
34
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
35
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
35
           <th v-if="isShow('处理')" width="92px">处理</th>
36
           <th v-if="isShow('处理')" width="92px">处理</th>
55
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
56
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
56
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
57
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
57
           <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th> 
58
           <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th> 
59
+          <th v-if="isShow('抗凝剂')">
60
+            <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
61
+            <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
62
+            <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
63
+            <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
64
+            <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
65
+            <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
66
+            <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
67
+            <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
68
+            <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
69
+            <span v-if="monitor.monitor_anticoagulant_value!=''">({{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }})</span>
70
+          </th>
58
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
71
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
59
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
72
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
60
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
73
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

+ 15 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue 파일 보기

875
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
875
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
876
             
876
             
877
             <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
877
             <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
878
+            <td style="line-height:20px;" width="100">抗凝剂</td>
878
             <td style="line-height:20px;" width="">病情变化及处理</td>
879
             <td style="line-height:20px;" width="">病情变化及处理</td>
879
             <td style="line-height:20px;" width="60">签名</td>
880
             <td style="line-height:20px;" width="60">签名</td>
880
           </tr>
881
           </tr>
917
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
918
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
918
 
919
 
919
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
920
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
921
+            <td>&nbsp;
922
+              <span v-if="monitor.monitor_anticoagulant == 0"></span>
923
+              <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
924
+              <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
925
+              <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
926
+              <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
927
+              <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
928
+              <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
929
+              <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
930
+              <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
931
+              <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
932
+              <span v-if="monitor.monitor_anticoagulant_value!=undefined && monitor.monitor_anticoagulant_value!='' ">({{monitor.monitor_anticoagulant_value}})</span>
933
+            </td>
920
             <td style="text-align:left;line-height:20px;">
934
             <td style="text-align:left;line-height:20px;">
921
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
935
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
922
             </td>
936
             </td>
1963
 
1977
 
1964
           this.advices = response.data.data.advices
1978
           this.advices = response.data.data.advices
1965
           this.monitors = response.data.data.monitors
1979
           this.monitors = response.data.data.monitors
1980
+          console.log("透析监测",this.monitors)
1966
           this.summary = response.data.data.summary
1981
           this.summary = response.data.data.summary
1967
           this.org_template_info = response.data.data.org_template_info
1982
           this.org_template_info = response.data.data.org_template_info
1968
           // 配置超滤量和置换量是否要显示0还是空
1983
           // 配置超滤量和置换量是否要显示0还是空

+ 220 - 126
src/xt_pages/workforce/appointment.vue 파일 보기

1989
                 for (let b = 0; b < jihaos.length; b++) {
1989
                 for (let b = 0; b < jihaos.length; b++) {
1990
                  var obj = {}
1990
                  var obj = {}
1991
 
1991
 
1992
+                  // obj['区号'] = partitions[key].name
1993
+                  // obj['机号'] = jihaos[b].number.toString()
1994
+
1995
+
1996
+                  // obj['上午'] = ''
1997
+                  // obj['下午'] = ''
1998
+                  // obj['晚上'] = ''
1999
+
2000
+                  // obj['上午1'] = ''
2001
+                  // obj['下午1'] = ''
2002
+                  // obj['晚上1'] = ''
2003
+
2004
+                  // obj['上午2'] = ''
2005
+                  // obj['下午2'] = ''
2006
+                  // obj['晚上2'] = ''
2007
+
2008
+                  // obj['上午3'] = ''
2009
+                  // obj['下午3'] = ''
2010
+                  // obj['晚上3'] = ''
2011
+
2012
+                  // obj['上午4'] = ''
2013
+                  // obj['下午4'] = ''
2014
+                  // obj['晚上4'] = ''
2015
+
2016
+
2017
+                  // obj['上午5'] = ''
2018
+                  // obj['下午5'] = ''
2019
+                  // obj['晚上5'] = ''
2020
+
2021
+                  // obj['上午6'] = ''
2022
+                  // obj['下午6'] = ''
2023
+                  // obj['晚上6'] = ''
2024
+
2025
+                  // obj['上午7'] = ''
2026
+                  // obj['下午7'] = ''
2027
+                  // obj['晚上7'] = ''
2028
+
2029
+                  // obj['上午8'] = ''
2030
+                  // obj['下午8'] = ''
2031
+                  // obj['晚上8'] = ''
2032
+
2033
+                  // obj['上午9'] = ''
2034
+                  // obj['下午9'] = ''
2035
+                  // obj['晚上9'] = ''
2036
+
2037
+                  // obj['上午10'] = ''
2038
+                  // obj['下午10'] = ''
2039
+                  // obj['晚上10'] = ''
2040
+
2041
+                  // obj['上午11'] = ''
2042
+                  // obj['下午11'] = ''
2043
+                  // obj['晚上11'] = ''
2044
+
2045
+
2046
+                  // obj['上午12'] = ''
2047
+                  // obj['下午12'] = ''
2048
+                  // obj['晚上12'] = ''
2049
+
2050
+                  // obj['上午13'] = ''
2051
+                  // obj['下午13'] = ''
2052
+                  // obj['晚上13'] = ''
2053
+
2054
+
2055
+                  // obj['上午14'] = ''
2056
+                  // obj['下午14'] = ''
2057
+                  // obj['晚上14'] = ''
2058
+
2059
+
2060
+                  // obj['上午15'] = ''
2061
+                  // obj['下午15'] = ''
2062
+                  // obj['晚上15'] = ''
2063
+
2064
+                  // obj['上午16'] = ''
2065
+                  // obj['下午16'] = ''
2066
+                  // obj['晚上16'] = ''
2067
+
2068
+                  // obj['上午17'] = ''
2069
+                  // obj['下午17'] = ''
2070
+                  // obj['晚上17'] = ''
2071
+
2072
+                  // obj['上午18'] = ''
2073
+                  // obj['下午18'] = ''
2074
+                  // obj['晚上18'] = ''
2075
+
2076
+                  // obj['上午19'] = ''
2077
+                  // obj['下午19'] = ''
2078
+                  // obj['晚上19'] = ''
2079
+
2080
+
2081
+                  // obj['上午20'] = ''
2082
+                  // obj['下午20'] = ''
2083
+                  // obj['晚上20'] = ''
2084
+
2085
+
1992
                   obj['区号'] = partitions[key].name
2086
                   obj['区号'] = partitions[key].name
1993
                   obj['机号'] = jihaos[b].number.toString()
2087
                   obj['机号'] = jihaos[b].number.toString()
1994
 
2088
 
1995
 
2089
 
1996
-                  obj['上午'] = ''
1997
-                  obj['下午'] = ''
1998
-                  obj['晚上'] = ''
2090
+                  obj['shangwu'] = ''
2091
+                  obj['xiawu'] = ''
2092
+                  obj['wanshang'] = ''
1999
 
2093
 
2000
-                  obj['上午1'] = ''
2001
-                  obj['下午1'] = ''
2002
-                  obj['晚上1'] = ''
2094
+                  obj['shangwu1'] = ''
2095
+                  obj['xiawu1'] = ''
2096
+                  obj['wanshang1'] = ''
2003
 
2097
 
2004
-                  obj['上午2'] = ''
2005
-                  obj['下午2'] = ''
2006
-                  obj['晚上2'] = ''
2098
+                  obj['shangwu2'] = ''
2099
+                  obj['xiawu2'] = ''
2100
+                  obj['wanshang2'] = ''
2007
 
2101
 
2008
-                  obj['上午3'] = ''
2009
-                  obj['下午3'] = ''
2010
-                  obj['晚上3'] = ''
2102
+                  obj['shangwu3'] = ''
2103
+                  obj['xiawu3'] = ''
2104
+                  obj['wanshang3'] = ''
2011
 
2105
 
2012
-                  obj['上午4'] = ''
2013
-                  obj['下午4'] = ''
2014
-                  obj['晚上4'] = ''
2106
+                  obj['shangwu4'] = ''
2107
+                  obj['xiawu4'] = ''
2108
+                  obj['wanshang4'] = ''
2015
 
2109
 
2016
 
2110
 
2017
-                  obj['上午5'] = ''
2018
-                  obj['下午5'] = ''
2019
-                  obj['晚上5'] = ''
2111
+                  obj['shangwu5'] = ''
2112
+                  obj['xiawu5'] = ''
2113
+                  obj['wanshang5'] = ''
2020
 
2114
 
2021
-                  obj['上午6'] = ''
2022
-                  obj['下午6'] = ''
2023
-                  obj['晚上6'] = ''
2115
+                  obj['shangwu6'] = ''
2116
+                  obj['xiawu6'] = ''
2117
+                  obj['wanshang6'] = ''
2024
 
2118
 
2025
-                  obj['上午7'] = ''
2026
-                  obj['下午7'] = ''
2027
-                  obj['晚上7'] = ''
2119
+                  obj['shangwu7'] = ''
2120
+                  obj['xiawu7'] = ''
2121
+                  obj['wanshang7'] = ''
2028
 
2122
 
2029
-                  obj['上午8'] = ''
2030
-                  obj['下午8'] = ''
2031
-                  obj['晚上8'] = ''
2123
+                  obj['shangwu8'] = ''
2124
+                  obj['xiawu8'] = ''
2125
+                  obj['wanshang8'] = ''
2032
 
2126
 
2033
-                  obj['上午9'] = ''
2034
-                  obj['下午9'] = ''
2035
-                  obj['晚上9'] = ''
2127
+                  obj['shangwu9'] = ''
2128
+                  obj['xiawu9'] = ''
2129
+                  obj['wanshang9'] = ''
2036
 
2130
 
2037
-                  obj['上午10'] = ''
2038
-                  obj['下午10'] = ''
2039
-                  obj['晚上10'] = ''
2131
+                  obj['shangwu10'] = ''
2132
+                  obj['xiawu10'] = ''
2133
+                  obj['wanshang10'] = ''
2040
 
2134
 
2041
-                  obj['上午11'] = ''
2042
-                  obj['下午11'] = ''
2043
-                  obj['晚上11'] = ''
2135
+                  obj['shangwu11'] = ''
2136
+                  obj['xiawu11'] = ''
2137
+                  obj['wanshang11'] = ''
2044
 
2138
 
2045
 
2139
 
2046
-                  obj['上午12'] = ''
2047
-                  obj['下午12'] = ''
2048
-                  obj['晚上12'] = ''
2140
+                  obj['shangwu12'] = ''
2141
+                  obj['xiawu12'] = ''
2142
+                  obj['wanshang12'] = ''
2049
 
2143
 
2050
-                  obj['上午13'] = ''
2051
-                  obj['下午13'] = ''
2052
-                  obj['晚上13'] = ''
2144
+                  obj['shangwu13'] = ''
2145
+                  obj['xiawu13'] = ''
2146
+                  obj['wanshang13'] = ''
2053
 
2147
 
2054
 
2148
 
2055
-                  obj['上午14'] = ''
2056
-                  obj['下午14'] = ''
2057
-                  obj['晚上14'] = ''
2149
+                  obj['shangwu14'] = ''
2150
+                  obj['xiawu14'] = ''
2151
+                  obj['wanshang14'] = ''
2058
 
2152
 
2059
 
2153
 
2060
-                  obj['上午15'] = ''
2061
-                  obj['下午15'] = ''
2062
-                  obj['晚上15'] = ''
2154
+                  obj['shangwu15'] = ''
2155
+                  obj['xiawu15'] = ''
2156
+                  obj['wanshang15'] = ''
2063
 
2157
 
2064
-                  obj['上午16'] = ''
2065
-                  obj['下午16'] = ''
2066
-                  obj['晚上16'] = ''
2158
+                  obj['shangwu16'] = ''
2159
+                  obj['xiawu16'] = ''
2160
+                  obj['wanshang16'] = ''
2067
 
2161
 
2068
-                  obj['上午17'] = ''
2069
-                  obj['下午17'] = ''
2070
-                  obj['晚上17'] = ''
2162
+                  obj['shangwu17'] = ''
2163
+                  obj['xiawu17'] = ''
2164
+                  obj['wanshang17'] = ''
2071
 
2165
 
2072
-                  obj['上午18'] = ''
2073
-                  obj['下午18'] = ''
2074
-                  obj['晚上18'] = ''
2166
+                  obj['shangwu18'] = ''
2167
+                  obj['xiawu18'] = ''
2168
+                  obj['wanshang18'] = ''
2075
 
2169
 
2076
-                  obj['上午19'] = ''
2077
-                  obj['下午19'] = ''
2078
-                  obj['晚上19'] = ''
2170
+                  obj['shangwu19'] = ''
2171
+                  obj['xiawu19'] = ''
2172
+                  obj['wanshang19'] = ''
2079
 
2173
 
2080
 
2174
 
2081
-                  obj['上午20'] = ''
2082
-                  obj['下午20'] = ''
2083
-                  obj['晚上20'] = ''
2175
+                  obj['shangwu20'] = ''
2176
+                  obj['xiawu20'] = ''
2177
+                  obj['wanshang20'] = ''
2084
 
2178
 
2085
                   list.push(obj)
2179
                   list.push(obj)
2086
 
2180
 
2138
                   if(list[i].机号 == week[j].number){
2232
                   if(list[i].机号 == week[j].number){
2139
                     //  周一上午
2233
                     //  周一上午
2140
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 1){
2234
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 1){
2141
-                        list[i].上午 = week[j].name
2235
+                        list[i].shangwu = week[j].name
2142
                     }
2236
                     }
2143
                     // 周一下午
2237
                     // 周一下午
2144
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 2){
2238
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 2){
2145
-                        list[i].下午 = week[j].name
2239
+                        list[i].xiawu = week[j].name
2146
                     }
2240
                     }
2147
                    // 周一晚上
2241
                    // 周一晚上
2148
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 3){
2242
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 3){
2149
-                        list[i].晚上 = week[j].name
2243
+                        list[i].wanshang = week[j].name
2150
                     }
2244
                     }
2151
 
2245
 
2152
                    //周二上午
2246
                    //周二上午
2153
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 1){
2247
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 1){
2154
-                        list[i].上午1 = week[j].name
2248
+                        list[i].shangwu1 = week[j].name
2155
                     }
2249
                     }
2156
                    //周二下午
2250
                    //周二下午
2157
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 2){
2251
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 2){
2158
-                        list[i].下午1 = week[j].name
2252
+                        list[i].xiawu1 = week[j].name
2159
                     }
2253
                     }
2160
                    //周二晚上
2254
                    //周二晚上
2161
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 3){
2255
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 3){
2162
-                        list[i].晚上1 = week[j].name
2256
+                        list[i].wanshang1 = week[j].name
2163
                     }
2257
                     }
2164
 
2258
 
2165
                    //周三上午
2259
                    //周三上午
2166
                    if( week[j].schedule_week == 3 && week[j].schedule_type == 1){
2260
                    if( week[j].schedule_week == 3 && week[j].schedule_type == 1){
2167
-                        list[i].上午2 = week[j].name
2261
+                        list[i].shangwu2 = week[j].name
2168
                     }
2262
                     }
2169
                    //周三下午
2263
                    //周三下午
2170
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 2){
2264
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 2){
2171
-                        list[i].下午2 = week[j].name
2265
+                        list[i].xiawu2 = week[j].name
2172
                     }
2266
                     }
2173
                    //周三晚上
2267
                    //周三晚上
2174
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 3){
2268
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 3){
2175
-                        list[i].晚上2 = week[j].name
2269
+                        list[i].wanshang2 = week[j].name
2176
                     }
2270
                     }
2177
                    //周四上午
2271
                    //周四上午
2178
                     if( week[j].schedule_week == 4&& week[j].schedule_type == 1){
2272
                     if( week[j].schedule_week == 4&& week[j].schedule_type == 1){
2179
-                        list[i].上午3 = week[j].name
2273
+                        list[i].shangwu3 = week[j].name
2180
                     }
2274
                     }
2181
                    //周四下午
2275
                    //周四下午
2182
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 2){
2276
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 2){
2183
-                        list[i].下午3 = week[j].name
2277
+                        list[i].xiawu3 = week[j].name
2184
                     }
2278
                     }
2185
                    //周四晚上
2279
                    //周四晚上
2186
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 3){
2280
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 3){
2187
-                        list[i].晚上3 = week[j].name
2281
+                        list[i].wanshang3 = week[j].name
2188
                     }
2282
                     }
2189
                    //周五上午
2283
                    //周五上午
2190
                     if( week[j].schedule_week == 5&& week[j].schedule_type == 1){
2284
                     if( week[j].schedule_week == 5&& week[j].schedule_type == 1){
2191
-                        list[i].上午4 = week[j].name
2285
+                        list[i].shangwu4 = week[j].name
2192
                     }
2286
                     }
2193
                    //周五下午
2287
                    //周五下午
2194
                     if( week[j].schedule_week ==5 && week[j].schedule_type == 2){
2288
                     if( week[j].schedule_week ==5 && week[j].schedule_type == 2){
2195
-                        list[i].下午4 = week[j].name
2289
+                        list[i].xiawu4 = week[j].name
2196
                     }
2290
                     }
2197
                    //周五晚上
2291
                    //周五晚上
2198
                     if( week[j].schedule_week == 5 && week[j].schedule_type == 3){
2292
                     if( week[j].schedule_week == 5 && week[j].schedule_type == 3){
2199
-                        list[i].晚上4 = week[j].name
2293
+                        list[i].wanshang4 = week[j].name
2200
                     }
2294
                     }
2201
                    //周六上午
2295
                    //周六上午
2202
                     if( week[j].schedule_week == 6&& week[j].schedule_type == 1){
2296
                     if( week[j].schedule_week == 6&& week[j].schedule_type == 1){
2203
-                        list[i].上午5 = week[j].name
2297
+                        list[i].shangwu5 = week[j].name
2204
                     }
2298
                     }
2205
                    //周六下午
2299
                    //周六下午
2206
                    if( week[j].schedule_week ==6 && week[j].schedule_type == 2){
2300
                    if( week[j].schedule_week ==6 && week[j].schedule_type == 2){
2207
-                        list[i].下午5 = week[j].name
2301
+                        list[i].xiawu5 = week[j].name
2208
                     }
2302
                     }
2209
                    //周六晚上
2303
                    //周六晚上
2210
                    if( week[j].schedule_week == 6 && week[j].schedule_type == 3){
2304
                    if( week[j].schedule_week == 6 && week[j].schedule_type == 3){
2211
-                        list[i].晚上5 = week[j].name
2305
+                        list[i].wanshang5 = week[j].name
2212
                     }
2306
                     }
2213
                    //周日上午
2307
                    //周日上午
2214
                     if( week[j].schedule_week ==7&& week[j].schedule_type == 1){
2308
                     if( week[j].schedule_week ==7&& week[j].schedule_type == 1){
2215
-                        list[i].上午6 = week[j].name
2309
+                        list[i].shangwu6 = week[j].name
2216
                     }
2310
                     }
2217
                    //周日下午
2311
                    //周日下午
2218
                     if( week[j].schedule_week ==7 && week[j].schedule_type == 2){
2312
                     if( week[j].schedule_week ==7 && week[j].schedule_type == 2){
2219
-                        list[i].下午6 = week[j].name
2313
+                        list[i].xiawu6 = week[j].name
2220
                     }
2314
                     }
2221
                    //周日晚上
2315
                    //周日晚上
2222
                    if( week[j].schedule_week == 7 && week[j].schedule_type == 3){
2316
                    if( week[j].schedule_week == 7 && week[j].schedule_type == 3){
2223
-                        list[i].晚上6 = week[j].name
2317
+                        list[i].wanshang6 = week[j].name
2224
                     }
2318
                     }
2225
                   }
2319
                   }
2226
 
2320
 
2236
                  if(list[i].机号 == nextWeek[j].number ){
2330
                  if(list[i].机号 == nextWeek[j].number ){
2237
                   //周一
2331
                   //周一
2238
                    if( nextWeek[j].schedule_week ==1&& nextWeek[j].schedule_type == 1){
2332
                    if( nextWeek[j].schedule_week ==1&& nextWeek[j].schedule_type == 1){
2239
-                        list[i].上午7 = nextWeek[j].name
2333
+                        list[i].shangwu7 = nextWeek[j].name
2240
                     }
2334
                     }
2241
                    //周一下午
2335
                    //周一下午
2242
                     if( nextWeek[j].schedule_week ==1 && nextWeek[j].schedule_type == 2){
2336
                     if( nextWeek[j].schedule_week ==1 && nextWeek[j].schedule_type == 2){
2243
-                        list[i].下午7 = nextWeek[j].name
2337
+                        list[i].xiawu7 = nextWeek[j].name
2244
                     }
2338
                     }
2245
                    //周一晚上
2339
                    //周一晚上
2246
                    if( nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3){
2340
                    if( nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3){
2247
-                        list[i].晚上7 = nextWeek[j].name
2341
+                        list[i].wanshang7 = nextWeek[j].name
2248
                     }
2342
                     }
2249
 
2343
 
2250
 
2344
 
2251
                    //周二上午
2345
                    //周二上午
2252
                    if( nextWeek[j].schedule_week ==2&& nextWeek[j].schedule_type == 1){
2346
                    if( nextWeek[j].schedule_week ==2&& nextWeek[j].schedule_type == 1){
2253
-                        list[i].上午8 = nextWeek[j].name
2347
+                        list[i].shangwu8 = nextWeek[j].name
2254
                     }
2348
                     }
2255
                    //周二下午
2349
                    //周二下午
2256
                     if( nextWeek[j].schedule_week ==2 && nextWeek[j].schedule_type == 2){
2350
                     if( nextWeek[j].schedule_week ==2 && nextWeek[j].schedule_type == 2){
2257
-                        list[i].下午8 = nextWeek[j].name
2351
+                        list[i].xiawu8 = nextWeek[j].name
2258
                     }
2352
                     }
2259
                    //周二晚上
2353
                    //周二晚上
2260
                    if( nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3){
2354
                    if( nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3){
2261
-                        list[i].晚上8  = nextWeek[j].name
2355
+                        list[i].wanshang8  = nextWeek[j].name
2262
                     }
2356
                     }
2263
 
2357
 
2264
                   //周三上午
2358
                   //周三上午
2265
                    if( nextWeek[j].schedule_week ==3&& nextWeek[j].schedule_type == 1){
2359
                    if( nextWeek[j].schedule_week ==3&& nextWeek[j].schedule_type == 1){
2266
-                        list[i].上午9 = nextWeek[j].name
2360
+                        list[i].shangwu9 = nextWeek[j].name
2267
                     }
2361
                     }
2268
                    //周三下午
2362
                    //周三下午
2269
                     if( nextWeek[j].schedule_week ==3 && nextWeek[j].schedule_type == 2){
2363
                     if( nextWeek[j].schedule_week ==3 && nextWeek[j].schedule_type == 2){
2270
-                        list[i].下午9 = nextWeek[j].name
2364
+                        list[i].xiawu9 = nextWeek[j].name
2271
                     }
2365
                     }
2272
                    //周三晚上
2366
                    //周三晚上
2273
                    if( nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3){
2367
                    if( nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3){
2274
-                        list[i].晚上9  = nextWeek[j].name
2368
+                        list[i].wanshang9  = nextWeek[j].name
2275
                     }
2369
                     }
2276
 
2370
 
2277
                    //周四上午
2371
                    //周四上午
2278
                    if( nextWeek[j].schedule_week ==4&& nextWeek[j].schedule_type == 1){
2372
                    if( nextWeek[j].schedule_week ==4&& nextWeek[j].schedule_type == 1){
2279
-                        list[i].上午10 = nextWeek[j].name
2373
+                        list[i].shangwu10 = nextWeek[j].name
2280
                     }
2374
                     }
2281
                    //周四下午
2375
                    //周四下午
2282
                     if( nextWeek[j].schedule_week ==4 && nextWeek[j].schedule_type == 2){
2376
                     if( nextWeek[j].schedule_week ==4 && nextWeek[j].schedule_type == 2){
2283
-                        list[i].下午10 = nextWeek[j].name
2377
+                        list[i].xiawu10 = nextWeek[j].name
2284
                     }
2378
                     }
2285
                    //周四晚上
2379
                    //周四晚上
2286
                    if( nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3){
2380
                    if( nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3){
2287
-                        list[i].晚上10  = nextWeek[j].name
2381
+                        list[i].wanshang10  = nextWeek[j].name
2288
                     }
2382
                     }
2289
 
2383
 
2290
                     //周五上午
2384
                     //周五上午
2291
                    if( nextWeek[j].schedule_week ==5&& nextWeek[j].schedule_type == 1){
2385
                    if( nextWeek[j].schedule_week ==5&& nextWeek[j].schedule_type == 1){
2292
-                        list[i].上午11 = nextWeek[j].name
2386
+                        list[i].shangwu11 = nextWeek[j].name
2293
                     }
2387
                     }
2294
                    //周五下午
2388
                    //周五下午
2295
                     if( nextWeek[j].schedule_week ==5 && nextWeek[j].schedule_type == 2){
2389
                     if( nextWeek[j].schedule_week ==5 && nextWeek[j].schedule_type == 2){
2296
-                        list[i].下午11 = nextWeek[j].name
2390
+                        list[i].xiawu11 = nextWeek[j].name
2297
                     }
2391
                     }
2298
                    //周五晚上
2392
                    //周五晚上
2299
                    if( nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3){
2393
                    if( nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3){
2300
-                        list[i].晚上11  = nextWeek[j].name
2394
+                        list[i].wanshang11  = nextWeek[j].name
2301
                     }
2395
                     }
2302
 
2396
 
2303
                   //周六上午
2397
                   //周六上午
2304
                    if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
2398
                    if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
2305
-                        list[i].上午12 = nextWeek[j].name
2399
+                        list[i].shangwu12 = nextWeek[j].name
2306
                     }
2400
                     }
2307
                    //周六下午
2401
                    //周六下午
2308
                     if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
2402
                     if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
2309
-                        list[i].下午12 = nextWeek[j].name
2403
+                        list[i].xiawu12 = nextWeek[j].name
2310
                     }
2404
                     }
2311
                    //周六晚上
2405
                    //周六晚上
2312
                    if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
2406
                    if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
2313
-                        list[i].晚上12  = nextWeek[j].name
2407
+                        list[i].wanshang12  = nextWeek[j].name
2314
                     }
2408
                     }
2315
 
2409
 
2316
                   //周日上午
2410
                   //周日上午
2317
                    if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 1){
2411
                    if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 1){
2318
-                        list[i].上午13 = nextWeek[j].name
2412
+                        list[i].shangwu13 = nextWeek[j].name
2319
                     }
2413
                     }
2320
                    //周日下午
2414
                    //周日下午
2321
                     if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 2){
2415
                     if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 2){
2322
-                        list[i].下午13 = nextWeek[j].name
2416
+                        list[i].xiawu13 = nextWeek[j].name
2323
                     }
2417
                     }
2324
                    //周日晚上
2418
                    //周日晚上
2325
                    if( nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3){
2419
                    if( nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3){
2326
-                        list[i].晚上13  = nextWeek[j].name
2420
+                        list[i].wanshang13  = nextWeek[j].name
2327
                     }
2421
                     }
2328
                   }
2422
                   }
2329
 
2423
 
2339
                    if(list[i].机号 == lastWeek[j].number ){
2433
                    if(list[i].机号 == lastWeek[j].number ){
2340
                      //周一
2434
                      //周一
2341
                     if( lastWeek[j].schedule_week ==1&& lastWeek[j].schedule_type == 1){
2435
                     if( lastWeek[j].schedule_week ==1&& lastWeek[j].schedule_type == 1){
2342
-                          list[i].上午14 = lastWeek[j].name
2436
+                          list[i].shangwu14 = lastWeek[j].name
2343
                       }
2437
                       }
2344
                     //周一下午
2438
                     //周一下午
2345
                       if( lastWeek[j].schedule_week ==1 && lastWeek[j].schedule_type == 2){
2439
                       if( lastWeek[j].schedule_week ==1 && lastWeek[j].schedule_type == 2){
2346
-                          list[i].下午14 = lastWeek[j].name
2440
+                          list[i].xiawu14 = lastWeek[j].name
2347
                       }
2441
                       }
2348
                     //周一晚上
2442
                     //周一晚上
2349
                     if( lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3){
2443
                     if( lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3){
2350
-                          list[i].晚上14 = lastWeek[j].name
2444
+                          list[i].wanshang14 = lastWeek[j].name
2351
                      }
2445
                      }
2352
 
2446
 
2353
                     //周二
2447
                     //周二
2354
                     if( lastWeek[j].schedule_week ==2&& lastWeek[j].schedule_type == 1){
2448
                     if( lastWeek[j].schedule_week ==2&& lastWeek[j].schedule_type == 1){
2355
-                          list[i].上午15 = lastWeek[j].name
2449
+                          list[i].shangwu15 = lastWeek[j].name
2356
                       }
2450
                       }
2357
                     //周二下午
2451
                     //周二下午
2358
                       if( lastWeek[j].schedule_week ==2 && lastWeek[j].schedule_type == 2){
2452
                       if( lastWeek[j].schedule_week ==2 && lastWeek[j].schedule_type == 2){
2359
-                          list[i].下午15 = lastWeek[j].name
2453
+                          list[i].xiawu15 = lastWeek[j].name
2360
                       }
2454
                       }
2361
                     //周二晚上
2455
                     //周二晚上
2362
                     if( lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3){
2456
                     if( lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3){
2363
-                          list[i].晚上15 = lastWeek[j].name
2457
+                          list[i].wanshang15 = lastWeek[j].name
2364
                       }
2458
                       }
2365
 
2459
 
2366
                     //周三
2460
                     //周三
2367
                     if( lastWeek[j].schedule_week ==3&& lastWeek[j].schedule_type == 1){
2461
                     if( lastWeek[j].schedule_week ==3&& lastWeek[j].schedule_type == 1){
2368
-                          list[i].上午16 = lastWeek[j].name
2462
+                          list[i].shangwu16 = lastWeek[j].name
2369
                       }
2463
                       }
2370
                     //周三下午
2464
                     //周三下午
2371
                       if( lastWeek[j].schedule_week ==3 && lastWeek[j].schedule_type == 2){
2465
                       if( lastWeek[j].schedule_week ==3 && lastWeek[j].schedule_type == 2){
2372
-                          list[i].下午16 = lastWeek[j].name
2466
+                          list[i].xiawu16 = lastWeek[j].name
2373
                       }
2467
                       }
2374
                     //周三晚上
2468
                     //周三晚上
2375
                     if( lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3){
2469
                     if( lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3){
2376
-                          list[i].晚上16 = lastWeek[j].name
2470
+                          list[i].wanshang16 = lastWeek[j].name
2377
                      }
2471
                      }
2378
 
2472
 
2379
 
2473
 
2380
                      //周四
2474
                      //周四
2381
                     if( lastWeek[j].schedule_week ==4&& lastWeek[j].schedule_type == 1){
2475
                     if( lastWeek[j].schedule_week ==4&& lastWeek[j].schedule_type == 1){
2382
-                          list[i].上午17 = lastWeek[j].name
2476
+                          list[i].shangwu17 = lastWeek[j].name
2383
                       }
2477
                       }
2384
                     //周四下午
2478
                     //周四下午
2385
                       if( lastWeek[j].schedule_week ==4 && lastWeek[j].schedule_type == 2){
2479
                       if( lastWeek[j].schedule_week ==4 && lastWeek[j].schedule_type == 2){
2386
-                          list[i].下午17 = lastWeek[j].name
2480
+                          list[i].xiawu17 = lastWeek[j].name
2387
                       }
2481
                       }
2388
                     //周四晚上
2482
                     //周四晚上
2389
                     if( lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3){
2483
                     if( lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3){
2390
-                          list[i].晚上17 = lastWeek[j].name
2484
+                          list[i].wanshang17 = lastWeek[j].name
2391
                      }
2485
                      }
2392
 
2486
 
2393
                     //周五
2487
                     //周五
2394
                     if( lastWeek[j].schedule_week ==5&& lastWeek[j].schedule_type == 1){
2488
                     if( lastWeek[j].schedule_week ==5&& lastWeek[j].schedule_type == 1){
2395
-                          list[i].上午18 = lastWeek[j].name
2489
+                          list[i].shangwu18 = lastWeek[j].name
2396
                       }
2490
                       }
2397
                     //周五下午
2491
                     //周五下午
2398
                       if( lastWeek[j].schedule_week ==5 && lastWeek[j].schedule_type == 2){
2492
                       if( lastWeek[j].schedule_week ==5 && lastWeek[j].schedule_type == 2){
2399
-                          list[i].下午18 = lastWeek[j].name
2493
+                          list[i].xiawu18 = lastWeek[j].name
2400
                       }
2494
                       }
2401
                     //周五晚上
2495
                     //周五晚上
2402
                     if( lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3){
2496
                     if( lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3){
2403
-                          list[i].晚上18 = lastWeek[j].name
2497
+                          list[i].wanshang18 = lastWeek[j].name
2404
                      }
2498
                      }
2405
 
2499
 
2406
                     //周六
2500
                     //周六
2407
                     if( lastWeek[j].schedule_week ==6&& lastWeek[j].schedule_type == 1){
2501
                     if( lastWeek[j].schedule_week ==6&& lastWeek[j].schedule_type == 1){
2408
-                          list[i].上午19 = lastWeek[j].name
2502
+                          list[i].shangwu19 = lastWeek[j].name
2409
                       }
2503
                       }
2410
                     //周六下午
2504
                     //周六下午
2411
                       if( lastWeek[j].schedule_week ==6 && lastWeek[j].schedule_type == 2){
2505
                       if( lastWeek[j].schedule_week ==6 && lastWeek[j].schedule_type == 2){
2412
-                          list[i].下午19 = lastWeek[j].name
2506
+                          list[i].xiawu19 = lastWeek[j].name
2413
                       }
2507
                       }
2414
                     //周六晚上
2508
                     //周六晚上
2415
                     if( lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3){
2509
                     if( lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3){
2416
-                          list[i].晚上19 = lastWeek[j].name
2510
+                          list[i].wanshang19 = lastWeek[j].name
2417
                      }
2511
                      }
2418
 
2512
 
2419
                      //周日
2513
                      //周日
2420
                     if( lastWeek[j].schedule_week ==7&& lastWeek[j].schedule_type == 1){
2514
                     if( lastWeek[j].schedule_week ==7&& lastWeek[j].schedule_type == 1){
2421
-                          list[i].上午20 = lastWeek[j].name
2515
+                          list[i].shangwu20 = lastWeek[j].name
2422
                       }
2516
                       }
2423
                     //周日下午
2517
                     //周日下午
2424
                       if( lastWeek[j].schedule_week ==7 && lastWeek[j].schedule_type == 2){
2518
                       if( lastWeek[j].schedule_week ==7 && lastWeek[j].schedule_type == 2){
2425
-                          list[i].下午20 = lastWeek[j].name
2519
+                          list[i].xiawu20 = lastWeek[j].name
2426
                       }
2520
                       }
2427
                     //周日晚上
2521
                     //周日晚上
2428
                     if( lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3){
2522
                     if( lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3){
2429
-                          list[i].晚上20 = lastWeek[j].name
2523
+                          list[i].wanshang20 = lastWeek[j].name
2430
                      }
2524
                      }
2431
                    }
2525
                    }
2432
 
2526
 

+ 8 - 8
src/xt_pages/workforce/components/scheduleUploadExcel/index.vue 파일 보기

10
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
10
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
11
   </span>
11
   </span>
12
     </el-dialog>
12
     </el-dialog>
13
-    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
13
+     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick">
14
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
14
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
15
     </el-button>
15
     </el-button>
16
   </div>
16
   </div>
37
     },
37
     },
38
     methods: {
38
     methods: {
39
       generateDate({ header, results }) {
39
       generateDate({ header, results }) {
40
-
41
-      
42
-
40
+        console.log("header",header)
41
+        console.log("results",results)
43
         this.excelData.header = header
42
         this.excelData.header = header
44
         this.excelData.results = results
43
         this.excelData.results = results
45
 
44
 
75
         document.getElementById('excel-upload-input').click()
74
         document.getElementById('excel-upload-input').click()
76
       },
75
       },
77
       handleClick(e) {
76
       handleClick(e) {
78
-        console.log("333",e.target.files)
77
+        
79
         const files = e.target.files
78
         const files = e.target.files
80
         const rawFile = files[0] // only use files[0]
79
         const rawFile = files[0] // only use files[0]
81
-        console.log("rawFile333333333",rawFile)  
80
+        console.log("rawfiel",rawFile)
82
         if (!rawFile) 
81
         if (!rawFile) 
83
         return
82
         return
84
         this.upload(rawFile)
83
         this.upload(rawFile)
85
       },
84
       },
86
       upload(rawFile) {
85
       upload(rawFile) {
86
+        console.log("触发了吗")
87
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
87
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
88
-        
88
+        console.log("3333",this.beforeUpload)
89
         if (!this.beforeUpload) {
89
         if (!this.beforeUpload) {
90
           this.readerData(rawFile)
90
           this.readerData(rawFile)
91
           return
91
           return
92
         }
92
         }
93
         const before = this.beforeUpload(rawFile)
93
         const before = this.beforeUpload(rawFile)
94
+        console.log("before",before)
94
         if (before) {
95
         if (before) {
95
           this.readerData(rawFile)
96
           this.readerData(rawFile)
96
         }
97
         }
97
       },
98
       },
98
       readerData(rawFile) {
99
       readerData(rawFile) {
99
-       
100
 
100
 
101
         this.loading = true
101
         this.loading = true
102
         return new Promise((resolve, reject) => {
102
         return new Promise((resolve, reject) => {