页面调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -322,7 +322,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	private String reviewerPerson;//审核人名称
 	private String reviewerPersonId;//审核人
-	private Integer contractsNum; //合同数量
+	private Integer contractsNum; //盖章数量
 	private String temporaryId; //临时id
 
 	public String getPrrId() {

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

@@ -1612,7 +1612,9 @@
 			drawer_id = #{drawer.id},
 			office_id = #{office.id},
 			invoice_number = #{invoiceNumber},
-			invoice_date = #{invoiceDate},
+			<if test="null != invoiceDate">
+				invoice_date = #{invoiceDate},
+			</if>
 			drawer_name = #{drawerName},
 			take_date = #{takeDate},
 			invoice_remarks = #{invoiceRemarks},

src/main/resources/mappings/modules/workstaff/WorkStaffAchivesDao.xml

@@ -806,7 +806,7 @@
 		<include refid="workStaffBasicInfoColumns"/>
 		FROM work_staff_achives a
 		<include refid="workStaffBasicInfoJoins"/>
-		WHERE a.user_id = #{userId} and a.company_id=#{company.id} and a.status not in ('离职','退休')
+		WHERE a.user_id = #{userId} and a.company_id=#{company.id} /*and a.status not in ('离职','退休')*/
 	</select>
 	<select id="getJob" resultType="WorkStaffBasicInfo" >
 		SELECT

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -55,19 +55,19 @@
                 }*/
                 var contractsNum = $("#contractsNum").val();
                 if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
-                    parent.layer.msg("合同数量不能为空!", {icon: 5});
+                    parent.layer.msg("盖章数量不能为空!", {icon: 5});
                     return false;
                 }
                 if(contractsNum<=0){
-                    parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                    parent.layer.msg("盖章数量必须大于0!", {icon: 5});
                     return false;
                 }
                 if(contractsNum%1!=0){
-                    parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                    parent.layer.msg("盖章数量必须为整数!", {icon: 5});
                     return false;
                 }
                 if(isNaN(contractsNum)){
-                    parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                    parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                     return false;
                 }
                 $("#inputForm").submit();
@@ -1003,9 +1003,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <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">
-                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
+                        <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -161,7 +161,7 @@
                     }
                     var contractsNum = $("#contractsNum").val();
                     if(contractsNum<=0){
-                        parent.layer.msg("登记数量必须大于0!", {icon: 5});
+                        parent.layer.msg("盖章数量必须大于0!", {icon: 5});
                         return false;
                     }
 
@@ -1148,9 +1148,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <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">
-                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
+                        <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp

@@ -50,19 +50,19 @@
               }
               var contractsNum = $("#contractsNum").val();
               if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
-                  parent.layer.msg("合同数量不能为空!", {icon: 5});
+                  parent.layer.msg("盖章数量不能为空!", {icon: 5});
                   return false;
               }
               if(contractsNum<=0){
-                  parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                  parent.layer.msg("盖章数量必须大于0!", {icon: 5});
                   return false;
               }
               if(contractsNum%1!=0){
-                  parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                  parent.layer.msg("盖章数量必须为整数!", {icon: 5});
                   return false;
               }
               if(isNaN(contractsNum)){
-                  parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                  parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                   return false;
               }
 			  $("#inputForm").submit();
@@ -999,7 +999,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <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"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -101,19 +101,19 @@
                     }
                     var contractsNum = $("#contractsNum").val();
                     if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
-                        parent.layer.msg("登记数量不能为空!", {icon: 5});
+                        parent.layer.msg("盖章数量不能为空!", {icon: 5});
                         return false;
                     }
                     if(contractsNum<=0){
-                        parent.layer.msg("登记数量必须大于0!", {icon: 5});
+                        parent.layer.msg("盖章数量必须大于0!", {icon: 5});
                         return false;
                     }
                     if(contractsNum%1!=0){
-                        parent.layer.msg("登记数量必须为整数!", {icon: 5});
+                        parent.layer.msg("盖章数量必须为整数!", {icon: 5});
                         return false;
                     }
                     if(isNaN(contractsNum)){
-                        parent.layer.msg("请输入正确登记数量!", {icon: 5});
+                        parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                         return false;
                     }
 
@@ -1196,9 +1196,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <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">
-                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input" id="contractsNum"/>
+                        <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input" id="contractsNum"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowFinishList.jsp

