Browse Source

Merge remote-tracking branch 'origin/master'

user5 3 năm trước cách đây
mục cha
commit
e17ea82801
87 tập tin đã thay đổi với 365 bổ sung223 xóa
  1. 3 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java
  2. 3 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java
  3. 3 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java
  4. 3 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java
  5. 6 0
      src/main/resources/mappings/modules/collectAccessory/CollectAccessoryDao.xml
  6. 7 1
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml
  7. 7 1
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml
  8. 7 0
      src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml
  9. 3 0
      src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml
  10. 6 0
      src/main/webapp/static/common/css/style.css
  11. 1 1
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp
  12. 1 1
      src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp
  13. 6 0
      src/main/webapp/webpage/modules/collectAccessory/collectAccessoryCompanyList.jsp
  14. 6 0
      src/main/webapp/webpage/modules/collectAccessory/collectAccessoryList.jsp
  15. 6 0
      src/main/webapp/webpage/modules/collectAccessory/collectAccessoryOfficeList.jsp
  16. 1 1
      src/main/webapp/webpage/modules/feedback/feedbackList.jsp
  17. 1 1
      src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp
  18. 1 1
      src/main/webapp/webpage/modules/oa/oaNotifyList.jsp
  19. 1 1
      src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp
  20. 3 3
      src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp
  21. 1 1
      src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp
  22. 1 1
      src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp
  23. 1 1
      src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp
  24. 2 2
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp
  25. 1 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterList.jsp
  26. 1 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp
  27. 2 2
      src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp
  28. 1 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp
  29. 2 2
      src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp
  30. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/armorProjectRecordsList.jsp
  31. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList.jsp
  32. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/concealProjectRecordsList.jsp
  33. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/designSumamarizingProjectRecordsList.jsp
  34. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList.jsp
  35. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/materialProjectRecordsList.jsp
  36. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/sumamarizingProjectRecordsList.jsp
  37. 1 1
      src/main/webapp/webpage/modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList.jsp
  38. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp
  39. 16 11
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp
  40. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp
  41. 16 12
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp
  42. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp
  43. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp
  44. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp
  45. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp
  46. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp
  47. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedFormPerson.jsp
  48. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp
  49. 8 8
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp
  50. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp
  51. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp
  52. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp
  53. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp
  54. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp
  55. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp
  56. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp
  57. 9 9
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp
  58. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp
  59. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedModify.jsp
  60. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp
  61. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp
  62. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp
  63. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp
  64. 6 2
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp
  65. 12 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedFormPerson.jsp
  66. 15 11
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp
  67. 8 8
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp
  68. 3 3
      src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoForm.jsp
  69. 2 2
      src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoList.jsp
  70. 3 3
      src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp
  71. 2 2
      src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp
  72. 5 5
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp
  73. 1 1
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp
  74. 1 1
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp
  75. 2 2
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp
  76. 1 1
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp
  77. 1 1
      src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp
  78. 1 1
      src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp
  79. 5 4
      src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp
  80. 2 2
      src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp
  81. 2 2
      src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp
  82. 3 3
      src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp
  83. 2 2
      src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp
  84. 3 3
      src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp
  85. 1 1
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp
  86. 2 2
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp
  87. 2 2
      src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

+ 3 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1811,6 +1811,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
                 Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                if(jingHeJianLv.isNaN()){
+                    jingHeJianLv = 0D;
+                }
                 reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 

+ 3 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1533,6 +1533,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
                 Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                if(jingHeJianLv.isNaN()){
+                    jingHeJianLv = 0D;
+                }
                 reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 

