1111

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -1319,6 +1319,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 						notifyRole = "市场研发管理部负责人";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+						vars.put("scyfglbzrscount",auditUsers.size());
+						vars.put("scyfglbzrsList",auditUsers);
 
 
 					} else {
@@ -1343,9 +1345,11 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 					exp = "pass";
 					workActivityProcess.setCount(0);
 					enname = "fgld";
+
 					if (!"yes".equals(workContractInfo.getAct().getFlag())) {
 						workContractInfo.setCompletionStatus("3");
 					}
+
 					break;
 				}
 			}

src/main/webapp/webpage/modules/workbidproject/workBidProjectList.jsp

@@ -330,10 +330,8 @@
                     ,"id":"${workBidProject.id}"
                     ,"number":"${workBidProject.projectNumber}"
                     ,"name":"${workBidProject.projectName}"
-                    ,"type":"${workBidProject.projectType}"
-                    <%--,"type":"${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"--%>
-                    ,"source":"${workBidProject.projectSource}"
-                    <%--,"source":"${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"--%>
+                    ,"type":"${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"
+                    ,"source":"${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"
                     ,"date":"<fmt:formatDate value="${workBidProject.bidDate}" pattern="yyyy-MM-dd"/>"
                     ,"money":"<fmt:formatNumber value="${workBidProject.investMoney}" pattern="#,#00.00"/>"
                     ,"status":"${workBidProject.status}"

src/main/webapp/webpage/modules/workbidproject/workBidProjectView.jsp

@@ -76,8 +76,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-                               value="${workBidProject.projectType}"/>
-<%--                               value="${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"/>--%>
+                               value="${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -91,8 +90,7 @@
                     <label class="layui-form-label">项目来源：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-                               value="${workBidProject.projectSource}"/>
-<%--                               value="${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"/>--%>
+                               value="${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -113,16 +111,14 @@
                     <label class="layui-form-label">规模类型：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-                               value="${workBidProject.scaleType}"/>
-<%--                               value="${fns:getMainDictLabel(workBidProject.scaleType, 'scale_type', '')}"/>--%>
+                               value="${fns:getMainDictLabel(workBidProject.scaleType, 'scale_type', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">规模单位：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-                               value="${workBidProject.scaleUnit}"/>
-<%--                               value="${fns:getMainDictLabel(workBidProject.scaleUnit, 'scale_unit', '')}"/>--%>
+                               value="${fns:getMainDictLabel(workBidProject.scaleUnit, 'scale_unit', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -317,8 +313,7 @@
                     <label class="layui-form-label">投标保证金形式：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-<%--                               value="${fns:getMainDictLabel(workBidProject.bondStyle, 'bond_style', '')}"/>--%>
-                               value="${workBidProject.bondStyle}"/>
+                               value="${fns:getMainDictLabel(workBidProject.bondStyle, 'bond_style', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -353,8 +348,7 @@
                     <label class="layui-form-label">业务类型：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" class="form-control required layui-input"
-                               value="${workBidProject.businessType}"/>
-<%--                               value="${fns:getMainDictLabel(workBidProject.businessType, 'business_type', '')}"/>--%>
+                               value="${fns:getMainDictLabel(workBidProject.businessType, 'business_type', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12">