Browse Source

质量复核撤回时 % 无法联动

[user3] 3 years ago
parent
commit
c6dde8c454

+ 17 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2869,6 +2869,23 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("id", projectcontentinfo.getId());

+ 8 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -269,6 +269,14 @@
 					$("#contractRate").parent().parent().hide();
 				}
 			}
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if ((bf!='' && inf !='') && (bf!=0 && inf !=0)){
+				getBuildingFee();
+				getInstallFee();
+			}
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){

+ 8 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -443,6 +443,14 @@
 					}
 				})
 			})
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if ((bf!='' && inf !='') && (bf!=0 && inf !=0)){
+				getBuildingFee();
+				getInstallFee();
+			}
 		});
 
 		function hasInArr(id,idArr) {

+ 8 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -208,6 +208,14 @@
 				, trigger: 'click'
 				, trigger: 'click'
 			});
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if ((bf!='' && inf !='') && (bf!=0 && inf !=0)){
+				getBuildingFee();
+				getInstallFee();
+			}
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){