发票管理样式修改

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -286,6 +286,8 @@ public class WorkInvoiceController extends BaseController {
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
 			String str = "";
+			//默认添加为分公司
+			workInvoice.setExt("0");
 			//1总公司0分公司
 			if("1".equals(workInvoice.getExt())){
 				//str = workInvoiceService.save(workInvoice, variables,processInstanceId);
@@ -293,6 +295,7 @@ public class WorkInvoiceController extends BaseController {
 			}else if("0".equals(workInvoice.getExt())){
 				str = workInvoiceService.saveBranch(workInvoice, variables,processInstanceId);
 			}
+
 			if(StringUtils.isNotBlank(workInvoice.getExt())){
 				if (StringUtils.isNotBlank(str)){
 					addMessage(redirectAttributes, "发票申请提交失败:"+str);
@@ -753,7 +756,7 @@ public class WorkInvoiceController extends BaseController {
 		map.put("bankNumber",bankNumber);
 		map.put("telephone",workClientInfo.getTelephone());
 		map.put("orUnicode",workClientInfo.getUscCode());
-		map.put("adress",workClientInfo.getAddress());
+		map.put("registerAddress",workClientInfo.getRegisterAddress());
 		map.put("ids",workClientInfo.getId());
 		return JsonMapper.toJsonString(map);
 	}

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

@@ -699,11 +699,13 @@
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
 		o.top_company AS "office.name",
-		dsu.name as "projectRegistrant"
+		dsu.name as "projectRegistrant",
+		prd.number as "reportData.number"
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 
 
+		LEFT JOIN project_report_data prd on a.id = prd.project_id
 		LEFT JOIN work_project_user w on a.id = w.project_id
 		LEFT JOIN sys_user su on w.user_id = su.id
 		LEFT JOIN sys_user dsu on a.create_by = dsu.id

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -118,6 +118,12 @@
 				<if test="dbName == 'mssql'">'%'+#{project.projectName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{project.projectName},'%')</if>
 			</if>
+			<if test="project != null and project.reportData != null and project.reportData.number != null and project.reportData.number != ''">
+				AND prd.number LIKE
+				<if test="dbName == 'oracle'">'%'||#{project.reportData.number}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{project.reportData.number}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{project.reportData.number},'%')</if>
+			</if>
 			<if test="client != null and client.name != null and client.name != ''">
 				AND w.name LIKE
 				<if test="dbName == 'oracle'">'%'||#{client.name}||'%'</if>
@@ -190,10 +196,9 @@
 		<if test="client != null and client.name != null and client.name != ''">
 			LEFT JOIN work_client_info w ON  w.id = a.client_id
 		</if>
-		<if test="project != null">
-			LEFT JOIN rural_project_records p ON  p.id = a.project_id
-		</if>
+		LEFT JOIN rural_project_records p ON  p.id = a.project_id
 		LEFT join sys_office so on so.id = a.office_id
+		left join project_report_data prd on p.id = prd.project_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="number != null and number != ''">
@@ -223,6 +228,12 @@
 				<if test="dbName == 'mssql'">'%'+#{project.projectName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{project.projectName},'%')</if>
 			</if>
+			<if test="project != null and project.reportData != null and project.reportData.number != null and project.reportData.number != ''">
+				AND prd.number LIKE
+				<if test="dbName == 'oracle'">'%'||#{project.reportData.number}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{project.reportData.number}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{project.reportData.number},'%')</if>
+			</if>
 			<if test="client != null and client.name != null and client.name != ''">
 				AND w.name LIKE
 				<if test="dbName == 'oracle'">'%'||#{client.name}||'%'</if>

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

@@ -37,7 +37,8 @@
 			    var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
 			    
 				var label = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codelabel").html();
-				return id+"_item_"+label;
+				var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
+				return id+"_item_"+label+"_item_"+number;
 		}
 		function page(n,s){
 			if(n) $("#pageNo").val(n);
@@ -63,6 +64,22 @@
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery">
+						<div class="layui-item query athird">
+							<span class="layui-form-label">项目名称：</span>
+							<div class="layui-input-block">
+								<form:input path="${searchKey}" 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>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
 				</form:form>
 			</div>
 		</div>
@@ -75,6 +92,7 @@
 							<c:forEach items="${labelNames}" var="projectName"  varStatus="status">
 								<th>项目名称</th>
 								<th>项目编号</th>
+								<th>项目报告号</th>
 								<th>负责人</th>
 								<th>委托方</th>
 							</c:forEach>
@@ -88,6 +106,7 @@
 									<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
 									<td class="codelabel">${obj.projectName}</td>
 									<td class="codelabel">${obj.projectId}</td>
+									<td class="codenumber">${obj.reportData.number}</td>
 									<td class="codelabel">${obj.leaderNameStr}</td>
 									<td class="codelabel">${obj.workContractInfo.client.name}</td>
 								</tr>

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

@@ -37,7 +37,7 @@
                   }
               }
               if(obj == 1 && money != m ){
-                  top.layer.alert('发票明细总价税合计与主信息价税合计不等，禁止提交！', {icon: 0});
+                  top.layer.alert('发票明细总开票金额与主信息开票金额不等，禁止提交！', {icon: 0});
                   return;
               }
 
@@ -176,8 +176,11 @@
         }
         function setTaxMoney(obj){
             var a = $(obj).attr("id");
+            //金额
             var b = a.replace('tax','taxMoney');
+            //开票金额
             var t = a.replace('tax','totalMoney');
+            //税额
             var tr = a.replace('tax','taxRate');
             var value = obj.value || 0;
             if(!value){
@@ -189,18 +192,18 @@
             var m = ${workInvoice.money};
             var t2 = $("#" +  t ).val();
             if(!/^\d+(\.\d{1,4})?$/.test( t2 )){
-                parent.layer.msg("请正确填写价税合计",{icon:5});
+                parent.layer.msg("请正确填写开票金额",{icon:5});
                 return;
             }else if(t2 > m) {
                 $("#" +  b ).val("");
                 $("#" +  tr ).val("");
-                parent.layer.msg("所填值大于发票总价税合计",{icon:5});
+                parent.layer.msg("所填值大于发票总开票金额",{icon:5});
                 return;
             }
             var tax = 1 + value/100;
-            var p = $("#" +  t ).val() || 0;//获取价税合计
+            var p = $("#" +  t ).val() || 0;//获取开票金额
             if(!p || p == 0){
-                parent.layer.msg("请先填写价税合计,且不能为零",{icon:5});
+                parent.layer.msg("请先填写开票金额,且不能为零",{icon:5});
                 return;
             }
             var num = p/tax || 0;
@@ -210,8 +213,19 @@
         }
         function setCheck(obj){
             var aa = $(obj).attr("id");
+			//金额
             var b = aa.replace('totalMoney','taxMoney');
+			//税额
             var tr = aa.replace('totalMoney','taxRate');
+			//开票金额
+			var t = aa.replace('totalMoney','totalMoney');
+			var tm = $("#" +  t ).val();
+			//税率
+			var sl = aa.replace('totalMoney','tax');
+			var sc = $("#" +  sl ).val();
+			//处理百分比税率
+			var tax = 1 + sc/100;
+
             $("#" +  b ).val("");
             $("#" +  tr ).val("");
             var m = ${workInvoice.money};
@@ -219,15 +233,31 @@
             if(a > m) {
                 $("#" +  b ).val("");
                 $("#" +  tr ).val("");
-                parent.layer.msg("所填值大于发票总价税合计",{icon:5});
+                parent.layer.msg("所填值大于发票总开票金额",{icon:5});
                 return;
-            }
+            }else{
+				var num = tm/tax || 0;
+				$("#" +  b ).val(parseFloat(num.toFixed(2)));
+				var taxRate = tm - num;
+				$("#" +  tr ).val(parseFloat(taxRate.toFixed(2)));
+			}
         }
         function getMoney(value,obj){
             var aa = $(obj).attr("id");
+			//金额
             var b = aa.replace('totalMoney','taxMoney');
             console.log("b====="+b);
+			//税额
             var tr = aa.replace('totalMoney','taxRate');
+			//开票金额
+			var t = aa.replace('totalMoney','totalMoney');
+			var tm = $("#" +  t ).val();
+			//税率
+			var sl = aa.replace('totalMoney','tax');
+			var sc = $("#" +  sl ).val();
+			//处理百分比税率
+			var tax = 1 + sc/100;
+
             var m = ${workInvoice.money};
             var money = "0.00";
             //自动计算出结果并填充在相应的输入框中
@@ -249,8 +279,13 @@
                 $("#" + aa ).val("");
                 $("#" +  b ).val("");
                 $("#" +  tr ).val("");
-                parent.layer.msg("发票明细价税合计总值大于主申请发票价税合计",{icon:5});
+                parent.layer.msg("发票明细开票金额总值大于主申请发票开票金额",{icon:5});
                 return;
+			}else{
+				var num = tm/tax || 0;
+				$("#" +  b ).val(parseFloat(num.toFixed(2)));
+				var taxRate = tm - num;
+				$("#" +  tr ).val(parseFloat(taxRate.toFixed(2)));
 			}
         }
         function setV(obj){
@@ -446,12 +481,12 @@
 		</div>
 		<div class="form-group layui-row first lw14">
 			<div class="form-group-label"><h2>发票详情</h2></div>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>上级/本公司开票：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<c:choose><c:when test="${workInvoice.ext eq '0'}">本公司开票	</c:when><c:when test="${workInvoice.ext eq '1'}">上级公司开票</c:when></c:choose>"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 				<div class="layui-input-block">
@@ -495,7 +530,7 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label"><span class="require-item">*</span>价税合计(元)：</label>
+				<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
 				</div>
@@ -554,7 +589,7 @@
 					<tr>
 						<th><span class="require-item">*</span>发票代码</th>
 						<th><span class="require-item">*</span>发票号</th>
-						<th><span class="require-item">*</span>价税合计</th>
+						<th><span class="require-item">*</span>开票金额</th>
 						<th width="80px"><span class="require-item">*</span>税率</th>
 						<th width="100px"><span class="require-item">*</span>金额</th>
 						<th width="100px"><span class="require-item">*</span>税额</th>

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

@@ -119,7 +119,7 @@
                     $("#orUnicode").val(d.orUnicode);
                     $("#bankNumber").val(d.bankNumber);
                     $("#telephone").val(d.telephone);
-                    $("#address").val(d.adress);
+                    $("#address").val(d.registerAddress);
                     $("#ids").val(d.ids);
                 }
             })
