2022.8.23 删除出差

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -201,7 +201,6 @@
                 <el-form-item><el-checkbox v-model="dialogData.reportApproveMsgpush">日报审核通过是否推送消息</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.projectWithDept">项目是否有所属部门</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.financeJobnumEnabled">财务导入薪资是否支持工号</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.deleteBusinessState">出差管理删除权限</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item>
                 <el-form-item>
                     日报审核模式：
@@ -360,7 +359,6 @@
                             this.$set(this.dialogData,'reportApproveMsgpush',res.data.reportApproveMsgpush ? true : false)
                             this.$set(this.dialogData,'projectWithDept',res.data.projectWithDept ? true : false)
                             this.$set(this.dialogData,'financeJobnumEnabled',res.data.financeJobnumEnabled ? true : false)
-                            this.$set(this.dialogData,'deleteBusinessState',res.data.deleteBusinessState ? true : false)
                             this.$set(this.dialogData,'reportAutoApprove',res.data.reportAutoApprove ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
@@ -634,7 +632,6 @@
                     reportApproveMsgpush: this.dialogData.reportApproveMsgpush ? 1 : 0,
                     projectWithDept: this.dialogData.projectWithDept ? 1 : 0,
                     financeJobnumEnabled: this.dialogData.financeJobnumEnabled ? 1 : 0,
-                    deleteBusinessState: this.dialogData.deleteBusinessState ? 1 : 0,
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -85,6 +85,7 @@ const StringUtil = {
         awayOfficeAll : false, // 查看全部出差 //
         awayOfficeStatistical : false, // 出差统计 //
         awayOfficeProcess : false, // 出差流程设置 // 
+        awayOfficeDelete: false, // 删除出差 //
 
         // 费用报销
         costFil : false, // 费用填报 //
@@ -187,6 +188,7 @@ const StringUtil = {
         arr[i] == '负责项目成本基线表' ? obj.reportOutputValue = true : ''
         arr[i] == '日报导出' ? obj.reportExport = true : ''
         arr[i] == '查看全公司数值' ? obj.customDataAll = true : ''
+        arr[i] == '删除出差' ? obj.awayOfficeDelete = true : ''
     }
 
     return obj

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

@@ -260,7 +260,7 @@
                                 <el-button icon="el-icon-close" circle size="mini"  @click="deny(scope.row)"></el-button>
                             </div>
                             <div v-if="!isAuditList">
-                                <el-button v-if="!isAuditList && user.timeType.deleteBusinessState && ((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="!isAuditList && 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>
@@ -268,7 +268,7 @@
                     <el-table-column v-if="isDingding" label="操作" width="150" fixed="right">
                         <template slot-scope="scope">
                             <el-button icon="iconfont firerock-iconguanlian" circle size="mini" @click="DingdingEditor(scope.row)"></el-button>
-                            <el-button v-if="(permissions.awayOfficeAll || userComLis.manageDeptId) && user.timeType.deleteBusinessState" icon="el-icon-delete" circle size="mini" @click="deleteOfDingding(scope.row)"></el-button>
+                            <el-button v-if="(permissions.awayOfficeAll || userComLis.manageDeptId) && permissions.awayOfficeDelete" icon="el-icon-delete" circle size="mini" @click="deleteOfDingding(scope.row)"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>