Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -219,7 +219,7 @@
           >批量打印</el-button
         >
       </template>
-      <template v-if="this.template_id == 27">
+      <!-- <template v-if="this.template_id == 27">
         <el-button
           size="small"
           icon="el-icon-printer"
@@ -228,7 +228,7 @@
           type="primary"
           >批量打印</el-button
         >
-      </template>
+      </template> -->
       <template v-if="this.template_id == 28">
         <el-button
           size="small"

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -88,6 +88,7 @@
        </el-select>
     </div>
     <el-table
+      v-loading="loading"
       :row-style="{ color: '#303133' }"
       :data="scheduleData"
       border
@@ -304,7 +305,8 @@ export default {
       zone:"",
       // zoneList:[{id:0,name:"全部"}],
       zoneList:[],
-      start_time:moment().week(moment().week() + 1).startOf('week').unix()
+      start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+      loading:false,
     };
   },
   watch: {
@@ -343,6 +345,7 @@ export default {
       }
      },
     getNextScheduleWeekDay() {
+       this.loading = true
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         // console.log("start",moment(start).unix())
@@ -375,6 +378,7 @@ export default {
         //   zone:str,
         //   record_date:this.getTime(now_time)
         // }
+
        const params = {
           start_time:next_monday,
           end_time:next_sunday,
@@ -387,6 +391,7 @@ export default {
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
+          this.loading = false
           var scheduleData = response.data.data.schedule;
           if(this.pre_status == 0){
               for(let i=0;i<scheduleData.length;i++){

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -17,7 +17,7 @@
     <div class="app-container" style="background-color: white;">
       <div id="print_content">
         <div class="print_main_content">
-          <div class="table_panel">
+          <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
             <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
              
 
@@ -234,7 +234,8 @@
         pre_status: 0,
         printObj: {},
         type: 1,
-        printDate: ''
+        printDate: '',
+        loading:false,
       }
     },
     components: {
@@ -261,11 +262,12 @@
           week_time: this.week_time,
           zone: this.zone
         }
-        console.log('params', params)
+      
+        this.loading = true
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
             var list = response.data.data.list
-  
+            this.loading = false
             for (let i = 0; i < list.length; i++) {
               list[i].sort = list[i].number.sort
             }