计划状态支持全部

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/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/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/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")),