Browse Source

3月27日杨青

杨青 2 years ago
parent
commit
2d98f0b48f

+ 10 - 8
src/xt_pages/workforce/components/historyWeekTable.vue View File

@@ -7,8 +7,9 @@
7 7
             type="week"
8 8
             format="第 WW 周"
9 9
             placeholder="选择周"  
10
-            :picker-options="pickerBeginDateBefore"
10
+            :picker-options="{'firstDayOfWeek': 1}"
11 11
             @change="changeWeek"
12
+            :clearable="false"
12 13
         >
13 14
         <!-- "{'firstDayOfWeek': 1}" -->
14 15
         </el-date-picker>
@@ -547,11 +548,11 @@ export default {
547 548
   data() {
548 549
     return {
549 550
       // 禁选当前之后的日期
550
-      pickerBeginDateBefore: {
551
-        disabledDate(time) {
552
-          return time.getTime() > Date.now();
553
-        }
554
-      },
551
+      // pickerBeginDateBefore: {
552
+      //   disabledDate(time) {
553
+      //     return time.getTime() > Date.now();
554
+      //   }
555
+      // },
555 556
       tableContainHeight:null,
556 557
       value1:false,
557 558
       modename_value:true,
@@ -2836,9 +2837,10 @@ export default {
2836 2837
 
2837 2838
       this.newDay.push(this.start_time)
2838 2839
       this.newDay.push(this.end_time)
2839
-      
2840
+      this.scheduleZone=[]
2840 2841
       // this.$nextTick(() => {
2841
-        this.getSchedules()
2842
+        this.getAllZones()
2843
+        // this.getSchedules()
2842 2844
         // this.source_scheduleZone=[]
2843 2845
       // })
2844 2846
       

+ 2 - 0
src/xt_pages/workforce/components/template_schedule_dialog.vue View File

@@ -106,6 +106,7 @@ export default {
106 106
       this.visible = false;
107 107
     },
108 108
     saveAction: function() {
109
+      
109 110
       if (this.form.patient_id <= 0) {
110 111
         this.$message.error("请选择患者", 1500);
111 112
         return;
@@ -122,6 +123,7 @@ export default {
122 123
         this.form.time_type,
123 124
         this.form.device_number_id
124 125
       );
126
+      
125 127
     },
126 128
     cancelScheduleAction: function() {
127 129
       this.$emit(