Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectAccessory/entity/ProjectTemplateInfo.java

@@ -38,6 +38,9 @@ public class ProjectTemplateInfo extends TreeEntity<ProjectTemplateInfo>{
 
 	private Integer fileFlag;   //判断是否有文件(1:有文件信息，0：无文件)
 
+	private String collectFlag;	//判断是否收藏
+	private String fileSize;	//f附件大小
+
 
 	public ProjectTemplateInfo() {
 		super();
@@ -207,4 +210,20 @@ public class ProjectTemplateInfo extends TreeEntity<ProjectTemplateInfo>{
 	public void setFileFlag(Integer fileFlag) {
 		this.fileFlag = fileFlag;
 	}
+
+	public String getCollectFlag() {
+		return collectFlag;
+	}
+
+	public void setCollectFlag(String collectFlag) {
+		this.collectFlag = collectFlag;
+	}
+
+	public String getFileSize() {
+		return fileSize;
+	}
+
+	public void setFileSize(String fileSize) {
+		this.fileSize = fileSize;
+	}
 }

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -4,10 +4,13 @@
 package com.jeeplus.modules.projectAccessory.service;
 
 import com.google.common.collect.Lists;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.TreeService;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.projectAccessory.dao.ProjectAccessoryDao;
 import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
+import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
@@ -42,6 +45,8 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
     private RuralProjectRecordsService projectRecordsService;
     @Autowired
     private ProjectAccessoryRelationService projectAccessoryRelationService;
+    @Autowired
+    private ProjectAccessoryDao projectAccessoryDao;
 
 	public ProjectTemplateInfo get(String id) {
 		return super.get(id);
@@ -298,6 +303,24 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             attchment.setProjectId(projectTemplateInfo.getId());
             attchment.setAttachmentId(info.getId());
             List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
+            cAInfo.setOfficeId(UserUtils.getUser().getOffice().getId());
+            cAInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
+            cAInfo.setCreateBy(UserUtils.getUser());
+            //遍历附件信息，判定改附件信息是否被收藏
+            for (WorkClientAttachment info1: attachments) {
+                //url截取
+                String aliyunUrl = Global.getAliDownloadUrl();
+                if(info1.getUrl().indexOf(aliyunUrl)!=-1){
+                    cAInfo.setUrl(info1.getUrl().replace(aliyunUrl,""));
+                }
+                CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
+                if(null != collectAccessoryInfo){
+                    info1.setCollectFlag("1");
+                }else{
+                    info1.setCollectFlag("0");
+                }
+            }
             //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
             workattachmentService.clientAttachmentManageOnUrl(attachments);
             info.setWorkAttachments(attachments);

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

@@ -2073,6 +2073,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				attach.setAttachName(attachment.getAttachmentName());
 				attach.setUrl(attachment.getUrl());
 				attach.setAttachTypes(attachment.getType());
+				attach.setCollectFlag(attachment.getCollectFlag());
+				attach.setCreateBy(UserUtils.getUser());
+				attach.setFileSize(attachment.getFileSize());
 				//添加临时查看url（阿里云）
 				attach.setTemporaryUrl(attachment.getTemporaryUrl());
 				list.add(attach);

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -736,10 +736,23 @@
 		LEFT JOIN project_report_data prd ON a.id = prd.project_id
 		where a.status='5'  and a.del_flag='0' and w.del_flag='0'
 		/*and prd.number is not null*/
-		and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
+		/*and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)*/
 		<if test="projectName != null and projectName != ''">
 			AND a.project_name like concat(concat('%',#{projectName}),'%')
 		</if>
+		<if test="projectId != null and projectId != ''">
+			AND a.project_Id like concat(concat('%',#{projectId}),'%')
+		</if>
+		<if test="workContractInfo != null and workContractInfo != ''">
+			<if test="workContractInfo.name != null and workContractInfo.name != ''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+		</if>
+		<if test="reportData != null and reportData != ''">
+			<if test="reportData.number != null and reportData.number != ''">
+				AND prd.number like concat(concat('%',#{reportData.number}),'%')
+			</if>
+		</if>
 		GROUP BY a.id
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/webapp/webpage/modules/iframeView/opinion.jsp

@@ -16,7 +16,7 @@
             <div class="form-group layui-row">
                 <div class="layui-item layui-col-sm8 lw6 with-textarea">
                     <div class="layui-input-block" style="margin-left:10px;position: relative">
-                        <textarea placeholder="请输入意见：" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="250"></textarea>
+                        <textarea placeholder="请输入意见：" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="245"></textarea>
                         <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -345,7 +345,7 @@
                                 <th>文件预览</th>
                                 <th>上传人</th>
                                 <th>上传时间</th>
-                                <th width="100px">操作</th>
+                                <th width="150px">操作</th>
                             </tr>
                             </thead>
                             <tbody id="file_attachment">
@@ -426,6 +426,9 @@
                                                     <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>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -280,7 +280,7 @@
                             <th>文件预览</th>
                             <th>上传人</th>
                             <th>上传时间</th>
-                            <th width="100px">操作</th>
+                            <th width="150px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
@@ -360,6 +360,9 @@
                                                 <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>
                                             </c:otherwise>
                                         </c:choose>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        </c:if>
                                     </div>
                                 </td>
                             </tr>

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

@@ -953,6 +953,20 @@
             obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
         }
+        function insertTitleCollection(tValue){
+            var files = tValue;
+            for(var i = 0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "95";
+                console.log(file);
+                var timestamp = new Date().getTime();
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile" + divId).show();
+                multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+            }
+        }
     </script>
 </head>
 <body>
@@ -1379,6 +1393,10 @@
                     <div class="form-group-label"><h2>附件信息</h2></div>
                     <div class="layui-item nav-btns">
                         <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                        <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+                                            name="linkman.id"  title="选择资料库"
+                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
                     </div>
                     <div id="addFile_attachment" style="display: none" class="upload-progress">
                         <span id="fileName_attachment" ></span>
@@ -1470,6 +1488,9 @@
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -951,6 +951,20 @@
             obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
         }
+        function insertTitleCollection(tValue){
+            var files = tValue;
+            for(var i = 0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "95";
+                console.log(file);
+                var timestamp = new Date().getTime();
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile" + divId).show();
+                multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+            }
+        }
     </script>
 </head>
 <body>
@@ -1383,6 +1397,10 @@
                     <div class="form-group-label"><h2>附件信息</h2></div>
                     <div class="layui-item nav-btns">
                         <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                        <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+                                            name="linkman.id"  title="选择资料库"
+                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
                     </div>
                     <div id="addFile_attachment" style="display: none" class="upload-progress">
                         <span id="fileName_attachment" ></span>
@@ -1474,6 +1492,9 @@
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}'" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -502,7 +502,7 @@
 								<tr>
 									<th width="30%">文件类型</th>
 									<th width="">文件名</th>
-									<th width="100px">操作</th>
+									<th width="150px">操作</th>
 								</tr>
 								</thead>
 								<tbody id="file_attachment">
@@ -601,6 +601,9 @@
 																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:otherwise>
 														</c:choose>
+														<c:if test="${fileAttachment.collectFlag != 1}">
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+														</c:if>
 													</c:otherwise>
 												</c:choose>
 											</div>
@@ -630,7 +633,7 @@
 								<tr>
 									<th width="30%">文件类型</th>
 									<th width="">文件名</th>
-									<th width="100px">操作</th>
+									<th width="150px">操作</th>
 								</tr>
 								</thead>
 								<tbody id="file_gistdata">
@@ -729,6 +732,9 @@
 																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:otherwise>
 														</c:choose>
+														<c:if test="${fileGistdata.collectFlag != 1}">
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+														</c:if>
 													</c:otherwise>
 												</c:choose>
 											</div>
@@ -760,7 +766,7 @@
 								<tr>
 									<th width="30%">文件类型</th>
 									<th width="">文件名</th>
-									<th width="100px">操作</th>
+									<th width="150px">操作</th>
 								</tr>
 								</thead>
 								<tbody id="file_other">
@@ -859,6 +865,9 @@
 																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:otherwise>
 														</c:choose>
+														<c:if test="${fileOther.collectFlag != 1}">
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+														</c:if>
 													</c:otherwise>
 												</c:choose>
 											</div>
@@ -1159,6 +1168,9 @@
 																		<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>
 																	</c:otherwise>
 																</c:choose>
+																<c:if test="${workClientAttachment.collectFlag != 1}">
+																	<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+																</c:if>
 															</div>
 														</td>
 													</tr>
@@ -1502,6 +1514,9 @@
 										<td class="op-td">
 											<div class="op-btn-box" >
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+												<c:if test="${workClientAttachment.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+												</c:if>
 											</div>
 										</td>
 									</tr>

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

@@ -957,6 +957,20 @@
             obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
         }
+        function insertTitleCollection(tValue){
+            var files = tValue;
+            for(var i = 0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "95";
+                console.log(file);
+                var timestamp = new Date().getTime();
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile" + divId).show();
+                multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+            }
+        }
     </script>
 </head>
 <body>
@@ -1391,6 +1405,10 @@
                     <div class="form-group-label"><h2>附件信息</h2></div>
                     <div class="layui-item nav-btns">
                         <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                        <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+                                            name="linkman.id"  title="选择资料库"
+                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
                     </div>
                     <div id="addFile_attachment" style="display: none" class="upload-progress">
                         <span id="fileName_attachment" ></span>
@@ -1482,6 +1500,9 @@
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -162,7 +162,7 @@
 					</c:when>
 						<c:otherwise>
 							<tr>
-								<td colspan="3" align="center">
+								<td colspan="4" align="center">
 									暂无数据
 								</td>
 							</tr>

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

@@ -35,6 +35,17 @@
 					$("#td4").removeClass("hide");
 					$("#tr1").hide()
 				}
+				//搜索框收放
+				$('#moresee').click(function(){
+					if($('#moresees').is(':visible'))
+					{
+						$('#moresees').slideUp(0,resizeListWindow1);
+						$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+					}else{
+						$('#moresees').slideDown(0,resizeListWindow1);
+						$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+					}
+				});
 			});
 		// });
 
@@ -73,6 +84,7 @@
 			$("#searchForm").submit();
 			return false;
 		}
+
 	</script>
 </head>
 <body>
@@ -108,14 +120,38 @@
 								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<span class="layui-form-label">项目编号：</span>
+							<div class="layui-input-block">
+								<form:input path="projectId" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
 						<div class="layui-item athird fr">
 							<div class="input-group">
-								<button id="searchReset" class="fixed-btn searchReset fr" style="margin-right: 0px;" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
+					<div id="moresees" style="clear:both;display:none;">
+						<div class="layui-item query athird">
+							<span class="layui-form-label">合同名称：</span>
+							<div class="layui-input-block">
+								<form:input path="workContractInfo.name" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<span class="layui-form-label">报告号：</span>
+							<div class="layui-input-block">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
 					<div id="td4" class="commonQuery">
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label"><span class="require-item">*</span>报销详情：</label>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -283,6 +283,9 @@
                                                 <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>
                                             </c:otherwise>
                                         </c:choose>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                        </c:if>
                                     </td>
                                 </tr>
                             </c:forEach>

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

@@ -249,6 +249,9 @@
                                                                     <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>
                                                                 </c:otherwise>
                                                             </c:choose>
+                                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                                            </c:if>
                                                         </td>
                                                     </tr>
                                                 </c:forEach>

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

@@ -480,6 +480,9 @@
 														</c:choose>
                                                     </c:otherwise>
                                                 </c:choose>
+												<c:if test="${workClientAttachment.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+												</c:if>
 											</div>
 										</td>
 									</tr>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -351,6 +351,9 @@
 											<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>
 										</c:otherwise>
 									</c:choose>
+									<c:if test="${workClientAttachment.collectFlag != 1}">
+										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+									</c:if>
 								</td>
 							</tr>
 						</c:forEach>

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

@@ -465,9 +465,9 @@
 												<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>
 											</c:otherwise>
 										</c:choose>
-										<%--<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>--%>
+										<c:if test="${workClientAttachment.collectFlag != 1}">
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+										</c:if>
 									</div>
 								</td>
 							</tr>
@@ -476,39 +476,6 @@
 				</table>
 			</div>
 		</div>
-<%--		<div class="form-group layui-row">--%>
-<%--			<div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--			<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--				<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--					<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--					<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--					<input type="file" name="upload_files" style="display: none;">--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--			<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--				<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--					<div style="padding: 5px 0px;">--%>
-<%--						<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--							<form:option value=""/>--%>
-<%--							<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--						</form:select>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
-<%--		</div>--%>
-<%--		<div class="form-group layui-row">--%>
-<%--			<div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--			<div class="layui-item layui-col-xs12 with-textarea" >--%>
-<%--					<label class="layui-form-label">审批意见：</label>--%>
-<%--					<div class="layui-input-block">--%>
-<%--						<form:textarea path="act.comment" class="form-control" rows="4" maxlength="127" />--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--			</div>--%>
-<%--		</div>--%>
 		<div class="form-group layui-row page-end"></div>
 	</form:form>
 		<div class="form-group-label">

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

@@ -784,6 +784,9 @@
                                             <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>
                                         </c:otherwise>
                                     </c:choose>
+                                    <c:if test="${workClientAttachment.collectFlag != 1}">
+                                        <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                    </c:if>
                                     <%--<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                         <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                     </c:if>--%>

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

@@ -520,6 +520,9 @@
                                         <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>
                                     </c:otherwise>
                                 </c:choose>
+                                <c:if test="${workClientAttachment.collectFlag != 1}">
+                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>
+                                </c:if>
                              <%--   <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                     <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                 </c:if>--%>