guoxu 2 anni fa
parent
commit
b8bd4e174c

+ 19 - 16
src/main/webapp/webpage/modules/statement/companyDataView.jsp

@@ -885,6 +885,9 @@
 		.layui-form-radio i{
 			margin-right: 0px;
 		}
+		.layui-unselect {
+			margin: 0px;
+		}
 	</style>
 </head>
 <body>
@@ -909,8 +912,8 @@
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px" >
-						<input type="radio" title="本年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
-						<input type="radio" title="本月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
+                        <input type="radio" title="当月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
+						<input type="radio" title="当年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
 					</div>
 					</c:if>
 				</h2>
@@ -923,8 +926,8 @@
 				<div class="form-group-label"><h2>项目年报
 				<c:if test="${nyr eq '月'}">
 					<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px">
-						<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="本年">
-						<input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="本月">
+                        <input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="当月">
+						<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="当年">
 					</div>
 				</c:if>
 				</h2></div>
@@ -936,8 +939,8 @@
 				<div class="form-group-label"><h2>开票${nyr}报
 				<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-						<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="本年">
-						<input type="radio" name="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="本月">
+                        <input type="radio" name="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="当月">
+						<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="当年">
 					</div>
 				</c:if>
 				</h2></div>
@@ -949,8 +952,8 @@
 				<div class="form-group-label"><h2>开票年报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-						<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="本年">
-						<input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="本月">
+                        <input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="当月">
+						<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="当年">
 					</div>
 					</c:if>
 				</h2></div>
@@ -962,8 +965,8 @@
 				<div class="form-group-label"><h2>报销${nyr}报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-						<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="本年">
-						<input type="radio" name="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="本月">
+                        <input type="radio" name="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="当月">
+						<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="当年">
 					</div>
 					</c:if>
 				</h2></div>
@@ -975,8 +978,8 @@
 					<div class="form-group-label"><h2>报销年报
 						<c:if test="${nyr eq '月'}">
 						<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-							<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="本年">
-							<input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="本月">
+                            <input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="当月">
+							<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="当年">
 						</div>
 						</c:if>
 					</h2></div>
@@ -988,8 +991,8 @@
 				<div class="form-group-label"><h2>合同${nyr}报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-						<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="本年">
-						<input type="radio" name="contract" value="contractMonthOne" checked="checked" lay-filter="contractMonth" id="contractMonthOne" checked title="本月">
+                        <input type="radio" name="contract" value="contractMonthOne" checked="checked" lay-filter="contractMonth" id="contractMonthOne" checked title="当月">
+						<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="当年">
 					</div>
 					</c:if>
 				</h2></div>
@@ -1001,8 +1004,8 @@
 				<div class="form-group-label"><h2>合同年报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-						<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="本年">
-						<input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="本月">
+                        <input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="当月">
+						<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="当年">
 					</div>
 					</c:if>
 				</h2></div>

+ 22 - 16
src/main/webapp/webpage/modules/statement/departmentCompanyDataView.jsp

@@ -878,6 +878,9 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
+		.layui-unselect {
+			margin: 0px;
+		}
 	</style>
 </head>
 <body>
@@ -901,8 +904,8 @@
 					<div class="form-group-label"><h2>项目${nyr}报
 						<c:if test="${nyr eq '月'}">
 							<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px" >
-								<input type="radio" title="本年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
-								<input type="radio" title="本月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
+								<input type="radio" title="当月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
+								<input type="radio" title="当年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
 							</div>
 						</c:if>
 					</h2></div>
@@ -930,8 +933,8 @@
 						<div class="form-group-label"><h2>项目年报
 							<c:if test="${nyr eq '月'}">
 								<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px">
-									<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="本年">
-									<input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="本月">
+									<input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="当月">
+									<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="当年">
 								</div>
 							</c:if>
 						</h2></div>
@@ -946,8 +949,8 @@
 				<div class="form-group-label"><h2>开票${nyr}报
 					<c:if test="${nyr eq '月'}">
 						<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-							<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="本年">
-							<input type="radio" name="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="本月">
+							<input type="radio" name="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="当月">
+							<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="当年">
 						</div>
 					</c:if>
 				</h2></div>
@@ -959,8 +962,8 @@
 					<div class="form-group-label"><h2>开票年报
 						<c:if test="${nyr eq '月'}">
 							<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="本年">
-								<input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="本月">
+								<input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="当月">
+								<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="当年">
 							</div>
 						</c:if>
 					</h2></div>
@@ -972,8 +975,8 @@
 				<div class="form-group-label"><h2>报销${nyr}报
 					<c:if test="${nyr eq '月'}">
 						<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-							<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="本年">
-							<input type="radio" name="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="本月">
+							<input type="radio" name="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="当月">
+							<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="当年">
 						</div>
 					</c:if>
 				</h2></div>
@@ -985,8 +988,9 @@
 					<div class="form-group-label"><h2>报销年报
 						<c:if test="${nyr eq '月'}">
 							<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="本年">
-								<input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="本月">
+								<input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="当月">
+								<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="当年">
+
 							</div>
 						</c:if>
 					</h2></div>
@@ -998,8 +1002,9 @@
 				<div class="form-group-label"><h2>合同${nyr}报
 					<c:if test="${nyr eq '月'}">
 						<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-							<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="本年">
-							<input type="radio" name="contract" value="contractMonthOne" checked="checked" lay-filter="contractMonth" id="contractMonthOne" checked title="本月">
+							<input type="radio" name="contract" value="contractMonthOne" checked="checked" lay-filter="contractMonth" id="contractMonthOne" checked title="当月">
+							<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="当年">
+
 						</div>
 					</c:if>
 				</h2></div>
@@ -1011,8 +1016,9 @@
 					<div class="form-group-label"><h2>合同年报
 						<c:if test="${nyr eq '月'}">
 							<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="本年">
-								<input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="本月">
+								<input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="当月">
+								<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="当年">
+
 							</div>
 						</c:if>
 					</h2></div>