Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectContentDataController.java

@@ -197,18 +197,20 @@ public class ProjectContentDataController extends BaseController {
     }
 
     @RequestMapping("selectcontent")
-	public String gridSelect(ProjectContentData projectContentData, String searchLabel ,HttpServletRequest request, HttpServletResponse response, Model model){
+	public String gridSelect(ProjectContentData projectContentData, String searchLabel ,HttpServletRequest request, HttpServletResponse response, Model model) throws UnsupportedEncodingException {
         Page<ProjectContentData> page = projectContentDataService.findPage(new Page<ProjectContentData>(request, response), projectContentData);
         model.addAttribute("obj", projectContentData);
         model.addAttribute("page", page);
+		searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
         model.addAttribute("searchLabel",searchLabel);
 	    return "modules/sys/gridselectProjcontent";
     }
     @RequestMapping("selectcontentData")
-	public String gridSelectData(ProjectContentData projectContentData, String searchLabel ,HttpServletRequest request, HttpServletResponse response, Model model){
+	public String gridSelectData(ProjectContentData projectContentData, String searchLabel ,HttpServletRequest request, HttpServletResponse response, Model model) throws UnsupportedEncodingException {
         Page<ProjectContentData> page = projectContentDataService.findPage(new Page<ProjectContentData>(request, response), projectContentData);
         model.addAttribute("obj", projectContentData);
         model.addAttribute("page", page);
+		searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
         model.addAttribute("searchLabel",searchLabel);
 	    return "modules/sys/gridselectProjcontentData";
     }

src/main/webapp/webpage/modules/workcontent/workContentAltermanage.jsp

@@ -8,7 +8,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
                 <div class="layui-input-block with-icon">
                     <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contId" name="contract.id"  value="${workContentAltermanage.contract.id}"  title="选择合同" labelName="contract.name"
-                                               labelValue="${workContentAltermanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentAltermanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="合同名称" searchKey="" ></sys:gridselectProjcontent>
+                                               labelValue="${workContentAltermanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentAltermanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合同名称')}" searchKey="" ></sys:gridselectProjcontent>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontent/workContentBiddingplan.jsp

@@ -7,7 +7,7 @@
         <label class="layui-form-label"><span class="require-item">*</span>合约规划名称：</label>
         <div class="layui-input-block with-icon">
             <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contProgramId" name="contProgram.id"  value="${workContentBiddingplan.contProgram.id}"  title="选择合约" labelName="contProgram.name"
-                                       labelValue="${workContentBiddingplan.contProgram.name}" cssClass="form-control layui-input required" projectId="${workContentBiddingplan.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="合约名称" searchKey="" ></sys:gridselectProjcontent>
+                                       labelValue="${workContentBiddingplan.contProgram.name}" cssClass="form-control layui-input required" projectId="${workContentBiddingplan.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合约名称')}" searchKey="" ></sys:gridselectProjcontent>
         </div>
     </div>
     <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontent/workContentClaimForm.jsp

@@ -7,7 +7,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
                 <div class="layui-input-block with-icon">
                     <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contractId" name="contract.id"  value="${workContentClaim.contract.id}"  title="选择合同" labelName="contract.name"
-                                               labelValue="${workContentClaim.contract.name}" cssClass="form-control layui-input required" projectId="${workContentClaim.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="合同名称" searchKey="" ></sys:gridselectProjcontent>
+                                               labelValue="${workContentClaim.contract.name}" cssClass="form-control layui-input required" projectId="${workContentClaim.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合约名称')}" searchKey="" ></sys:gridselectProjcontent>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontent/workContentContprogram.jsp

@@ -56,7 +56,7 @@
             <label class="layui-form-label">与其他合约关系：</label>
             <div class="layui-input-block with-icon">
                 <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="otherProgramId" name="otherProgram.id"  value="${workContentContprogram.otherProgram.id}"  title="选择合约" labelName="otherProgram.name"
-                                           extId="${workContentContprogram.contentId}"    labelValue="${workContentContprogram.otherProgram.name}" cssClass="form-control layui-input " projectId="${workContentContprogram.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="合约名称" searchKey="" ></sys:gridselectProjcontent>
+                                           extId="${workContentContprogram.contentId}"    labelValue="${workContentContprogram.otherProgram.name}" cssClass="form-control layui-input " projectId="${workContentContprogram.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合约名称')}" searchKey="" ></sys:gridselectProjcontent>
             </div>
         </div>
         <div class="layui-item layui-col-sm12 with-textarea">

src/main/webapp/webpage/modules/workcontent/workContentContractinfoForm.jsp

@@ -7,7 +7,7 @@
             <label class="layui-form-label">合约规划名称：</label>
             <div class="layui-input-block with-icon">
                 <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="programId" name="program.id"  value="${workContentContractinfo.program.id}"  title="选择合约规划名称" labelName="program.name"
-                                           labelValue="${workContentContractinfo.program.name}" cssClass="form-control layui-input required" projectId="${workContentContractinfo.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="合约名称" searchKey="" ></sys:gridselectProjcontent>
+                                           labelValue="${workContentContractinfo.program.name}" cssClass="form-control layui-input required" projectId="${workContentContractinfo.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合约名称')}" searchKey="" ></sys:gridselectProjcontent>
             </div>
         </div>
         <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontent/workContentPricemanageForm.jsp

@@ -8,7 +8,7 @@
             <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
             <div class="layui-input-block with-icon">
                 <sys:gridselectProjcontent url="${ctx}/projectcontentinfo/projectContentData/selectcontent" id="contId" name="contract.id"  value="${workContentPricemanage.contract.id}"  title="选择合同" labelName="contract.name"
-                                           labelValue="${workContentPricemanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentPricemanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="合同名称" searchKey="" ></sys:gridselectProjcontent>
+                                           labelValue="${workContentPricemanage.contract.name}" cssClass="form-control layui-input required" projectId="${workContentPricemanage.projectId}" type="41" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('合约名称')}" searchKey="" ></sys:gridselectProjcontent>
             </div>
         </div>
         <div class="layui-item layui-col-sm6">