瀏覽代碼

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

XMLWAN 4 年之前
父節點
當前提交
db78c375ff
共有 2 個文件被更改,包括 367 次插入175 次删除
  1. 213 171
      src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue
  2. 154 4
      src/xt_pages/workforce/appointment.vue

+ 213 - 171
src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue 查看文件

@@ -121,8 +121,8 @@
121 121
           pipeline_connection_desc: '',
122 122
           collator: '',
123 123
 
124
-          creater: 0,
125
-          modifier: 0,
124
+          creater: this.$store.getters.xt_user.user.id,
125
+          modifier: '',
126 126
           created_time: 0,
127 127
           updated_time: 0,
128 128
           check_time: 0,
@@ -133,27 +133,51 @@
133 133
       }
134 134
     }, methods: {
135 135
       show() {
136
+        console.log(this.double_check)
136 137
 
137 138
         this.isVisibility = true
138 139
         if (this.double_check.id > 0) {
139 140
 
140 141
           this.first_check_time = uParseTime(
141 142
             this.double_check.first_check_time,
142
-            '{y}-{m}-{d}  {h}:{i}'
143
+            '{y}-{m}-{d} {h}:{i}'
143 144
           ).split(' ')[1]
144 145
 
145
-          this.check_time = uParseTime(
146
-            this.double_check.check_time,
147
-            '{y}-{m}-{d}  {h}:{i}'
148
-          ).split(' ')[1]
146
+
147
+          if(this.$store.getters.xt_user.user.id == this.double_check.creater || this.double_check.modifier > 0){
148
+            if(this.double_check.modifier > 0){
149
+                this.check_time = uParseTime(
150
+                this.doubleReview.check_time,
151
+                  '{y}-{m}-{d} {h}:{i}'
152
+                ).split(' ')[1]
153
+                
154
+                console.log('真性感')
155
+            }
156
+            
157
+          }else if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
158
+            this.check_time = uParseTime(
159
+              new Date(),
160
+              '{y}-{m}-{d} {h}:{i}'
161
+            ).split(' ')[1]
162
+            this.doubleReview.modifier = this.$store.getters.xt_user.user.id
163
+          }
164
+          if(this.doubleReview.modifier == 0){
165
+            this.doubleReview.modifier = ""
166
+          }
167
+          console.log( this.first_check_time )
168
+          console.log( this.check_time )
169
+
149 170
 
150 171
         } else {
151 172
           var nowDate = new Date()
152 173
           var nowHours = nowDate.getHours()
153 174
           var nowMinutes = nowDate.getMinutes()
154
-          this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
175
+          if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
176
+            this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
177
+          }
155 178
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
156
-
179
+          console.log( this.first_check_time )
180
+          console.log( this.check_time )
157 181
 
158 182
         }
159 183
       },
@@ -175,8 +199,8 @@
175 199
         var first_time = new Date(first_check_time).getTime()
176 200
         var second_time = new Date(check_time).getTime()
177 201
 
178
-        this.doubleReview.creater = 400
179
-        this.doubleReview.modifier = 448
202
+
203
+
180 204
 
181 205
         if (first_time >= second_time) {
182 206
           this.$message.error('第一次核对时间不能大于或者等于第二次核对时间')
@@ -193,10 +217,9 @@
193 217
         ParamsQuery['record_date'] = this.record_date
194 218
         ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
195 219
         ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
196
-        ParamsQuery['creater'] = 400
197
-        ParamsQuery['modifier'] = 448
220
+        ParamsQuery['creater'] = this.doubleReview.creater
221
+        ParamsQuery['modifier'] = this.doubleReview.modifier
198 222
 
199
-        console.log(ParamsQuery)
200 223
 
201 224
         postDoubleCheck(ParamsQuery).then(response => {
202 225
           if (response.data.state == 0) {
@@ -222,10 +245,12 @@
222 245
               '{y}-{m}-{d}  {h}:{i}'
223 246
             ).split(' ')[1]
224 247
 
225
-            this.check_time = uParseTime(
226
-              this.doubleReview.check_time,
227
-              '{y}-{m}-{d}  {h}:{i}'
228
-            ).split(' ')[1]
248
+            // if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
249
+            //   this.check_time = uParseTime(
250
+            //     this.doubleReview.check_time,
251
+            //     '{y}-{m}-{d}  {h}:{i}'
252
+            //   ).split(' ')[1]
253
+            // }
229 254
 
230 255
             let doublecheck_resp = response.data.data.doubleCheck
231 256
             var doubleCheck = this.double_check
@@ -238,196 +263,201 @@
238 263
         })
239 264
 
240 265
       },
