dev01 il y a 3 ans
Parent
commit
f5550c6516

+ 8 - 5
src/pages/egressDetails/index.jsx

@@ -125,8 +125,8 @@ class EgressDetails extends Component {
       });
   }
 
-  // 同意
-  agree() {
+  // 同意/驳回
+  agree(sta) {
     if (!this.state.opinion) {
       Taro.showToast({ title: "请填写审批意见", icon: "none" });
       return;
@@ -148,7 +148,9 @@ class EgressDetails extends Component {
               inquiryContent: "当前公出申请已修改,请重新审核",
             });
           } else {
-            this.examinePublicRelease(2);
+            sta === 2
+              ? this.examinePublicRelease(2)
+              : this.examinePublicRelease(0);
           }
           if (v.data) {
             let list = [];
@@ -511,7 +513,8 @@ class EgressDetails extends Component {
                       inquiryTitle: "提醒",
                       inquiryContent: "您确定要驳回此申请吗?",
                       inquiryFn: () => {
-                        this.examinePublicRelease(0);
+                        this.agree(0);
+                        // this.examinePublicRelease(0);
                       },
                     });
                   }}
@@ -531,7 +534,7 @@ class EgressDetails extends Component {
                       inquiryTitle: "提醒",
                       inquiryContent: "您确定要同意此申请吗?",
                       inquiryFn: () => {
-                        this.agree();
+                        this.agree(2);
                         // this.examinePublicRelease(2);
                       },
                     });

+ 6 - 1
src/pages/egressDetails/publicContent.jsx

@@ -307,7 +307,12 @@ class PublicContent extends Component {
     if (data.startTime && data.endTime) {
       let a = dayjs(data.startTime);
       let b = dayjs(data.endTime);
-      let num = b.diff(a, "day") + 1;
+      let num;
+      if (a.hour() <= b.hour()) {
+        num = b.diff(a, "day") + 1;
+      } else {
+        num = b.diff(a, "day") + 2;
+      }
       let strAdd = data.startTime;
       for (let i = 0; i < num; i++) {
         let time = dayjs(strAdd).add(i, "days").format("YYYY-MM-DD");