Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -974,11 +974,11 @@
                                       cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"
                                       searchLabel="联系人" searchKey="name"></sys:gridselect1>
                 </div>
-                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">
-                    <a id="aButton" href="javascript:void(0)"
-                       onclick="openBill2('新增委托方管理', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=1','95%','95%',false,'inputForm')"
-                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增委托方信息</a>
-                </div>
+<%--                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">--%>
+<%--                    <a id="aButton" href="javascript:void(0)"--%>
+<%--                       onclick="openBill2('新增委托方管理', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=1','95%','95%',false,'inputForm')"--%>
+<%--                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增委托方信息</a>--%>
+<%--                </div>--%>
 
                 <div class="layui-item layui-col-xs12 form-table-container" style="padding:0px">
                     <table id="contentTable1" class="table table-bordered table-condensed details">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -490,7 +490,75 @@
 					</table>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划列表</h2></div>
+				<div class="layui-item layui-col-sm12 lw7">
+					<div class="layui-item nav-btns">
+							<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
+							<%--							<a class="nav-btn nav-btn-add"--%>
+							<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
+							<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
+							<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
+							<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
+							<%--							</shiro:hasPermission>--%>
+							<%--						</div>--%>
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th >任务阶段</th>
+								<th >计划开始时间</th>
+								<th >计划结束时间</th>
+								<th >提醒人</th>
+								<th >完成人</th>
+							</tr>
+							</thead>
+							<tbody id="projectPlanList">
+
+							</tbody>
+						</table>
+						<script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="projectPlanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
+                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
+                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
+                                    </td>
+
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
+                                    </td>
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
+                                    </td>
+
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
+                                    </td>
 
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
+                                    </td>
+
+<%--                                    <td class="text-center op-td" width="10">--%>
+<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                                    </td>--%>
+                                </tr>//-->
+						</script>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -543,7 +543,75 @@
 					</table>
 				</div>
 			</div>--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划列表</h2></div>
+				<div class="layui-item layui-col-sm12 lw7">
+					<div class="layui-item nav-btns">
+<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
+<%--							<a class="nav-btn nav-btn-add"--%>
+<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
+<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
+<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
+<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--						</div>--%>
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th >任务阶段</th>
+								<th >计划开始时间</th>
+								<th >计划结束时间</th>
+								<th >提醒人</th>
+								<th >完成人</th>
+							</tr>
+							</thead>
+							<tbody id="projectPlanList">
+
+							</tbody>
+						</table>
+						<script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="projectPlanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
+                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
+                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
+                                    </td>
+
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
+                                    </td>
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
+                                    </td>
 
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
+                                    </td>
+
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
+                                    </td>
+
+<%--                                    <td class="text-center op-td" width="10">--%>
+<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                                    </td>--%>
+                                </tr>//-->
+						</script>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -986,11 +986,11 @@
                                       cssClass="form-control required" fieldLabels="联系人" fieldKeys="name"
                                       searchLabel="联系人" searchKey="name"></sys:gridselect1>
                 </div>
-                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">
-                    <a id="aButton" href="javascript:void(0)"
-                       onclick="openBill2('新增委托方管理', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=1','95%','95%',false,'inputForm')"
-                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增委托方信息</a>
-                </div>
+<%--                <div id="addUserButton" class="layui-item nav-btns" style="float: left;">--%>
+<%--                    <a id="aButton" href="javascript:void(0)"--%>
+<%--                       onclick="openBill2('新增委托方管理', '${ctx}/workclientinfo/workClientInfo/form?param=2&jobTypeShow=1','95%','95%',false,'inputForm')"--%>
+<%--                       class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增委托方信息</a>--%>
+<%--                </div>--%>
 
                 <div class="layui-item layui-col-xs12 form-table-container" style="padding:0px">
                     <table id="contentTable1" class="table table-bordered table-condensed details">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -489,7 +489,75 @@
 					</table>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划列表</h2></div>
+				<div class="layui-item layui-col-sm12 lw7">
+					<div class="layui-item nav-btns">
+<%--						<div class="layui-item nav-btns" style="padding-left:0px;">--%>
+<%--							<a class="nav-btn nav-btn-add"--%>
+<%--							   onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"--%>
+<%--							   title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
+<%--							<shiro:hasPermission name="project:projectPlan:export">--%>
+<%--								<a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--						</div>--%>
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th >任务阶段</th>
+								<th >计划开始时间</th>
+								<th >计划结束时间</th>
+								<th >提醒人</th>
+								<th >完成人</th>
+							</tr>
+							</thead>
+							<tbody id="projectPlanList">
+
+							</tbody>
+						</table>
+						<script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="projectPlanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" readonly="true" value="{{row.id}}"/>
+                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" readonly="true" value="0"/>
+                                        <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" readonly="true" value="{{row.remindId}}"/>
+                                    </td>
 
+                                    <td width="60px">
+                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="true" list ="num" title="{{row.projectStage}}"  value="{{row.projectStage}}" class="form-control required"/>
+                                    </td>
+
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" name="projectPlanList[{{idx}}].beginDate" style="text-align: center" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
+                                    </td>
+                                    <td>
+                                        <input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" name="projectPlanList[{{idx}}].endDate" style="text-align: center" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
+                                    </td>
+
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_remindName" name="remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser  id="projectPlanList{{idx}}_remindName" name="remindName" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].remindName" labelValue="{{row.remindName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataByPlan?type=3&projectId=${projectRecords.id}" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true"/>--%>
+                                    </td>
+
+                                    <td>
+                                    	<input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
+<%--                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" disabled="true" />--%>
+                                    </td>
+
+<%--                                    <td class="text-center op-td" width="10">--%>
+<%--                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                                    </td>--%>
+                                </tr>//-->
+						</script>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -53,9 +53,9 @@
         $(document).ready(function() {
 			var chargeCriterionH = $("#chargeCriterionH").val();
 			if(chargeCriterionH.indexOf("4")!=-1){
-				document.getElementById("otherDetails").readOnly=false
+				// document.getElementById("otherDetails").readOnly=false
 			}else{
-				document.getElementById("otherDetails").readOnly=true
+				// document.getElementById("otherDetails").readOnly=true
 				$("#otherDetails").val("");
 			}
             if($("#createDate").val()==null || $("#createDate").val()==''){
@@ -663,15 +663,16 @@
 							<div class="layui-item layui-col-sm12">
 								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">
-									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
+<%--									<form:checkboxes path="chargeCriterionList" cssStyle="display: none;" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />--%>
 								</div>
 							</div>
 
 
 							<div class="layui-item layui-col-sm12">
-								<label class="layui-form-label ">其他详情：</label>
+								<label class="layui-form-label "><!--其他详情：--></label>
 								<div class="layui-input-block">
-									<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+									<form:input path="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -852,15 +853,17 @@
 
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
+
 				var ids = [];
 				$("input[name='chargeCriterionList']:checked").each(function(i){
-					ids.push($(this).val())
+					ids.push($(this).val());
 				})
+
 				if(ids.indexOf("4")!=-1){
-					document.getElementById("otherDetails").readOnly=false
+					// document.getElementById("otherDetails").readOnly=false
 				}else{
-					document.getElementById("otherDetails").readOnly=true
-					$("#otherDetails").val("");
+					// document.getElementById("otherDetails").readOnly=true
+					$("#otherDetails").val(ids);
 				}
 			});
 		});

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -179,7 +179,7 @@
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
-								<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+								<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">