依据资料加一列 资料性质

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectBasedData.java

@@ -34,6 +34,7 @@ public class ProjectBasedData extends DataEntity<ProjectBasedData> {
 	private User uploadUser;		// 上传人
     @JsonFormat(pattern="yyyy-MM-dd")
     private Date uploadDate;		// 上传日期
+	private String nature;   //资料性质
 	private List<Workattachment> workAttachments;
 	private Date startDate;
 	private Date endDate;
@@ -231,4 +232,12 @@ public class ProjectBasedData extends DataEntity<ProjectBasedData> {
 	public void setChooseCondition(String chooseCondition) {
 		this.chooseCondition = chooseCondition;
 	}
+
+	public String getNature() {
+		return nature;
+	}
+
+	public void setNature(String nature) {
+		this.nature = nature;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -131,7 +131,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         if(i==0){
             return;
         }
-        if("according".equals(condition) || "completion".equals(condition) || "early".equals(condition) || "claim".equals(condition) || "design".equals(condition) || "visa".equals(condition) || "interim".equals(condition) || "distribution".equals(condition)){
+        if("according".equals(condition) || "completion".equals(condition) || "early".equals(condition) || "claim".equals(condition) || "design".equals(condition) || "visa".equals(condition) || "interim".equals(condition) || "distribution".equals(condition) || "material".equals(condition) || "armor".equals(condition)){
             dao.deleteProjectContentBased(contentId,basedId);
         }else{
             //删除菜单

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -251,6 +251,12 @@ public class ProjectEarlyReviewController extends BaseController {
             projectContentDataService.queryBasedData(projectContentData);
         }
 
+        //判断是否呦引用的依据性文件
+        if(null != projectContentData && projectContentData.getProjectBasedDataList().size()>0){
+            for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
+                projectBasedData.setNature("引用");
+            }
+        }
         //获取该工作内容的依据性资料信息
         List<ProjectBasedData> projectBasedDataList =  projectTypeService.getAccrdingDataList(typeId);
         for (ProjectBasedData projectBasedData: projectBasedDataList) {
@@ -266,10 +272,14 @@ public class ProjectEarlyReviewController extends BaseController {
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
             }
-            //判断是否有上传文件 如果没有上传文件则添加当前登录人信息 和当前时间作为上传时间
+            /*//判断是否有上传文件 如果没有上传文件则添加当前登录人信息 和当前时间作为上传时间
             if(StringUtils.isBlank(projectBasedData.getFileUrl())){
                 projectBasedData.setUploadDate(new Date());
                 projectBasedData.setUploadUser(UserUtils.getUser());
+            }*/
+            //判定是否为必填项，如果是则展示必填字段
+            if("1".equals(projectBasedData.getChooseCondition())){
+                projectBasedData.setNature("必填");
             }
         }
         for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementEarlyController.java

@@ -275,6 +275,11 @@ public class ProjectImplementEarlyController {
                 projectBasedData.setUploadDate(new Date());
                 projectBasedData.setUploadUser(UserUtils.getUser());
                 projectBasedData.setType(typeId);
+
+                //判定是否为必填项，如果是则展示必填字段
+                if("1".equals(projectBasedData.getChooseCondition())){
+                    projectBasedData.setNature("必填");
+                }
             }
         }
         map.put("projectBasedDataList",projectBasedDataList);

src/main/webapp/static/bos/bosupload.js

@@ -25,15 +25,15 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
         multitest(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix);
 };
 
-function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix) {
+function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
     console.log("-----------------------start");
     if(cpt == 1)
-        multitestFlag(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix);
+        multitestFlag(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser);
     else
-        multitest(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix);
+        multitest(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser);
 };
 
-function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,idx,prefix) {
+function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt,idx,prefix,currentUser) {
     var formdata = new FormData();
     formdata.append("storeAs",storeAs);
     formdata.append("file",file);
@@ -73,6 +73,10 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             }
                             $(prefix+"_fileTypeDiv").empty();
                             $(prefix+"_fileTypeDiv").append(str);