@@ -167,7 +167,7 @@
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsShowList.jsp

@@ -167,7 +167,7 @@
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -122,7 +122,7 @@
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">委托方：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+						   <input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.clientName}"/>
 					   </div>
 				   </div>
 			   </div>
@@ -258,17 +258,17 @@
 						</c:forEach>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目等级：</label>
 					<div class="layui-input-block">
-<%--						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">--%>
-<%--							<form:option value=""/>--%>
-<%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-<%--						</form:select>--%>
+&lt;%&ndash;						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">&ndash;%&gt;
+&lt;%&ndash;							<form:option value=""/>&ndash;%&gt;
+&lt;%&ndash;							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;
+&lt;%&ndash;						</form:select>&ndash;%&gt;
 						<input class=" form-control layui-input " readonly="true" id="submitMoney" name="submitMoney" style="background-color: #f1f1f1" value="${projectRecords.submitMoney}"/>
 						<p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">送审规模（万元）：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/downloadForm.jsp

@@ -55,7 +55,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 lw7" style="display: none">
 					<div class="layui-input-block">
-						<form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${companyType}"/>
+						<input type="text" id="companyType" name="companyType"   readonly="true" class="form-control layui-input" value="${companyType}">
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -354,7 +354,7 @@
 							</c:if>
 						</c:if>
 					</c:if>
-					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+					<%--<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>
 					<h2>质量复核信息</h2>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -317,7 +317,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<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"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
 					</div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForAudit.jsp

@@ -214,25 +214,25 @@
                         <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${sealApplyForInfo.projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目类别：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">盖章数量：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.contractsNum}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw12 with-textarea">
+                <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
                         <textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${sealApplyForInfo.projectRecords.projectDesc}</textarea>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw12 with-textarea">
+                <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
                         <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${sealApplyForInfo.projectRecords.remarks}</textarea>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForModify.jsp

@@ -234,13 +234,13 @@
                         <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${sealApplyForInfo.projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目类别：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">盖章数量：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.contractsNum}"/>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForView.jsp

@@ -189,13 +189,13 @@
                         <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${sealApplyForInfo.projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目类别：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">盖章数量：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.contractsNum}"/>

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

@@ -1272,7 +1272,7 @@
         var elem = $("#email-bord .bord-right ul");
         var xml = "";
         <c:forEach items="${projectCount}" var="project" varStatus="index">
-        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectRecords/view?id=${project.id}','95%','95%')\">";
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectView/view?id=${project.id}','95%','95%')\">";
         elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(project.projectType, 'project_type', '')}\">${fns:getDictLabel(project.projectType, 'project_type', '')}</span><span class=\"bord-record\" title=\"${project.projectName}\">${project.projectName}</span>" +
             '<span class="bord-record-time">' + '<fmt:formatDate value="${project.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
         <%--<c:if test="${index.index < 8}">

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

@@ -331,8 +331,8 @@
                                     <ul class="dropdown-menu dropdown-user">
                                         <li><a id="userInfoBtn" data-toggle="modal" data-target="#register">编辑资料</a>
                                         </li>
-                                        <li><a id="userImageBtn" data-toggle="modal" data-target="#register">更换头像</a>
-                                        </li>
+                                        <%--<li><a id="userImageBtn" data-toggle="modal" data-target="#register">更换头像</a>
+                                        </li>--%>
                                         <li><a id="userPassWordBtn" data-toggle="modal" data-target="#register">更换密码</a>
                                         </li>
                                         <li><a id="userMobileBtn" data-toggle="modal" data-target="#register">更换手机号</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -625,6 +625,29 @@
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>
 								</div>
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">公司地址：</label>
+									<div class="layui-input-block">
+										<form:input path="address" placeholder="请输入公司地址" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">开户银行：</label>
+									<div class="layui-input-block">
+										<form:input path="ourBank" placeholder="请输入开户银行" htmlEscape="false" id="telephone" class="form-control layui-input"/>
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<br>
+									<label class="layui-form-label">银行账号：</label>
+									<div class="layui-input-block">
+										<form:input path="bankNumber" placeholder="请输入银行账号" htmlEscape="false" id="telephone" maxlength="25" class="form-control number layui-input"/>
+									</div>
+								</div>
 							</div>
 						</div>