修改材料价格管理新增和展示问题

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectEngineerService.java

@@ -228,6 +228,7 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
         workMaterialCollectTypeDao.updateEngId(workEngineer.getId());
     }
 
+    @Transactional(readOnly = false)
     public void deleteWorkInformationCollectType(String id){
         workMaterialCollectTypeDao.deleteWorkInformationCollectType(id);
     }

src/main/resources/mappings/modules/workmaterialcollect/WorkMaterialCollectTypeDao.xml

@@ -178,7 +178,7 @@
 
 	<delete id="deleteWorkInformationCollectType">
 		DELETE FROM work_material_collect_type
-		WHERE id = #{id}
+		WHERE attachmentId = #{id}
 	</delete>
 	
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->

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

@@ -240,4 +240,31 @@ function deleteFileFromAliyun(obj,deleteUrl,addFile,divId){
             }
         }
     });
+}
+
+function deleteFileFrom(obj,deleteUrl,addFile,divId,trId){
+    console.log("---------------------------------:");
+    console.log(divId);
+    console.log("---------------------------------");
+    if (divId==null || divId== undefined || divId == ''){
+        divId = "_attachment";
+    }
+    var fileDiv = divId.substr(1,divId.length)+"_file";
+    console.log("---------------------------------:");
+    console.log(fileDiv);
+    console.log("---------------------------------");
+    $("#"+fileDiv).val("");
+    $.ajax({
+        type:"post",
+        url:deleteUrl,
+        success:function(data){
+            if(data.str){
+                parent.layer.msg('删除成功',{icon:1});
+                //$(obj).parent().parent().parent().remove();
+                $("#"+trId).hide();
+            }else {
+                parent.layer.msg('删除失败',{icon:2});
+            }
+        }
+    });
 }

src/main/webapp/webpage/modules/workmaterialcollect/workMaterialCollectEngineerForm.jsp

@@ -178,8 +178,9 @@
                     }
                 }*/
                 if(canInsert==true){
-					var xml = "<a class=\"attention-info\" style=\"text-align: center\" href=\"javascript:void(0)\" onclick=\"preview('预览','"+data[i].url+"','90%','90%')\">"+data[i].attachmentName+"</a>"
-					var delXml="<a href=\"javascript:void(0)\" onclick=\"deleteFileFromAliyun(this,'${ctx}/workMaterialCollect/engineer/deleteFileFromAliyun?url="+data[i].url+"&id=null&type=2','addFile')\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i>&nbsp;删除</a>"
+					var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"preview('预览','"+data[i].url+"','90%','90%')\">"+data[i].attachmentName+"</a>"
+					var delXml="<a href=\"javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('"+data[i].url+"'));\" class=\"op-btn op-btn-download\"><i class=\"fa fa-download\"></i>&nbsp;下载</a>" +
+						"<a href=\"javascript:void(0)\" onclick=\"deleteFileFromAliyun(this,'${ctx}/workMaterialCollect/engineer/deleteFileFromAliyun?url="+data[i].url+"&id=null&type=2','addFile')\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i>&nbsp;删除</a>"
 					// var idArr = $("#workMaterialCollectEngineer tr:visible .workCatalogueItemId");
                     workItemCollarCatalogListRowIdx = ss;
 					addRow('#workMaterialCollectEngineer', workItemCollarCatalogListRowIdx, workItemCollarCatalogListTpl,data[i]);
@@ -189,10 +190,10 @@
 					// $("#"+"workMaterialCollectTypes"+row+"_workCatalogueItemid").val(data[i].id);
 					$("#"+"workMaterialCollectTypes"+row+"_1").val(data[i].projectType);
 					$("#"+"workMaterialCollectTypes"+row+"_2").val(data[i].projectPart);
-					//$("#"+"workMaterialCollectTypes"+row+"_3").val(data[i].attachmentName);
 					$("#"+"workMaterialCollectTypes"+row+"_3").html(xml);
 					$("#"+"workMaterialCollectTypes"+row+"_4").html(delXml);
-					// $("#"+"workMaterialCollectTypes"+row+"_4").val(data[i].url);
+                    $("#"+"workMaterialCollectTypes"+row+"_5").val(data[i].attachmentName);
+					$("#"+"workMaterialCollectTypes"+row+"_6").val(data[i].url);
                 }
 			}
         }
