Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/styles/index.scss

@@ -544,5 +544,6 @@ code {
   color: #3a8ee6;
 }
 .el-table__body tr > td:hover {
-  background-color: #409eff;
+  background-color: #409eff !important;
+  color: #fff !important;
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -111,7 +111,7 @@
               诊断：
               <div
                 class="under_line"
-                style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: pre-wrap;"
+                style="width: 740px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: unset;"
               >
                 {{ record.patient.diagnose }}
               </div>
@@ -705,46 +705,12 @@
                           class="under_line"
                           style="width: 150px;text-align: center"
                         >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 0"
-                            >&nbsp;/</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 1"
-                            >&nbsp;无肝素</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 2"
-                            >&nbsp;普通肝素</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 3"
-                            >&nbsp;低分子肝素</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 4"
-                            >&nbsp;阿加曲班</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 5"
-                            >&nbsp;枸橼酸钠</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 6"
-                            >&nbsp;低分子肝素钙</span
-                          >
-                          <span
-                            class="under-line"
-                            v-if="record.prescription.anticoagulant == 7"
-                            >&nbsp;低分子肝素钠</span
-                          >
+                          {{
+                            record.prescription &&
+                            record.prescription.anticoagulant_name
+                              ? record.prescription.anticoagulant_name
+                              : "/"
+                          }}
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
@@ -753,96 +719,48 @@
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          <span class="under-line">{{
+                          {{
+                            record.prescription &&
                             record.prescription.anticoagulant_shouji
                               ? record.prescription.anticoagulant_shouji
                               : "/"
-                          }}</span>
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '枸橼酸钠'
-                            "
-                            >mg</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '阿加曲班'
-                            "
-                            >mg</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '低分子肝素'
-                            "
-                            >iu</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '普通肝素'
-                            "
-                            >iu</span
-                          >
-                          <span
-                            v-if="record.prescription.anticoagulant == '无肝素'"
-                            >mg</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 6"
-                            >iu</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 7"
-                            >iu</span
-                          >
-                          &nbsp;
+                          }}
                         </div>
+                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         维持：
                         <div
+                          v-if="
+                            record.prescription &&
+                              record.prescription.anticoagulant == 1
+                          "
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          <span class="under-line"
-                            >&nbsp;{{
-                              record.prescription.anticoagulant_weichi
-                                ? record.prescription.anticoagulant_weichi
-                                : "/"
-                            }}</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '枸橼酸钠'
-                            "
-                            >ml/h</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '阿加曲班'
-                            "
-                            >mg/h</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '低分子肝素'
-                            "
-                            >iu/h</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '普通肝素'
-                            "
-                            >iu/h</span
-                          >
-                          <span
-                            v-if="record.prescription.anticoagulant == '无肝素'"
-                            >mg/h</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 6"
-                            >iu/h</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 7"
-                            >iu/h</span
-                          >
+                          {{
+                            record.prescription &&
+                            record.prescription.anticoagulant_weichi
+                              ? record.prescription.anticoagulant_weichi
+                              : "/"
+                          }}
                         </div>
+                        <div
+                          v-if="
+                            record.prescription &&
+                              record.prescription.anticoagulant != 1
+                          "
+                          class="under_line"
+                          style="width: 50px;text-align: center;"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.anticoagulant_weichi
+                              ? record.prescription.anticoagulant_weichi
+                              : 0
+                          }}
+                        </div>
+                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         总量：
@@ -850,48 +768,14 @@
                           class="under_line"
                           style="width: 50px;text-align: center;"
                         >
-                          <span class="under-line"
-                            >&nbsp;{{
-                              record.prescription.anticoagulant_zongliang
-                                ? record.prescription.anticoagulant_zongliang
-                                : "0"
-                            }}</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '枸橼酸钠'
-                            "
-                            >mg</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '阿加曲班'
-                            "
-                            >mg</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '低分子肝素'
-                            "
-                            >iu</span
-                          >
-                          <span
-                            v-if="
-                              record.prescription.anticoagulant == '普通肝素'
-                            "
-                            >iu</span
-                          >
-                          <span
-                            v-if="record.prescription.anticoagulant == '无肝素'"
-                            >mg</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 6"
-                            >iu</span
-                          >
-                          <span v-if="record.prescription.anticoagulant == 7"
-                            >iu</span
-                          >
+                          {{
+                            record.prescription &&
+                            record.prescription.anticoagulant_zongliang
+                              ? record.prescription.anticoagulant_zongliang
+                              : "/"
+                          }}
                         </div>