+ 3 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1796,6 +1796,9 @@ public class RuralProjectMessageController extends BaseController {
                 Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
                 Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                if(jingHeJianLv.isNaN()){
+                    jingHeJianLv = 0D;
+                }
                 reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
 

+ 3 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -1352,6 +1352,9 @@ public class RuralProjectMessageNewController extends BaseController {
                 Double jingHeJianE = Double.valueOf(reported.getShenDingJia())-Double.valueOf(reported.getSongShenJia());
                 reported.setJingHeJianE(String.format("%.2f", jingHeJianE));
                 Double jingHeJianLv = jingHeJianE/Double.valueOf(reported.getSongShenJia()) * 100;
+                if(jingHeJianLv.isNaN()){
+                    jingHeJianLv = 0D;
+                }
                 reported.setJingHeJianLv(String.format("%.2f", jingHeJianLv));
             }
             if(StringUtils.isNotBlank(projectReportData.getZiXunShouRu())){

+ 6 - 0
src/main/resources/mappings/modules/collectAccessory/CollectAccessoryDao.xml

@@ -77,6 +77,9 @@
 					</otherwise>
 				</choose>
 			</if>
+			<if test="fileDescription!=null and fileDescription!=''">
+				and a.fileDescription like concat('%',#{fileDescription},'%')
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -126,6 +129,9 @@
 					</otherwise>
 				</choose>
 			</if>
+			<if test="fileDescription!=null and fileDescription!=''">
+				and a.fileDescription like concat('%',#{fileDescription},'%')
+			</if>
 		</where>
 	</select>
 

+ 7 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -376,7 +376,9 @@ END) as projectScale*/
 			<!--<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>-->
-
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
@@ -484,6 +486,7 @@ END) as projectScale*/
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		left join project_paper_filing ppf on ppf.project_id = a.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -579,6 +582,9 @@ END) as projectScale*/
 			<!--<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>-->
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">

+ 7 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -470,6 +470,9 @@
 			<!--<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>-->
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
 
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
@@ -575,7 +578,7 @@
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		left join project_paper_filing ppf on ppf.project_id = a.id
-
+		LEFT JOIN sys_office o ON o.id = a.office_id
 		<where>
             a.status = 5
             <if test="projectId != null and projectId != ''">
@@ -668,6 +671,9 @@
 			<!--<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>-->
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">

+ 7 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -107,6 +107,9 @@
 			<if test="area != null and area.id != null and area.id != ''">
 				AND (a.area_id = #{area.id} OR find_in_set(#{area.id},a.area_parent_ids))
 			</if>
+			<if test="area != null and area.id == '' and area.name!=null and area.name != ''">
+				AND area.name like concat("%",#{area.name},"%")
+			</if>
             <if test="workClientLinkman != null and workClientLinkman.name != null and workClientLinkman.name !=''">
 				AND b.name LIKE concat('%',#{workClientLinkman.name},'%')
             </if>
@@ -308,6 +311,7 @@
         <if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
             LEFT JOIN work_client_linkman b ON a.id = b.client_id
         </if>
+		<include refid="workClientInfoJoinsLink"/>
 		left join work_client_job_type_info c on c.work_client_id=a.id
 		left join sys_user su on su.id = a.create_by
 		left join sys_office so on so.id = su.office_id
@@ -328,6 +332,9 @@
             <if test="area != null and area.id != null and area.id != ''">
                 AND (a.area_id = #{area.id} OR find_in_set(#{area.id},a.area_parent_ids))
             </if>
+			<if test="area != null and area.id == '' and area.name!=null and area.name != ''">
+				AND area.name like concat("%",#{area.name},"%")
+			</if>
             <if test="workClientLinkman != null and workClientLinkman.name != null and workClientLinkman.name !=''">
                 AND b.name LIKE concat('%',#{workClientLinkman.name},'%')
             </if>

+ 3 - 0
src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -177,6 +177,9 @@
 			<if test="office != null and office.id != null and office.id != ''">
 				AND a.office_id = #{office.id}
 			</if>
+			<if test="office != null and office.id =='' and office.name != null and office.name != ''">
+				AND o.name like concat("%",#{office.name},"%")
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">

+ 6 - 0
src/main/webapp/static/common/css/style.css

@@ -9113,6 +9113,12 @@ table thead tr{
 {
     background-color: #f1f1f1;
 }
+.readOnlyFFF .input-group .layui-input[readonly],
+.readOnlyFFF .layui-input[readonly],
+.form-control[readonly]
+{
+    background-color: #fff;
+}
 /*form只读样式*/
 .view-form .form-group .layui-item .layui-input-block .input-group .layui-input[readonly],
 .view-form .form-group .layui-item .view-form .layui-input-block .layui-input[readonly],

+ 1 - 1
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp

@@ -215,7 +215,7 @@
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${standardOpinion.startDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp

@@ -324,7 +324,7 @@
 							</div>
 							<div class="layui-item query athird ">
 								<label class="layui-form-label">创建时间:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 										   value="<fmt:formatDate value="${standardOpinion.startDate}" pattern="yyyy-MM-dd"/>"/>
 									</input>

+ 6 - 0
src/main/webapp/webpage/modules/collectAccessory/collectAccessoryCompanyList.jsp

@@ -307,6 +307,12 @@
 								</span>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">文件描述:</label>
+							<div class="layui-input-block">
+								<form:input path="fileDescription" htmlEscape="false" maxlength="250"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

+ 6 - 0
src/main/webapp/webpage/modules/collectAccessory/collectAccessoryList.jsp

@@ -377,6 +377,12 @@
 								</span>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">文件描述:</label>
+							<div class="layui-input-block">
+								<form:input path="fileDescription" htmlEscape="false" maxlength="250"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

+ 6 - 0
src/main/webapp/webpage/modules/collectAccessory/collectAccessoryOfficeList.jsp

@@ -308,6 +308,12 @@
 								</span>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">文件描述:</label>
+							<div class="layui-input-block">
+								<form:input path="fileDescription" htmlEscape="false" maxlength="250"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

+ 1 - 1
src/main/webapp/webpage/modules/feedback/feedbackList.jsp

@@ -389,7 +389,7 @@
 					</div>
 					<div class="layui-item query athird">
 						<label class="layui-form-label">创建日期:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<input id="createStartDate" name="createDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon"
 								   value="<fmt:formatDate value="${questionFeedback.createDate}" pattern="yyyy-MM-dd"/>"/>
 							</input>

+ 1 - 1
src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -222,7 +222,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="type" class="form-control judgment simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 1 - 1
src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -435,7 +435,7 @@
 					</div>
 					<div class="layui-item query athird">
 						<label class="layui-form-label">创建日期:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<input id="createStartDate" name="createStartDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 								   value="<fmt:formatDate value="${oaNotify.createStartDate}" pattern="yyyy-MM-dd"/>"/>
 							</input>

+ 1 - 1
src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -196,7 +196,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="type" class="form-control required simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 3 - 3
src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -250,7 +250,7 @@
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="attachmentProjectType" class=" form-control  simple-select" lay-filter="typeFilter">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getMainDictList('attachment_project_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -259,7 +259,7 @@
 						</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">项目类别:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="attachmentProjectSort" name="attachmentProjectSort" value="" lay-filter="sortFilter"></select>
 							</div>
 						</div>
@@ -278,7 +278,7 @@
 					<div id="moresees" class="commonQuery lw6">
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目等级:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="attachmentProjectApprovalMoney" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getMainDictList('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -270,7 +270,7 @@
                     <div id="moresees" style="clear:both;display:none;" class="commonQuery lw6">
                         <div class="layui-item query athird">
                             <label class="layui-form-label">创建时间:</label>
-                            <div class="layui-input-block">
+                            <div class="layui-input-block readOnlyFFF">
                                 <input id="beginDate" placeholder="开始时间" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
                                        value="<fmt:formatDate value="${projectFilingBatch.beginDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -200,7 +200,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -200,7 +200,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 2 - 2
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -638,7 +638,7 @@
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecordsAlter.projectTypeId}">
                             <%--<form:option value=""/>
                             <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
@@ -697,7 +697,7 @@
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程用途:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterList.jsp

@@ -159,7 +159,7 @@
 						<div id="moresees" style="clear:both;display:none;" class="lw6">
 							<div class="layui-item query athird">
 								<label class="layui-form-label">创建时间:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 										   value="<fmt:formatDate value="${projectRecordsAlter.beginDate}" pattern="yyyy-MM-dd"/>"/>
 									</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -255,7 +255,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人:</label>
-                    <div class="layui-input-block  with-icon">
+                    <div class="layui-input-block readOnlyFFF  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>

+ 2 - 2
src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -1227,7 +1227,7 @@
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecords.projectTypeId}">
                             <%--<form:option value=""/>
                             <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
@@ -1287,7 +1287,7 @@
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程用途:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -267,7 +267,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 2 - 2
src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -466,7 +466,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectRecords.projectTypeId}">
                             <%--<form:option value=""/>
                             <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
@@ -525,7 +525,7 @@
                 </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程用途:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/armorProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/concealProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/designSumamarizingProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/materialProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/sumamarizingProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList.jsp

@@ -256,7 +256,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -838,8 +838,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 16 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -868,8 +868,13 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
+
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1080,19 +1085,19 @@
 
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="countyDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
                     </div>
                 </div>
@@ -1115,7 +1120,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectClassify" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1138,7 +1143,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1153,7 +1158,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1161,7 +1166,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
                             <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1326,7 +1331,7 @@
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="PorjectStruct" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1356,7 +1361,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>建筑规模:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -872,8 +872,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1092,19 +1096,19 @@
 
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="countyDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
                     </div>
                 </div>
@@ -1127,7 +1131,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectClassify" class="form-control layui-input judgment simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1150,7 +1154,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1165,7 +1169,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1173,7 +1177,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
                             <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1338,7 +1342,7 @@
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="PorjectStruct" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1368,7 +1372,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 16 - 12
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -864,8 +864,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1074,7 +1078,7 @@
                 <div class="form-group-label"><h2>咨询项目登记</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block ">
                         <input type="radio" title="本省" lay-filter="ext" name="s1" checked id="ext" value="10">
                         <input type="radio" title="外省" lay-filter="ext" name="s1" id="ext1" value="999">
                     </div>
@@ -1082,19 +1086,19 @@
 
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="countyDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
                     </div>
                 </div>
@@ -1117,7 +1121,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectClassify" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1140,7 +1144,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1155,7 +1159,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1163,7 +1167,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
                             <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1328,7 +1332,7 @@
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="PorjectStruct" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1358,7 +1362,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp

@@ -864,8 +864,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -834,8 +834,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1380,8 +1380,12 @@
 				var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
 				$("#JingHeJianE").val(JingHeJianE);
 				//审核增减率
-				var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-				$("#JingHeJianLv").val(JingHeJianLv);
+				if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+					$("#JingHeJianLv").val("0");
+				}else{
+					var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+					$("#JingHeJianLv").val(JingHeJianLv);
+				}
 			}else{
 				$("#JingHeJianE").val('');
 				$("#JingHeJianLv").val('');
@@ -2194,19 +2198,19 @@
 
 						<div class="layui-item layui-col-sm6 lw6" id="d2">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="otherProvinces" name="recordsReported.s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="cityDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="city" name="recordsReported.s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="countyDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="county" name="recordsReported.s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
 							</div>
 						</div>
@@ -2224,7 +2228,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.projectClassify" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2244,7 +2248,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.TouZiXZ" id="TouZiXZ" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2259,7 +2263,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.HeTongLeiXing" id="HeTongLeiXing" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2267,7 +2271,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.ProjectType" id="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
 									<form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2444,7 +2448,7 @@
 						<div class="form-group-label"><h2>项目信息</h2></div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.PorjectStruct" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2474,7 +2478,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.GCGMValue"  id="GCGMValue"  class="form-control layui-input required simple-select" lay-filter="GCGMValue">
 									<form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1014,7 +1014,7 @@
 					</c:choose>--%>
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp

@@ -416,8 +416,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedFormPerson.jsp

@@ -416,8 +416,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -825,8 +825,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 8 - 8
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -546,7 +546,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" allowInput="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -563,7 +563,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
@@ -575,7 +575,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">复核状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatus" class="form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -584,7 +584,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">签发状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -593,7 +593,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">电子归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -602,7 +602,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
@@ -614,7 +614,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -623,7 +623,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -825,7 +825,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -934,7 +934,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类别:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -973,7 +973,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -1103,7 +1103,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类别:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -411,7 +411,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp

@@ -773,7 +773,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -867,7 +867,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类别:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -993,7 +993,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -1125,7 +1125,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类别:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -384,7 +384,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1389,8 +1389,12 @@
 				var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
 				$("#JingHeJianE").val(JingHeJianE);
 				//审核增减率
-				var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-				$("#JingHeJianLv").val(JingHeJianLv);
+				if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+					$("#JingHeJianLv").val("0");
+				}else{
+					var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+					$("#JingHeJianLv").val(JingHeJianLv);
+				}
 			}else{
 				$("#JingHeJianE").val('');
 				$("#JingHeJianLv").val('');
@@ -2200,19 +2204,19 @@
 
 						<div class="layui-item layui-col-sm6 lw6" id="d2">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="otherProvinces" name="recordsReported.s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="cityDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="city" name="recordsReported.s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="countyDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="county" name="recordsReported.s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
 							</div>
 						</div>
@@ -2230,7 +2234,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.projectClassify" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2250,7 +2254,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.TouZiXZ" id="TouZiXZ" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2265,7 +2269,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.HeTongLeiXing" id="HeTongLeiXing" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2273,7 +2277,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.ProjectType" id="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
 									<form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2450,7 +2454,7 @@
 						<div class="form-group-label"><h2>项目信息</h2></div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.PorjectStruct" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2480,7 +2484,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.GCGMValue"  id="GCGMValue"  class="form-control layui-input required simple-select" lay-filter="GCGMValue">
 									<form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>

+ 9 - 9
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -636,7 +636,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" allowInput="true" />
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -653,7 +653,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
@@ -665,7 +665,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">复核状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatus" class="form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -674,7 +674,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">签发状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -683,7 +683,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">电子归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -692,7 +692,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
@@ -704,7 +704,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -713,7 +713,7 @@
 						</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">总审人员:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="bzshbUserId" class=" form-control simple-select">
 									<form:option value="" label=""/>
 									<c:forEach items="${userList}" var="user" varStatus="status">
@@ -724,7 +724,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -868,8 +868,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1066,19 +1070,19 @@
 
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="countyDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
                     </div>
                 </div>
@@ -1101,7 +1105,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectClassify" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1124,7 +1128,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1139,7 +1143,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1147,7 +1151,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
                             <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1312,7 +1316,7 @@
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="PorjectStruct" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1342,7 +1346,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedModify.jsp

@@ -863,8 +863,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1380,8 +1380,12 @@
 				var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
 				$("#JingHeJianE").val(JingHeJianE);
 				//审核增减率
-				var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-				$("#JingHeJianLv").val(JingHeJianLv);
+				if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+					$("#JingHeJianLv").val("0");
+				}else{
+					var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+					$("#JingHeJianLv").val(JingHeJianLv);
+				}
 			}else{
 				$("#JingHeJianE").val('');
 				$("#JingHeJianLv").val('');
@@ -2194,19 +2198,19 @@
 
 						<div class="layui-item layui-col-sm6 lw6" id="d2">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="otherProvinces" name="recordsReported.s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="cityDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="city" name="recordsReported.s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6" id="countyDiv">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<select id="county" name="recordsReported.s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
 							</div>
 						</div>
@@ -2224,7 +2228,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.projectClassify" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2244,7 +2248,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.TouZiXZ" id="TouZiXZ" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2259,7 +2263,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.HeTongLeiXing" id="HeTongLeiXing" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2267,7 +2271,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.ProjectType" id="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
 									<form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2444,7 +2448,7 @@
 						<div class="form-group-label"><h2>项目信息</h2></div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.PorjectStruct" class="form-control layui-input required simple-select">
 									<form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -2474,7 +2478,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="recordsReported.GCGMValue"  id="GCGMValue"  class="form-control layui-input required simple-select" lay-filter="GCGMValue">
 									<form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -943,7 +943,7 @@
 					</c:choose>--%>
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -846,7 +846,7 @@
 					</c:choose>--%>
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -838,8 +838,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 6 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -834,8 +834,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 12 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedFormPerson.jsp

@@ -211,8 +211,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -432,8 +436,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');

+ 15 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -863,8 +863,12 @@
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
                 $("#JingHeJianE").val(JingHeJianE);
                 //审核增减率
-                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                $("#JingHeJianLv").val(JingHeJianLv);
+                if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
+                    $("#JingHeJianLv").val("0");
+                }else{
+                    var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                    $("#JingHeJianLv").val(JingHeJianLv);
+                }
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1068,19 +1072,19 @@
 
                 <div class="layui-item layui-col-sm6 lw6" id="d2">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在省份</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="otherProvinces" name="s3" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="cityDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在地级市</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="countyDiv">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程所在区县</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
                     </div>
                 </div>
@@ -1103,7 +1107,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="projectClassify" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1126,7 +1130,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1141,7 +1145,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1149,7 +1153,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="ProjectType" class="form-control layui-input required simple-select" lay-filter="ProjectType">
                             <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1314,7 +1318,7 @@
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工程结构:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="PorjectStruct" class="form-control layui-input required simple-select">
                             <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -1344,7 +1348,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑规模:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="GCGMValue" class="form-control layui-input required simple-select" lay-filter="GCGMValue">
                             <form:options items="${fns:getMainDictList('architectural_scale')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 8 - 8
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -544,7 +544,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" allowInput="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -561,7 +561,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
@@ -573,7 +573,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">复核状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -582,7 +582,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">签发状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -591,7 +591,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">电子归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -600,7 +600,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
@@ -612,7 +612,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -621,7 +621,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>

+ 3 - 3
src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoForm.jsp

@@ -477,7 +477,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="companyType" class="form-control simple-select required" id="companyType">
                             <form:option value="" label="--请选择客户性质--"/>
                             <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -487,7 +487,7 @@
 
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="companyIndustry" id="companyIndustry" class="form-control simple-select required">
                             <form:option value="" label="--请选择行业--"/>
                             <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -496,7 +496,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="clientType" id="clientType" class="form-control simple-select required">
                             <form:option value="" label="--请选择客户类型--"/>
                             <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 2 - 2
src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoList.jsp

@@ -144,7 +144,7 @@
                             <label class="layui-form-label">地区:</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name" labelValue="${workClientInfo.area.name}"
-                                                title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" allowInput="true"/>
                             </div>
                         </div>
 
@@ -162,7 +162,7 @@
 					<div id="moresees" style="clear:both;display:none;" class="lw7">
 						<div class="layui-item query athird">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" placeholder="开始时间" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${workClientInfo.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 3 - 3
src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -515,7 +515,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="companyType" class="form-control simple-select required" id="companyType">
                             <form:option value="" label="--请选择客户性质--"/>
                             <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -525,7 +525,7 @@
 
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="companyIndustry" id="companyIndustry" class="form-control simple-select required">
                             <form:option value="" label="--请选择行业--"/>
                             <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -534,7 +534,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户类型:</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block readOnlyFFF">
                         <form:select path="clientType" id="clientType" class="form-control simple-select required">
                             <form:option value="" label="--请选择客户类型--"/>
                             <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 2 - 2
src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -153,7 +153,7 @@
                             <label class="layui-form-label">地区:</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name" labelValue="${workClientInfo.area.name}"
-                                                title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" allowInput="true"/>
                             </div>
                         </div>
 
@@ -174,7 +174,7 @@
 					<div id="moresees" style="clear:both;display:none;" class="lw7">
 						<div class="layui-item query athird">
 							<label class="layui-form-label">创建时间:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<input id="beginDate" placeholder="开始时间" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${workClientInfo.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>

+ 5 - 5
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -611,31 +611,31 @@
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<form:input path="name" htmlEscape="false"    class="form-control required layui-input"/>
 								</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">
+								<div class="layui-input-block readOnlyFFF">
 									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同生效日期:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同终止日期:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 								</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">
+								<div class="layui-input-block readOnlyFFF">
 									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 										<form:option value="" label=""/>
 										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -576,7 +576,7 @@
 				<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
 					<div class="layui-item query athird">
 						<label class="layui-form-label">签订日期:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 								   value="<fmt:formatDate value="${workContractInfo.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
 							</input>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -690,7 +690,7 @@
 							</div>
 							<div class="layui-item layui-col-sm6 ">
 								<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-								<div class="layui-input-block">
+								<div class="layui-input-block readOnlyFFF">
 									<form:select path="contractTypeDoc" cssClass="form-control judgment simple-select">
 										<form:option value="" label=""/>
 										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 2 - 2
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -599,7 +599,7 @@
 						<div class="form-group-label"><h2>合同基础信息</h2></div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>客户名称:</label>
-							<div class="layui-input-block with-icon" <%--style="margin-right:95px;"--%>>
+							<div class="layui-input-block readOnlyFFF with-icon" <%--style="margin-right:95px;"--%>>
 								<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
 													  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
@@ -632,7 +632,7 @@
 						</div>
 						<div class="layui-item layui-col-sm6 ">
 							<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block readOnlyFFF">
 								<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -576,7 +576,7 @@
 				<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
 					<div class="layui-item query athird">
 						<label class="layui-form-label">签订日期:</label>
-						<div class="layui-input-block">
+						<div class="layui-input-block readOnlyFFF">
 							<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 								   value="<fmt:formatDate value="${workContractInfo.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
 							</input>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -233,7 +233,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 ">
 					<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
 							<form:option value="" label=""/>
 							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -177,7 +177,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 ">
 					<label class="layui-form-label"><span class="require-item">*</span>合同类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
 							<form:option value="" label=""/>
 							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

+ 5 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -66,6 +66,7 @@
 						return flag;
 					}
 				}
+				$("#chargeType").removeAttr("disabled")
 				$("#inputForm").submit();
 				return true;
 			}else {
@@ -636,7 +637,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line">发票申请编号:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block ">
 						<div class="input-group">
 							<form:input path="number" htmlEscape="false" readonly="true"   class="form-control layui-input"/>
 							<span class="input-group-btn">
@@ -685,15 +686,15 @@
 
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
-						<form:select  path="chargeType" class="form-control simple-select judgment">
+					<div class="layui-input-block readOnlyFFF">
+						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</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">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -687,7 +687,7 @@
 
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
@@ -695,7 +695,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -687,7 +687,7 @@
 
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
@@ -695,7 +695,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 3 - 3
src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -660,7 +660,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位:</label>
-					<div class="layui-input-block with-icon">
+					<div class="layui-input-block readOnlyFFF with-icon">
 						<sys:gridselect url="${ctx}/workinvoice/workInvoice/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 						</td>
@@ -698,7 +698,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
@@ -706,7 +706,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -687,7 +687,7 @@
 
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true">
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
@@ -695,7 +695,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 3 - 3
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -660,7 +660,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>实际开票单位:</label>
-					<div class="layui-input-block with-icon">
+					<div class="layui-input-block readOnlyFFF with-icon">
 						<sys:gridselect url="${ctx}/workinvoiceTwo/workinvoiceTwo/selectclient" id="client" name="client.id"  value="${workInvoice.client.id}"  title="选择开票单位" labelName="workInvoice.client.name"
 										labelValue="${workInvoice.client.name}" cssClass="form-control judgment layui-input" fieldLabels="单位" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselect>
 						</td>
@@ -698,7 +698,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>收款类型:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select  path="chargeType" class="form-control simple-select judgment" disabled="true" >
 							<form:options items="${fns:getMainDictList('receipt_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
@@ -706,7 +706,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容:</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<form:select path="billingContent" class="form-control simple-select judgment">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

+ 1 - 1
src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -64,7 +64,7 @@
 
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销时间:</label>
-                            <div class="layui-input-block">
+                            <div class="layui-input-block readOnlyFFF">
                                 <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
                                        value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -120,7 +120,7 @@
 
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销时间:</label>
-                            <div class="layui-input-block">
+                            <div class="layui-input-block readOnlyFFF">
                                 <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group bg-white"
                                        value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
@@ -154,7 +154,7 @@
                             <label class="layui-form-label">报销人:</label>
                             <div class="layui-input-block with-icon">
                                 <sys:inquireselectUser id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
-                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff"/>
+                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff" allowInput="true"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">

+ 2 - 2
src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -143,7 +143,7 @@
                         <label class="layui-form-label">部门:</label>
                         <div class="layui-input-block with-icon">
                             <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
+                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">
@@ -164,7 +164,7 @@
                     </div>
                     <div class="layui-item query athird">
                         <label class="layui-form-label">入职日期:</label>
-                        <div class="layui-input-block">
+                        <div class="layui-input-block readOnlyFFF">
                             <input id="beginEntryDate" name="beginEntryDate" type="text" placeholder="开始时间" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.beginEntryDate}" pattern="yyyy-MM-dd"/>"/>
                             </input>