Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -805,7 +805,7 @@ public class WorkReimbursementController extends BaseController {
 	 * 选择报销项目
 	 */
 	@RequestMapping(value = "selectReproject")
-	public String selectReproject(String userId,ProjectRecords projectId, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String extid, HttpServletRequest request, HttpServletResponse response, Model model) {
+	public String selectReproject(String userId,ProjectRecords projectId, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String extid,@RequestParam(value = "name",required = false)String name, HttpServletRequest request, HttpServletResponse response, Model model) {
 		projectId.setCompany(UserUtils.getSelectCompany());
 		Page<ProjectRecords> page = projectRecordsService.ruralFindPageByReimbur(new Page<ProjectRecords>(request, response), projectId,userId);
 		try {
@@ -828,6 +828,9 @@ public class WorkReimbursementController extends BaseController {
 		model.addAttribute("allowInput", true);
 		model.addAttribute("page", page);
 		model.addAttribute("extId", extid);
+		if (StringUtils.isNotBlank(name)){
+			model.addAttribute("reimburseRemarks", name);
+		}
 		return "modules/sys/gridselectcallprojectOnReimbur";
 		//return "modules/sys/gridselect";
 	}

src/main/webapp/WEB-INF/tags/sys/reimburselectReproject.tag

@@ -20,6 +20,7 @@
 <script type="text/javascript">
 	function searchGrid${id}(){
 	var  userId=$("#submitterIdId").val();
+	var name=$("#${id}Name").val();
 	var extid=$("#${id}extId").val();
 	var area=$("#${id}area").val();
 	if (extid!=null && extid != ''){
@@ -65,7 +66,7 @@
 				title:"${title}",
 				name:'friend',
 				skin:"two-btns",
-				content: encodeURI("${url}?userId="+userId+"&fieldLabels=${fieldLabels}&fieldKeys=${fieldKeys}&url=${url}&searchLabel=${searchLabel}&searchKey=${searchKey}&extid="+extid),
+				content: encodeURI("${url}?userId="+userId+"&fieldLabels=${fieldLabels}&fieldKeys=${fieldKeys}&url=${url}&searchLabel=${searchLabel}&searchKey=${searchKey}&extid="+extid+"&name="+name),
 				btn: ['确定', '关闭'],
 				yes: function(index, layero){
 					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

src/main/webapp/webpage/modules/feedback/feedbackview.jsp

@@ -37,6 +37,8 @@
             return false;
         }
         $(document).ready(function() {
+           // CKEDITOR.replace( 'contents',{toolbarStartupExpanded:false,toolbar :'Basic'});
+            CKEDITOR.config.readOnly = true;
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
             });

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

@@ -19,7 +19,6 @@
 				$('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
 			});
 			$("#td4").addClass("hide");
-
 			// $("input[name='ext']").on('ifChecked', function(event){
 				var radioVal = ${extId};
 				if(radioVal == 1){
@@ -156,7 +155,7 @@
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label"><span class="require-item">*</span>报销详情：</label>
 							<div class="layui-input-block">
-								<textarea  id="reimburseRemarks" name="reimburseRemarks" style="width: 100%" rows="7" class="form-control required" maxlength="255"></textarea>
+								<textarea  id="reimburseRemarks" name="reimburseRemarks"  style="width: 100%" rows="7" class="form-control required" maxlength="255">${reimburseRemarks}</textarea>
 							</div>
 						</div>
 					</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -524,18 +524,19 @@
             }
         }
         function setParentInfo(parentId){
-            $.ajax({
-                url:"${ctx}/reimbursementType/reimbursementType/jsonData",
-                dataType:"json",
-                data:{id:parentId},
-                success:function (data) {
-                    if(data.proofread==1&&data.grade==1){
-                        $("#maxDeductTr").show();
-                    }else {
-                        $("#maxDeductTr").hide();
-                    }
-                }
-            })
+            return ;
+            <%--$.ajax({--%>
+            <%--    url:"${ctx}/reimbursementType/reimbursementType/jsonData",--%>
+            <%--    dataType:"json",--%>
+            <%--    data:{id:parentId},--%>
+            <%--    success:function (data) {--%>
+            <%--        if(data.proofread==1&&data.grade==1){--%>
+            <%--            $("#maxDeductTr").show();--%>
+            <%--        }else {--%>
+            <%--            $("#maxDeductTr").hide();--%>
+            <%--        }--%>
+            <%--    }--%>
+            <%--})--%>
         }
         function setPids(pIds,id){
             $.ajax({