导出

src/xt_pages/stock/cancelStockOrder.vue

@@ -199,13 +199,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -201,13 +201,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+   
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugSalesReturnOrder.vue

@@ -197,13 +197,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -315,14 +315,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
     
-   
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -379,12 +379,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+       var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/salesReturnOrder.vue

@@ -198,13 +198,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/stockInOrder.vue

@@ -589,16 +589,28 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
      
+  
+    var date1 = new Date();
+    var date2 = new Date(date1);
 
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
 
-     
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
 
       // this.warehousing_time =
       //   nowYear +
@@ -741,6 +753,7 @@ export default {
         end_time: this.end_time,
         type: this.type
       };
+      console.log("parasm22222",Params)
       this.Warehouse.warehouseDate = [];
       getWarehouseList(Params).then(response => {
         if (response.data.state == 0) {

src/xt_pages/stock/stockOutOrder.vue

@@ -551,12 +551,29 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+
+      
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();
    

src/xt_pages/workforce/appointment.vue

@@ -69,12 +69,13 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
-          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-            导出模版
-          </el-button> -->
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button>
+          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
+            导出模版
+          </el-button> -->
+         
           <el-button
             @click="generateLog()"
             class="filter-item"
@@ -504,10 +505,16 @@
 
             i++
           }
+          console.log("listw22222222",list)
+            var data = []
+          // const data = this.formatJson(filterVal, this.tableList)
+        
+          this.tableList.map(item=>{
+            data.push(Object.values(item))
 
-          const data = this.formatJson(filterVal, list)
-          // console.log("data",data)
-
+          })
+          console.log("data",data)
+          
           const filename = '排班模版'
           excel.export_json_to_excel({
             multiHeader,
@@ -532,7 +539,7 @@
 
           var data = []
           console.log("33333",this.tableList)
-
+         
          this.tableList.map(item=>{
            data.push(Object.values(item))
 
@@ -549,8 +556,24 @@
 
         })
       },
+      // formatJson(filterVal, jsonData) {
+      //  return jsonData.map(v => filterVal.map(j => v[j]))
+      // },
+
       formatJson(filterVal, jsonData) {
-       return jsonData.map(v => filterVal.map(j => v[j]))
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            console.log(v)
+            console.log(j)
+            console.log(v[j])
+
+            if (j === 'timestamp') {
+              return parseTime(v[j])
+            } else {
+              return v[j]
+            }
+          })
+        )
       },