241
-      getFirstCheckDesc: function() {
242
-        if (
243
-          this.doubleReview.first_check_time > 0 &&
244
-          this.doubleReview.check_time > 0
245
-        ) {
246
-          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
247
-            let time = uParseTime(
248
-              this.doubleReview.first_check_time,
249
-              '{y}-{m}-{d}  {h}:{i}'
250
-            )
251
-            if (this.doubleReview.creater <= 0) {
252
-              return ''
253
-            }
266
+      getFirstCheckDesc: function () {
267
+        if(this.double_check.creater > 0){
268
+          if (
269
+            this.doubleReview.first_check_time > 0 &&
270
+            this.doubleReview.check_time > 0
271
+          ) {
272
+            if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
273
+              let time = uParseTime(
274
+                this.doubleReview.first_check_time,
275
+                "{y}-{m}-{d}  {h}:{i}:{s}"
276
+              );
277
+              if (this.doubleReview.creater <= 0) {
278
+                return "";
279
+              }
254 280
 
255
-            var desc = ''
256
-            if (
257
-              this.admin_users == null ||
258
-              typeof this.admin_users.length == 'undefined'
259
-            ) {
260
-              return ''
261
-            }
281
+              var desc = "";
282
+              if (
283
+                this.admin_users == null ||
284
+                typeof this.admin_users.length == "undefined"
285
+              ) {
286
+                return "";
287
+              }
262 288
 
263
-            var leng = this.admin_users.length
264
-            if (leng == 0) {
265
-              return ''
266
-            }
289
+              var leng = this.admin_users.length;
290
+              if (leng == 0) {
291
+                return "";
292
+              }
267 293
 
268
-            for (let index = 0; index < leng; index++) {
269
-              if (this.admin_users[index].id == this.doubleReview.creater) {
270
-                let name = this.admin_users[index].name
271
-                desc = '第一核对人员:' + name + ' 第一核对时间:' + time
294
+              for (let index = 0; index < leng; index++) {
295
+                if (this.admin_users[index].id == this.doubleReview.creater) {
296
+                  let name = this.admin_users[index].name;
297
+                  desc = "第一核对人员:" + name + " 第一核对时间:" + time;
298
+
299
+                  break;
300
+                }
301
+              }
302
+              return desc;
303
+            } else {
304
+              let time = uParseTime(
305
+                this.doubleReview.check_time,
306
+                "{y}-{m}-{d}  {h}:{i}:{s}"
307
+              );
308
+              if (this.doubleReview.modifier <= 0) {
309
+                return "";
310
+              }
272 311
 
273
-                break
312
+              var desc = "";
313
+              if (
314
+                this.admin_users == null ||
315
+                typeof this.admin_users.length == "undefined"
316
+              ) {
317
+                return "";
274 318
               }
319
+
320
+              var leng = this.admin_users.length;
321
+              if (leng == 0) {
322
+                return "";
323
+              }
324
+
325
+              for (let index = 0; index < leng; index++) {
326
+                if (this.admin_users[index].id == this.doubleReview.modifier) {
327
+                  let name = this.admin_users[index].name;
328
+                  desc = "第一核对人员:" + name + " 第一核对时间:" + time;
329
+
330
+                  break;
331
+                }
332
+              }
333
+              return desc;
275 334
             }
276
-            return desc
277 335
           } else {
278 336
             let time = uParseTime(
279
-              this.doubleReview.check_time,
280
-              '{y}-{m}-{d}  {h}:{i}'
281
-            )
282
-            if (this.doubleReview.modifier <= 0) {
283
-              return ''
337
+              this.doubleReview.first_check_time,
338
+              "{y}-{m}-{d}  {h}:{i}:{s}"
339
+            );
340
+            if (this.doubleReview.creater <= 0) {
341
+              return "";
284 342
             }
285 343
 
286
-            var desc = ''
344
+            var desc = "";
287 345
             if (
288 346
               this.admin_users == null ||
289
-              typeof this.admin_users.length == 'undefined'
347
+              typeof this.admin_users.length == "undefined"
290 348
             ) {
291
-              return ''
349
+              return "";
292 350
             }
293 351
 
294
-            var leng = this.admin_users.length
352
+            var leng = this.admin_users.length;
295 353
             if (leng == 0) {
296
-              return ''
354
+              return "";
297 355
             }
298 356
 
299 357
             for (let index = 0; index < leng; index++) {
300
-              if (this.admin_users[index].id == this.doubleReview.modifier) {
301
-                let name = this.admin_users[index].name
302
-                desc = '第一核对人员:' + name + ' 第一核对时间:' + time
358
+              if (this.admin_users[index].id == this.doubleReview.creater) {
359
+                let name = this.admin_users[index].name;
360
+                desc = "第一核对人员:" + name + " 第一核对时间:" + time;
303 361
 
304
-                break
362
+                break;
305 363
               }
306 364
             }
307
-            return desc
308
-          }
309
-        } else {
310
-          let time = uParseTime(
311
-            this.doubleReview.first_check_time,
312
-            '{y}-{m}-{d}  {h}:{i}'
313
-          )
314
-          if (this.doubleReview.creater <= 0) {
315
-            return ''
365
+            return desc;
316 366
           }
367
+        }
368
+      },
369
+      getScondCheckDesc: function () {
370
+        if(this.double_check.modifier > 0){
317 371
 
318
-          var desc = ''
319 372
           if (
320
-            this.admin_users == null ||
321
-            typeof this.admin_users.length == 'undefined'
373
+            this.doubleReview.first_check_time > 0 &&
374
+            this.doubleReview.check_time > 0 
322 375
           ) {
323
-            return ''
324
-          }
325
-
326
-          var leng = this.admin_users.length
327
-          if (leng == 0) {
328
-            return ''
329
-          }
330
-
331
-          for (let index = 0; index < leng; index++) {
332
-            if (this.admin_users[index].id == this.doubleReview.creater) {
333
-              let name = this.admin_users[index].name
334
-              desc = '第一核对人员:' + name + ' 第一核对时间:' + time
335
-
336
-              break
376
+            if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
377
+              let time = uParseTime(
378
+                this.doubleReview.check_time,
379
+                "{y}-{m}-{d} {h}:{i}:{s}"
380
+              );
381
+              if (this.doubleReview.modifier <= 0) {
382
+                return "";
383
+              }
384
+              var desc = "";
385
+              if (
386
+                this.admin_users == null ||
387
+                typeof this.admin_users.length == "undefined"
388
+              ) {
389
+                return desc;
390
+              }
391
+              var leng = this.admin_users.length;
392
+              if (leng == 0) {
393
+                return desc;
394
+              }
395
+              for (let index = 0; index < leng; index++) {
396
+                if (this.admin_users[index].id == this.doubleReview.modifier ) {
397
+                  let name = this.admin_users[index].name;
398
+                  desc = "第二核对人员:" + name + " 第二核对时间:" + time;
399
+                  break;
400
+                }
401
+              }
402
+              return desc;
403
+            } else {
404
+              let time = uParseTime(
405
+                this.doubleReview.first_check_time,
406
+                "{y}-{m}-{d} {h}:{i}:{s}"
407
+              );
408
+              if (this.doubleReview.creater <= 0) {
409
+                return "";
410
+              }
411
+              var desc = "";
412
+              if (
413
+                this.admin_users == null ||
414
+                typeof this.admin_users.length == "undefined"
415
+              ) {
416
+                return desc;
417
+              }
418
+              var leng = this.admin_users.length;
419
+              if (leng == 0) {
420
+                return desc;
421
+              }
422
+              for (let index = 0; index < leng; index++) {
423
+                if (this.admin_users[index].id == this.doubleReview.creater) {
424
+                  let name = this.admin_users[index].name;
425
+                  desc = "第二核对人员:" + name + " 第二核对时间:" + time;
426
+                  break;
427
+                }
428
+              }
429
+              return desc;
337 430
             }
338
-          }
339
-          return desc
340
-        }
341
-      },
342
-      getScondCheckDesc: function() {
343
-        if (
344
-          this.doubleReview.first_check_time > 0 &&
345
-          this.doubleReview.check_time > 0
346
-        ) {
347
-          if (this.doubleReview.first_check_time < this.doubleReview.check_time) {
431
+          } else {
348 432
             let time = uParseTime(
349 433
               this.doubleReview.check_time,
350
-              '{y}-{m}-{d} {h}:{i}'
351
-            )
434
+              "{y}-{m}-{d} {h}:{i}:{s}"
435
+            );
352 436
             if (this.doubleReview.modifier <= 0) {
353
-              return ''
437
+              return "";
354 438
             }
355
-            var desc = ''
439
+            var desc = "";
356 440
             if (
357 441
               this.admin_users == null ||
358
-              typeof this.admin_users.length == 'undefined'
442
+              typeof this.admin_users.length == "undefined"
359 443
             ) {
360
-              return desc
444
+              return desc;
361 445
             }
362
-            var leng = this.admin_users.length
446
+            var leng = this.admin_users.length;
363 447
             if (leng == 0) {
364
-              return desc
448
+              return desc;
365 449
             }
366 450
             for (let index = 0; index < leng; index++) {
367 451
               if (this.admin_users[index].id == this.doubleReview.modifier) {
368
-                let name = this.admin_users[index].name
369
-                desc = '第二核对人员:' + name + ' 第二核对时间:' + time
370
-                break
371
-              }
372
-            }
373
-            return desc
374
-          } else {
375
-            let time = uParseTime(
376
-              this.doubleReview.first_check_time,
377
-              '{y}-{m}-{d} {h}:{i}'
378
-            )
379
-            if (this.doubleReview.creater <= 0) {
380
-              return ''
381
-            }
382
-            var desc = ''
383
-            if (
384
-              this.admin_users == null ||
385
-              typeof this.admin_users.length == 'undefined'
386
-            ) {
387
-              return desc
388
-            }
389
-            var leng = this.admin_users.length
390
-            if (leng == 0) {
391
-              return desc
392
-            }
393
-            for (let index = 0; index < leng; index++) {
394
-              if (this.admin_users[index].id == this.doubleReview.creater) {
395
-                let name = this.admin_users[index].name
396
-                desc = '第二核对人员:' + name + ' 第二核对时间:' + time
397
-                break
452
+                let name = this.admin_users[index].name;
453
+                desc = "第二核对人员:" + name + " 第二核对时间:" + time;
454
+                break;
398 455
               }
399 456
             }
400
-            return desc
401
-          }
402
-        } else {
403
-          let time = uParseTime(
404
-            this.doubleReview.check_time,
405
-            '{y}-{m}-{d} {h}:{i}'
406
-          )
407
-          if (this.doubleReview.modifier <= 0) {
408
-            return ''
409
-          }
410
-          var desc = ''
411
-          if (
412
-            this.admin_users == null ||
413
-            typeof this.admin_users.length == 'undefined'
414
-          ) {
415
-            return desc
416
-          }
417
-          var leng = this.admin_users.length
418
-          if (leng == 0) {
419
-            return desc
420
-          }
421
-          for (let index = 0; index < leng; index++) {
422
-            if (this.admin_users[index].id == this.doubleReview.modifier) {
423
-              let name = this.admin_users[index].name
424
-              desc = '第二核对人员:' + name + ' 第二核对时间:' + time
425
-              break
426
-            }
457
+            return desc;
427 458
           }
428
-          return desc
429 459
         }
430
-      }
460
+      },
431 461
     },
432 462
 
433 463
     props: {
@@ -482,10 +512,18 @@
482 512
             '{y}-{m}-{d}  {h}:{i}'
483 513
           ).split(' ')[1]
484 514
 
485
-          this.check_time = uParseTime(
486
-            this.doubleReview.check_time,
487
-            '{y}-{m}-{d}  {h}:{i}'
488
-          ).split(' ')[1]
515
+          if(this.$store.getters.xt_user.user.id == this.double_check.creater || this.double_check.modifier > 0){
516
+            this.check_time = uParseTime(
517
+              this.doubleReview.check_time,
518
+              '{y}-{m}-{d}  {h}:{i}'
519
+            ).split(' ')[1]
520
+          }else if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
521
+            this.check_time = uParseTime(
522
+              new Date(),
523
+              '{y}-{m}-{d}  {h}:{i}'
524
+            ).split(' ')[1]
525
+            this.doubleReview.modifier = this.$store.getters.xt_user.user.id
526
+          }
489 527
 
