机构排序修改，报销项目添加搜索框、发票合同非必填

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -306,7 +306,7 @@
 		FROM sys_office a
 		<include refid="officeJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL} and a.id != '1'
-		/*ORDER BY a.code*/
+		ORDER BY a.code
 	</select>
 
 	<select id="findAllList1" resultType="Office" parameterType="String">
@@ -315,7 +315,7 @@
 		FROM sys_office a
 		<include refid="officeJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL} and a.id != '1'
-		/*ORDER BY a.code*/
+		ORDER BY a.code
 	</select>
 
 	<select id="findAllListByParentIds" resultType="Office">

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -21,6 +21,8 @@
 
                 $("#inputForm").submit();
                 return true;
+            }else {
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -35,6 +35,8 @@
                 }
                 $("#inputForm").submit();
                 return true;
+            }else {
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -30,6 +30,8 @@
             if(validateForm.form()){
                 $("#inputForm").submit();
                 return true;
+            }else {
+                parent.layer.msg("信息未填写完整!", {icon: 5});
             }
 
             return false;

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

@@ -23,13 +23,13 @@
 			 $("input[name='ext']").on('ifChecked', function(event){
                  var radioVal = $(this).val();
                  if(radioVal == 1){
-                     //$("#td1").removeClass("hide");
+                     $("#td1").removeClass("hide");
                      $("#td2").removeClass("hide");
                      $("#td3").removeClass("hide");
                      $("#td4").addClass("hide");
                      $("#tr1").show()
                  }else{
-                     //$("#td1").addClass("hide");
+                     $("#td1").addClass("hide");
                      $("#td2").addClass("hide");
                      $("#td3").addClass("hide");
                      $("#td4").removeClass("hide");
@@ -99,7 +99,7 @@
 							<label for="ext1">非项目报销</label>
 						</div>
 					</div>
-					<%--<div id="td1" class="commonQuery">
+					<div id="td1" class="commonQuery">
 						<div class="layui-item query athird">
 							<span class="layui-form-label">项目名称：</span>
 							<div class="layui-input-block">
@@ -113,7 +113,7 @@
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
-					</div>--%>
+					</div>
 					<div id="td4" class="commonQuery">
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>报销详情：</label>