mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.2.0' into 1.2.0

master
Harry Yang 2023-01-05 18:31:46 +08:00
parent e02d48192f 63b099f390
commit 89388b8d8a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/controller/backend/ProcessController.java
View File

@ -382,7 +382,7 @@ public class ProcessController {
if (process.getProcessType() == ProcessType.sale_contract) { if (process.getProcessType() == ProcessType.sale_contract) {
contract = processService.findSaleContract(id); contract = processService.findSaleContract(id);
incomeDetails = projectBudgetService.getBudgetIncomeDetail(project); incomeDetails = projectBudgetService.getBudgetIncomeDetail(project);
detail.setContractAmount(project.getContractAmount()); detail.setContractAmount(getContractAmount(project.getId()));
} }
else if (process.getProcessType() == ProcessType.procurement_contract) { else if (process.getProcessType() == ProcessType.procurement_contract) {
contract = processService.findProcurementContract(id); contract = processService.findProcurementContract(id);

3
src/main/resources/templates/admin/business/process-new.ftl
View File

@ -255,7 +255,8 @@
</el-form-item> </el-form-item>
<el-form-item label="合同金额"> <el-form-item label="合同金额">
<span v-if="projectSelected">{{processForm.contractAmount}}元</span> <span v-if="projectSelected && isSalesContractMode">{{processForm.contractAmount}}元</span>
<span v-else="projectSelected && isProcurementContractMode">0元</span>
<span v-else>未选择项目</span> <span v-else>未选择项目</span>
</el-form-item> </el-form-item>