发票管理(部门筛选,发票号与发票金额展示)

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

@@ -62,23 +62,23 @@
 							}//</c:if><c:if test="${notAllowSelectRoot}">
 							if (nodes[i].level == 0){
 								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if><c:if test="${notAllowSelectParent}">
 							if (nodes[i].isParent){
 								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
 								//layer.msg('有表情地提示');
-								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if><c:if test="${not empty module && selectScopeModule}">
 							if (nodes[i].module == ""){
 								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								// return false;
 							}else if (nodes[i].module != "${module}"){
 								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
-								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
-								return false;
+								// top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+								// return false;
 							}//</c:if>
 							ids.push(nodes[i].id);
 							names.push(nodes[i].name);//<c:if test="${!checked}">

src/main/webapp/static/oss/ossupload.js

@@ -722,7 +722,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                         str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                     }
                     str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
-                        /*'<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/ossCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+*/
+                        '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/ossCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;收藏</a>'+
                         '</div>' +
                         '</td>'+
                         '</tr>';

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -116,8 +116,6 @@
 					}
 				}
 			}
-
-
 			var list = "${workIncomingMessage.workAttachments}";
 			var size = (list.split('url')).length-1;
 			var files = tValue;
@@ -142,11 +140,6 @@
 				$("#addFile"+divId).show();
 				multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
 		}
-
-
-
-
-
 		function showfile(){
 			var length=$("#file_attachment tr").length;
 			var files=new Array();

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -620,6 +620,9 @@
 				,{field:'money',align:'center', title: '开票金额（元）',  width:110,templet:function(d){
 						return "<span title='"+ d.money +"'>" + d.money + "</span>";
 					}}
+				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
+						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
+					}}
 				,{field:'billingContent',align:'center', title: '开票内容',  width:90,templet:function(d){
 						return "<span title='"+ d.billingContent +"'>" + d.billingContent + "</span>";
 					}}
@@ -629,9 +632,7 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
-						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
-					}}
+
 				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -675,6 +675,9 @@
 				,{field:'money',align:'center', title: '开票金额（元）',  width:110,templet:function(d){
 						return "<span title='"+ d.money +"'>" + d.money + "</span>";
 					}}
+				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
+						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
+					}}
 				,{field:'billingContent',align:'center', title: '开票内容',  width:90,templet:function(d){
 						return "<span title='"+ d.billingContent +"'>" + d.billingContent + "</span>";
 					}}
@@ -684,9 +687,7 @@
 				,{field:'invoiceType',align:'center', title: '发票类型',  width:90,templet:function(d){
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
-				,{field:'widTotalMoney',align:'center', title: '发票金额（元）',  width:120,templet:function(d){
-						return "<span title='"+ d.widTotalMoney +"'>" + d.widTotalMoney + "</span>";
-					}}
+
                 <%--,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){--%>
 				<%--		&lt;%&ndash;return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";&ndash;%&gt;--%>
 				<%--		return d.reportNumber;--%>