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

src/components/work/workManager.vue

@@ -281,6 +281,7 @@ export default {
     exportFile(){
       let msg = this.msg
       msg.EmpId = this.userInfo.EmployeeId
+      msg.IsAll = 0
       let fileName =  "【" + moment(new Date()).format("YYYY-MM-DD HH:mm:ss") + "】工作计划.xls";
       this.GetLocalFile("UserWork_GetUserWorkExportList", this.msg, fileName);
     },

src/components/work/workManager2.vue

@@ -266,6 +266,7 @@ export default {
     exportFile(){
       let msg = this.msg
       msg.EmpId = this.userInfo.EmployeeId
+      msg.IsAll = 1
       let fileName =  "【" + moment(new Date()).format("YYYY-MM-DD HH:mm:ss") + "】工作计划.xls";
       this.GetLocalFile("UserWork_GetUserWorkExportList", this.msg, fileName);
     },
@@ -285,7 +286,7 @@ export default {
           this.msg.et="";
       }
       this.apipost(
-        "user_post_GetWorkPageList",
+        "user_post_GetAllPageList",
         this.msg,
         res => {
           this.loading = false;