报销

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageAllService.java

@@ -8,14 +8,17 @@ import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
+import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectMessageAllDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import org.activiti.engine.HistoryService;
@@ -48,6 +51,10 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
     private ProjectFilingbatchRelationDao filingbatchRelationDao;
     @Autowired
     private ProjectFilingBatchDao projectFilingBatchDao;
+    @Autowired
+    private WorkClientInfoService workClientInfoService;
+    @Autowired
+    private WorkClientLinkmanDao workClientLinkmanDao;
 
     public RuralProjectRecords get(String id) {
         return super.get(id);
@@ -112,6 +119,16 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
             RuralProjectRecords records1 = list.get(i);
             if (records1.getWorkContractInfo() == null) {
+                //委托
+                List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(records1.getId(), 1);
+                for(WorkClientLinkman linkman :clientLinkmanList){
+                    WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());
+                    linkman.setClientId(clientInfo);
+                }
+                //施工（根据项目id）
+                List<WorkClientLinkman> constructionLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectRecords.getId(), 3);
+                records1.setWorkConstructionLinkmanList(constructionLinkmanList);
+                records1.setWorkClientLinkmanList(clientLinkmanList);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
                     WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
                     WorkContractInfo contractInfo = new WorkContractInfo();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -249,6 +249,21 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public Map<String,List> getProjectList(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response) {
         //添加查询类型(工程咨询)
         Page<RuralProjectRecords> page = this.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
+//        //无合同状态下，获取委托方的名称
+//        List<RuralProjectRecords> list = page.getList();
+//        for (int i = 0; i < list.size(); i++) {
+//            RuralProjectRecords records1 = list.get(i);
+//            if (records1.getWorkContractInfo() == null) {
+//                this.queryLinkmanInfos(records1);
+//                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//                    WorkContractInfo contractInfo = new WorkContractInfo();
+//                    contractInfo.setClient(linkman.getClientId());
+//                    records1.setWorkContractInfo(contractInfo);
+//                    records1.getWorkContractInfo().setClientName(records1.getWorkContractInfo().getClient().getName());
+//                }
+//            }
+//        }
 
         //查询所有和当前登陆人有关的项目的审核
         WorkProjectNotify workProjectNotify = new WorkProjectNotify();
@@ -308,11 +323,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
             }
             if (records1.getWorkContractInfo() == null) {
+                this.queryLinkmanInfos(records1);
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
                     WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
                     WorkContractInfo contractInfo = new WorkContractInfo();
                     contractInfo.setClient(linkman.getClientId());
                     records1.setWorkContractInfo(contractInfo);
+                    records1.getWorkContractInfo().setClientName(records1.getWorkContractInfo().getClient().getName());
                 }
             }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -130,6 +130,21 @@ public class RuralCostProjectMessageController extends BaseController {
                 model.addAttribute("workContractInfoClientName", projectRecords.getWorkContractInfo().getClient().getName());
             }
         }
