|
|
@@ -192,7 +192,7 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 其他设置 -->
|
|
|
- <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置">
|
|
|
+ <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置" width="850px">
|
|
|
<el-form label-width="100px" class="otherForm">
|
|
|
<el-form-item><el-checkbox v-model="dialogData.reportWorkflow">是否开启审批流设置</el-checkbox></el-form-item>
|
|
|
<el-form-item><el-checkbox v-model="dialogData.needEvaluate">审核通过需输入评价</el-checkbox></el-form-item>
|
|
|
@@ -207,7 +207,7 @@
|
|
|
<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.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item>
|
|
|
+ <!-- <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item> -->
|
|
|
<el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
|
|
|
<el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
|
|
|
<!-- <el-form-item><el-checkbox v-model="dialogData.pushReportData">是否开通【推送工时数据】</el-checkbox></el-form-item> -->
|
|
|
@@ -222,6 +222,13 @@
|
|
|
<el-option :value="2" label="先分组审核再PM审核"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox>
|
|
|
+ <el-input-number v-if="dialogData.reportAutoApprove" v-model.number="dialogData.reportAutoApproveDays" controls-position="right" size="mini" style="margin: 0 10px 0 10px;width: 90px;" :min="0"></el-input-number>
|
|
|
+ <el-tooltip effect="dark" :content="`${dialogData.reportAutoApproveDays}天后自动审核`" placement="top-start" v-if="dialogData.reportAutoApprove">
|
|
|
+ <i class="el-icon-question"></i>
|
|
|
+ </el-tooltip>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<!-- 是否开启审批流设置，是否启用主项目模式，是否秘薪模式，是否显示日报审批流程，是否CRO企业，是否仅使用导入日报审核（不要项目审核） reportAuditType-->
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -381,6 +388,7 @@
|
|
|
this.$set(this.dialogData,'includeWeekends',res.data.includeWeekends ? true : false)
|
|
|
this.$set(this.dialogData,'multiWorktime',res.data.multiWorktime ? true : false)
|
|
|
this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
|
|
|
+ this.$set(this.dialogData,'reportAutoApproveDays',res.data.reportAutoApproveDays)
|
|
|
}else{
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -659,7 +667,8 @@
|
|
|
// pushReportData: this.dialogData.pushReportData ? 1 : 0,
|
|
|
includeWeekends: this.dialogData.includeWeekends ? 1 : 0,
|
|
|
multiWorktime: this.dialogData.multiWorktime ? 1 : 0,
|
|
|
- reportAuditType: this.dialogData.reportAuditType
|
|
|
+ reportAuditType: this.dialogData.reportAuditType,
|
|
|
+ reportAutoApproveDays: this.dialogData.reportAutoApproveDays, // 自动审核的天数
|
|
|
},res => {
|
|
|
if(res.code == 'ok'){
|
|
|
this.editDialogG = false
|
Lijy