调整有关pageSize为9999的接口

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -1464,7 +1464,8 @@ export default {
             this.http.post(this.port.manage.list, {
                 departmentId: -1,
                 pageIndex: 1,
-                pageSize: 99999
+                // pageSize: 99999
+                pageSize: -1
             },
             res => {
                 if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -809,7 +809,8 @@ export default {
       this.http.post('/user/getEmployeeList', {
         departmentId: -1,
         pageIndex: 1,
-        pageSize: 99999
+        // pageSize: 99999
+        pageSize: -1
       },
       res => {
           if (res.code == "ok") {
@@ -982,6 +983,9 @@ export default {
         } else if (this.ins == 1) {
           fName = "项目任务报表.xls";
           url += "/exportProjectTask";
+          if(this.taskTypeId != 'null' && this.taskTypeId != null && this.taskTypeId != '') {
+            sl.taskType = this.taskTypeId
+          }
         } else if (this.ins == 2) {
           fName = "项目成本报表.xls";
           url += "/exportAllProjectCost";
@@ -1497,8 +1501,9 @@ export default {
     // 加班情况获取项目
     getProjectListOvertime() {
         this.http.post('/project/getProjectPage', {
-                    pageIndex: 1,
-                    pageSize: 9999,
+            pageIndex: 1,
+            // pageSize: 9999,
+            pageSize: -1,
         },
         res => {
             if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -787,7 +787,8 @@ export default {
         this.http.post(this.port.manage.list, {
             departmentId: -1,
             pageIndex: 1,
-            pageSize: 99999
+            // pageSize: 99999
+            pageSize: -1
         },
         res => {
             if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -1300,7 +1300,8 @@ export default {
       this.http.post(this.port.manage.list, {
             departmentId: -1,
             pageIndex: 1,
-            pageSize: 99999
+            // pageSize: 99999
+            pageSize: -1
         },
         res => {
             if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -197,7 +197,8 @@
                 this.http.post(this.port.manage.list, {
                         departmentId: -1,
                         pageIndex: 1,
-                        pageSize: 99999
+                        // pageSize: 99999
+                        pageSize: -1
                     },
                     res => {
                         if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/project/custom_data.vue

@@ -140,7 +140,8 @@
                 this.http.post(this.port.manage.list, {
                         departmentId: -1,
                         pageIndex: 1,
-                        pageSize: 99999
+                        // pageSize: 99999
+                        pageSize: -1
                     },
                     res => {
                         if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/project/fileCenter.vue

@@ -360,7 +360,8 @@
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },
                 res => {
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -654,7 +654,8 @@ import { error } from 'dingtalk-jsapi';
                 this.http.post('/user/getEmployeeList', {
                     departmentId: '-1',
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },res =>{
                     if(res.code == 'ok') {
                         this.people = res.data.records

fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -1046,7 +1046,8 @@
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    pageSize: -1
+                    // pageSize: 99999
                 },
                 res => {
                     if (res.code == "ok") {
@@ -1342,7 +1343,8 @@
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },
                 res => {
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -144,6 +144,8 @@
                      </div>
                 </template>
             </el-table-column>
+            <el-table-column prop="projectMainName" label="主项目" sortable="custom" min-width="250">
+            </el-table-column>
             <el-table-column prop="inchargerName" label="负责人" sortable="custom" min-width="150">
                 <template slot-scope="scope">
                     <el-link type="primary" :underline="false" @click="showUser(scope.row.inchargerId)">{{scope.row.inchargerName}}</el-link>
@@ -1138,7 +1140,8 @@ a {
             getSupplierList() {
                 this.http.post('/provider-info/list', {
                     pageIndex: 1,
-                    pageSize: 999,
+                    // pageSize: 999,
+                    pageSize: -1,
                     keyword: ''
                 },
                 res => {
@@ -2552,7 +2555,8 @@ a {
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },
                 res => {
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -912,7 +912,8 @@ import { error } from 'dingtalk-jsapi';
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },
                 res => {
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -1649,7 +1649,8 @@ export default {
         {
           departmentId: -1,
           pageIndex: 1,
-          pageSize: 99999,
+          // pageSize: 99999,
+          pageSize: -1,
         },
         (res) => {
           if (res.code == "ok") {
@@ -1734,7 +1735,8 @@ export default {
         {
           departmentId: -1,
           pageIndex: 1,
-          pageSize: 99999,
+          // pageSize: 99999,
+          pageSize: -1,
           keyword: this.keyword,
         },
         (res) => {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -695,7 +695,8 @@
                 this.http.post(this.port.manage.list, {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 },
                 res => {
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -199,7 +199,8 @@
                 this.$axios.post("/user/getEmployeeList", {
                     departmentId: -1,
                     pageIndex: 1,
-                    pageSize: 99999
+                    // pageSize: 99999
+                    pageSize: -1
                 })
                 .then(res => {
                     if(res.code == "ok") {