Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24" >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24)">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"

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

                   template_id == 20 ||
                   template_id == 21 ||
                   template_id == 22 ||
-                  template_id == 23)
+                  template_id == 23 ||
+                  template_id == 24)
             "
           >
             <template slot-scope="scope">
                 template_id != 20 &&
                 template_id != 21 &&
                 template_id != 22 &&
-                template_id != 23
+                template_id != 23 &&
+                template_id != 24
             "
           >
             <template slot-scope="scope">
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 "
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " width="92px" > 置换率(ml/min) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width='60'>置管口</td>
-                    <td width="340">
+                    <td width='50'>置管口</td>
+                    <td width="400">
                       <div>
                         <label-box :isChecked="predialysis.catheter.indexOf('干洁') > -1 ? true : false" showValue="干洁"></label-box>
-                        &nbsp;
+                        
                         <label-box :isChecked="predialysis.catheter.indexOf('红肿') > -1 ? true : false" showValue="红肿"></label-box>
-                        &nbsp;
+                        
                         <label-box :isChecked="predialysis.catheter.indexOf('分泌物') > -1 ? true : false" showValue="分泌物"></label-box>
-                        &nbsp;
+                        
                         <label-box :isChecked="predialysis.catheter.indexOf('渗血') > -1 ? true : false" showValue="渗血"></label-box>
-                        &nbsp;
+                        
                         <label-box :isChecked="predialysis.catheter.indexOf('陈旧性血痂') > -1 ? true : false" showValue="陈旧性血痂"></label-box>
+                        
+                        <label-box :isChecked="predialysis.catheter.indexOf('消毒') > -1 ? true : false" showValue="消毒"></label-box>
+                        
+                        <label-box :isChecked="predialysis.catheter.indexOf('用药') > -1 ? true : false" showValue="用药"></label-box>
                       </div>
                     </td>
                     <td width='70'>管腔外露</td>
                         </div>
                     </td>
                     <td width='10'>cm</td>
-                    <td width='60'>血流量</td>
+                    <td width='50'>血流量</td>
                     <td width="220">
                       <div>
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="干洁"></label-box>
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
                       </div>
                     </td>
-                    <td></td>
                   </tr>
                 </tbody>
               </table>
                 <table class="table-box">
                     <tbody>
                         <tr>
-                            <td width='80'>透析频率/周</td>
+                            <td width='100'>透析频率(次/周)</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}
                             <td width='60'>透析器</td>
                             <td width='120'>
                                 <div class="under-line">
-                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('透析器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0] : prescription.dialyzer_perfusion_apparatus.split(',')[1] : '' }}
+                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('透析器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0].slice(3) : prescription.dialyzer_perfusion_apparatus.split(',')[1].slice(3) : '' }}
                                 </div>
                             </td>
                             <td width='20'></td>
                             <td width='80'>灌流器</td>
                             <td width='120'>
                                 <div class="under-line">
-                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('灌流器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0] : prescription.dialyzer_perfusion_apparatus.split(',')[1] : '' }}
+                                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split(',')[0].indexOf('灌流器') > -1 ? prescription.dialyzer_perfusion_apparatus.split(',')[0].slice(3) : prescription.dialyzer_perfusion_apparatus.split(',')[1].slice(3) : '' }}
                                 </div>
                             </td>
                             <td></td>

src/xt_pages/medicalScheduling/index.vue

                         </el-table-column>
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
                             <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,1) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周二\n(' + weekDayArr[1] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,2) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周三\n(' + weekDayArr[2] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,2)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,3) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周四\n(' + weekDayArr[3] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,3)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,4) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周五\n(' + weekDayArr[4] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,4)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,5) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周六\n(' + weekDayArr[5] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,5)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,6) }}<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-table-column>
                         <el-table-column prop="name" :label="'周日\n(' + weekDayArr[6] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
-                                <div @click="hangdleClick(scope.row,scope.$index)">
+                                <div @click="hangdleClick(scope.row,scope.$index,6)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
                                         {{ getClass(scope.row.user_name,0) }}<i class="el-icon-arrow-down el-icon--right"></i>
                 }
             }) 
         },
-        hangdleClick(val,index){
+        hangdleClick(val,index,num){
          console.log("val",val)
          this.docobj = val
+         if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
+            this.$message.warning("过去日期不可以编辑")
+            return
+         }
         },
         clickThis(row, column, cell, event){
             // console.log("row",row)
                         }
                     }
                     let arr = [...newArr]