+                            $(prefix+"_uploadUserName").html(currentUser);
+                            var d = new Date();
+                            var dateTime=d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
+                            $(prefix+"_uploadDate").html(dateTime);
                             $(prefix+"_fileName").val(data.attachmentName);
                             $(prefix+"_fileType").val(data.type);
                             $(prefix+"_fileUrl").val(data.url);

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsForm.jsp

@@ -561,9 +561,11 @@
                 <thead>
                 <tr>
                     <th class="hide"></th>
-                    <th >资料编号</th>
+                    <%--<th >资料编号</th>--%>
                     <th >资料名称</th>
                     <th >资料类别</th>
+                    <th >资料性质</th>
+                    <th >资料内容</th>
                     <th >上传人</th>
                     <th >上传日期</th>
                     <th>操作</th>
@@ -587,9 +589,9 @@
                             <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>
-                        <td style="text-align:center;">
+                        <%--<td style="text-align:center;">
                                 ${projectBasedData.number}
-                        </td>
+                        </td>--%>
                         <td style="text-align:center;">
                                 ${projectBasedData.name}
                         </td>
@@ -597,6 +599,11 @@
                                 ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                         </td>
                         <td style="text-align:center;">
+                            <div id="workBaseDataList${idx.index}_nature">
+                                    ${projectBasedData.nature}
+                            </div>
+                        </td>
+                        <td style="text-align:center;">
                                 ${projectBasedData.uploadUser.name}
                         </td>
                         <td style="text-align:center;">
@@ -640,7 +647,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -664,9 +677,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -674,6 +687,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -693,6 +716,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/claim/projectClaimForm.jsp

@@ -535,9 +535,11 @@
                         <thead>
                         <tr>
                             <th class="hide"></th>
-                            <th >资料编号</th>
+                            <%--<th >资料编号</th>--%>
                             <th >资料名称</th>
                             <th >资料类别</th>
+                            <th >资料性质</th>
+                            <th >资料内容</th>
                             <th >上传人</th>
                             <th >上传日期</th>
                             <th>操作</th>
@@ -561,9 +563,9 @@
                                     <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                                     <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
-                                <td style="text-align:center;">
+                                <%--<td style="text-align:center;">
                                         ${projectBasedData.number}
-                                </td>
+                                </td>--%>
                                 <td style="text-align:center;">
                                         ${projectBasedData.name}
                                 </td>
@@ -571,6 +573,11 @@
                                         ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                                 </td>
                                 <td style="text-align:center;">
+                                    <div id="workBaseDataList${idx.index}_nature">
+                                            ${projectBasedData.nature}
+                                    </div>
+                                </td>
+                                <td style="text-align:center;">
                                         ${projectBasedData.uploadUser.name}
                                 </td>
                                 <td style="text-align:center;">
