Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/productOrderList.vue

@@ -84,7 +84,7 @@
   .superSearchLayer>div>span {
     margin: 0 15px 0 5px;
   }
-  
+
   .productQuerybottomLayer {
     overflow: auto;
     position: fixed;
@@ -322,7 +322,7 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
-    
+
   </div>
 </template>
 
@@ -394,7 +394,7 @@
               for (let i = 0; i < res.data.data.pageData.length; i++) {
                 res.data.data.pageData[i]["wxImage"] = "";
               }
-              this.list = res.data.data.pageData;      
+              this.list = res.data.data.pageData;
         this.list.forEach(element => {
           element.check = false
         });
@@ -543,7 +543,10 @@
       }
       if (this.msg.StartTime === "") {
         let nowDay = this.FormartDate(new Date());
-        this.msg.StartTime = nowDay;
+
+        let nowdays = new Date()
+        let Year = new Date().getFullYear()
+        this.msg.StartTime = Year+'-01-01';
       }
       this.getCompanyList();//公司
       this.getList();//产品列表