490 528
         } else {
491 529
           this.dialysis_item_check = '1'
@@ -504,7 +542,9 @@
504 542
           var nowDay = nowDate.getDate()
505 543
           var nowHours = nowDate.getHours()
506 544
           var nowMinutes = nowDate.getMinutes()
507
-          this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
545
+          if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
546
+            this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
547
+          }
508 548
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
509 549
 
510 550
         }
@@ -521,7 +561,9 @@
521 561
       var nowDay = nowDate.getDate()
522 562
       var nowHours = nowDate.getHours()
523 563
       var nowMinutes = nowDate.getMinutes()
524
-      this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
564
+      if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
565
+        this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
566
+      }
525 567
       this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
526 568
 
527 569
     }

+ 154 - 4
src/xt_pages/workforce/appointment.vue 查看文件

@@ -504,77 +504,209 @@
504 504
         }
505 505
         if (results.length > 0) {
506 506
           var isHas_1 = headers.includes('区号')
507
+          console.log("1"+isHas_1)
507 508
           var isHas_2 = headers.includes('机号')
509
+          console.log("2"+isHas_2)
510
+
511
+
508 512
           var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
513
+          console.log("3"+isHas_3)
514
+
515
+
509 516
           var isHas_4 = headers.includes('')
517
+          console.log("4"+isHas_4)
518
+
519
+
510 520
           var isHas_5 = headers.includes('_1')
521
+          console.log("5"+isHas_5)
522
+
511 523
           var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
524
+          console.log("6"+isHas_6)
525
+
512 526
           var isHas_7 = headers.includes('_2')
527
+          console.log("7"+isHas_7)
528
+
513 529
           var isHas_8 = headers.includes('_3')
530
+          console.log("8"+isHas_8)
531
+
514 532
           var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
533
+          console.log("9"+isHas_9)
534
+
515 535
           var isHas_10 = headers.includes('_4')
536
+          console.log("10"+isHas_10)
537
+
516 538
           var isHas_11 = headers.includes('_5')
539
+          console.log("11"+isHas_11)
540
+
517 541
           var isHas_12 = headers.includes('周四'+"("+this.days[3]+")")
542
+          console.log("12"+isHas_12)
543
+
518 544
           var isHas_13 = headers.includes('_6')
545
+          console.log("13"+isHas_13)
546
+
519 547
           var isHas_14 = headers.includes('_7')
548
+          console.log("14"+isHas_14)
549
+
520 550
           var isHas_15 = headers.includes('周五'+"("+this.days[4]+")")
551
+          console.log("15"+isHas_15)
552
+
521 553
           var isHas_16 = headers.includes('_8')
554
+          console.log("16"+isHas_16)
555
+
522 556
 
523 557
           var isHas_17 = headers.includes('_9')
558
+          console.log("17"+isHas_17)
559
+
524 560
 
525 561
           var isHas_18 = headers.includes('周六'+"("+this.days[5]+")")
562
+          console.log("18"+isHas_18)
563
+
526 564
 
527 565
           var isHas_19 = headers.includes('_10')
566
+          console.log("19"+isHas_19)
567
+
528 568
 
529 569
           var isHas_20 = headers.includes('_11')
570
+          console.log("20"+isHas_20)
571
+
530 572
 
531 573
           var isHas_21 = headers.includes('周日'+"("+this.days[6]+")")
574
+          console.log("21"+isHas_21)
532 575
 
533 576
           var isHas_22 = headers.includes('_12')
577
+          console.log("22"+isHas_22)
578
+
534 579
           var isHas_23 = headers.includes('_13')
580
+          console.log("23"+isHas_23)
581
+
535 582
 
536 583
           var isHas_24 = headers.includes('周一'+"("+this.days[7]+")")
584
+          console.log("24"+isHas_24)
585
+
537 586
           var isHas_25 = headers.includes('_14')
587
+          console.log("25"+isHas_25)
588
+
538 589
           var isHas_26 = headers.includes('_15')
590
+          console.log("26"+isHas_26)
591
+
539 592
           var isHas_27 = headers.includes('周二'+"("+this.days[8]+")")
593
+          console.log("27"+isHas_27)
594
+
540 595
           var isHas_28 = headers.includes('_16')
596
+          console.log("28"+isHas_28)
597
+
541 598
           var isHas_29 = headers.includes('_17')
599
+          console.log("29"+isHas_29)
600
+
542 601
           var isHas_30 = headers.includes('周三'+"("+this.days[9]+")")
602
+          console.log("30"+isHas_30)
603
+
543 604
           var isHas_31 = headers.includes('_18')
605
+          console.log("31"+isHas_31)
606
+
544 607
           var isHas_32 = headers.includes('_19')
608
+          console.log("32"+isHas_32)
609
+
545 610
           var isHas_33 = headers.includes('周四'+"("+this.days[10]+")")
611
+          console.log("33"+isHas_33)
612
+
546 613
           var isHas_34 = headers.includes('_20')
614
+          console.log("34"+isHas_34)
615
+
547 616
           var isHas_35 = headers.includes('_21')
617
+          console.log("35"+isHas_35)
618
+
548 619
           var isHas_36 = headers.includes('周五'+"("+this.days[11]+")")
620
+          console.log("36"+isHas_36)
621
+
549 622
           var isHas_37 = headers.includes('_22')
623
+          console.log("37"+isHas_37)
624
+
550 625
           var isHas_38 = headers.includes('_23')
626
+          console.log("38"+isHas_38)
627
+
551 628
           var isHas_39 = headers.includes('周六'+"("+this.days[12]+")")
629
+          console.log("39"+isHas_39)
630
+
552 631
           var isHas_40 = headers.includes('_24')
632
+          console.log("40"+isHas_40)
633
+
553 634
           var isHas_41 = headers.includes('_25')
635
+          console.log("41"+isHas_41)
636
+
554 637
           var isHas_42 = headers.includes('周日'+"("+this.days[13]+")")
638
+          console.log("42"+isHas_42)
639
+
555 640
           var isHas_43 = headers.includes('_26')
641
+          console.log("43"+isHas_43)
642
+
556 643
           var isHas_44 = headers.includes('_27')
644
+          console.log("44"+isHas_44)
645
+
557 646
           var isHas_45 = headers.includes('周一'+"("+this.days[14]+")")
647
+          console.log("45"+isHas_45)
648
+
558 649
           var isHas_46 = headers.includes('_28')
650
+          console.log("46"+isHas_46)
651
+
559 652
           var isHas_47 = headers.includes('_29')
653
+          console.log("47"+isHas_47)
654
+
560 655
           var isHas_48 = headers.includes('周二'+"("+this.days[15]+")")
656
+          console.log("48"+isHas_48)
657
+
561 658
           var isHas_49 = headers.includes('_30')
659
+          console.log("49"+isHas_49)
660
+
562 661
           var isHas_50 = headers.includes('_31')
662
+          console.log("50"+isHas_50)
663
+
563 664
           var isHas_51 = headers.includes('周三'+"("+this.days[16]+")")
665
+          console.log("51"+isHas_51)
666
+
564 667
           var isHas_52 = headers.includes('_32')
668
+          console.log("52"+isHas_52)
669
+
565 670
           var isHas_53 = headers.includes('_33')
671
+          console.log("53"+isHas_53)
672
+
566 673
           var isHas_54 = headers.includes('周四'+"("+this.days[17]+")")
674
+          console.log("54"+isHas_54)
675
+
567 676
           var isHas_55 = headers.includes('_34')
677
+          console.log("55"+isHas_55)
678
+
568 679
           var isHas_56 = headers.includes('_35')
680
+          console.log("56"+isHas_56)
681
+
569 682
           var isHas_57 = headers.includes('周五'+"("+this.days[18]+")")
683
+          console.log("57"+isHas_57)
684
+
570 685
           var isHas_58 = headers.includes('_36')
686
+          console.log("58"+isHas_58)
687
+
571 688
           var isHas_59 = headers.includes('_37')
689
+          console.log("59"+isHas_59)
690
+
691
+
572 692
           var isHas_60 = headers.includes('周六'+"("+this.days[19]+")")
693
+          console.log("60"+isHas_60)
694
+
573 695
           var isHas_61 = headers.includes('_38')
696
+          console.log("61"+isHas_61)
697
+
574 698
           var isHas_62 = headers.includes('_39')
699
+          console.log("62"+isHas_62)
700
+
575 701
           var isHas_63 = headers.includes('周日'+"("+this.days[20]+")")
702
+          console.log("63"+isHas_63)
703
+
576 704
           var isHas_64 = headers.includes('_40')
705
+          console.log("64"+isHas_64)
706
+
577 707
           var isHas_65 = headers.includes('_41')
708
+          console.log("65"+isHas_65)
709
+
578 710
 
579 711
           if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
580 712
             isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
@@ -589,10 +721,14 @@
589 721
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
590 722
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
591 723
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
724
+
725
+            console.log("222222222")
726
+
592 727
             this.dialogVisible = true
593 728
             return
594 729
           }
