Jelajahi Sumber

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

Lijy 2 tahun lalu
induk
melakukan
6763d6c536

+ 15 - 2
fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -193,8 +193,17 @@
                 <el-form-item><el-checkbox v-model="dialogData.showFillauditTime">是否显示日报审批流程</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.isCro">是否CRO企业</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.onlyImportreport">是否仅使用导入日报审核(不要项目审核)</el-checkbox></el-form-item>
+                <el-form-item><el-checkbox v-model="dialogData.projectLevelState">是否开启项目级别自定义</el-checkbox></el-form-item>
+                <el-form-item>
+                    日报审核模式:
+                    <el-select v-model="dialogData.reportAuditType" size="small">
+                        <el-option :value="0" label="项目审核人审核"></el-option>
+                        <el-option :value="1" label="任务分组负责人审核"></el-option>
+                        <el-option :value="2" label="先分组审核再PM审核"></el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
-            <!-- 是否开启审批流设置,是否启用主项目模式,是否秘薪模式,是否显示日报审批流程,是否CRO企业,是否仅使用导入日报审核(不要项目审核) -->
+            <!-- 是否开启审批流设置,是否启用主项目模式,是否秘薪模式,是否显示日报审批流程,是否CRO企业,是否仅使用导入日报审核(不要项目审核) reportAuditType-->
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editDialogG = false">取 消</el-button>
                 <el-button type="primary" @click="ConfirmG()">确 定</el-button>
@@ -311,6 +320,8 @@
                             this.$set(this.dialogData,'showFillauditTime',res.data.showFillauditTime ? true : false)
                             this.$set(this.dialogData,'isCro',res.data.isCro ? true : false)
                             this.$set(this.dialogData,'onlyImportreport',res.data.onlyImportreport ? true : false)
+                            this.$set(this.dialogData,'projectLevelState',res.data.projectLevelState ? true : false)
+                            this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
                                 message: res.msg,
@@ -535,7 +546,9 @@
                     isSecretSalary: this.dialogData.isSecretSalary ? 1 : 0,
                     showFillauditTime: this.dialogData.showFillauditTime ? 1 : 0,
                     isCro: this.dialogData.isCro ? 1 : 0,
-                    onlyImportreport: this.dialogData.onlyImportreport ? 1 : 0
+                    onlyImportreport: this.dialogData.onlyImportreport ? 1 : 0,
+                    projectLevelState: this.dialogData.projectLevelState ? 1 : 0,
+                    reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){
                         this.editDialogG = false