江西祥-导入工时增加保持审核记录

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

@@ -7145,7 +7145,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 } else {
                     //如果开启了审批流的显示，需要插入日报提交记录表
                     reportService.saveBatch(reportList);
-                    saveFillReportLog(reportList);
+                    if (companyId == 7836) {//江西祥益鼎盛
+                        //保存日报提交和审批记录
+                        saveReportWithAuditLog(allUserList, reportList);
+                    } else {
+                        saveFillReportLog(reportList);
+                    }
+
                     msg.data = dataCount;
                     String originName = fileName;
                     //定义一个独立的文件夹

fhKeeper/formulahousekeeper/timesheet/src/views/project/financeComponents/salaryDetails.vue

@@ -776,11 +776,11 @@
                     <el-radio :label="0">{{ $t('Exportbyproject') }}</el-radio>
                     <el-radio :label="1">{{ $t('Exportbprojectcategory') }}</el-radio>
                 </el-radio-group>
-                <div style="margin-top: 20px;">
+                <div style="margin-top: 20px;" v-if="groupByCategory==0">
                     <el-checkbox v-model="personnelAllocation">含人员分摊明细</el-checkbox>
                 </div>
-                <div style="margin-top: 20px;">
-                    <span style="margin-right: 10px;">项目数据精度：保留小数点后</span>
+                <div style="margin-top: 20px;" v-if="groupByCategory==0">
+                    <span style="margin-right: 10px;">项目成本金额保留至小数点后</span>
                     <el-select v-model="exportScale" size="small" style="width: 120px;">
                         <el-option :value="2" label="2位"></el-option>
                         <el-option :value="3" label="3位"></el-option>
@@ -2143,7 +2143,6 @@ export default {
                 yearMonth: this.date
             },
                 res => {
-                    this.listLoading = false;
                     if (res.code == "ok") {
                         // console.log(res.data, '审核状态')
                         if (res.data) {
@@ -2173,7 +2172,6 @@ export default {
                     }
                 },
                 error => {
-                    this.listLoading = false;
                     this.$message({
                         message: error,
                         type: "error"