@@ -614,7 +621,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -638,9 +651,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -648,6 +661,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -665,12 +688,9 @@
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){
                         var idArr = $("#workBaseDataList tr:visible .clientId");
-                        if(idArr.length == 1){
-                            layer.msg('只能选择或新增一条依据性资料', {icon: 5});
-                            return;
-                        }
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/concealProject/workContentForm.jsp

@@ -570,9 +570,11 @@
                 <thead>
                 <tr>
                     <th class="hide"></th>
-                    <th >资料编号</th>
+                    <%--<th >资料编号</th>--%>
                     <th >资料名称</th>
                     <th >资料类别</th>
+                    <th >资料性质</th>
+                    <th >资料内容</th>
                     <th >上传人</th>
                     <th >上传日期</th>
                     <th>操作</th>
@@ -596,9 +598,9 @@
                             <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>
-                        <td style="text-align:center;">
+                        <%--<td style="text-align:center;">
                                 ${projectBasedData.number}
-                        </td>
+                        </td>--%>
                         <td style="text-align:center;">
                                 ${projectBasedData.name}
                         </td>
@@ -606,6 +608,11 @@
                                 ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                         </td>
                         <td style="text-align:center;">
+                            <div id="workBaseDataList${idx.index}_nature">
+                                    ${projectBasedData.nature}
+                            </div>
+                        </td>
+                        <td style="text-align:center;">
                                 ${projectBasedData.uploadUser.name}
                         </td>
                         <td style="text-align:center;">
@@ -649,7 +656,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -673,9 +686,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -683,6 +696,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -702,6 +725,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/contractMaterial/workMaterialForm.jsp

@@ -555,9 +555,11 @@
                 <thead>
                 <tr>
                     <th class="hide"></th>
-                    <th >资料编号</th>
+                    <%--<th >资料编号</th>--%>
                     <th >资料名称</th>
                     <th >资料类别</th>
+                    <th >资料性质</th>
+                    <th >资料内容</th>
                     <th >上传人</th>
                     <th >上传日期</th>
                     <th>操作</th>
@@ -581,9 +583,9 @@
                             <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>
-                        <td style="text-align:center;">
+                        <%--<td style="text-align:center;">
                                 ${projectBasedData.number}
-                        </td>
+                        </td>--%>
                         <td style="text-align:center;">
                                 ${projectBasedData.name}
                         </td>
@@ -591,6 +593,11 @@
                                 ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                         </td>
                         <td style="text-align:center;">
+                            <div id="workBaseDataList${idx.index}_nature">
+                                    ${projectBasedData.nature}
+                            </div>
+                        </td>
+                        <td style="text-align:center;">
                                 ${projectBasedData.uploadUser.name}
                         </td>
                         <td style="text-align:center;">
@@ -634,7 +641,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -658,9 +671,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -668,6 +681,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -687,6 +710,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/design/projectDesignForm.jsp

@@ -536,9 +536,11 @@
                         <thead>
                         <tr>
                             <th class="hide"></th>
-                            <th >资料编号</th>
+                            <%--<th >资料编号</th>--%>
                             <th >资料名称</th>
                             <th >资料类别</th>
+                            <th >资料性质</th>
+                            <th >资料内容</th>
                             <th >上传人</th>
                             <th >上传日期</th>
                             <th>操作</th>
@@ -562,9 +564,9 @@
                                     <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                                     <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
-                                <td style="text-align:center;">
+                                <%--<td style="text-align:center;">
                                         ${projectBasedData.number}
-                                </td>
+                                </td>--%>
                                 <td style="text-align:center;">
                                         ${projectBasedData.name}
                                 </td>
@@ -572,6 +574,11 @@
                                         ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                                 </td>
                                 <td style="text-align:center;">
+                                <div id="workBaseDataList${idx.index}_nature">
+                                        ${projectBasedData.nature}
+                                </div>
+                            </td>
+                                <td style="text-align:center;">
                                         ${projectBasedData.uploadUser.name}
                                 </td>
                                 <td style="text-align:center;">
@@ -615,7 +622,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -639,9 +652,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -649,6 +662,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -668,6 +691,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementForm.jsp

@@ -559,9 +559,11 @@
                 <thead>
                 <tr>
                     <th class="hide"></th>
-                    <th >资料编号</th>
+                    <%--<th >资料编号</th>--%>
                     <th >资料名称</th>
                     <th >资料类别</th>
+                    <th >资料性质</th>
+                    <th >资料内容</th>
                     <th >上传人</th>
                     <th >上传日期</th>
                     <th>操作</th>
@@ -585,9 +587,9 @@
                             <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>
-                        <td style="text-align:center;">
+                        <%--<td style="text-align:center;">
                                 ${projectBasedData.number}
-                        </td>
+                        </td>--%>
                         <td style="text-align:center;">
                                 ${projectBasedData.name}
                         </td>
@@ -595,6 +597,11 @@
                                 ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                         </td>
                         <td style="text-align:center;">
+                            <div id="workBaseDataList${idx.index}_nature">
+                                    ${projectBasedData.nature}
+                            </div>
+                        </td>
+                        <td style="text-align:center;">
                                 ${projectBasedData.uploadUser.name}
                         </td>
                         <td style="text-align:center;">
@@ -638,7 +645,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -662,9 +675,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -672,6 +685,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -691,6 +714,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/implementStage/projectInterimPaymentForm.jsp

@@ -562,6 +562,7 @@
                             <th class="hide"></th>
                             <th >资料编号</th>
                             <th >资料名称</th>
+                            <th >资料性质</th>
                             <th >资料类别</th>
                             <th >上传人</th>
                             <th >上传日期</th>
@@ -593,6 +594,11 @@
                                         ${projectBasedData.name}
                                 </td>
                                 <td style="text-align:center;">
+                                    <div id="workBaseDataList${idx.index}_nature">
+                                            ${projectBasedData.nature}
+                                    </div>
+                                </td>
+                                <td style="text-align:center;">
                                         ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                                 </td>
                                 <td style="text-align:center;">
@@ -636,6 +642,11 @@
                         {{row.name}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
@@ -670,6 +681,11 @@
                         {{row.name}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
@@ -692,6 +708,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/visa/projectVisaForm.jsp

@@ -548,9 +548,11 @@
                         <thead>
                         <tr>
                             <th class="hide"></th>
-                            <th >资料编号</th>
+                            <%--<th >资料编号</th>--%>
                             <th >资料名称</th>
                             <th >资料类别</th>
+                            <th >资料性质</th>
+                            <th >资料内容</th>
                             <th >上传人</th>
                             <th >上传日期</th>
                             <th>操作</th>
@@ -574,9 +576,9 @@
                                     <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                                     <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
-                                <td style="text-align:center;">
+                                <%--<td style="text-align:center;">
                                         ${projectBasedData.number}
-                                </td>
+                                </td>--%>
                                 <td style="text-align:center;">
                                         ${projectBasedData.name}
                                 </td>
@@ -584,6 +586,11 @@
                                         ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
                                 </td>
                                 <td style="text-align:center;">
+                                    <div id="workBaseDataList${idx.index}_nature">
+                                            ${projectBasedData.nature}
+                                    </div>
+                                </td>
+                                <td style="text-align:center;">
                                         ${projectBasedData.uploadUser.name}
                                 </td>
                                 <td style="text-align:center;">
@@ -627,7 +634,13 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -651,9 +664,9 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <%--<td style="text-align:center;">
                         {{row.number}}
-                    </td>
+                    </td>--%>
                     <td style="text-align:center;">
                         {{row.name}}
                     </td>
@@ -661,6 +674,16 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">
@@ -680,6 +703,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -611,6 +611,7 @@
 							<%--<th >资料编号</th>--%>
 							<th >资料名称</th>
 							<th >资料类别</th>
+							<th >资料性质</th>
 							<th >资料内容</th>
 							<th >上传人</th>
 							<th >上传日期</th>
@@ -645,6 +646,11 @@
 										${projectBasedData.type}
 								</td>
 								<td style="text-align:center;">
+									<div id="workBaseDataList${idx.index}_nature">
+											${projectBasedData.nature}
+									</div>
+								</td>
+								<td style="text-align:center;">
 									<div id="workBaseDataList${idx.index}_fileTypeDiv">
 										<c:choose>
 											<c:when test="${fn:containsIgnoreCase(projectBasedData.fileName,'jpg')
@@ -717,6 +723,11 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentForm.jsp

@@ -12,6 +12,7 @@
         }
     </style>
 	<script type="text/javascript">
+        var enterInt = 0;
         $.fn.serializeJson=function(){
             var serializeObj={};
             var array=this.serializeArray();
@@ -186,6 +187,8 @@
         }
 
         function insertAccording(tValue,idx,prefix) {
+            //当前登陆人
+            var currentUser = '${fns:getUser().name}';
             var files = $(prefix+"_file")[0].files;
             for(var i=0;i<files.length;i++) {
                 var file = files[i];
@@ -198,7 +201,7 @@
                 var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
                 /*将这段字符串存到数据库即可*/
                 var divId = "_attachment";
-                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix,currentUser);
             }
             $(prefix+"_file").val(123)
         }
@@ -260,8 +263,10 @@
                     }
                 })
             }
