Quellcode durchsuchen

工作内容中的操作中添加一个迷你按钮、黄色字体的‘提示’
用于展示项目类型中的项目提示文本内容

user5 vor 4 Jahren
Ursprung
Commit
c9eecdf590
25 geänderte Dateien mit 257 neuen und 16 gelöschten Zeilen
  1. 9 0
      src/main/java/com/jeeplus/modules/projectType/entity/ProjectType.java
  2. 18 0
      src/main/java/com/jeeplus/modules/projectType/web/ProjectTypeController.java
  3. 9 0
      src/main/java/com/jeeplus/modules/projectVisa/entity/VisaTreeData.java
  4. 1 0
      src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java
  5. 1 0
      src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java
  6. 1 0
      src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java
  7. 9 0
      src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java
  8. 1 0
      src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java
  9. 1 0
      src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java
  10. 1 0
      src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java
  11. 1 0
      src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java
  12. 1 0
      src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java
  13. 8 4
      src/main/resources/mappings/modules/projectType/ProjectTypeDao.xml
  14. 2 2
      src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml
  15. 6 0
      src/main/webapp/webpage/modules/project/type/projectTypeFormSubordinate.jsp
  16. 19 1
      src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsList.jsp
  17. 19 1
      src/main/webapp/webpage/modules/projectrecord/claim/projectClaimList.jsp
  18. 19 1
      src/main/webapp/webpage/modules/projectrecord/concealProject/concealProjectList.jsp
  19. 19 1
      src/main/webapp/webpage/modules/projectrecord/contractMaterial/materialList.jsp
  20. 19 1
      src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementList.jsp
  21. 19 1
      src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectImplementCompletionList.jsp
  22. 20 1
      src/main/webapp/webpage/modules/projectrecord/implementEarly/projectImplementEarlyList.jsp
  23. 18 1
      src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp
  24. 18 1
      src/main/webapp/webpage/modules/projectrecord/implementStage/projectInterimPaymentList.jsp
  25. 18 1
      src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

+ 9 - 0
src/main/java/com/jeeplus/modules/projectType/entity/ProjectType.java