595 730
         } else {
731
+          console.log("11111111")
596 732
 
597 733
           this.dialogVisible = true
598 734
           return
@@ -649,9 +785,15 @@
649 785
         }
650 786
 
651 787
 
788
+        console.log("number:")
789
+        console.log(total_device_number)
790
+        console.log("23121212:")
791
+        console.log(deviceNumber)
792
+
652 793
 
653 794
         for (let i = 0; i < deviceNumber.length; i++) {
654 795
           if (!total_device_number.includes(deviceNumber[i])) {
796
+            console.log("number:11111")
655 797
             is_device_number = false
656 798
           }
657 799
         }
@@ -713,6 +855,8 @@
713 855
 
714 856
         }
715 857
 
858
+        console.log(datas)
859
+
716 860
 
717 861
         let date_arr = []
718 862
         //校验文档是否规范
@@ -723,6 +867,8 @@
723 867
 
724 868
           if (datas[i].device_number_name == undefined) {
725 869
             console.log(datas[i].name)
870
+            console.log("number:222222")
871
+
726 872
             is_device_number = false
727 873
 
728 874
           }
@@ -788,16 +934,20 @@
788 934
           }
789 935
         }
790 936
 
937
+        console.log(is_system_zone)
938
+        console.log(is_device_number)
939
+        console.log(headers.length)
940
+
791 941
 
792 942
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
793 943
           this.dialogVisible = true
794 944
           return
795 945
         } else {
796 946
           if (is_exist_repeat) {
797
-          //   this.isExistRepeatVisible = true
798
-          //   return
799
-          // } else {
800
-            // this.exportVisible = true
947
+            this.isExistRepeatVisible = true
948
+            return
949
+          } else {
950
+            this.exportVisible = true
801 951
 
802 952
             this.$alert('您提交的排班信息已上传成功,系统正在执行导入,请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
803 953
               confirmButtonText: '确定',