+                        lu
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         透析机号：
@@ -1434,7 +1318,7 @@
                       class="row"
                       style="padding: 2px 0;line-height:23px;display:flex;"
                     >
-                      <div class="inline_block" style="flex:1;">
+                      <!-- <div class="inline_block" style="flex:1;">
                         透析器凝血：
                         <div
                           class="under_line"
@@ -1447,7 +1331,7 @@
                               : "/"
                           }}
                         </div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex:1;">
                         内瘘：
                         <div
@@ -1508,6 +1392,21 @@
                         </div>
                         min
                       </div>
+                      <!-- 只是占位 -->
+                      <div class="inline_block" style="flex:1;visibility: hidden;">
+                        透析器凝血：
+                        <div
+                          class="under_line"
+                          style="width: 70px;text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.cruor
+                              ? record.assessment_after_dislysis.cruor
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                     </div>
 
                     <div
@@ -1586,7 +1485,24 @@
                         ml
                       </div>
                     </div>
-
+                    <div
+                      class="row"
+                      style="padding: 2px 0;line-height:23px;display:flex;"
+                    >
+                      <div class="inline_block" style="flex:1;">
+                        透析器凝血：
+                        <span
+                          style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.cruor
+                              ? record.assessment_after_dislysis.cruor
+                              : "/"
+                          }}
+                        </span>
+                      </div>
+                    </div>
                     <div
                       class="row"
                       style="padding: 2px 0;line-height:23px;display:flex;"
@@ -1616,7 +1532,7 @@
                         穿刺护士：
                         <div
                           class="under_line"
-                          style="width: 60px;text-align: center"
+                          style="width: 80px;text-align: center"
                         >
                           <span
                             v-if="
@@ -1656,7 +1572,7 @@
                         治疗护士：
                         <div
                           class="under_line"
-                          style="width: 60px;text-align: center"
+                          style="width: 80px;text-align: center"
                         >
                           <span
                             v-if="
@@ -1691,10 +1607,14 @@
                       </div>
                       <div class="inline_block" style="flex:1;">
                         核对人员：
-                        <div v-if="record.check">
+                        <div
+                          class="under_line"
+                          style="width: 80px;text-align: left"
+                          v-if="record.dialysis_order == null"
+                        ></div>
+                        <div v-if="record.check" class="under_line" style="width: 80px;text-align: left">
                           <div
-                            class="under_line"
-                            style="width: 60px;text-align: left"
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
                             v-if="
                               record.dialysis_order != null &&
                                 record.dialysis_order.start_nurse ==
@@ -1720,8 +1640,55 @@
                               style="height: 40px;"
                             />
                           </div>
