Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/sealApplyFor/SealApplyForDao.xml

@@ -91,6 +91,7 @@
 		rpr.belonging_department as "projectRecords.belongingDepartment",
 		rpr.reviewer_person as "projectRecords.reviewerPerson",
 		rpr.reviewer_person_id as "projectRecords.reviewerPersonId",
+		rpr.contracts_num as "projectRecords.contractsNum",
 		prd.number as "projectRecords.projectReportNumber",
 		wci.name as "projectRecords.workContractInfo.name",
 		wci.id as "projectRecords.workContractInfo.id"
@@ -191,6 +192,7 @@
 			   update_by = #{updateBy.id},
 			   update_date = #{updateDate},
 			   status = #{status},
+			   remarks = #{remarks},
 			   process_instance_id = #{processInstanceId},
 			   project_id = #{projectId},
 			   seal_company = #{sealCompany}

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

@@ -220,13 +220,19 @@
                         <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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw7">
+                    <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">
                     <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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw12 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/sealApplyForForm.jsp

@@ -241,13 +241,19 @@
                         <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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw7">
+                    <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-sm12 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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm12 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/sealApplyForList.jsp

@@ -282,6 +282,7 @@
 						}
 
 					}}
+                ,{field:'createBy',align:'center', title: '创建人',  width:100}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:100}
                 ,{align:'center', title: '状态',  width:90,templet:function(d){
                         var st = getruralProjectState(d.status);
@@ -338,6 +339,7 @@
                     ,"createDate":"<fmt:formatDate value="${sealApplyFor.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"status":"${sealApplyFor.status}"
                     ,"procId":"${sealApplyFor.processInstanceId}"
+                    ,"createBy":"${sealApplyFor.createBy.name}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == sealApplyFor.createBy.id}">
                     <shiro:hasPermission name="sealApplyFor:sealApplyFor:del">
 						,"candel":<c:choose><c:when test="${(sealApplyFor.status == 1 or sealApplyFor.status == 3 or sealApplyFor.status == 4) && fns:getUser().id == sealApplyFor.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

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

@@ -240,13 +240,19 @@
                         <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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw7">
+                    <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-sm12 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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm12 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/sealApplyForView.jsp

@@ -195,13 +195,19 @@
                         <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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw7">
+                    <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-sm12 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 lw6 with-textarea">
+                <div class="layui-item layui-col-sm12 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>