修改非项目审核人获取逻辑

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

@@ -728,15 +728,26 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     //对于简单模式的非项目，直接获取部门主管作为审核人
                     if (company.getNonProjectSimple() == 1 && project.getIsPublic() == 1) {
                         User user = userMapper.selectById(r.getCreatorId());
-                        Department department = departmentMapper.selectById(user.getDepartmentId());
-                        if (department != null) {
-                            User deptManager = userMapper.selectById(department.getManagerId());
-                            List<ProjectAuditor> auditorList1 = new ArrayList<>();
-                            ProjectAuditor auditor = new ProjectAuditor();
-                            auditor.setAuditorId(deptManager.getId());
-                            auditor.setAuditorName(deptManager.getName());
-                            auditorList1.add(auditor);
-                            r.setAuditUserList(auditorList1);
+                        //优先取个人的非项目审核人
+                        String superiorId = user.getSuperiorId();
+                        //其次取员工的部门主要负责人
+                        if (superiorId == null) {
+                            Integer departmentId = user.getDepartmentId();
+                            Department department = departmentMapper.selectById(departmentId);
+                            if (department != null) {
+                                superiorId = department.getManagerId();
+                            }
+                        }
+                        if (superiorId != null) {
+                            User superior = userMapper.selectById(superiorId);
+                            if (superior != null) {
+                                List<ProjectAuditor> auditorList1 = new ArrayList<>();
+                                ProjectAuditor auditor = new ProjectAuditor();
+                                auditor.setAuditorId(superiorId);
+                                auditor.setAuditorName(superior.getName());
+                                auditorList1.add(auditor);
+                                r.setAuditUserList(auditorList1);
+                            }
                         }
                         if (r.getProjectAuditorId() != null) {
                             Optional<ProjectAuditor> auItem = r.getAuditUserList().stream().filter(au->au.getAuditorId().equals(r.getProjectAuditorId())).findFirst();

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -113,6 +113,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="amountsNoTax" label="合同金额(元)/不含税价" min-width="190"></el-table-column>
+      <el-table-column prop="isAmountFixed" label="是否固定金额" min-width="190">
+        <template slot-scope="scope">
+          <span>{{scope.row.isAmountFixed?'是':'否'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="currency" label="币种" min-width="190"></el-table-column>
       <el-table-column prop="finishStatus" label="合同状态(是否结清)" min-width="190">
         <template slot-scope="scope">
@@ -244,6 +249,12 @@
               <span slot="prefix">￥</span>
             </el-input>
           </el-form-item>
+          <el-form-item label="是否固定金额">
+            <el-select v-model="contractForm.isAmountFixed" :disabled="contractForm.status == 0" placeholder="请选择">
+              <el-option label="是" :value="true"></el-option>
+              <el-option label="否" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="币种">
             <el-input v-model="contractForm.currency" :disabled="contractForm.status == 0" :placeholder="$t('peaseenterthe')" clearable></el-input>
           </el-form-item>
@@ -451,6 +462,9 @@
           <el-form-item label="合同金额(元)/不含税价">
             ￥ {{contractForm.amountsNoTax}}
           </el-form-item>
+          <el-form-item label="是否固定金额">
+            {{contractForm.isAmountFixed?'是':'否'}}
+          </el-form-item>
           <el-form-item label="币种">
             {{contractForm.currency}}
           </el-form-item>
@@ -994,7 +1008,8 @@ export default {
         typeId: null,
         remarks: '',
         startDate: '',
-        endDate: ''
+        endDate: '',
+        isAmountFixed: true,
       }
       this.contractPaymentList = [];
       this.fileList = []