@@ -295,10 +295,10 @@
             console.log("-value----"+value);
             var tax = 1 + value/100;
             console.log("-tax----"+tax);
-            var p = $("#" +  t ).val() || 0;//获取价税合计
+            var p = $("#" +  t ).val() || 0;//获取发票金额
             console.log("-----"+p);
             if(!p || p == 0){
-                parent.layer.msg("请先填写价税合计,且不能为零",{icon:5});
+                parent.layer.msg("请先填写发票金额,且不能为零",{icon:5});
                 return;
             }
             var num = p/tax || 0;
@@ -358,7 +358,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">发票申请编号：</label>
+					<label class="layui-form-label double-line">发票申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
 							<form:input path="number" htmlEscape="false" readonly="true"   class="form-control layui-input"/>
@@ -402,7 +402,7 @@
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>发票详情</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>上级/本公司开票：</label>
 					<div class="layui-input-block">
 						<c:choose>
@@ -424,7 +424,7 @@
 							</c:otherwise>
 						</c:choose>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
@@ -491,14 +491,14 @@
 				</div>
 
 				<div class="layui-item layui-col-sm12">
-					<label class="layui-form-label"><span class="require-item">*</span>价税合计(元)：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>发票金额(元)：</label>
 					<div class="layui-input-block">
 							<%--<form:input id=""  path="money" htmlEscape="false" class="form-control number required layui-input"/>--%>
 						<input name="money" htmlEscape="false"  value="${workInvoice.money}" class="form-control required number layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label">开票内容要求：</label>