+        //无合同状态下，获取委托方的名称
+        List<RuralProjectRecords> list = page.getList();
+        for (int i = 0; i < list.size(); i++) {
+            RuralProjectRecords records1 = list.get(i);
+            if (records1.getWorkContractInfo() == null) {
+                projectRecordsService.queryLinkmanInfos(records1);
+                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+                    WorkContractInfo contractInfo = new WorkContractInfo();
+                    contractInfo.setClient(linkman.getClientId());
+                    records1.setWorkContractInfo(contractInfo);
+                    records1.getWorkContractInfo().setClientName(records1.getWorkContractInfo().getClient().getName());
+                }
+            }
+        }
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
         return "modules/ruralprojectrecords/cost/ruralCostProjectMessageLists";

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -520,13 +520,14 @@ public class RuralProjectViewController extends BaseController {
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(RuralProjectRecords projectRecords, Model model) {
         projectRecords = projectRecordsService.get(projectRecords.getId());
+        model.addAttribute("projectRecords", projectRecords);
         if (null != projectRecords) {
             if (StringUtils.isBlank(projectRecords.getPrrId())) {
-                model.addAttribute("projectRecords", projectRecords);
+                model.addAttribute("projectReportRecord", projectRecords);
                 return "modules/ruralprojectrecords/view/projectReportRecordView";
             }
         }else{
-            model.addAttribute("projectRecords", projectRecords);
+            model.addAttribute("projectReportRecord", projectRecords);
             return "modules/ruralprojectrecords/view/projectReportRecordView";
         }
         ProjectReportRecord projectReportRecord = projectReportRecordService.get(projectRecords.getPrrId());
@@ -604,7 +605,6 @@ public class RuralProjectViewController extends BaseController {
         //}
 
         model.addAttribute("projectReportRecord", projectReportRecord);
-        model.addAttribute("projectRecords", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";
     }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -17,7 +17,10 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -131,6 +134,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     private WorkLoanDao workLoanDao;
     @Autowired
     private HistoicFlowUtil histoicFlowUtil;
+    @Autowired
+    private ProjectRecordsService projectRecordsService;
+    @Autowired
+    private ProjectReportDataService projectReportDataService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -263,6 +270,14 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     project.setProjectName(workAccount.getReimburseRemarks());
                     info.setProject(project);
                 }
+//                //查询项目
+//                info.setProject(projectRecordsService.get(info.getWorkAccount().getProject().getId()));
+                //查询项目报告信息
+                if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
+                    ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
+                    info.setProjectName(projectReportData.getNumber());
+                }
+                info.setBusinessTypeName(workAccount.getTypeName());
             }
             /*if(StringUtils.isNotBlank(info.getProcessInstanceId())){
                 String taskName = histoicFlowUtil.histoicFlow(info.getProcessInstanceId());

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -60,10 +60,14 @@
 		,wa.money as "money"
 		,wa.project_radio as "workAccount.projectRadio"
 		,wa.reimburse_remarks as "workAccount.reimburseRemarks"
+		,wa.project_id as "workAccount.project.id"
+		,wrt.standard_detail as "workAccount.typeName"
 		,(select office_id from sys_user where id = wa.reimbursement_name) AS "officeId"
 		,p.id AS "project.projectId"
 		FROM work_reimbursement a
 		left join work_account wa on wa.work_reimbursement_id =a.id
+		left join work_reimbursement_type_info wrt on wrt.id =wa.type
+		left join project_report_data pd on pd.project_id =wa.project_id
 		left join rural_project_records p on p.id = wa.project_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
@@ -94,6 +98,12 @@
 			<if test="submitterId != null and submitterId != ''">
 				AND wa.reimbursement_name = #{submitterId}
 			</if>
+			<if test="businessType != null and businessType != ''">
+				AND wa.type = #{businessType}
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND pd.number like concat('%',#{projectName},'%')
+			</if>
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				and (${sqlMap.dsf}
 				or wa.reimbursement_name = #{createBy.id})
@@ -114,6 +124,8 @@
 		FROM work_reimbursement a
 		left join work_account wa on wa.work_reimbursement_id =a.id
 		left join rural_project_records p on p.id = wa.project_id
+		left join work_reimbursement_type_info wrt on wrt.id =wa.type
+		left join project_report_data pd on pd.project_id =wa.project_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="id != null and id != ''">
@@ -143,6 +155,12 @@
 			<if test="submitterId != null and submitterId != ''">
 				AND wa.reimbursement_name = #{submitterId}
 			</if>
+			<if test="businessType != null and businessType != ''">
+				AND wa.type = #{businessType}
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND pd.number like concat('%',#{projectName},'%')
+			</if>
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				and (${sqlMap.dsf}
 				or wa.reimbursement_name = #{createBy.id})

src/main/webapp/WEB-INF/tags/sys/treeselectAccessory.tag

@@ -66,7 +66,7 @@
 						$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
 						$("#${id}Name").val(names.join(","));
 						$("#${id}Name").focus();
-						setParentInfo($("#${id}Id").val());
+						<%--setParentInfo($("#${id}Id").val());--%>
 						top.layer.close(index);
 				    	       },
     	cancel: function(index){ //或者使用btn2

src/main/webapp/static/ckeditor/config.js

@@ -41,11 +41,11 @@ CKEDITOR.editorConfig = function( config ) {
 		// config.filebrowserBrowseUrl = config.ckfinderPath+'/ckfinder.html?type=files&start=files:'+config.ckfinderUploadPath;
 		// config.filebrowserImageBrowseUrl = config.ckfinderPath+'/ckfinder.html?type=images&start=images:'+config.ckfinderUploadPath;
 		// config.filebrowserFlashBrowseUrl = config.ckfinderPath+'/ckfinder.html?type=flash&start=flash:'+config.ckfinderUploadPath;
-		config.filebrowserUploadUrl = config.ckfinderPath+'/core/connector/java/connector.java?command=QuickUpload&type=files&currentFolder='+config.ckfinderUploadPath;
+		// config.filebrowserUploadUrl = config.ckfinderPath+'/core/connector/java/connector.java?command=QuickUpload&type=files&currentFolder='+config.ckfinderUploadPath;
 		// config.filebrowserImageUploadUrl = realPath+'/bos/upload?storeAs='+config.ckfinderUploadPath;
-		config.filebrowserFlashUploadUrl = config.ckfinderPath+'/core/connector/java/connector.java?command=QuickUpload&type=flash&currentFolder='+config.ckfinderUploadPath;
-		config.filebrowserWindowWidth = '1000';
-		config.filebrowserWindowHeight = '700';
+		// config.filebrowserFlashUploadUrl = config.ckfinderPath+'/core/connector/java/connector.java?command=QuickUpload&type=flash&currentFolder='+config.ckfinderUploadPath;
+		// config.filebrowserWindowWidth = '1000';
+		// config.filebrowserWindowHeight = '700';
 	}
 };
 CKEDITOR.stylesSet.add( 'default', [

src/main/webapp/webpage/modules/feedback/feedbackHandle.jsp

@@ -166,7 +166,7 @@
             <div class="layui-item layui-col-sm12 with-textarea" style="padding-bottom: 20px;">
                 <label class="layui-form-label"><span class="require-item">*</span>处理意见：</label>
                 <div class="layui-input-block">
-                    <form:textarea path="handlingOpinions" htmlEscape="false"  colspan="3" rows="6"  maxlength="550" class="form-control "/>
+                    <form:textarea path="handlingOpinions" htmlEscape="false"  colspan="3" rows="6"  maxlength="550" class="form-control required"/>
                 </div>
             </div>
             <div class="form-group layui-row page-end"></div>

src/main/webapp/webpage/modules/feedback/feedbackview.jsp

@@ -164,7 +164,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 with-textarea" style="padding-bottom: 20px;">
-                <label class="layui-form-label"><span class="require-item">*</span>处理意见：</label>
+                <label class="layui-form-label">处理意见：</label>
                 <div class="layui-input-block">
                     <form:textarea path="handlingOpinions" readonly="true" htmlEscape="false"  colspan="3" rows="6"  maxlength="550" class="form-control "/>
                 </div>

src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -134,7 +134,7 @@
 			}else{
 				if(d.count ==1){
 					return[
-						"<a href=\"${ctx}/workfullmanage/workFullManage/downLoadAttach?file=" +encodeURIComponent(encodeURIComponent( d.url ))+ "\"    class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"
+						"<a href=\"${ctx}/workfullmanage/workFullManage/downLoadAttach?file=" +encodeURIComponent( d.url )+ "\"    class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"
 						/*"<a href=\"${ctx}/projectreportnum/projectReportNum/download?number=" +encodeURIComponent(encodeURIComponent( d.num ))+ "\"    class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"*/
 					].join('');
 				}else{

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -34,6 +34,11 @@
         .notForbidden{
             background-color:#3ca2e0;
         }
+        .spanzj{
+            color: red;
+            font-size: 12px;
+            padding-left: 10px;
+        }
     </style>
     <script type="text/javascript">
         var validateForm;
@@ -897,6 +902,7 @@
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
                                                     cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -917,7 +923,7 @@
                 </div>
 
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
                         <form:select path="submitMoney" class="form-control required simple-select">
                             <form:option value=""/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -34,6 +34,11 @@
         .notForbidden{
              background-color:#3ca2e0;
          }
+        .spanzj{
+            color:red;
+            font-size: 12px;
+            padding-left: 10px;
+        }
     </style>
     <script type="text/javascript">
         var validateForm;
@@ -913,6 +918,7 @@
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"
                                                     cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span class="spanzj">必须拥有一级造价师证书</span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -932,7 +938,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审规模：</label>
                     <div class="layui-input-block">
                         <form:select path="submitMoney" class="form-control required simple-select">
                             <form:option value=""/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -583,15 +583,23 @@
 					{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
 								<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
-								return  d.projectReportNumber;
+								if(""!= d.projectReportNumber){
+									return  d.projectReportNumber;
+								}else{
+									return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
+								}
 							}else{
 								return "<font></font>";
 							}
 						}},
                     {field: 'projectLeader', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								<%--return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";--%>
-								return  d.contractName;
+								if(""!= d.contractName && null!= d.contractName) {
+									return  d.contractName;
+								}else{
+									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
+								}
+									<%--return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";--%>
 							}else{
 								return "<font></font>";
 							}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -654,7 +654,7 @@
 						}},
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								if(""!= d.contractName){
+								if(""!= d.contractName && null!= d.contractName){
 									return  d.contractName ;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";

src/main/webapp/webpage/modules/sys/gridselectcallprojectOnReimbur.jsp

@@ -101,7 +101,6 @@
 <%--						</div>--%>
 <%--					</div>--%>
 					<div id="td1" class="commonQuery">
-						<div class="form-group-label"><h2>项目报销</h2></div>
 						<div class="layui-item query athird">
 							<span class="layui-form-label">项目名称：</span>
 							<div class="layui-input-block">
@@ -117,7 +116,6 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="td4" class="commonQuery">
-						<div class="form-group-label"><h2>非项目报销</h2></div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>报销详情：</label>
 							<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -424,10 +424,10 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
-                                                        <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
                                                         <c:choose>
                                                             <c:when test="${signflag == '是'}">
-                                                                <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+																<a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                             </c:when>
                                                             <c:otherwise>
 																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForma.jsp

@@ -368,18 +368,18 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
-                                                            <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
                                                             <c:choose>
                                                                 <c:when test="${signflag == '是'}">
-                                                                    <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	<a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+																	<a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                                 </c:when>
                                                                 <c:otherwise>
-                                                                    <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                    <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                                 </c:otherwise>
                                                             </c:choose>
                                                         </c:when>
                                                         <c:otherwise>
-                                                            <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:otherwise>
                                                     </c:choose>
 												</div>
@@ -722,18 +722,18 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
-                                                                <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
                                                                 <c:choose>
                                                                     <c:when test="${signflag == '是'}">
-                                                                        <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+																		<a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                                     </c:when>
                                                                     <c:otherwise>
-                                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                                     </c:otherwise>
                                                                 </c:choose>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                             </c:otherwise>
                                                         </c:choose>
 													</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -172,6 +172,23 @@
                                                 title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff"/>
                             </div>
                         </div>
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">报销类别：</label>
+                            <div class="layui-input-block with-icon">
+                                <sys:treeselectAccessory id="type" name="businessType" value="${workReimbursement.businessTypeName}" labelName="businessTypeName" labelValue="${workReimbursement.businessTypeName}"
+                                                         cssStyle="background-color:#fff" title="报销类别" url="/reimbursementType/reimbursementType/treeData" extId=""  cssClass="form-control  layui-input" allowClear="true" notAllowSelectParent="true"/>
+
+<%--                                <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"--%>
+<%--                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff"/>--%>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">报告号：</label>
+                            <div class="layui-input-block with-icon">
+                                <input id="projectName" placeholder="请输入报告号" name="projectName" type="text" maxlength="20" class="form-control layui-input" value="${workReimbursement.projectName}"/>
+                                </input>
+                            </div>
+                        </div>
                         <div style="clear:both;"></div>
                     </div>
                 </form:form>
@@ -215,6 +232,9 @@
                             "<span title=" + d.realnumber + ">" + d.number + "</span></a>";
                         return xml;
                     }}