@@ -22,6 +22,7 @@ public class ProjectType extends DataEntity<ProjectType> {
     private String typeId;   //类型id
     private Integer tier;    //层级标识
     private String chooseCondition;  //是否必填标识
+    private String hintContent;  //提示内容
 
 
     private String createId;//创建者id
@@ -124,4 +125,12 @@ public class ProjectType extends DataEntity<ProjectType> {
     public void setForbidden(String forbidden) {
         this.forbidden = forbidden;
     }
+
+    public String getHintContent() {
+        return hintContent;
+    }
+
+    public void setHintContent(String hintContent) {
+        this.hintContent = hintContent;
+    }
 }

+ 18 - 0
src/main/java/com/jeeplus/modules/projectType/web/ProjectTypeController.java

@@ -102,6 +102,7 @@ public class ProjectTypeController extends BaseController {
 				projectType.setTypeName("");
 				projectType.setRemarks("");
 				projectType.setId("");
+				projectType.setHintContent("");
 			}else if("updateSubordinateInfo".equals(projectType.getView())){
 
 			}
@@ -189,4 +190,21 @@ public class ProjectTypeController extends BaseController {
 		addMessage(redirectAttributes, msg+"项目类型成功");
 		return "redirect:"+Global.getAdminPath()+"/projectType/projectType/?repage";
 	}
+
+	/**
+	 * 启用、禁用项目类型
+	 */
+	@RequestMapping(value = "getHintContent")
+	@ResponseBody
+	public Map<String,Object> getHintContent(ProjectType projectType) {
+		Map<String,Object> map = new HashMap<>();
+		ProjectType projectTypeInfo = projectTypeService.get(projectType.getId());
+		map.put("code",1);
+		if(StringUtils.isNotBlank(projectTypeInfo.getHintContent())){
+			map.put("msg",projectTypeInfo.getHintContent());
+		}else{
+			map.put("msg","");
+		}
+		return map;
+	}
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/projectVisa/entity/VisaTreeData.java

@@ -25,6 +25,7 @@ public class VisaTreeData extends DataEntity<VisaTreeData> {
     private String status;  //复核状态
     private String reportId;  //报告id
     private String contentPId;      //保留工作内容id
+    private String projectTypeId;      //项目类型id
 
     private String dictType;
     private String parentIds;
@@ -188,4 +189,12 @@ public class VisaTreeData extends DataEntity<VisaTreeData> {
     public void setParentIds(String parentIds) {
         this.parentIds = parentIds;
     }
+
+    public String getProjectTypeId() {
+        return projectTypeId;
+    }
+
+    public void setProjectTypeId(String projectTypeId) {
+        this.projectTypeId = projectTypeId;
+    }
 }

+ 1 - 0
src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -182,6 +182,7 @@ public class ProjectClaimController extends BaseController {
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -329,6 +329,7 @@ public class ProjectDesignController extends BaseController {
                             VisaTreeData contentData=new VisaTreeData();
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -346,6 +346,7 @@ public class ProjectVisaController extends BaseController {
                             VisaTreeData contentData=new VisaTreeData();
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());

+ 9 - 0
src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -19,6 +19,7 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private String status;          //状态
     private String reportId;        //报告id
     private String reportName;      //报告名称
+    private String projectTypeId;      //项目类型id
 
     private String contentPId;      //保留工作内容id
 
@@ -238,4 +239,12 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setProcessInstanceId(String processInstanceId) {
         this.processInstanceId = processInstanceId;
     }
+
+    public String getProjectTypeId() {
+        return projectTypeId;
+    }
+
+    public void setProjectTypeId(String projectTypeId) {
+        this.projectTypeId = projectTypeId;
+    }
 }

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java

@@ -186,6 +186,7 @@ public class ArmorForMaterialsController extends BaseController {
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java

@@ -188,6 +188,7 @@ public class ConcealProjectController extends BaseController {
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -181,6 +181,7 @@ public class MaterialController extends BaseController {
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -192,6 +192,7 @@ public class DistributionSettlementController extends BaseController {
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -170,6 +170,7 @@ public class ProjectInterimPaymentController extends BaseController {
                             VisaTreeData contentData=new VisaTreeData();
                             ProjectRecordTreeData data=reportDataList.get(j);
                             contentData.setPid(visaTreeData.getId());
+                            contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());

+ 8 - 4
src/main/resources/mappings/modules/projectType/ProjectTypeDao.xml

@@ -16,7 +16,8 @@
 		a.del_flag,
 		a.tier,
 		a.choose_condition as "chooseCondition",
-		a.forbidden as "forbidden"
+		a.forbidden as "forbidden",
+		a.hint_content as "hintContent"
 	</sql>
 
 
@@ -109,7 +110,8 @@
 			remarks,
 			del_flag,
 			tier,
-			choose_condition
+			choose_condition,
+			hint_content
 		) VALUES (
 			#{id},
 			#{parentId},
@@ -123,7 +125,8 @@
 			#{remarks},
 			#{delFlag},
 			#{tier},
-			#{chooseCondition}
+			#{chooseCondition},
+			#{hintContent}
 		)
 	</insert>
 
@@ -135,7 +138,8 @@
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			choose_condition = #{chooseCondition},
-			remarks = #{remarks}
+			remarks = #{remarks},
+			hint_content = #{hintContent}
 		WHERE id = #{id}
 	</update>
 

+ 2 - 2
src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -295,7 +295,7 @@
 		select a.id as "id", a.create_by as "createBy.id", a.create_date as "createDate",
 		a.project_id as "pid", a.name as "projectName", "" as projectId,
 		"0" as projectStatus,su.name as "projectRegistrant" ,
-		pt.type_name as projectLeader,
+		pt.type_name as projectLeader,pt.id as projectTypeId,
 		ppt.type_name as clientName,prd.status as status
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
@@ -311,7 +311,7 @@
 		select a.id as "id", a.create_by as "createBy.id", a.create_date as "createDate",
 		a.project_id as "pid", a.name as "projectName", "" as projectId,
 		"0" as projectStatus,su.name as "projectRegistrant" ,
-		pt.type_name as projectLeader,
+		pt.type_name as projectLeader,pt.id as projectTypeId,
 		ppt.type_name as clientName,ifnull(prd.status,'10') as status
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by

+ 6 - 0
src/main/webapp/webpage/modules/project/type/projectTypeFormSubordinate.jsp

@@ -54,6 +54,12 @@
 						<form:input path="typeName" htmlEscape="false" class="form-control layui-input"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label">提示内容:</label>
+					<div class="layui-input-block">
+						<form:textarea path="hintContent" htmlEscape="false" maxlength="255" rows="6"    class="form-control"/>
+					</div>
+				</div>
 			</div>
 		</form:form>
 	</div>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsList.jsp

@@ -284,7 +284,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -325,6 +325,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=armor&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -469,6 +470,23 @@
         });
         return false;
     }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/claim/projectClaimList.jsp

@@ -304,7 +304,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -345,6 +345,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -490,6 +491,23 @@
         });
         return false;
     }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/concealProject/concealProjectList.jsp

