Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/BusinessTripController.java

@@ -1,17 +1,30 @@
 package com.management.platform.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.BusinessTrip;
 import com.management.platform.entity.LeaveSheet;
+import com.management.platform.entity.TimeType;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessTripService;
+import com.management.platform.util.DockWithMLD;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>
@@ -31,6 +44,8 @@ public class BusinessTripController {
     BusinessTripService businessTripService;
     @Resource
     private HttpServletRequest request;
+    @Resource
+    private TimeTypeMapper timeTypeMapper;
 
 
 
@@ -97,5 +112,93 @@ public class BusinessTripController {
         String userId = request.getHeader("Token");
         return businessTripService.exportData(sheet,keyword, startDate, endDate, userId);
     }
+    @RequestMapping("/syncData")
+    public HttpRespMsg syncData(String startDate, String endDate){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        TimeType one = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId).eq("sync_fanwei", 1));
+        if(one==null){
+            msg.setError("暂无请假数据待同步");
+            return msg;
+        }
+        if (StringUtils.isEmpty(startDate)) {
+            msg.setError("开始时间不能为空");
+            return msg;
+        }
+        //时间跨度不能超过1个月
+        if (StringUtils.isEmpty(endDate)) {
+            msg.setError("结束时间不能为空");
+            return msg;
+        }
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate parse = LocalDate.parse(startDate, df);
+        LocalDate parse1 = LocalDate.parse(endDate, df);
+        long between = parse1.toEpochDay() - parse.toEpochDay();
+        if (between > 31) {
+            msg.setError("时间跨度不能超过1个月");
+            return msg;
+        }
+        JSONObject jsonObject=new JSONObject();
+        DateTimeFormatter dtf1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String date = startDate + " 00:00:00," + endDate + " 23:59:59";
+        jsonObject.put("gmtFinished",date);
+        String jsonString = jsonObject.toJSONString();
+        List<User> allUserList=userMapper.selectList(new QueryWrapper<User>().eq("company_id",companyId));
+        List<BusinessTrip> businessTripList=new ArrayList<>();
+        List<BusinessTrip> oldBusinessTripList = businessTripService.list(new QueryWrapper<BusinessTrip>().eq("company_id", companyId));
+        DockWithMLD dockWithMLD=new DockWithMLD();
+        HttpRespMsg travelRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getTravelRecord", jsonString);
+        List<Map<String,Object>> travelRecordList= (List<Map<String, Object>>) travelRecordMsg.data;
+        for (Map<String, Object> map : travelRecordList) {
+            Optional<User> optional=allUserList.stream().filter(al->al.getJobNumber()!=null&&al.getJobNumber().equals(map.get("rybh"))).findFirst();
+            if(!optional.isPresent()){
+                continue;
+            }
+            User user=optional.get();
+            BusinessTrip businessTrip=new BusinessTrip();
+            businessTrip.setCompanyId(user.getCompanyId());
+            businessTrip.setOwnerId(user.getId());
+            businessTrip.setOwnerName(user.getName());
+            businessTrip.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
+            businessTrip.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf1));
+            Integer way=null;
+            switch (String.valueOf(map.get("way"))){
+                case "飞机":way=0;
+                    break;
+                case "高铁/火车":way=1;
+                    break;
+                case "汽车":way=2;
+                    break;
+                case "轮船":way=3;
+                    break;
+                case "其他":way=4;
+                    break;
+            }
+            businessTrip.setWay(way);
+            businessTrip.setCityFrom((String) map.get("cityFrom"));
+            businessTrip.setCityTo((String) map.get("cityTo"));
+            Integer goBack=null;
+            switch (String.valueOf(map.get("goBack"))){
+                case "单程":goBack=0;
+                    break;
+                case "往返":goBack=1;
+                    break;
+            }
+            businessTrip.setGoBack(goBack);
+            Double dayCount =Double.valueOf(String.valueOf(map.get("dayCount")));
+            businessTrip.setDayCount(dayCount.intValue());
+            businessTrip.setProcinstId((String) map.get("id"));
+            businessTrip.setGmtFinished((String)map.get("gmtFinished"));
+            Optional<BusinessTrip> first = oldBusinessTripList.stream().filter(ol -> ol.getStartDate().isEqual(businessTrip.getStartDate())&&ol.getEndDate().isEqual(businessTrip.getEndDate())&& ol.getOwnerId().equals(businessTrip.getOwnerId())&&(ol.getProcinstId()!=null&& ol.getProcinstId().equals(businessTrip.getProcinstId()))).findFirst();
+            if(first.isPresent()){
+                businessTrip.setId(first.get().getId());
+            }
+            businessTripList.add(businessTrip);
+        }
+        if(businessTripList.size()>0){
+            businessTripService.saveOrUpdateBatch(businessTripList);
+        }
+        return msg;
+    }
 }
 

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/LeaveSheetController.java

