Browse Source

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

XMLWAN 1 year ago
parent
commit
2f0095e547

+ 2 - 2
src/xt_pages/dialysis/bloodPresssWatch.vue View File

219
           >批量打印</el-button
219
           >批量打印</el-button
220
         >
220
         >
221
       </template>
221
       </template>
222
-      <template v-if="this.template_id == 27">
222
+      <!-- <template v-if="this.template_id == 27">
223
         <el-button
223
         <el-button
224
           size="small"
224
           size="small"
225
           icon="el-icon-printer"
225
           icon="el-icon-printer"
228
           type="primary"
228
           type="primary"
229
           >批量打印</el-button
229
           >批量打印</el-button
230
         >
230
         >
231
-      </template>
231
+      </template> -->
232
       <template v-if="this.template_id == 28">
232
       <template v-if="this.template_id == 28">
233
         <el-button
233
         <el-button
234
           size="small"
234
           size="small"

+ 6 - 1
src/xt_pages/workforce/components/nextTableWeeks.vue View File

88
        </el-select>
88
        </el-select>
89
     </div>
89
     </div>
90
     <el-table
90
     <el-table
91
+      v-loading="loading"
91
       :row-style="{ color: '#303133' }"
92
       :row-style="{ color: '#303133' }"
92
       :data="scheduleData"
93
       :data="scheduleData"
93
       border
94
       border
304
       zone:"",
305
       zone:"",
305
       // zoneList:[{id:0,name:"全部"}],
306
       // zoneList:[{id:0,name:"全部"}],
306
       zoneList:[],
307
       zoneList:[],
307
-      start_time:moment().week(moment().week() + 1).startOf('week').unix()
308
+      start_time:moment().week(moment().week() + 1).startOf('week').unix(),
309
+      loading:false,
308
     };
310
     };
309
   },
311
   },
310
   watch: {
312
   watch: {
343
       }
345
       }
344
      },
346
      },
345
     getNextScheduleWeekDay() {
347
     getNextScheduleWeekDay() {
348
+       this.loading = true
346
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
349
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
347
         const end = moment().weekday(7).format('YYYY-MM-DD')
350
         const end = moment().weekday(7).format('YYYY-MM-DD')
348
         // console.log("start",moment(start).unix())
351
         // console.log("start",moment(start).unix())
375
         //   zone:str,
378
         //   zone:str,
376
         //   record_date:this.getTime(now_time)
379
         //   record_date:this.getTime(now_time)
377
         // }
380
         // }
381
+
378
        const params = {
382
        const params = {
379
           start_time:next_monday,
383
           start_time:next_monday,
380
           end_time:next_sunday,
384
           end_time:next_sunday,
387
       getNextScheduleWeekDay(params).then(response => {
391
       getNextScheduleWeekDay(params).then(response => {
388
         this.scheduleData = [];
392
         this.scheduleData = [];
389
         if (response.data.state == 1) {
393
         if (response.data.state == 1) {
394
+          this.loading = false
390
           var scheduleData = response.data.data.schedule;
395
           var scheduleData = response.data.data.schedule;
391
           if(this.pre_status == 0){
396
           if(this.pre_status == 0){
392
               for(let i=0;i<scheduleData.length;i++){
397
               for(let i=0;i<scheduleData.length;i++){

+ 6 - 4
src/xt_pages/workforce/remind_print_setting_one.vue View File

17
     <div class="app-container" style="background-color: white;">
17
     <div class="app-container" style="background-color: white;">
18
       <div id="print_content">
18
       <div id="print_content">
19
         <div class="print_main_content">
19
         <div class="print_main_content">
20
-          <div class="table_panel">
20
+          <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
21
             <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':''">
21
             <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':''">
22
              
22
              
23
 
23
 
234
         pre_status: 0,
234
         pre_status: 0,
235
         printObj: {},
235
         printObj: {},
236
         type: 1,
236
         type: 1,
237
-        printDate: ''
237
+        printDate: '',
238
+        loading:false,
238
       }
239
       }
239
     },
240
     },
240
     components: {
241
     components: {
261
           week_time: this.week_time,
262
           week_time: this.week_time,
262
           zone: this.zone
263
           zone: this.zone
263
         }
264
         }
264
-        console.log('params', params)
265
+      
266
+        this.loading = true
265
         getScheduleList(params).then(response => {
267
         getScheduleList(params).then(response => {
266
           if (response.data.state == 1) {
268
           if (response.data.state == 1) {
267
             var list = response.data.data.list
269
             var list = response.data.data.list
268
-  
270
+            this.loading = false
269
             for (let i = 0; i < list.length; i++) {
271
             for (let i = 0; i < list.length; i++) {
270
               list[i].sort = list[i].number.sort
272
               list[i].sort = list[i].number.sort
271
             }
273
             }