@@ -285,7 +285,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -326,6 +326,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=conceal&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -470,6 +471,23 @@
         });
         return false;
     }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/contractMaterial/materialList.jsp

@@ -285,7 +285,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -326,6 +326,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=material&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -470,6 +471,23 @@
         });
         return false;
     }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementList.jsp

@@ -284,7 +284,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -325,6 +325,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -469,6 +470,23 @@
         });
         return false;
     }
+
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 19 - 1
src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectImplementCompletionList.jsp

@@ -345,7 +345,7 @@
 								return '';
 							}
 						}},*/
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -386,6 +386,7 @@
 						//子级内容
 						return [
 							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗?\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 						].join('');
 
@@ -535,6 +536,23 @@
 		});
 		return false;
 	}
+
+	// 确认对话框
+	function confirmxHintContent(mess, href){
+		$.ajax({
+			url:href,
+			data:$('#loginForm').serialize(),
+			type:"post",
+			success:function(data){
+				parent.layer.open({
+					title: '提示内容'
+					,shade: 0
+					,maxmin: true
+					,content: data.msg
+				});
+			}
+		});
+	}
 </script>
 </body>
 </html>

+ 20 - 1
src/main/webapp/webpage/modules/projectrecord/implementEarly/projectImplementEarlyList.jsp

@@ -4,6 +4,7 @@
 <head>
 	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
+	<script src="${ctxStatic}/layer-v2.3/layim/layui/layui.js"></script>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
     <style>
@@ -366,7 +367,7 @@
 								return '';
 							}
 						}},*/
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -407,6 +408,7 @@
 						//子级内容
 						return [
 							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗?\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 						].join('');
 
@@ -557,6 +559,23 @@
 		});
 		return false;
 	}
+
+	// 确认对话框
+	function confirmxHintContent(mess, href){
+		$.ajax({
+			url:href,
+			data:$('#loginForm').serialize(),
+			type:"post",
+			success:function(data){
+				parent.layer.open({
+					title: '提示内容'
+					,shade: 0
+					,maxmin: true
+					,content: data.msg
+				});
+			}
+		});
+	}
 </script>
 </body>
 </html>

+ 18 - 1
src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp

@@ -306,7 +306,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -347,6 +347,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -492,6 +493,22 @@
         });
         return false;
     }
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>

+ 18 - 1
src/main/webapp/webpage/modules/projectrecord/implementStage/projectInterimPaymentList.jsp

@@ -323,7 +323,7 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
-					{templet: complain, align:'center', title: '操作',width:130}
+					{templet: complain, align:'center', title: '操作',width:160}
 				]],
                 /*cols: [
 					[
@@ -418,6 +418,7 @@
 				if(1 == d.operationSign) {
 					return [
 						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+						'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 						/*'<a href="${ctx}/project/projectInterimPayment/deleteInterimPayment?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗?\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 					].join('');
 				}else{
@@ -573,6 +574,22 @@
 			}
 		});
 	}
+	// 确认对话框
+	function confirmxHintContent(mess, href){
+		$.ajax({
+			url:href,
+			data:$('#loginForm').serialize(),
+			type:"post",
+			success:function(data){
+				parent.layer.open({
+					title: '提示内容'
+					,shade: 0
+					,maxmin: true
+					,content: data.msg
+				});
+			}
+		});
+	}
 </script>
 </body>
 </html>

+ 18 - 1
src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -301,7 +301,7 @@
                                 return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
                             }
                         }},
-                    {templet: complain, align:'center', title: '操作',width:130}
+                    {templet: complain, align:'center', title: '操作',width:160}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -342,6 +342,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改签证信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=visa&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
                 }else{
                     return[''].join('');
@@ -487,6 +488,22 @@
         });
         return false;
     }
+    // 确认对话框
+    function confirmxHintContent(mess, href){
+        $.ajax({
+            url:href,
+            data:$('#loginForm').serialize(),
+            type:"post",
+            success:function(data){
+                parent.layer.open({
+                    title: '提示内容'
+                    ,shade: 0
+                    ,maxmin: true
+                    ,content: data.msg
+                });
+            }
+        });
+    }
 </script>
 </body>
 </html>