@@ -15,6 +15,7 @@ import com.management.platform.service.DepartmentService;
 import com.management.platform.service.LeaveSheetService;
 import com.management.platform.util.DockWithMLD;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -160,7 +161,7 @@ public class LeaveSheetController {
     }
 
     @RequestMapping("/syncLeaveSheet")
-    public HttpRespMsg syncLeaveSheet(){
+    public HttpRespMsg syncLeaveSheet(String startDate, String endDate){
         HttpRespMsg msg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         TimeType one = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId).eq("sync_fanwei", 1));
@@ -168,11 +169,28 @@ public class LeaveSheetController {
             msg.setError("暂无请假数据待同步");
             return msg;
         }
+        if (StringUtils.isEmpty(startDate)) {
+            msg.setError("开始时间不能为空");
+            return msg;
+        }
+        //时间跨度不能超过1个月
+        if (StringUtils.isEmpty(endDate)) {
+            msg.setError("结束时间不能为空");
+            return msg;
+        }
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate parse = LocalDate.parse(startDate, df);
+        LocalDate parse1 = LocalDate.parse(endDate, df);
+        long between = parse1.toEpochDay() - parse.toEpochDay();
+        if (between > 31) {
+            msg.setError("时间跨度不能超过1个月");
+            return msg;
+        }
         DockWithMLD dockWithMLD=new DockWithMLD();
         JSONObject jsonObject=new JSONObject();
         DateTimeFormatter dtf1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String startDate = dtf1.format(LocalDateTime.now().withHour(0).withMinute(0).withSecond(0)) + "," + dtf1.format(LocalDateTime.now().withHour(23).withMinute(59).withSecond(59));
-        jsonObject.put("gmtFinished",startDate);
+        String date = startDate + " 00:00:00," + endDate + " 23:59:59";
+        jsonObject.put("gmtFinished",date);
         String jsonString = jsonObject.toJSONString();
         TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId));
         List<User> allUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskController.java

