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

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -7,8 +7,9 @@
             type="week"
             format="第 WW 周"
             placeholder="选择周"  
-            :picker-options="pickerBeginDateBefore"
+            :picker-options="{'firstDayOfWeek': 1}"
             @change="changeWeek"
+            :clearable="false"
         >
         <!-- "{'firstDayOfWeek': 1}" -->
         </el-date-picker>
@@ -547,11 +548,11 @@ export default {
   data() {
     return {
       // 禁选当前之后的日期
-      pickerBeginDateBefore: {
-        disabledDate(time) {
-          return time.getTime() > Date.now();
-        }
-      },
+      // pickerBeginDateBefore: {
+      //   disabledDate(time) {
+      //     return time.getTime() > Date.now();
+      //   }
+      // },
       tableContainHeight:null,
       value1:false,
       modename_value:true,
@@ -2836,9 +2837,10 @@ export default {
 
       this.newDay.push(this.start_time)
       this.newDay.push(this.end_time)
-      
+      this.scheduleZone=[]
       // this.$nextTick(() => {
-        this.getSchedules()
+        this.getAllZones()
+        // this.getSchedules()
         // this.source_scheduleZone=[]
       // })
       

src/xt_pages/workforce/components/template_schedule_dialog.vue

@@ -113,6 +113,7 @@ export default {
       this.visible = false;
     },
     saveAction: function() {
+
       if (this.form.patient_id <= 0) {
         this.$message.error("请选择患者", 1500);
         return;