导出

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

@@ -381,6 +381,29 @@
           >
           </el-table-column>
 
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="抗凝剂" 
+            width="140"
+            v-if="isShow('抗凝剂')"
+          >
+            <template slot-scope="scope">
+             <span v-if="scope.row.monitor_anticoagulant == 1">无肝素</span> 
+             <span v-if="scope.row.monitor_anticoagulant == 2">普通肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant == 3">低分子肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant == 4">阿加曲班</span>
+             <span v-if="scope.row.monitor_anticoagulant == 5">枸橼酸钠</span>
+             <span v-if="scope.row.monitor_anticoagulant == 6">低分子肝素钙</span>
+             <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
+             <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant_value!=''">（{{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }}）</span>
+             
+            </template>
+          </el-table-column>
+
            <el-table-column
             prop="heparin"
             align="center"
@@ -622,6 +645,18 @@
             </el-form-item>
           </el-col>
 
+           <el-col :span="8" v-if="isShow('抗凝剂')">
+            <el-form-item label="抗凝剂：">
+              <div style="display:flex;">
+                <el-select v-model="form.monitor_anticoagulant" placeholder="请选择" style="width:50%;">
+                  <el-option v-for="(item, index) in anticoagulantsConfit" :label="item.name" :key="index + 'e'" :value="item.id"></el-option>
+                </el-select>
+                <el-input v-model="form.monitor_anticoagulant_value" style="width:49%;margin-left:10px;"></el-input>
+                </div>
+            </el-form-item>
+          </el-col>
+
+      
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -810,6 +845,8 @@ export default {
         blood_oxygen_saturation: '',
         urr:'', 
         blood_sugar:'',//血糖
+        monitor_anticoagulant:'',
+        monitor_anticoagulant_value:"",
       },
 
       table_current_row: null,
