Browse Source

Merge branch 'file-collect' into 'master'

经分bug修复

See merge request spfm/spfm-market-front!123
徐兴安 3 years ago
parent
commit
cd8846c74f
1 changed files with 15 additions and 11 deletions
  1. 15 11
      src/pages/main/collect/launch.vue

+ 15 - 11
src/pages/main/collect/launch.vue

@@ -531,14 +531,10 @@ export default {
     },
 
     //时间处理方法
-    formatDate(str) {
-      return str.replace(
-        /(?<=\/|-|\.|:|\b|T)\d{1}(?=\/|-|\.|:|\b|T)/g,
-        function ($1) {
-          return "0" + $1;
-        }
-      );
-    },
+    // formatDate(str) {
+    //     console.log(str)
+    //     return str.replace(/(?<=\/|-|\.|:|\b|T)\d{1}(?=\/|-|\.|:|\b|T)/g, "0$&");
+    // },
       async getReceiverList(){
           let a = window.sessionStorage.getItem('userInfo')
           if(this.infolist.receiverList){
@@ -560,10 +556,15 @@ export default {
       }
       let b = await this.getReceiverList()
         if(b!=false){
+
             const d = new Date();
-            let dates = this.formatDate(
-                d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate()
+            const month = d.getMonth()+1<10?'0'+(d.getMonth()+1):d.getMonth()+1;
+            const date = d.getDate()<10 ?'0'+(d.getDate()+1):d.getDate()
+            let dates = (
+                d.getFullYear() + "-" + month+ "-" + date
             );
+            console.log(dates)
+
             if (this.infolist.issuedTime < dates) {
                 this.$message.error("请选择正确截止时间");
             } else {
@@ -853,7 +854,10 @@ export default {
     handleSearch(data) {
       const d = new Date(data.issuedTime);
       if (data.issuedTime) {
-        data.issuedTime =this.formatDate(d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate())
+          const month = d.getMonth()+1<10?'0'+(d.getMonth()+1):d.getMonth()+1;
+          const Date = d.getDate()<10 ?'0'+(d.getDate()+1):d.getDate()
+        data.issuedTime =d.getFullYear() + "-" + month + "-" + Date;
+          console.log(data.issuedTime)
 
       }
       if (data != "reset") {