XMLWAN 4 år sedan
förälder
incheckning
e833ad6451

+ 19 - 6
src/xt_pages/stock/cancelStockOrder.vue Visa fil

199
     nowYear = nowDate.getFullYear();
199
     nowYear = nowDate.getFullYear();
200
     nowMonth = nowDate.getMonth() + 1;
200
     nowMonth = nowDate.getMonth() + 1;
201
     nowDay = nowDate.getDate();
201
     nowDay = nowDate.getDate();
202
-    this.start_time =
203
-      nowYear +
204
-      "-" +
205
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
206
-      "-" +
207
-      (nowDay < 10 ? "0" + nowDay : nowDay);
202
+    // this.start_time =
203
+    //   nowYear +
204
+    //   "-" +
205
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
206
+    //   "-" +
207
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
208
+    var date1 = new Date();
209
+    var date2 = new Date(date1);
210
+
211
+    //-30为30天前,+30可以获得30天后的日期
212
+    date2.setDate(date1.getDate() - 30);
213
+
214
+    //30天前(月份判断是否小于10,小于10的前面+0)
215
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
216
+      
217
+    //当前日期
218
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
208
 
219
 
220
+     this.start_time = agoDay
221
+     console.log("333333332222",this.start_time)
209
     this.GetCancelStock();
222
     this.GetCancelStock();
210
     this.GetConfigInfo();
223
     this.GetConfigInfo();
211
     this.fetchAllAdminUsers();
224
     this.fetchAllAdminUsers();

+ 20 - 6
src/xt_pages/stock/drugs/cancelDrugStockOrder.vue Visa fil

201
     nowYear = nowDate.getFullYear();
201
     nowYear = nowDate.getFullYear();
202
     nowMonth = nowDate.getMonth() + 1;
202
     nowMonth = nowDate.getMonth() + 1;
203
     nowDay = nowDate.getDate();
203
     nowDay = nowDate.getDate();
204
-    this.start_time =
205
-      nowYear +
206
-      "-" +
207
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
208
-      "-" +
209
-      (nowDay < 10 ? "0" + nowDay : nowDay);
204
+    // this.start_time =
205
+    //   nowYear +
206
+    //   "-" +
207
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
208
+    //   "-" +
209
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
210
+   
211
+    var date1 = new Date();
212
+    var date2 = new Date(date1);
213
+
214
+    //-30为30天前,+30可以获得30天后的日期
215
+    date2.setDate(date1.getDate() - 30);
216
+
217
+    //30天前(月份判断是否小于10,小于10的前面+0)
218
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
219
+      
220
+    //当前日期
221
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
210
 
222
 
223
+     this.start_time = agoDay
224
+     console.log("333333332222",this.start_time)
211
     this.GetCancelStock();
225
     this.GetCancelStock();
212
     this.GetConfigInfo();
226
     this.GetConfigInfo();
213
     this.fetchAllAdminUsers();
227
     this.fetchAllAdminUsers();

+ 20 - 6
src/xt_pages/stock/drugs/drugSalesReturnOrder.vue Visa fil

197
     nowYear = nowDate.getFullYear();
197
     nowYear = nowDate.getFullYear();
198
     nowMonth = nowDate.getMonth() + 1;
198
     nowMonth = nowDate.getMonth() + 1;
199
     nowDay = nowDate.getDate();
199
     nowDay = nowDate.getDate();
200
-    this.start_time =
201
-      nowYear +
202
-      "-" +
203
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
204
-      "-" +
205
-      (nowDay < 10 ? "0" + nowDay : nowDay);
200
+    // this.start_time =
201
+    //   nowYear +
202
+    //   "-" +
203
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
204
+    //   "-" +
205
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
206
+    
207
+    var date1 = new Date();
208
+    var date2 = new Date(date1);
209
+
210
+    //-30为30天前,+30可以获得30天后的日期
211
+    date2.setDate(date1.getDate() - 30);
212
+
213
+    //30天前(月份判断是否小于10,小于10的前面+0)
214
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
215
+      
216
+    //当前日期
217
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
206
 
218
 
219
+     this.start_time = agoDay
220
+     console.log("333333332222",this.start_time)
207
     this.GetSalesReturn();
221
     this.GetSalesReturn();
208
     this.GetConfigInfo();
222
     this.GetConfigInfo();
209
     this.fetchAllAdminUsers();
223
     this.fetchAllAdminUsers();

+ 20 - 7
src/xt_pages/stock/drugs/drugStockInOrder.vue Visa fil

315
     nowYear = nowDate.getFullYear();
315
     nowYear = nowDate.getFullYear();
316
     nowMonth = nowDate.getMonth() + 1;
316
     nowMonth = nowDate.getMonth() + 1;
317
     nowDay = nowDate.getDate();
317
     nowDay = nowDate.getDate();