@@ -822,7 +859,8 @@ export default {
       result_options: getDataConfig('hemodialysis', 'results'),
       valueOne: 0,
       valueTwo: 0,
-      valueThree: 0
+      valueThree: 0,
+      anticoagulantsConfit:{}
     }
   },
   props: {
@@ -847,7 +885,9 @@ export default {
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
     this.form.operate_time = new Date().getTime()
     var symptoms = getDataConfig('hemodialysis', 'symptoms')
-    
+    console.log("sysmptoms3333333333",symptoms)
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    console.log("抗凝剂",this.anticoagulantsConfit)
   },
   methods: {
     venousPressureChange(type) {
@@ -1014,6 +1054,9 @@ export default {
         this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:''
         this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:''
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:''
+        this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:""
+        this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
+
       })
     },
 
@@ -1075,6 +1118,8 @@ export default {
         this.result_selecteds = []
         this.form.urr = ''
         this.form.blood_sugar = ''
+        this.form.monitor_anticoagulant = ''
+        this.form.monitor_anticoagulant_value = ''
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
@@ -1110,6 +1155,8 @@ export default {
         this.form.blood_oxygen_saturation = monitor.blood_oxygen_saturation
         this.form.urr = monitor.urr?monitor.urr:''
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:''
+        this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:''
+        this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur()
         this.disposeTextareaBlur()
@@ -1148,6 +1195,8 @@ export default {
       this.form.monitoring_date = parseInt(this.form.monitoring_date)
       this.form.urr = this.form.urr
       this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
+      this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
+      this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
       let mode = '1'
       if (this.form.id > 0) {
         mode = '2'
@@ -1204,6 +1253,8 @@ export default {
             this.form.ktv = parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv)
             this.form.urr = this.form.urr
             this.form.blood_sugar = parseFloat(this.form.blood_sugar) == NaN ? 0 : parseFloat(this.form.blood_sugar)
+            this.form.monitor_anticoagulant = parseInt(this.form.monitor_anticoagulant)
+            this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value
             this.$message.error(resp.msg)
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -30,6 +30,7 @@
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
+          <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -55,6 +56,18 @@
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
           <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th> 
+          <th v-if="isShow('抗凝剂')">
+            <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
+            <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
+            <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
+            <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
+            <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
+            <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
+            <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
+            <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
+            <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+            <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
+          </th>
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -875,6 +875,7 @@
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
             
             <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
+            <td style="line-height:20px;" width="100">抗凝剂</td>
             <td style="line-height:20px;" width="">病情变化及处理</td>
             <td style="line-height:20px;" width="60">签名</td>
           </tr>
@@ -917,6 +918,19 @@
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
 
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
+            <td>&nbsp;
+              <span v-if="monitor.monitor_anticoagulant == 0"></span>
+              <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
+              <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
+              <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+              <span v-if="monitor.monitor_anticoagulant_value!=undefined && monitor.monitor_anticoagulant_value!='' ">({{monitor.monitor_anticoagulant_value}})</span>
+            </td>
             <td style="text-align:left;line-height:20px;">
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
@@ -1963,6 +1977,7 @@ export default {
 
           this.advices = response.data.data.advices
           this.monitors = response.data.data.monitors
+          console.log("透析监测",this.monitors)
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
           // 配置超滤量和置换量是否要显示0还是空

src/xt_pages/workforce/appointment.vue

@@ -1989,98 +1989,192 @@
                 for (let b = 0; b < jihaos.length; b++) {
                  var obj = {}
 
+                  // obj['区号'] = partitions[key].name
+                  // obj['机号'] = jihaos[b].number.toString()
+
+
+                  // obj['上午'] = ''
+                  // obj['下午'] = ''
+                  // obj['晚上'] = ''
+
+                  // obj['上午1'] = ''
+                  // obj['下午1'] = ''
+                  // obj['晚上1'] = ''
+
+                  // obj['上午2'] = ''
+                  // obj['下午2'] = ''
+                  // obj['晚上2'] = ''
+
+                  // obj['上午3'] = ''
+                  // obj['下午3'] = ''
+                  // obj['晚上3'] = ''
+
+                  // obj['上午4'] = ''
+                  // obj['下午4'] = ''
+                  // obj['晚上4'] = ''
+
+
+                  // obj['上午5'] = ''
+                  // obj['下午5'] = ''
+                  // obj['晚上5'] = ''
+
+                  // obj['上午6'] = ''
+                  // obj['下午6'] = ''
+                  // obj['晚上6'] = ''
+
+                  // obj['上午7'] = ''
+                  // obj['下午7'] = ''
+                  // obj['晚上7'] = ''
+
+                  // obj['上午8'] = ''
+                  // obj['下午8'] = ''
+                  // obj['晚上8'] = ''
+
+                  // obj['上午9'] = ''
+                  // obj['下午9'] = ''
+                  // obj['晚上9'] = ''
+
+                  // obj['上午10'] = ''
+                  // obj['下午10'] = ''
+                  // obj['晚上10'] = ''
+
+                  // obj['上午11'] = ''
+                  // obj['下午11'] = ''
+                  // obj['晚上11'] = ''
+
+
+                  // obj['上午12'] = ''
+                  // obj['下午12'] = ''
+                  // obj['晚上12'] = ''
+
+                  // obj['上午13'] = ''
+                  // obj['下午13'] = ''
+                  // obj['晚上13'] = ''
+
+
+                  // obj['上午14'] = ''
+                  // obj['下午14'] = ''
+                  // obj['晚上14'] = ''
+
+
+                  // obj['上午15'] = ''
+                  // obj['下午15'] = ''
+                  // obj['晚上15'] = ''
+
+                  // obj['上午16'] = ''
+                  // obj['下午16'] = ''
+                  // obj['晚上16'] = ''
+
+                  // obj['上午17'] = ''
+                  // obj['下午17'] = ''
+                  // obj['晚上17'] = ''
+
+                  // obj['上午18'] = ''
+                  // obj['下午18'] = ''
+                  // obj['晚上18'] = ''
+
+                  // obj['上午19'] = ''
+                  // obj['下午19'] = ''
+                  // obj['晚上19'] = ''
+
+
+                  // obj['上午20'] = ''
+                  // obj['下午20'] = ''
+                  // obj['晚上20'] = ''
+
+
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
 
 
-                  obj['上午'] = ''
-                  obj['下午'] = ''
-                  obj['晚上'] = ''
+                  obj['shangwu'] = ''
+                  obj['xiawu'] = ''
+                  obj['wanshang'] = ''
 
-                  obj['上午1'] = ''
-                  obj['下午1'] = ''
-                  obj['晚上1'] = ''
+                  obj['shangwu1'] = ''
+                  obj['xiawu1'] = ''
+                  obj['wanshang1'] = ''
 
-                  obj['上午2'] = ''
-                  obj['下午2'] = ''
-                  obj['晚上2'] = ''
+                  obj['shangwu2'] = ''
+                  obj['xiawu2'] = ''
+                  obj['wanshang2'] = ''
 
-                  obj['上午3'] = ''
-                  obj['下午3'] = ''
-                  obj['晚上3'] = ''
+                  obj['shangwu3'] = ''
+                  obj['xiawu3'] = ''
+                  obj['wanshang3'] = ''
 
-                  obj['上午4'] = ''
-                  obj['下午4'] = ''
-                  obj['晚上4'] = ''
+                  obj['shangwu4'] = ''
+                  obj['xiawu4'] = ''
+                  obj['wanshang4'] = ''
 
 
-                  obj['上午5'] = ''
-                  obj['下午5'] = ''
-                  obj['晚上5'] = ''
+                  obj['shangwu5'] = ''
+                  obj['xiawu5'] = ''
+                  obj['wanshang5'] = ''
 
-                  obj['上午6'] = ''
-                  obj['下午6'] = ''
-                  obj['晚上6'] = ''
+                  obj['shangwu6'] = ''
+                  obj['xiawu6'] = ''
+                  obj['wanshang6'] = ''
 
-                  obj['上午7'] = ''
-                  obj['下午7'] = ''
-                  obj['晚上7'] = ''
+                  obj['shangwu7'] = ''
+                  obj['xiawu7'] = ''
+                  obj['wanshang7'] = ''
 
-                  obj['上午8'] = ''
-                  obj['下午8'] = ''
-                  obj['晚上8'] = ''
+                  obj['shangwu8'] = ''
+                  obj['xiawu8'] = ''
+                  obj['wanshang8'] = ''
 
-                  obj['上午9'] = ''
-                  obj['下午9'] = ''
-                  obj['晚上9'] = ''
+                  obj['shangwu9'] = ''
+                  obj['xiawu9'] = ''
+                  obj['wanshang9'] = ''
 
-                  obj['上午10'] = ''
-                  obj['下午10'] = ''
-                  obj['晚上10'] = ''
+                  obj['shangwu10'] = ''
+                  obj['xiawu10'] = ''
+                  obj['wanshang10'] = ''
 
-                  obj['上午11'] = ''
-                  obj['下午11'] = ''
-                  obj['晚上11'] = ''
+                  obj['shangwu11'] = ''
+                  obj['xiawu11'] = ''
+                  obj['wanshang11'] = ''
 
 
-                  obj['上午12'] = ''
-                  obj['下午12'] = ''
-                  obj['晚上12'] = ''
+                  obj['shangwu12'] = ''
+                  obj['xiawu12'] = ''
+                  obj['wanshang12'] = ''
 
-                  obj['上午13'] = ''
-                  obj['下午13'] = ''
-                  obj['晚上13'] = ''
+                  obj['shangwu13'] = ''
+                  obj['xiawu13'] = ''
+                  obj['wanshang13'] = ''
 
 
-                  obj['上午14'] = ''
-                  obj['下午14'] = ''
-                  obj['晚上14'] = ''
+                  obj['shangwu14'] = ''
+                  obj['xiawu14'] = ''
+                  obj['wanshang14'] = ''
 
 
-                  obj['上午15'] = ''
-                  obj['下午15'] = ''
-                  obj['晚上15'] = ''
+                  obj['shangwu15'] = ''
+                  obj['xiawu15'] = ''
+                  obj['wanshang15'] = ''
 
-                  obj['上午16'] = ''
-                  obj['下午16'] = ''
-                  obj['晚上16'] = ''
+                  obj['shangwu16'] = ''
+                  obj['xiawu16'] = ''
+                  obj['wanshang16'] = ''
 
-                  obj['上午17'] = ''
-                  obj['下午17'] = ''
-                  obj['晚上17'] = ''
+                  obj['shangwu17'] = ''
+                  obj['xiawu17'] = ''
+                  obj['wanshang17'] = ''
 
-                  obj['上午18'] = ''
-                  obj['下午18'] = ''
-                  obj['晚上18'] = ''
+                  obj['shangwu18'] = ''
+                  obj['xiawu18'] = ''
+                  obj['wanshang18'] = ''
 
-                  obj['上午19'] = ''
-                  obj['下午19'] = ''
-                  obj['晚上19'] = ''
+                  obj['shangwu19'] = ''
+                  obj['xiawu19'] = ''
+                  obj['wanshang19'] = ''
 
 
-                  obj['上午20'] = ''
-                  obj['下午20'] = ''
-                  obj['晚上20'] = ''
+                  obj['shangwu20'] = ''
+                  obj['xiawu20'] = ''
+                  obj['wanshang20'] = ''
 
                   list.push(obj)
 
@@ -2138,89 +2232,89 @@
                   if(list[i].机号 == week[j].number){
                     //  周一上午
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 1){
-                        list[i].上午 = week[j].name
+                        list[i].shangwu = week[j].name
                     }
                     // 周一下午
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 2){
-                        list[i].下午 = week[j].name
+                        list[i].xiawu = week[j].name
                     }
                    // 周一晚上
                     if( week[j].schedule_week == 1 && week[j].schedule_type == 3){
-                        list[i].晚上 = week[j].name
+                        list[i].wanshang = week[j].name
                     }
 
                    //周二上午
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 1){
-                        list[i].上午1 = week[j].name
+                        list[i].shangwu1 = week[j].name
                     }
                    //周二下午
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 2){
-                        list[i].下午1 = week[j].name
+                        list[i].xiawu1 = week[j].name
                     }
                    //周二晚上
                     if( week[j].schedule_week == 2 && week[j].schedule_type == 3){
-                        list[i].晚上1 = week[j].name
+                        list[i].wanshang1 = week[j].name
                     }
 
                    //周三上午
                    if( week[j].schedule_week == 3 && week[j].schedule_type == 1){
-                        list[i].上午2 = week[j].name
+                        list[i].shangwu2 = week[j].name
                     }
                    //周三下午
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 2){
-                        list[i].下午2 = week[j].name
+                        list[i].xiawu2 = week[j].name
                     }
                    //周三晚上
                     if( week[j].schedule_week == 3 && week[j].schedule_type == 3){
-                        list[i].晚上2 = week[j].name
+                        list[i].wanshang2 = week[j].name
                     }
                    //周四上午
                     if( week[j].schedule_week == 4&& week[j].schedule_type == 1){
-                        list[i].上午3 = week[j].name
+                        list[i].shangwu3 = week[j].name
                     }
                    //周四下午
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 2){
-                        list[i].下午3 = week[j].name
+                        list[i].xiawu3 = week[j].name
                     }
                    //周四晚上
                     if( week[j].schedule_week == 4 && week[j].schedule_type == 3){
-                        list[i].晚上3 = week[j].name
+                        list[i].wanshang3 = week[j].name
                     }
                    //周五上午
                     if( week[j].schedule_week == 5&& week[j].schedule_type == 1){
-                        list[i].上午4 = week[j].name
+                        list[i].shangwu4 = week[j].name
                     }
                    //周五下午
                     if( week[j].schedule_week ==5 && week[j].schedule_type == 2){
-                        list[i].下午4 = week[j].name
+                        list[i].xiawu4 = week[j].name
                     }
                    //周五晚上
                     if( week[j].schedule_week == 5 && week[j].schedule_type == 3){
-                        list[i].晚上4 = week[j].name
+                        list[i].wanshang4 = week[j].name
                     }
                    //周六上午
                     if( week[j].schedule_week == 6&& week[j].schedule_type == 1){
-                        list[i].上午5 = week[j].name
+                        list[i].shangwu5 = week[j].name
                     }
                    //周六下午
                    if( week[j].schedule_week ==6 && week[j].schedule_type == 2){
-                        list[i].下午5 = week[j].name
+                        list[i].xiawu5 = week[j].name
                     }
                    //周六晚上
                    if( week[j].schedule_week == 6 && week[j].schedule_type == 3){
-                        list[i].晚上5 = week[j].name
+                        list[i].wanshang5 = week[j].name
                     }
                    //周日上午
                     if( week[j].schedule_week ==7&& week[j].schedule_type == 1){
-                        list[i].上午6 = week[j].name
+                        list[i].shangwu6 = week[j].name
                     }
                    //周日下午
                     if( week[j].schedule_week ==7 && week[j].schedule_type == 2){
-                        list[i].下午6 = week[j].name
+                        list[i].xiawu6 = week[j].name
                     }
                    //周日晚上
                    if( week[j].schedule_week == 7 && week[j].schedule_type == 3){
-                        list[i].晚上6 = week[j].name
+                        list[i].wanshang6 = week[j].name
                     }
                   }
 
@@ -2236,94 +2330,94 @@
                  if(list[i].机号 == nextWeek[j].number ){
                   //周一
                    if( nextWeek[j].schedule_week ==1&& nextWeek[j].schedule_type == 1){
-                        list[i].上午7 = nextWeek[j].name
+                        list[i].shangwu7 = nextWeek[j].name
                     }
                    //周一下午
                     if( nextWeek[j].schedule_week ==1 && nextWeek[j].schedule_type == 2){
-                        list[i].下午7 = nextWeek[j].name
+                        list[i].xiawu7 = nextWeek[j].name
                     }
                    //周一晚上
                    if( nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上7 = nextWeek[j].name
+                        list[i].wanshang7 = nextWeek[j].name
                     }
 
 
                    //周二上午
                    if( nextWeek[j].schedule_week ==2&& nextWeek[j].schedule_type == 1){
-                        list[i].上午8 = nextWeek[j].name
+                        list[i].shangwu8 = nextWeek[j].name
                     }
                    //周二下午
                     if( nextWeek[j].schedule_week ==2 && nextWeek[j].schedule_type == 2){
-                        list[i].下午8 = nextWeek[j].name
+                        list[i].xiawu8 = nextWeek[j].name
                     }
                    //周二晚上
                    if( nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上8  = nextWeek[j].name
+                        list[i].wanshang8  = nextWeek[j].name
                     }
 
                   //周三上午
                    if( nextWeek[j].schedule_week ==3&& nextWeek[j].schedule_type == 1){
-                        list[i].上午9 = nextWeek[j].name
+                        list[i].shangwu9 = nextWeek[j].name
                     }
                    //周三下午
                     if( nextWeek[j].schedule_week ==3 && nextWeek[j].schedule_type == 2){
-                        list[i].下午9 = nextWeek[j].name
+                        list[i].xiawu9 = nextWeek[j].name
                     }
                    //周三晚上
                    if( nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上9  = nextWeek[j].name
+                        list[i].wanshang9  = nextWeek[j].name
                     }
 
                    //周四上午
                    if( nextWeek[j].schedule_week ==4&& nextWeek[j].schedule_type == 1){
-                        list[i].上午10 = nextWeek[j].name
+                        list[i].shangwu10 = nextWeek[j].name
                     }
                    //周四下午
                     if( nextWeek[j].schedule_week ==4 && nextWeek[j].schedule_type == 2){
-                        list[i].下午10 = nextWeek[j].name
+                        list[i].xiawu10 = nextWeek[j].name
                     }
                    //周四晚上
                    if( nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上10  = nextWeek[j].name
+                        list[i].wanshang10  = nextWeek[j].name
                     }
 
                     //周五上午
                    if( nextWeek[j].schedule_week ==5&& nextWeek[j].schedule_type == 1){
-                        list[i].上午11 = nextWeek[j].name
+                        list[i].shangwu11 = nextWeek[j].name
                     }
                    //周五下午
                     if( nextWeek[j].schedule_week ==5 && nextWeek[j].schedule_type == 2){
-                        list[i].下午11 = nextWeek[j].name
+                        list[i].xiawu11 = nextWeek[j].name
                     }
                    //周五晚上
                    if( nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上11  = nextWeek[j].name
+                        list[i].wanshang11  = nextWeek[j].name
                     }
 
                   //周六上午
                    if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
-                        list[i].上午12 = nextWeek[j].name
+                        list[i].shangwu12 = nextWeek[j].name
                     }
                    //周六下午
                     if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
-                        list[i].下午12 = nextWeek[j].name
+                        list[i].xiawu12 = nextWeek[j].name
                     }
                    //周六晚上
                    if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上12  = nextWeek[j].name