@@ -1491,7 +1491,7 @@ public class TaskController {
 
         //任务状态
         queryWrapper.eq("task.company_id", companyId);
-        if (viewId == 0 || viewId == 1 || viewId == 2) {
+        if ((viewId == 0 || viewId == 1 || viewId == 2) && status != -1) {
             if (status == 1 || status == 0) {
                 queryWrapper.eq("task.task_status", status);
             } else if (status == 2) {

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -4810,7 +4810,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (functionList.size() == 0) {
             //担任部门主要负责人
             if (user.getManageDeptId() != null && user.getManageDeptId() != 0) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("department_id", user.getManageDeptId()));
+                List<Integer> allMainManagedDeptIdList = departmentService.getAllMainManagedDeptIdList(user, departmentList);
+                List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("department_id", allMainManagedDeptIdList));
                 userIds = userList.stream().map(User::getId).collect(Collectors.toList());
             }
             //检查是否是项目负责人
@@ -4917,6 +4918,73 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                 }
 
+                QueryWrapper<LeaveSheet> lsQueryWrapper=new QueryWrapper();
+                lsQueryWrapper.in("owner_id", userIds);
+                if (startDate != null && endDate != null) {
+                    lsQueryWrapper.le("start_date", endDate).ge("end_date", startDate);
+                }
+                List<LeaveSheet> leaveSheetList = leaveSheetMapper.selectList(lsQueryWrapper);
+                for(int i=0;i<leaveSheetList.size();i++){
+                    GanttDataItem curItem = new GanttDataItem();;
+                    if (!leaveSheetList.get(i).getOwnerId().equals(lsLastItemId)) {
+                        //抽取父级对象，人员名称
+                        int finalI = i;
+                        Optional<User> first = AllUser.stream().filter(us -> us.getId().equals(leaveSheetList.get(finalI).getOwnerId())).findFirst();
+                        Integer departmentId =null;
+                        if(first.isPresent()){
+                            departmentId=first.get().getDepartmentId();
+                        }
+                        GanttDataItem parent = new GanttDataItem();
+                        parent.id = leaveSheetList.get(i).getOwnerId();
+                        parent.userId = leaveSheetList.get(i).getOwnerId();
+                        parent.text = leaveSheetList.get(i).getOwnerName();
+                        parent.render = "split";
+                        parent.start_date = leaveSheetList.get(i).getStartDate().toString();
+                        parent.end_date = leaveSheetList.get(i).getEndDate().toString();
+                        parent.time = 0.0;
+                        parent.parent=String.valueOf(departmentId);
+                        parent.setObjType(0);
+                        itemList.add(parent);
+                        lsLastItemId =leaveSheetList.get(i).getOwnerId();
+                    }
+                    curItem.id = "请假_"+leaveSheetList.get(i).getId();
+                    curItem.userId = leaveSheetList.get(i).getOwnerId();
+                    switch (leaveSheetList.get(i).getLeaveType()){
+                        //case 0:curItem.text = "事假";
+                        case 0:curItem.text = MessageUtils.message("leave.thing");
+                            break;
+                        //case 1:curItem.text = "病假";
+                        case 1:curItem.text = MessageUtils.message("leave.illness");
+                            break;
+                        //case 2:curItem.text = "年假";
+                        case 2:curItem.text = MessageUtils.message("leave.year");
+                            break;
+                        //case 3:curItem.text = "产假";
+                        case 3:curItem.text = MessageUtils.message("leave.maternity");
+                            break;
+                        //case 4:curItem.text = "婚假";
+                        case 4:curItem.text = MessageUtils.message("leave.marry");
+                            break;
+                        //case 5:curItem.text = "丧假";
+                        case 5:curItem.text = MessageUtils.message("leave.die");
+                            break;
+                        //case 6:curItem.text = "调休假";
+                        case 6:curItem.text = MessageUtils.message("leave.compensatory");
+                            break;
+                        //case 7:curItem.text = "陪产假";
+                        case 7:curItem.text = MessageUtils.message("leave.paternity");
+                            break;
+                        //case 8:curItem.text = "其他";
+                        case 8:curItem.text = MessageUtils.message("leave.other");
+                            break;
+                    }
+                    curItem.start_date = leaveSheetList.get(i).getStartDate().toString();
+                    curItem.end_date =leaveSheetList.get(i).getEndDate().toString();
+                    curItem.parent = lsLastItemId;
+                    itemList.add(curItem);
+                    lsLastItemId = leaveSheetList.get(i).getOwnerId();
+                }
+
                 for(int i=0;i<businessTripList.size();i++){
                     GanttDataItem curItem = new GanttDataItem();;
                     if (!businessTripList.get(i).getOwnerId().equals(btLastItemId)) {
@@ -4990,6 +5058,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 if (startDate != null && endDate != null) {
                     bpQueryWrapper.le("start_date", endDate).ge("end_date", startDate);
                 }
+
                 List<Integer> btIdList=new ArrayList<>();
                 List<BusinessTrip> businessTripList = businessTripMapper.selectList(btQueryWrapper);
                 if(businessTripList.size()>0){
@@ -5057,6 +5126,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //String exeId = "任务_"+map.get("task_id") +"_"+ (type==0?(Integer) map.get("exe_id"):userId);
                 String exeId = MessageUtils.message("excel.task") + "_"+map.get("task_id") +"_"+ (type==0?(Integer) map.get("exe_id"):userId);
                 String taskId = ""+ (Integer) map.get("task_id");
+                //跳过重叠的请假任务
+                boolean findMatch = itemList.stream().anyMatch(item->{
+                    if (item.id.startsWith("请假_") && userId.equals(item.userId)) {
+                        String trimStartDate = start_date.substring(0, "yyyy-MM-dd".length());
+                        String trimEndDate = end_date.substring(0, "yyyy-MM-dd".length());
+                        if (trimStartDate.equals(item.start_date) && trimEndDate.equals(item.end_date)) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
+                if (findMatch) {
+                    continue;
+                }
+
 
                 GanttDataItem curItem = new GanttDataItem();;
                 if (type == 0) {

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_mld_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/application-mld.yml

@@ -13,7 +13,7 @@ spring:
       max-request-size: 100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
+    url: jdbc:mysql://127.0.0.1:17089/man_mld_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
     username: root
     password: P011430@Huoshi*
     hikari:

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.94.62.58:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+    url: jdbc:mysql://1.94.62.58:17089/man_mld_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: P011430@Huoshi*
     hikari:

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -391,7 +391,7 @@
         </template>
         
         <template>
-            <el-button type="primary" @click="submitInsert()" :loading="addLoading" v-if="addForm.id == null || canEditTask">
+            <el-button type="primary" @click="submitInsert()" :loading="addLoading">
                 提交
             </el-button>
             <!--对于需要审核的情况-->

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

@@ -212,6 +212,9 @@
                     <div style="margin: 0 0 0 20px" v-if="userComLis.dingdingUserid != null">
                         <el-button size="small" type="primary" @click="dingdingListExport()" >{{ $t('export.export') }}</el-button>
                     </div>
+                    <div style="margin: 0 0 0 20px" >
+                        <el-button size="small" type="primary" @click="syncData()" :loading="syncLoading">同步出差数据</el-button>
+                    </div>
                 </div>
         <!-- 出差列表 -->
                 <el-table :data="tableList" style="width: 100%" height="90%" :loading="tableListLoading">
@@ -774,6 +777,7 @@ export default {
         //         }
         //     };
         return {
+            syncLoading: false,
             themeColor: getThemeColor(),
             denyDialogV: false,
             denyInfo: {},
@@ -922,6 +926,32 @@ export default {
         this.getUsers()
     },
     methods: {
+        syncData(){
+            this.syncLoading=true
+            var startTime = this.createDate[0]
+            var endTime = this.createDate[1]
+            this.http.post('/business-trip/syncData',{startDate:startTime, endDate: endTime},
+            res => {
+                if (res.code == "ok") {
+                    this.$message({
+                            message: this.$t('operationissuccessful'),
+                            type: "success"
+                    });
+                } else {
+                    this.$message({
+                    message: res.msg,
+                    type: "error"
+                    });
+                }
+                this.syncLoading=false
+            },
+            error => {
+                this.$message({
+                    message: error,
+                    type: "error"
+                });
+            });
+        },
         // 自定义事件
         selectCal(obj) {
             if(obj.distinction == '1') {

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

@@ -1765,7 +1765,9 @@ export default {
 
     syncLeave(){
       this.syncLeaveLoading=true
-      this.http.post('/leave-sheet/syncLeaveSheet',{},
+      var startTime = this.createDate[0]
+      var endTime = this.createDate[1]
+      this.http.post('/leave-sheet/syncLeaveSheet',{startDate:startTime, endDate: endTime},
         res => {
             if (res.code == "ok") {
                 this.$message({

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/gantt.vue

@@ -686,4 +686,5 @@ export default {
 .greyStr {
   background: #e0e0e0;
 }
+
 </style>

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/project_gantt.vue

@@ -160,6 +160,16 @@
         </div>
       </template>
 
+      <!-- 部门 -->
+      <template v-if="radio1 == $t('an-ren-yuan-cha-kan')">
+        <div class="eachLayout">
+          <div class="eachLayout-title">部门</div>
+          <el-cascader v-model="departmentValue" :placeholder="$t('defaultText.pleaseChoose')" style="width: 125px"
+            :options="departmentOptions" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
+            @change="optupdata()" size="small"></el-cascader>
+        </div>
+      </template>
+
       <!-- 人员 -->
       <template v-if="radio1 == $t('an-ren-yuan-cha-kan')">
         <div class="eachLayout">
@@ -332,7 +342,9 @@ export default {
       valuex2: '',
 
       user: JSON.parse(sessionStorage.getItem("user")),
-      typeList: []
+      typeList: [],
+      departmentOptions: [],
+      departmentValue: []
     };
   },
   computed: {},
@@ -356,10 +368,52 @@ export default {
 
     this.getTaskTypeList()
 
+    this.getDepartment()
+
     console.log('<===== 开始执行咯')
     localStorage.removeItem('ganttChartTaskId')
   },
   methods: {
+    // 获取部门列表
+    getDepartment() {
+        this.http.post( this.port.manage.depList, {},
+        res => {
+            if (res.code == "ok") {
+                var list1 = JSON.parse(JSON.stringify(res.data));
+                
+                this.departmentOptions = this.changeArr(list1);
+                console.log(this.departmentOptions, '部门')
+            } else {
+                this.$message({
+                    message: res.msg,
+                    type: "error"
+                });
+            }
+        },
+        error => {
+            this.$message({
+                message: error,
+                type: "error"
+            });
+        });
+    },
+    changeArr(arr) {
+        for (var i = 0; i < arr.length; i++) {
+            if(arr[i].id != -1 && arr[i].id != 0) {
+                if (arr[i].children != null && arr[i].children.length>0) {
+                    arr[i].children = this.changeArr(arr[i].children);
+                }
+                arr[i].id && (arr[i].value = arr[i].id);
+                delete arr[i].id;
+            }
+        }
+        for(var i in arr) {
+            if(arr[i].id == -1 || arr[i].id == 0) {
+                arr.splice(i,1)
+            }    
+        }
+        return arr;
+    },
     // 周的切换
     weekSwitching(weekType) {
       // const now = weekType == 'next' ? this.dayjs(this.valueDate[1]) : this.dayjs(this.valueDate[0]); // 获取当前日期
@@ -512,6 +566,7 @@ export default {
         this.valuex = null
         // console.log("切换按钮",this.radio1);
         if (this.radio1 == this.$t('an-ren-yuan-cha-kan')) {
+          this.departmentValue = []
           this.isDataLoaded = true
           this.reqpar1 = 0
           this.getList()
@@ -689,6 +744,11 @@ export default {
             getlistcs.userId = this.valuex
           }
         }
+        if(this.radio1 == this.$t('an-ren-yuan-cha-kan')) {
+          if(this.departmentValue.length > 0) {
+            getlistcs.deptId = this.departmentValue[this.departmentValue.length - 1]
+          }
+        }
         var urls = '/project/getGanttData';
         this.http.post(urls, getlistcs,
         // this.http.post('/project/getGanttDataNew', getlistcs,

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

@@ -6,6 +6,7 @@
                 <el-form-item :label="$t('tasklist')">
                     <div style="margin-left: 8px">
                         <el-select v-model="searchField" style="width:100px;" size="small" slot="prepend" :placeholder="$t('defaultText.pleaseChoose')" >
+                            <el-option label="全部" value="-1" @click.native="hiddens()"></el-option>
                             <el-option :label="$t('ongoing')" value="0" @click.native="hiddens()"></el-option>
                             <el-option :label="$t('state.completed')" value="1" @click.native="hiddens()"></el-option>
                             <el-option label="待审核" value="2" @click.native="hiddens()"></el-option>
@@ -664,7 +665,7 @@ import { getThemeColor } from '@/utils/commonMethod.js'
                 showOrNot: false,
                 typeField: null,
 
-                searchField: '0',
+                searchField: '-1',
                 keyword:null,
                 user: JSON.parse(sessionStorage.getItem("user")),
                 permissions: JSON.parse(sessionStorage.getItem("permissions")),