-
             $("#contentDetail").empty();
+            if(enterInt > 0){
+                $("#workBaseDataList").empty();
+            }
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -339,6 +344,7 @@
                     $("#contentDetail").html("");
                     break;
             }
+            enterInt+=1;
         }
 
         function addFile() {
@@ -676,6 +682,7 @@
                     <%--<th>资料编号</th>--%>
                     <th >资料名称</th>
                     <th >资料类别</th>
+                    <th >资料性质</th>
                     <th >资料内容</th>
                     <th >上传人</th>
                     <th >上传日期</th>
@@ -712,6 +719,11 @@
                                <%-- ${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}--%>
                         </td>
                         <td style="text-align:center;">
+                            <div id="workBaseDataList${idx.index}_nature">
+                                ${projectBasedData.nature}
+                            </div>
+                        </td>
+                        <td style="text-align:center;">
                             <div id="workBaseDataList${idx.index}_fileTypeDiv">
                                 <c:choose>
                                     <c:when test="${fn:containsIgnoreCase(projectBasedData.fileName,'jpg')
@@ -756,7 +768,7 @@
 
                                     </c:when>
                                     <c:otherwise>
-                                        <a href=javascript:void(0); onclick="delRowBaseData(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+                                        <a href=javascript:void(0); onclick="delBaseData(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
                                     </c:otherwise>
                                 </c:choose>
                             </div>
@@ -795,15 +807,24 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
                             <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_uploadUserName">
                         {{row.uploadUser.name}}
+                        </div>
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_uploadDate">
                         {{row.uploadDate}}
+                        </div>
                     </td>
                     <td class="text-center op-td">
                         <div id="workBaseDataList{{idx}}_operation">
@@ -843,15 +864,24 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
                             <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_uploadUserName">
                         {{row.uploadUser.name}}
+                        </div>
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_uploadDate">
                         {{row.uploadDate}}
+                        </div>
                     </td>
                     <td class="text-center op-td">
                         <div id="workBaseDataList{{idx}}_operation">
@@ -881,6 +911,11 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
                         </div>
                     </td>
@@ -905,6 +940,7 @@
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+                            $("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }
                     }
@@ -962,7 +998,39 @@
                         dataType:"json",
                         success:function(data){
                             if(data.success) {
-                                if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition ){
+                                if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition || "material" == condition || "armor" == condition ){
+                                    $(obj).parent().parent().remove();
+                                }else{
+                                    $(obj).parent().parent().remove();
+                                }
+                                if(data.body.inuse){
+                                    return;
+                                }
+                                if (currentUser == userId) {
+                                    confirmDelete('是否同步删除资料库的文件？','${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+id+'&id=${projectcontentinfo.id}&type=1');
+                                }
+                            }else {
+                                top.layer.msg("删除依据资料失败！", {icon: 0});
+                            }
+                        }
+                    })
+                    return;
+                }
+
+                function delBaseData(obj, prefix,userId){
+                    var id = $(prefix+"_id").val();
+                    var currentUser = '${fns:getUser().id}';
+                    var contentId = '${projectcontentinfo.projectContentData.id}';
+                    console.log(contentId);
+                    var condition = "${flag}";
+                    $.ajax({
+                        type:"post",
+                        url:'${ctx}/projectcontentinfo/projectContentData/ajaxdelete',
+                        data:{"contentId":contentId,"basedId":id,"condition":condition},
+                        dataType:"json",
+                        success:function(data){
+                            if(data.success) {
+                                if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition || "material" == condition || "armor" == condition ){
                                     $(obj).parent().parent().parent().remove();
                                 }else{
                                     $(obj).parent().parent().remove();

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentView.jsp

@@ -662,6 +662,7 @@
                                 <%--<th >资料编号</th>--%>
                             <th >资料名称</th>
                             <th >资料类别</th>
+                            <th >资料性质</th>
                             <th >资料内容</th>
                             <th >上传人</th>
                             <th >上传日期</th>
@@ -684,6 +685,9 @@
                                         ${projectBasedData.type}
                                 </td>
                                 <td style="text-align:center;">
+                                        ${projectBasedData.nature}
+                                </td>
+                                <td style="text-align:center;">
 
                                     <c:choose>
                                         <c:when test="${fn:containsIgnoreCase(projectBasedData.fileName,'jpg')
@@ -754,6 +758,11 @@
                         {{row.typeLabel}}
                     </td>
                     <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_nature">
+                        {{row.nature}}
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
                         {{row.uploadUser.name}}
                     </td>
                     <td style="text-align:center;">