+                ,{field:'businessTypeName',align:'center', title: '报销类别', width:100,templet:function(d){
+                        return "<span title='"+ d.businessTypeName +"'>" + d.businessTypeName + "</span>";
+                    }}
                 ,{field:'projectId', align:'center',title: '报销项目', minWidth:150,templet:function(d){
                         if(1 == d.showView && d.showView != undefined){
                             return "<a class=\"attention-info\" title=\"" + d.projectId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.proId +"','95%', '95%')\">" + d.projectId + "</a>";
@@ -223,6 +243,9 @@
                         }
                     // return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
                     }}
+                ,{field:'projectNumber',align:'center', title: '报告号', width:100,templet:function(d){
+                        return "<span title='"+ d.projectNumber +"'>" + d.projectNumber + "</span>";
+                    }}
                 ,{field:'handleName',align:'center', title: '经办人', width:100,templet:function(d){
                         return "<span title='"+ d.handleName +"'>" + d.handleName + "</span>";
                     }}
@@ -328,6 +351,9 @@
                     <shiro:hasPermission name="ruralProject:ruralProjectView:reimbursementView">
                     ,"showView":1
                     </shiro:hasPermission>
+                    ,"businessTypeName":"${workReimbursement.businessTypeName}"
+                    ,"projectNumber":"${workReimbursement.projectName}"
+
                 }
                 </c:forEach>
                 </c:if>