diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index 424ea0d..7671a18 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -109,7 +109,7 @@ <span>{{scope.row.processType | processType}}</span> </template> </el-table-column> - <el-table-column prop="applyPersonName" label="申请人"></el-table-column> + <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column> <el-table-column prop="status" label="审核状态" width="100"> <template slot-scope="scope"> <span>{{scope.row.status | processStatus}}</span> diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 6171fe7..1f91898 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -94,7 +94,8 @@ <el-descriptions-item label="税率">{{process.taxRate}}%</el-descriptions-item> <el-descriptions-item label="是否垫资">${isPrepaid}</el-descriptions-item> - <el-descriptions-item label="垫资金额">${repaidAmount}元</el-descriptions-item> + <el-descriptions-item label="垫资金额" v-if="isPrepaid!=='否'">${repaidAmount}元</el-descriptions-item> + <el-descriptions-item label="预算毛利率">${project.grossProfitMargin}</el-descriptions-item> <el-descriptions-item label="收款条件" v-if="isSaleContract"> diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl index fe77298..9b56b10 100644 --- a/src/main/resources/templates/admin/business/process-review.ftl +++ b/src/main/resources/templates/admin/business/process-review.ftl @@ -101,7 +101,7 @@ <span>{{scope.row.processType | processType}}</span> </template> </el-table-column> - <el-table-column prop="applyPersonName" label="申请人"></el-table-column> + <el-table-column prop="applyPersonName" label="申请人" width="100"></el-table-column> <el-table-column prop="status" label="审核状态" width="100"> <template slot-scope="scope"> <span>{{scope.row.status | processStatus}}</span>