出差模块整理

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

@@ -55,7 +55,8 @@ public class AuditWorkflowSettingServiceImpl extends ServiceImpl<AuditWorkflowSe
                 setting.setAuditDeptId(dept.getDepartmentId());
                 setting.setAuditDeptName(dept.getDepartmentName());
                 setting.setIsFinal(1);
-                setting.setAuditorType(type);
+                setting.setAuditorType(1);//按部门
+                setting.setType(type);
                 auditWorkflowSettingMapper.insert(setting);
                 auditWorkflowTimeSettings.add(setting);
             }

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

@@ -3321,7 +3321,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             });
             //钉钉请假的数据
-            if (timeType.getSyncDingding() == 1 && leaveSheets != null && leaveSheets.size() > 0) {
+            if ((timeType.getSyncDingding() == 1 || timeType.getSyncFanwei()==1)&& leaveSheets != null && leaveSheets.size() > 0) {
                 List<LeaveSheet> curUserLeaveList = leaveSheets.stream().filter(leave -> leave.getOwnerId().equals(userMonthWork.userId)).collect(Collectors.toList());
                 curUserLeaveList.forEach(leave->{
                     LocalDate startDate1 = leave.getStartDate();

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

@@ -140,6 +140,20 @@
                         <el-form-item :label="$t('travelnote')" style="width:635px">
                             <el-input type="textarea" v-model="addform.remark" :rows="3" style="width: 100%" maxlength="100" show-word-limit></el-input>
                         </el-form-item>
+                        <!--流程显示-->
+                        <el-form-item label="审批流程" style="width: 100%;color:#606266" >
+                        <span v-for="(item, index) in curWorkflowList" :key="item.id" >
+                            <span v-if="index>0"><i class="el-icon-right"></i></span>
+                            <span><i class="el-icon-s-custom"></i></span>
+                            <span v-if="user.userNameNeedTranslate == 1">
+                            <span v-if="item.auditorType == 1"><ww-open-data type='departmentName' :openid='item.auditDeptName' ></ww-open-data>(主要负责人)</span>
+                            <ww-open-data type='userName' :openid='item.userName' v-if="item.auditorType == 2"></ww-open-data>
+                            </span>
+                            <span v-if="user.userNameNeedTranslate == 0">
+                            {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
+                            </span>
+                        </span>
+                        </el-form-item>
                 </el-form>
                 <div>
                     <p style="width:635px;text-align:center;">
@@ -260,7 +274,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column v-if="!isSyncData" :label="isAuditList ? $t('other.audit') : $t('operation')" width="180" fixed="right" >
-                        <template slot-scope="scope">
+                        <!-- <template slot-scope="scope">
                             <div v-if="isAuditList">
                                 <el-button icon="el-icon-check" circle size="mini" @click="approve(scope.row)"></el-button>
                                 <el-button icon="el-icon-close" circle size="mini"  @click="deny(scope.row)"></el-button>
@@ -269,6 +283,17 @@
                                 <el-button v-if="permissions.awayOfficeDelete && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll)" icon="el-icon-delete" circle size="mini"  @click="deletes(scope.row)"></el-button>
                                 <el-button v-if="((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll) || scope.row.status == 1" icon="el-icon-edit" circle size="mini" @click="editor(scope.row)"></el-button>
                             </div>
+                        </template> -->
+                        <template slot-scope="scope">
+                        <div v-if="isAuditList" >
+                            <el-button icon="el-icon-check" circle size="mini" @click.stop.native="approve(scope.row)"></el-button>
+                            <el-button icon="el-icon-close" circle size="mini"  @click.stop.native="deny(scope.row)"></el-button>
+                        </div>
+                        <div v-if="!isAuditList && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.awayOfficeAll)">
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >删除</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">撤回</el-button>
+                            <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">重新提交</el-button>
+                        </div>
                         </template>
                     </el-table-column>
                     <el-table-column v-if="isSyncData" :label="$t('operation')" width="150" fixed="right">
@@ -277,6 +302,9 @@
                             <el-button v-if="permissions.awayOfficeDelete" icon="el-icon-delete" circle size="mini" @click="deleteOfDingding(scope.row)"></el-button>
                         </template>
                     </el-table-column>
+
+                    
+                    
                 </el-table>
                 <!-- 页码 -->
                 <div class="poss">
@@ -803,7 +831,10 @@ export default {
 
             isOverTendays: false,
             tableListLoading: false,
-
+            
+            curWorkflowList:{},
+            denyReasonVisible : false,
+            auditLogList:[],
         }
     },
     created(){
@@ -824,9 +855,7 @@ export default {
         this.getTableList()
         this.getProjectList()
         this.getDepartment()
-        
-        
-        // console.log("session",this.wuduData);
+        this.getAuditWorkflow();
     },
     methods: {
         // 自定义事件
@@ -838,6 +867,25 @@ export default {
                 this.ownerIdsId = obj.id
             }
         },
+        //获取添加出差单时的审批流
+        getAuditWorkflow() {
+            this.http.post('/audit-workflow-setting/get',{deptId: this.user.departmentId, type: 2},
+                res => {
+                if(res.code == 'ok'){
+                    this.curWorkflowList = res.data;
+                }else{
+                    this.$message({
+                    message: res.msg,
+                    type: 'error'
+                    })
+                }
+                },err => {
+                this.$message({
+                    message: err,
+                    type: 'error'
+                })
+            })
+        },
         dingdingListExport(){
             let parameter = {
                 keyword: ''
@@ -1093,7 +1141,8 @@ export default {
             // console.log("keypath",keyPath)
             if (keyPath[0] == '1') {
                 this.displayTable = false;
-                this.apk = 0
+                this.apk = 0;
+                this.getAuditWorkflow();
             } else if(keyPath[0] == '2' || keyPath[0] == '3') {
                 this.displayTable = true;
                 this.apk = 0
@@ -1115,7 +1164,7 @@ export default {
         auditList() {
             this.falg = 1
             this.code = 1
-            this.tableData = []
+            this.tableList = []
             this.displayTable = true;
             this.isAuditList = true;
             this.loading = true
@@ -1126,16 +1175,16 @@ export default {
                             startDate: this.createDate == null ? '' : this.createDate[0],
                             endDate: this.createDate == null ? '' : this.createDate[1],
                             ownerId: this.ownerIds,
-                            leaveType: this.type,
+                            way: this.type,
                         };
-            this.list = [];
-            // this.total = 0;
+            this.tableList = [];
+            this.total = 0;
             this.http.post('/business-trip/auditList', param,
                 res => {
                     if (res.code == "ok") {
-                    this.tableData = res.data.records
-                    this.total = res.data.total
-                    this.loading = false
+                        this.tableList = res.data.records
+                        this.total = res.data.total
+                        this.loading = false
                     } else {
                     this.loading = false
                         this.$message({