See999 4 年前
父节点
当前提交
05064cb5f7

+ 2 - 1
src/styles/index.scss 查看文件

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

+ 3 - 3
src/xt_pages/dialysis/details/NavIgation.vue 查看文件

@@ -642,11 +642,11 @@ export default {
642 642
 }
643 643
 .redpoint {
644 644
   display: inline-block;
645
-  height: 30px;
646
-  width: 30px;
645
+  height: 26px;
646
+  width: 26px;
647 647
   line-height: 26px;
648 648
   text-align: center;
649
-  font-size: 0.8em;
649
+  font-size: 16px;
650 650
   border-radius: 20px;
651 651
   color: #fff;
652 652
   background: #f56c6c;

+ 6 - 1
src/xt_pages/user/components/PatientForm.vue 查看文件

@@ -650,7 +650,7 @@
650 650
             </el-form-item>
651 651
           </el-col>
652 652
 
653
-          <el-col :span="24" align="right">
653
+          <el-col :span="24" align="right" class="newCol">
654 654
             <el-form-item>
655 655
               <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
656 656
               <el-button
@@ -1594,5 +1594,10 @@ export default {
1594 1594
 .el-select-dropdown {
1595 1595
   z-index: 998 !important;
1596 1596
 }
1597
+.newCol{
1598
+  position: fixed;
1599
+  bottom: 0;
1600
+  right: 50px;
1601
+}
1597 1602
 </style>
1598 1603
 

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue 查看文件

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

+ 52 - 2
src/xt_pages/workforce/remind_print.vue 查看文件

@@ -18,7 +18,7 @@
18 18
       <div id="print_content">
19 19
         <div class="print_main_content">
20 20
           <div class="order_title_panl">
21
-            <span class="main_title">{{day}}排班提醒</span>
21
+            <span class="main_title">{{day}}排班提醒({{ currentDate }})</span>
22 22
           </div>
23 23
           <div class="table_panel">
24 24
             <table class="table">
@@ -109,13 +109,14 @@
109 109
         td_4_width: '45%',
110 110
         modeOptions: null,
111 111
         anticoagulants_confit:null,
112
+        currentDate:''
112 113
       }
113 114
     },
114 115
     components: {
115 116
       BreadCrumb
116 117
     },
117 118
     created() {
118
-
119
+     this.currentDate = this.getCurrentDate()
119 120
       this.modeOptions = this.$store.getters.treatment_mode
120 121
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
121 122
       this.week_type = this.$route.query.week_type
@@ -212,6 +213,55 @@
212 213
             break
213 214
         }
214 215
         return type_name
216
+      },
217
+      getCurrentDate: function () {
218
+        console.log(this.$route.query.week_type)
219
+        var myDate = new Date();
220
+        var year = myDate.getFullYear(); //年
221
+        var month = myDate.getMonth() + 1; //月
222
+        var day = myDate.getDate(); //日
223
+        var newday = myDate.getDay();
224
+        var days = parseInt(this.$route.query.week_type);
225
+        var dayNum = parseInt(this.$route.query.week_type);
226
+        switch(days) {
227
+          case 1:
228
+            days = '星期一';
229
+            break;
230
+          case 2:
231
+            days = '星期二';
232
+            break;
233
+          case 3:
234
+            days = '星期三';
235
+            break;
236
+          case 4:
237
+            days = '星期四';
238
+            break;
239
+          case 5:
240
+            days = '星期五';
241
+            break;
242
+          case 6:
243
+            days = '星期六';
244
+            break;
245
+          case 7:
246
+            days = '星期日';
247
+            break;
248
+        }
249
+        if(newday > dayNum){
250
+          let lastDay = day - (newday - dayNum)
251
+          console.log("lastDay1",lastDay)
252
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
253
+          return str;
254
+        }else if(newday < dayNum){
255
+          let lastDay = day + (dayNum - newday)
256
+          console.log("lastDay2",lastDay)
257
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
258
+          return str;
259
+        }else{
260
+          var str = year + "年" + month + "月" + day + "日  " + days;
261
+          return str;
262
+        }
263
+        
264
+        
215 265
       }
216 266
     }
217 267
   }