@@ -295,7 +296,7 @@
 						<tbody id="workMaterialCollectEngineer">
 						<c:if test="${not empty workMaterialCollectEngineer.workMaterialCollectTypes}">
 							<c:forEach items="${workMaterialCollectEngineer.workMaterialCollectTypes}" var="workMaterialCollectType" varStatus="index">
-								<tr id="workItemCollarCatalogList${index.index}">
+								<tr id="workItemCollarCatalogList${index.index}" style="align-content: center">
 									<td class="hide">
 										<input id="workMaterialCollectTypes${index.index}_id" name="workMaterialCollectTypes[${index.index}].id" type="hidden" value="${workMaterialCollectType.id}"/>
 									</td>
@@ -305,7 +306,7 @@
 									<td>
 										<input id="workMaterialCollectTypes${index.index}_2"  readonly="true"   name="workMaterialCollectTypes[${index.index}].projectPart" type="text" value="${workMaterialCollectType.projectPart}"   class="form-control "/>
 									</td>
-									<td id="workMaterialCollectTypes${index.index}_3" >
+									<td id="workMaterialCollectTypes${index.index}_3" style="text-align: center; vertical-align:middle;">
 										<c:choose>
 											<c:when test="${fn:containsIgnoreCase(workMaterialCollectType.workattachment.attachmentName,'jpg')
 															   or fn:containsIgnoreCase(workMaterialCollectType.workattachment.attachmentName,'png')
@@ -346,11 +347,15 @@
 												<%--</c:choose>--%>
 											<%--</c:otherwise>--%>
 										<%--</c:choose>--%>
-										<td class="hide">
+										<%--<td class="hide">
 											<input id="workMaterialCollectTypes${index.index}_4" readonly="true" name="workMaterialCollectTypes[${index.index}].workattachment.url" value="${workMaterialCollectType.workattachment.url}" class="form-control "/>
-										</td>
+										</td>--%>
 									<td class="text-center op-td" >
-										<span class="op-btn op-btn-delete" id="workMaterialCollectTypes${index.index}_span" onclick="delRow(this, '#workItemCollarCatalogList${index.index}','${workMaterialCollectType.workattachment.url}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
+										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workMaterialCollectType.workattachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+										<a href="javascript:void(0)"
+										   onclick="deleteFileFrom(this,'${ctx}/workMaterialCollect/engineer/deleteFileFromAliyun?url=${workMaterialCollectType.workattachment.url}&id=${workMaterialCollectType.workattachment.id}&type=2','addFile','','workItemCollarCatalogList${index.index}')"
+										   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
+										<%--<span class="op-btn op-btn-delete" id="workMaterialCollectTypes${index.index}_span" onclick="delRow(this, '#workItemCollarCatalogList${index.index}','${workMaterialCollectType.workattachment.url}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>--%>
 									</td>
 								</tr>
 							</c:forEach>
@@ -365,10 +370,16 @@
                                         <td>
                                             <input id="workMaterialCollectTypes{{idx}}_2"  name="workMaterialCollectTypes[{{idx}}].projectPart" type="text" value="{{row.workMaterialCollectType.projectPart}}"   readonly="true"  class="form-control "/>
                                         </td>
-                                        <td id="workMaterialCollectTypes{{idx}}_3">
+                                        <td id="workMaterialCollectTypes{{idx}}_3"  style="text-align: center; vertical-align:middle;">
 										</td>
                                         <td id="workMaterialCollectTypes{{idx}}_4" class="text-center op-td" >
                                         </td>
+                                        <td class="hide">
+											<input id="workMaterialCollectTypes{{idx}}_5" name="workMaterialCollectTypes[{{idx}}].workattachment.attachmentName" type="text" value="{{row.workMaterialCollectType.workattachment.attachmentName}}"   readonly="true"  class="form-control "/>
+										</td>
+                                        <td class="hide">
+											<input id="workMaterialCollectTypes{{idx}}_6" name="workMaterialCollectTypes[{{idx}}].workattachment.url" type="text" value="{{row.workMaterialCollectType.workattachment.url}}"   readonly="true"  class="form-control "/>
+										</td>
                                     </tr>//-->
 					</script>
 					<script type="text/javascript">