+					<label class="layui-form-label double-line">开票内容要求：</label>
 					<div class="layui-input-block">
 						<form:textarea path="content" id="contractTypeDoc" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>
@@ -530,7 +530,7 @@
 						<tr>
 							<th><span class="require-item">*</span>发票代码</th>
 							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>价税合计</th>
+							<th><span class="require-item">*</span>发票金额</th>
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>

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

@@ -239,6 +239,12 @@
 					</div>
 					<div id="moresees" class="lw9" style="clear:both;display:none;">
 						<div class="layui-item query athird">
+							<label class="layui-form-label">报告号名称：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="project.reportData.number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
 							<label class="layui-form-label">开票日期：</label>
 							<div class="layui-input-block">
 								<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -264,7 +270,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">报销人：</label>
+							<label class="layui-form-label">经办人：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="submitterId" name="submitterId" value="${workInvoice.submitterId}" labelName="submitterName" labelValue="${workInvoice.submitterName}"
 												title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
@@ -362,7 +368,7 @@
 				,{field:'projName',align:'center', title: '项目名称', minWidth:160,templet:function(d){
 						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
 					}}
-                ,{field:'invoiceNum',align:'center', sort:true,title: '发票编号', minWidth:130,templet:function(d){
+                ,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogView('查看发票管理', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=1','95%', '95%')\">" + d.invoiceNum + "</a>";
                     }}
 				,{field:'clientName', align:'center',title: '开票单位', minWidth:160,templet:function(d){

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

@@ -287,10 +287,10 @@
             console.log("-value----"+value);
             var tax = 1 + value/100;
             console.log("-tax----"+tax);
-            var p = $("#" +  t ).val() || 0;//获取价税合计
+            var p = $("#" +  t ).val() || 0;//获取开票金额
             console.log("-----"+p);
             if(!p || p == 0){
-                parent.layer.msg("请先填写价税合计,且不能为零",{icon:5});
+                parent.layer.msg("请先填写开票金额,且不能为零",{icon:5});
                 return;
             }
             var num = p/tax || 0;
@@ -402,7 +402,7 @@
 			</div>
 			<div class="form-group layui-row first lw14">
 				<div class="form-group-label"><h2>发票详情</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>上级/本公司开票：</label>
 					<div class="layui-input-block">
 						<c:choose>
@@ -424,7 +424,7 @@
 							</c:otherwise>
 						</c:choose>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>发票类型：</label>
 					<div class="layui-input-block">
@@ -473,7 +473,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">
-					<label class="layui-form-label"><span class="require-item">*</span>价税合计(元)：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>开票金额(元)：</label>
 					<div class="layui-input-block">
 						<input name="money" htmlEscape="false"  value="<fmt:formatNumber value="${workInvoice.money}" pattern="#.00#"/>" class="form-control required number layui-input"/>
 					</div>
@@ -511,7 +511,7 @@
 						<tr>
 							<th><span class="require-item">*</span>发票代码</th>
 							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>价税合计</th>
+							<th><span class="require-item">*</span>开票金额</th>
 							<th><span class="require-item">*</span>税率</th>
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>