-                    console.log("arr=======",arr)
-                    this.doctorlist.map((item,index) => {
-                        if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                            arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: [],user_type:item.user_type})
-                        }
-                    })
+                    arr.sort(this.compare('admin_user_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
                     
-                    console.log("arr",arr)
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                        // console.log("arr",arr)
+                      }
+                    })
                     this.tableData = arr
         
                 
                         }
                     }
                     let arr = [...newArr]
-
-                    this.doctorlist.map((item,index) => {
-                        if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                        arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                        }
+                    arr.sort(this.compare('admin_user_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                        // console.log("arr",arr)
+                      }
                     })
-
-                    console.log(arr)
                     this.tableData = arr
                 }
             })
 
                     if(id == 0){
                         let arr = [...newArr]
-                        this.doctorlist.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
+                        this.doctorlist.forEach((item, index) => {
+                          if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
                         })
                         this.tableData = arr
                     }
                     if(id == 2){
                         let arr = [...newArr]
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
                         let newDoctor = []
                         this.doctorlist.map(item => {
-                            if(item.user_type == 2){
-                                newDoctor.push(item)
-                            }
+                        if (item.user_type == 2) {
+                            newDoctor.push(item)
+                        }
                         })
-                        newDoctor.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        newDoctor.map((item, index) => {
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
                         })
                         this.tableData = arr
                     }
                     if(id == 3){
                         let arr = [...newArr]
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
                         let newDoctor = []
                         this.doctorlist.map(item => {
-                            if(item.user_type == 3){
-                                newDoctor.push(item)
-                            }
+                        if (item.user_type == 3) {
+                            newDoctor.push(item)
+                        }
                         })
-                        newDoctor.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
+                        newDoctor.map((item, index) => {
+                        if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+                        
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
                         })
                         this.tableData = arr
                     }
                         this.tableData = newArr
                     }else{
                         let arr = [...newArr]
-                        this.doctorlist.map((item,index) => {
-                            if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                                arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                            }
-                        })
+                        arr.sort(this.compare('admin_user_id'))
+                        this.doctorlist.sort(this.compare('admin_user_id'))
+                        this.doctorlist.forEach((item, index) => {
+                          if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
                         
-            
-                        console.log(arr)
+                          }else{
+                            arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                            // console.log("arr",arr)
+                          }
+                        })
                         this.tableData = arr
                     }
                 }
                 })
               }
            })
-        }
+        },
+        compare(property){
+            return function(a,b){
+                var value1 = a[property];
+                var value2 = b[property];
+                return value1 - value2;
+            }
+        },
     },
     created(){
         //获取医护人员
     border-radius: 4px;
 }
 .classBox{
-    width:25%;
+    width:28%;
     height: 100%;
     border: 1px solid #EBEEF5;
     .classTitle{
         flex-direction: column;
         >div>p{
             line-height: 30px;
+            color: rgb(48, 49, 51);
         }
         .classMainBox{
             height: 350px;

src/xt_pages/medicalScheduling/medical_print.vue

                     list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
                   })
                   tempArr.push(staffList[i].user_name);
-                  console.log("temArr",tempArr)
-                  console.log("newARR",newArr)
                 } else {
                   for (let j = 0; j < newArr.length; j++) {
                     if (newArr[j].user_name == staffList[i].user_name) {
                 }
               }
               let arr = [...newArr]
-              console.log("arr====",arr)
-              this.doctorlist.map((item,index) => {
-                if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                  arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
-                }
+              arr.sort(this.compare('admin_user_id'))
+              this.doctorlist.sort(this.compare('admin_user_id'))
+              this.doctorlist.forEach((item, index) => {
+                if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
+              
+                }else{
+                  arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: []})
+                  // console.log("arr",arr)
+                }
               })
               this.tableData = arr
               
         var currentdate = year + seperator1 + month + seperator1 + strDate;
         return currentdate;
       },
-     unique(arr) { 
-        const res = new Map();
-        return arr.filter((arr) => !res.has(arr.admin_user_id) && res.set(arr.admin_user_id, 1))
-     },
+      compare(property){
+        return function(a,b){
+            var value1 = a[property];
+            var value2 = b[property];
+            return value1 - value2;
+        }
+      },
     },
     created(){
       var starttime =  this.$route.query.starttime