+                          <div
+                            class="under_line"
+                            style="width: 80px;text-align: left"
+                            v-if="
+                              record.dialysis_order != null &&
+                                record.dialysis_order.start_nurse ==
+                                  record.check.modifier
+                            "
+                          >
+                            <span
+                              v-if="
+                                setAdminUserES(record.check, 'creater') == ''
+                              "
+                              >{{ getAdminUser(record.check, "creater") }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="setAdminUserES(record.check, 'creater')"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 80px;text-align: left"
+                            v-if="
+                              record.dialysis_order != null &&
+                                record.dialysis_order.start_nurse !=
+                                  record.check.modifier &&
+                                record.dialysis_order.start_nurse !=
+                                  record.check.creater
+                            "
+                          >
+                            <span
+                              v-if="
+                                setAdminUserES(record.check, 'creater') == ''
+                              "
+                              >{{ getAdminUser(record.check, "creater") }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="setAdminUserES(record.check, 'creater')"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                          </div>
                         </div>
-
                         <div
                           class="under_line"
                           style="width: 80px;text-align: left"
@@ -1732,7 +1699,7 @@
                         下机护士：
                         <div
                           class="under_line"
-                          style="width: 60px;text-align: center"
+                          style="width: 80px;text-align: center"
                         >
                           <span
                             v-if="

src/xt_pages/dialysis/details/NavIgation.vue

@@ -642,11 +642,11 @@ export default {
 }
 .redpoint {
   display: inline-block;
-  height: 30px;
-  width: 30px;
+  height: 26px;
+  width: 26px;
   line-height: 26px;
   text-align: center;
-  font-size: 0.8em;
+  font-size: 16px;
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;

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

@@ -1244,16 +1244,27 @@ export default {
 <style style="stylesheet/scss" lang="scss">
 .dialog_box .current-box-class .current-row > td {
   background: #6fb5fa;
-  color: white;
+  // color: #000;
   /* font-size: 12px; */
 }
 
 .dialog_box .current-box-class .current-row:hover > td {
   background: #6fb5fa;
-  color: white;
+  // color: white;
   /* font-size: 12px; */
 }
 .el-table__body-wrapper::-webkit-scrollbar {
   height: 20px;
 }
+.dialog_box .current-box-class .current-row{
+  background: #87ceff;
+}
+.dialog_box tr:hover > td {
+  background-color: #ecf5ff !important;
+  color: #3a8ee6;
+}
+.dialog_box tr > td:hover {
+  background-color: #409eff !important;
+  color: #fff !important;
+}
 </style>

src/xt_pages/user/components/PatientForm.vue

@@ -650,7 +650,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" align="right">
+          <el-col :span="24" align="right" class="newCol">
             <el-form-item>
               <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
               <el-button
@@ -1594,5 +1594,10 @@ export default {
 .el-select-dropdown {
   z-index: 998 !important;
 }
+.newCol{
+  position: fixed;
+  bottom: 0;
+  right: 50px;
+}
 </style>
 

src/xt_pages/workforce/components/tableWeeks.vue

@@ -144,7 +144,7 @@
 
     methods: {
       printAction(){
-        console.log("111111")
+        console.log("111111",this.week_type)
         this.$router.push({ path: '/schedule/remind/print?week_type=' + this.week_type })
 
       },

src/xt_pages/workforce/remind_print.vue

@@ -18,7 +18,7 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
-            <span class="main_title">{{day}}排班提醒</span>
+            <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span>
           </div>
           <div class="table_panel">
             <table class="table">
@@ -109,13 +109,14 @@
         td_4_width: '45%',
         modeOptions: null,
         anticoagulants_confit:null,
+        currentDate:''
       }
     },
     components: {
       BreadCrumb
     },
     created() {
-
+     this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
@@ -212,6 +213,55 @@
             break
         }
         return type_name
+      },
+      getCurrentDate: function () {
+        console.log(this.$route.query.week_type)
+        var myDate = new Date();
+        var year = myDate.getFullYear(); //年
+        var month = myDate.getMonth() + 1; //月
+        var day = myDate.getDate(); //日
+        var newday = myDate.getDay();
+        var days = parseInt(this.$route.query.week_type);
+        var dayNum = parseInt(this.$route.query.week_type);
+        switch(days) {
+          case 1:
+            days = '星期一';
+            break;
+          case 2:
+            days = '星期二';
+            break;
+          case 3:
+            days = '星期三';
+            break;
+          case 4:
+            days = '星期四';
+            break;
+          case 5:
+            days = '星期五';
+            break;
+          case 6:
+            days = '星期六';
+            break;
+          case 7:
+            days = '星期日';
+            break;
+        }
+        if(newday > dayNum){
+          let lastDay = day - (newday - dayNum)
+          console.log("lastDay1",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else if(newday < dayNum){
+          let lastDay = day + (dayNum - newday)
+          console.log("lastDay2",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else{
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          return str;
+        }
+        
+        
       }
     }
   }