Quellcode durchsuchen

订单管理回复交期调整

qymljy vor 9 Monaten
Ursprung
Commit
c03d98a7be
1 geänderte Dateien mit 34 neuen und 9 gelöschten Zeilen
  1. 34 9
      src/HDrpManagement/orderManage/details/tabs/confirmList.vue

+ 34 - 9
src/HDrpManagement/orderManage/details/tabs/confirmList.vue

@@ -535,9 +535,6 @@ export default {
     },
     /*获取节假日数据*/
     async holiday(now,date,days,type,sa_orderitemsid){
-      console.log(now)
-      console.log(date)
-      console.log(days)
       let dateNow = new Date(now)
       let dateNow1 = new Date(date)
       let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
@@ -559,9 +556,7 @@ export default {
         }
       })
       this.jsDay = res.total
-      console.log(this.jsDay)
       if (this.jsDay >0){
-        console.log('进入了嘛')
         const dateAdd = this.addDaysToDate(date, this.jsDay)
         this.holidayE(now,dateAdd.toISOString().split('T')[0],Number(this.jsDay),type,sa_orderitemsid)
       }else {
@@ -574,7 +569,6 @@ export default {
       }
     },
     async holidayE(now,date,days,type,sa_orderitemsid){
-      console.log('进入了嘛22222')
       let dateNow = new Date(now)
       let dateNow1 = new Date(date)
       let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
@@ -596,6 +590,40 @@ export default {
         }
       })
       this.jsYcDay = res.total - this.jsDay
+      if (this.jsYcDay >0){
+        const dateAdd = this.addDaysToDate(date, this.jsYcDay)
+        this.holidayS(now,dateAdd.toISOString().split('T')[0],Number(this.jsDay + this.jsYcDay),type,sa_orderitemsid)
+
+      }else {
+        if (type == '单'){
+          this.dayChange(date,days,sa_orderitemsid)
+        }else {
+          this.daysChange(date,this.value3)
+        }
+      }
+    },
+    async holidayS(now,date,days,type,sa_orderitemsid){
+      let dateNow = new Date(now)
+      let dateNow1 = new Date(date)
+      let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
+      let dateB = dateNow.getDate() > 10 ? dateNow.getDate() : '0' +  dateNow.getDate()
+      let monthE = (dateNow1.getMonth() + 1) > 10 ? dateNow1.getMonth() + 1 : '0' + (dateNow1.getMonth() + 1)
+      let dateE = dateNow1.getDate() > 10 ? dateNow1.getDate() : '0' +  dateNow1.getDate()
+      const res = await this.$api.requested({
+        id:20221215165504,
+        content:{
+          isExport: 0,
+          isnext: "0",
+          pageNumber: 1,
+          pageSize: 100,
+          where:{
+            begindate: monthB + '-' + dateB,
+            condition: "",
+            enddate: monthE + '-' + dateE
+          }
+        }
+      })
+      this.jsYcDay = res.total - (this.jsDay + this.jsYcDay)
       if (this.jsYcDay >0){
         const dateAdd = this.addDaysToDate(date, this.jsYcDay)
         if (type == '单'){
@@ -603,9 +631,7 @@ export default {
         }else {
           this.daysChange(dateAdd.toISOString().split('T')[0],this.value3)
         }
-
       }else {
-        console.log(date,'计算出来的日期')
         if (type == '单'){
           this.dayChange(date,days,sa_orderitemsid)
         }else {
@@ -634,7 +660,6 @@ export default {
           item.deliverydate = date
         }
       })
-      console.log(this.tableData,'22222')
       const res = await this.$api.requested({
         "id": 20221109093602,
         "content": {