+                        list[i].wanshang12  = nextWeek[j].name
                     }
 
                   //周日上午
                    if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 1){
-                        list[i].上午13 = nextWeek[j].name
+                        list[i].shangwu13 = nextWeek[j].name
                     }
                    //周日下午
                     if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 2){
-                        list[i].下午13 = nextWeek[j].name
+                        list[i].xiawu13 = nextWeek[j].name
                     }
                    //周日晚上
                    if( nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3){
-                        list[i].晚上13  = nextWeek[j].name
+                        list[i].wanshang13  = nextWeek[j].name
                     }
                   }
 
@@ -2339,94 +2433,94 @@
                    if(list[i].机号 == lastWeek[j].number ){
                      //周一
                     if( lastWeek[j].schedule_week ==1&& lastWeek[j].schedule_type == 1){
-                          list[i].上午14 = lastWeek[j].name
+                          list[i].shangwu14 = lastWeek[j].name
                       }
                     //周一下午
                       if( lastWeek[j].schedule_week ==1 && lastWeek[j].schedule_type == 2){
-                          list[i].下午14 = lastWeek[j].name
+                          list[i].xiawu14 = lastWeek[j].name
                       }
                     //周一晚上
                     if( lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上14 = lastWeek[j].name
+                          list[i].wanshang14 = lastWeek[j].name
                      }
 
                     //周二
                     if( lastWeek[j].schedule_week ==2&& lastWeek[j].schedule_type == 1){
-                          list[i].上午15 = lastWeek[j].name
+                          list[i].shangwu15 = lastWeek[j].name
                       }
                     //周二下午
                       if( lastWeek[j].schedule_week ==2 && lastWeek[j].schedule_type == 2){
-                          list[i].下午15 = lastWeek[j].name
+                          list[i].xiawu15 = lastWeek[j].name
                       }
                     //周二晚上
                     if( lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上15 = lastWeek[j].name
+                          list[i].wanshang15 = lastWeek[j].name
                       }
 
                     //周三
                     if( lastWeek[j].schedule_week ==3&& lastWeek[j].schedule_type == 1){
-                          list[i].上午16 = lastWeek[j].name
+                          list[i].shangwu16 = lastWeek[j].name
                       }
                     //周三下午
                       if( lastWeek[j].schedule_week ==3 && lastWeek[j].schedule_type == 2){
-                          list[i].下午16 = lastWeek[j].name
+                          list[i].xiawu16 = lastWeek[j].name
                       }
                     //周三晚上
                     if( lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上16 = lastWeek[j].name
+                          list[i].wanshang16 = lastWeek[j].name
                      }
 
 
                      //周四
                     if( lastWeek[j].schedule_week ==4&& lastWeek[j].schedule_type == 1){
-                          list[i].上午17 = lastWeek[j].name
+                          list[i].shangwu17 = lastWeek[j].name
                       }
                     //周四下午
                       if( lastWeek[j].schedule_week ==4 && lastWeek[j].schedule_type == 2){
-                          list[i].下午17 = lastWeek[j].name
+                          list[i].xiawu17 = lastWeek[j].name
                       }
                     //周四晚上
                     if( lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上17 = lastWeek[j].name
+                          list[i].wanshang17 = lastWeek[j].name
                      }
 
                     //周五
                     if( lastWeek[j].schedule_week ==5&& lastWeek[j].schedule_type == 1){
-                          list[i].上午18 = lastWeek[j].name
+                          list[i].shangwu18 = lastWeek[j].name
                       }
                     //周五下午
                       if( lastWeek[j].schedule_week ==5 && lastWeek[j].schedule_type == 2){
-                          list[i].下午18 = lastWeek[j].name
+                          list[i].xiawu18 = lastWeek[j].name
                       }
                     //周五晚上
                     if( lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上18 = lastWeek[j].name
+                          list[i].wanshang18 = lastWeek[j].name
                      }
 
                     //周六
                     if( lastWeek[j].schedule_week ==6&& lastWeek[j].schedule_type == 1){
-                          list[i].上午19 = lastWeek[j].name
+                          list[i].shangwu19 = lastWeek[j].name
                       }
                     //周六下午
                       if( lastWeek[j].schedule_week ==6 && lastWeek[j].schedule_type == 2){
-                          list[i].下午19 = lastWeek[j].name
+                          list[i].xiawu19 = lastWeek[j].name
                       }
                     //周六晚上
                     if( lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上19 = lastWeek[j].name
+                          list[i].wanshang19 = lastWeek[j].name
                      }
 
                      //周日
                     if( lastWeek[j].schedule_week ==7&& lastWeek[j].schedule_type == 1){
-                          list[i].上午20 = lastWeek[j].name
+                          list[i].shangwu20 = lastWeek[j].name
                       }
                     //周日下午
                       if( lastWeek[j].schedule_week ==7 && lastWeek[j].schedule_type == 2){
-                          list[i].下午20 = lastWeek[j].name
+                          list[i].xiawu20 = lastWeek[j].name
                       }
                     //周日晚上
                     if( lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3){
-                          list[i].晚上20 = lastWeek[j].name
+                          list[i].wanshang20 = lastWeek[j].name
                      }
                    }
 

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -10,7 +10,7 @@
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
   </span>
     </el-dialog>
-    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick">
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
     </el-button>
   </div>
@@ -37,9 +37,8 @@
     },
     methods: {
       generateDate({ header, results }) {
-
-      
-
+        console.log("header",header)
+        console.log("results",results)
         this.excelData.header = header
         this.excelData.results = results
 
@@ -75,28 +74,29 @@
         document.getElementById('excel-upload-input').click()
       },
       handleClick(e) {
-        console.log("333",e.target.files)
+        
         const files = e.target.files
         const rawFile = files[0] // only use files[0]
-        console.log("rawFile333333333",rawFile)  
+        console.log("rawfiel",rawFile)
         if (!rawFile) 
         return
         this.upload(rawFile)
       },
       upload(rawFile) {
+        console.log("触发了吗")
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
-        
+        console.log("3333",this.beforeUpload)
         if (!this.beforeUpload) {
           this.readerData(rawFile)
           return
         }
         const before = this.beforeUpload(rawFile)
+        console.log("before",before)
         if (before) {
           this.readerData(rawFile)
         }
       },
       readerData(rawFile) {
-       
 
         this.loading = true
         return new Promise((resolve, reject) => {