318
-    this.start_time =
319
-      nowYear +
320
-      "-" +
321
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
322
-      "-" +
323
-      (nowDay < 10 ? "0" + nowDay : nowDay);
318
+    // this.start_time =
319
+    //   nowYear +
320
+    //   "-" +
321
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
322
+    //   "-" +
323
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
324
     
324
     
325
-   
325
+    var date1 = new Date();
326
+    var date2 = new Date(date1);
327
+
328
+    //-30为30天前,+30可以获得30天后的日期
329
+    date2.setDate(date1.getDate() - 30);
330
+
331
+    //30天前(月份判断是否小于10,小于10的前面+0)
332
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
333
+      
334
+    //当前日期
335
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
336
+
337
+     this.start_time = agoDay
338
+     console.log("333333332222",this.start_time)
326
     this.GetWarehouse();
339
     this.GetWarehouse();
327
     this.GetConfigInfo();
340
     this.GetConfigInfo();
328
     this.fetchAllAdminUsers();
341
     this.fetchAllAdminUsers();

+ 20 - 6
src/xt_pages/stock/drugs/drugStockOutOrder.vue Visa fil

379
     nowYear = nowDate.getFullYear();
379
     nowYear = nowDate.getFullYear();
380
     nowMonth = nowDate.getMonth() + 1;
380
     nowMonth = nowDate.getMonth() + 1;
381
     nowDay = nowDate.getDate();
381
     nowDay = nowDate.getDate();
382
-    this.start_time =
383
-      nowYear +
384
-      "-" +
385
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
386
-      "-" +
387
-      (nowDay < 10 ? "0" + nowDay : nowDay);
382
+    // this.start_time =
383
+    //   nowYear +
384
+    //   "-" +
385
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
386
+    //   "-" +
387
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
388
+       var date1 = new Date();
389
+    var date2 = new Date(date1);
390
+
391
+    //-30为30天前,+30可以获得30天后的日期
392
+    date2.setDate(date1.getDate() - 30);
393
+
394
+    //30天前(月份判断是否小于10,小于10的前面+0)
395
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
396
+      
397
+    //当前日期
398
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
399
+
400
+     this.start_time = agoDay
401
+     console.log("333333332222",this.start_time)
388
     this.GetWarehouseOut();
402
     this.GetWarehouseOut();
389
     this.GetConfigInfo();
403
     this.GetConfigInfo();
390
     this.fetchAllAdminUsers();
404
     this.fetchAllAdminUsers();

+ 20 - 6
src/xt_pages/stock/salesReturnOrder.vue Visa fil

198
     nowYear = nowDate.getFullYear();
198
     nowYear = nowDate.getFullYear();
199
     nowMonth = nowDate.getMonth() + 1;
199
     nowMonth = nowDate.getMonth() + 1;
200
     nowDay = nowDate.getDate();
200
     nowDay = nowDate.getDate();
201
-    this.start_time =
202
-      nowYear +
203
-      "-" +
204
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
205
-      "-" +
206
-      (nowDay < 10 ? "0" + nowDay : nowDay);
201
+    // this.start_time =
202
+    //   nowYear +
203
+    //   "-" +
204
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
205
+    //   "-" +
206
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
207
+    
208
+    var date1 = new Date();
209
+    var date2 = new Date(date1);
210
+
211
+    //-30为30天前,+30可以获得30天后的日期
212
+    date2.setDate(date1.getDate() - 30);
213
+
214
+    //30天前(月份判断是否小于10,小于10的前面+0)
215
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
216
+      
217
+    //当前日期
218
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
207
 
219
 
220
+     this.start_time = agoDay
221
+     console.log("333333332222",this.start_time)
208
     this.GetSalesReturn();
222
     this.GetSalesReturn();
209
     this.GetConfigInfo();
223
     this.GetConfigInfo();
210
     this.fetchAllAdminUsers();
224
     this.fetchAllAdminUsers();

+ 20 - 7
src/xt_pages/stock/stockInOrder.vue Visa fil

589
     nowYear = nowDate.getFullYear();
589
     nowYear = nowDate.getFullYear();
590
     nowMonth = nowDate.getMonth() + 1;
590
     nowMonth = nowDate.getMonth() + 1;
591
     nowDay = nowDate.getDate();
591
     nowDay = nowDate.getDate();
592
-    this.start_time =
593
-      nowYear +
594
-      "-" +
595
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
596
-      "-" +
597
-      (nowDay < 10 ? "0" + nowDay : nowDay);
592
+    // this.start_time =
593
+    //   nowYear +
594
+    //   "-" +
595
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
596
+    //   "-" +
597
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
598
      
598
      
599
+  
600
+    var date1 = new Date();
601
+    var date2 = new Date(date1);
599
 
602
 
603
+    //-30为30天前,+30可以获得30天后的日期
604
+    date2.setDate(date1.getDate() - 30);
600
 
