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

修改跳转逻辑

master
OathK1per 2023-06-13 14:55:58 +08:00
parent 824379e732
commit 92e18e8790
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,7 +322,7 @@ public class ProjectController extends BaseController {
model.put("estimateBean", estimateBean); model.put("estimateBean", estimateBean);
//freemarker可以利用的静态方法 //freemarker可以利用的静态方法
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
if (project.getStatus() >= 5) { if (project.getStatus() >= 5 || project.getApproveStatusEstimate() == 2) {
model.put("saveStage", 1); model.put("saveStage", 1);
} else { } else {
model.put("saveStage", 0); model.put("saveStage", 0);

6
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -329,7 +329,7 @@
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="2" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
<option value="0" >C0、项目可研</option> <option value="0" >C0、项目可研</option>
<option value="1" >C1、项目申报</option> <option value="1" >C1、项目申报</option>
@ -341,10 +341,8 @@
<option value="7" >C7、项目结算期</option> <option value="7" >C7、项目结算期</option>
</select> </select>
</td> </td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="2" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
<option value="0" >S0-商机线索</option> <option value="0" >S0-商机线索</option>
<option value="1" >S1-需求摸索</option> <option value="1" >S1-需求摸索</option>

4
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -376,7 +376,7 @@
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="2" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
<option value="0" <#if project.stage?? && project.stage=0>selected</#if>>C0、项目可研</option> <option value="0" <#if project.stage?? && project.stage=0>selected</#if>>C0、项目可研</option>
<option value="1" <#if project.stage?? && project.stage=1>selected</#if>>C1、项目申报</option> <option value="1" <#if project.stage?? && project.stage=1>selected</#if>>C1、项目申报</option>
@ -389,7 +389,7 @@
</select> </select>
</td> </td>
<th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="2" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
<option value="0" <#if project.saleStage?? && project.saleStage=0>selected</#if>>S0-商机线索</option> <option value="0" <#if project.saleStage?? && project.saleStage=0>selected</#if>>S0-商机线索</option>
<option value="1" <#if project.saleStage?? && project.saleStage=1>selected</#if>>S1-需求摸索</option> <option value="1" <#if project.saleStage?? && project.saleStage=1>selected</#if>>S1-需求摸索</option>