605
 
601
-     
606
+    //30天前(月份判断是否小于10,小于10的前面+0)
607
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
608
+      
609
+    //当前日期
610
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
611
+
612
+     this.start_time = agoDay
613
+     console.log("333333332222",this.start_time)
602
 
614
 
603
       // this.warehousing_time =
615
       // this.warehousing_time =
604
       //   nowYear +
616
       //   nowYear +
741
         end_time: this.end_time,
753
         end_time: this.end_time,
742
         type: this.type
754
         type: this.type
743
       };
755
       };
756
+      console.log("parasm22222",Params)
744
       this.Warehouse.warehouseDate = [];
757
       this.Warehouse.warehouseDate = [];
745
       getWarehouseList(Params).then(response => {
758
       getWarehouseList(Params).then(response => {
746
         if (response.data.state == 0) {
759
         if (response.data.state == 0) {

+ 23 - 6
src/xt_pages/stock/stockOutOrder.vue Visa fil

551
     nowYear = nowDate.getFullYear();
551
     nowYear = nowDate.getFullYear();
552
     nowMonth = nowDate.getMonth() + 1;
552
     nowMonth = nowDate.getMonth() + 1;
553
     nowDay = nowDate.getDate();
553
     nowDay = nowDate.getDate();
554
-    this.start_time =
555
-      nowYear +
556
-      "-" +
557
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
558
-      "-" +
559
-      (nowDay < 10 ? "0" + nowDay : nowDay);
554
+
555
+
556
+      
557
+    var date1 = new Date();
558
+    var date2 = new Date(date1);
559
+
560
+    //-30为30天前,+30可以获得30天后的日期
561
+    date2.setDate(date1.getDate() - 30);
562
+
563
+    //30天前(月份判断是否小于10,小于10的前面+0)
564
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
565
+      
566
+    //当前日期
567
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
568
+
569
+     this.start_time = agoDay
570
+     console.log("333333332222",this.start_time)
571
+    // this.start_time =
572
+    //   nowYear +
573
+    //   "-" +
574
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
575
+    //   "-" +
576
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
560
     this.GetConfigInfo();
577
     this.GetConfigInfo();
561
     this.GetWarehouseOut();
578
     this.GetWarehouseOut();
562
    
579
    

+ 32 - 9
src/xt_pages/workforce/appointment.vue Visa fil

69
       <bread-crumb :crumbs="crumbs"></bread-crumb>
69
       <bread-crumb :crumbs="crumbs"></bread-crumb>
70
         <div style="display:flex;align-items:center">
70
         <div style="display:flex;align-items:center">
71
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
71
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
72
-          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
73
-            导出模版
74
-          </el-button> -->
75
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
72
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
76
             导出模版
73
             导出模版
77
           </el-button>
74
           </el-button>
75
+          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
76
+            导出模版
77
+          </el-button> -->
78
+         
78
           <el-button
79
           <el-button
79
             @click="generateLog()"
80
             @click="generateLog()"
80
             class="filter-item"
81
             class="filter-item"
504
 
505
 
505
             i++
506
             i++
506
           }
507
           }
508
+          console.log("listw22222222",list)
509
+            var data = []
510
+          // const data = this.formatJson(filterVal, this.tableList)
511
+        
512
+          this.tableList.map(item=>{
513
+            data.push(Object.values(item))
507
 
514
 
508
-          const data = this.formatJson(filterVal, list)
509
-          // console.log("data",data)
510
-
515
+          })
516
+          console.log("data",data)
517
+          
511
           const filename = '排班模版'
518
           const filename = '排班模版'
512
           excel.export_json_to_excel({
519
           excel.export_json_to_excel({
513
             multiHeader,
520
             multiHeader,
532
 
539
 
533
           var data = []
540
           var data = []
534
           console.log("33333",this.tableList)
541
           console.log("33333",this.tableList)
535
-
542
+         
536
          this.tableList.map(item=>{
543
          this.tableList.map(item=>{
537
            data.push(Object.values(item))
544
            data.push(Object.values(item))
538
 
545
 
549
 
556
 
550
         })
557
         })
551
       },
558
       },
559
+      // formatJson(filterVal, jsonData) {
560
+      //  return jsonData.map(v => filterVal.map(j => v[j]))
561
+      // },
562
+
552
       formatJson(filterVal, jsonData) {
563
       formatJson(filterVal, jsonData) {
553
-       return jsonData.map(v => filterVal.map(j => v[j]))
564
+        return jsonData.map(v =>
565
+          filterVal.map(j => {
566
+            console.log(v)
567
+            console.log(j)
568
+            console.log(v[j])
569
+
570
+            if (j === 'timestamp') {
571
+              return parseTime(v[j])
572
+            } else {
573
+              return v[j]
574
+            }
575
+          })
576
+        )
554
       },
577
       },
555
 
578
 
556
 
579