|
@@ -8,13 +8,19 @@
|
|
|
<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
|
|
|
<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
|
|
|
<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
|
|
|
+ <script src="${ctxStatic}/common/html/js/script.js"></script>
|
|
|
<%@include file="/webpage/include/treetable.jsp" %>
|
|
|
<script type="text/javascript">
|
|
|
var validateForm;
|
|
|
function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
|
|
|
if(validateForm.form()){
|
|
|
if(obj == 1) {
|
|
|
- $("#flag").val("yes");
|
|
|
+ var flags=judgment();
|
|
|
+ if (flags){
|
|
|
+ $("#flag").val("yes");
|
|
|
+ }else{
|
|
|
+ return flags;
|
|
|
+ }
|
|
|
/*var technicistRemarks = $("#technicistRemarks").val();
|
|
|
var type = $("#type").val();
|
|
|
if( type==4 && (undefined == technicistRemarks || null ==technicistRemarks || '' ==technicistRemarks)){
|
|
@@ -796,6 +802,83 @@
|
|
|
</table>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="form-group layui-row">
|
|
|
+ <div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
|
|
|
+ <div class="layui-item layui-col-sm12 lw6">
|
|
|
+ <div class="layui-item nav-btns">
|
|
|
+ <table id="bankinfo" class="table table-bordered table-condensed can-edit">
|
|
|
+ <thead>
|
|
|
+ <tr>
|
|
|
+ <th width="60px">编号</th>
|
|
|
+ <th ><span class="require-item">*</span>成员名称</th>
|
|
|
+ <th >角色</th>
|
|
|
+ <th >注册/资格证号</th>
|
|
|
+ <th >专业</th>
|
|
|
+ <th >本人负责内容</th>
|
|
|
+ <th ><span class="require-item">*</span>审核意见</th>
|
|
|
+ <%-- <th width="100px">操作</th>--%>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody id="reportedConsultantList">
|
|
|
+ <c:forEach items="${consultantinfo}" var = "info" varStatus="status">
|
|
|
+ <tr>
|
|
|
+ <td width="60px">
|
|
|
+ <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center" value="${status.index+1}" type="text" class="form-control contentDetail"/>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control judgment"/>
|
|
|
+
|
|
|
+ <%-- <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
|
|
|
+ <%-- title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
|
|
|
+ </td>
|
|
|
+
|
|
|
+ <td>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_major" readonly="true" name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <c:choose>
|
|
|
+ <c:when test="${consultantCount == status.index+1}">
|
|
|
+ <input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
|
|
|
+ </c:when>
|
|
|
+ <c:otherwise>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}" placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
|
|
|
+ </c:otherwise>
|
|
|
+ </c:choose>
|
|
|
+
|
|
|
+ </td>
|
|
|
+
|
|
|
+ <%-- <td class="text-center op-td" width="10">--%>
|
|
|
+ <%-- <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i> 删除</span>--%>
|
|
|
+ <%-- </td>--%>
|
|
|
+ <td class="hide">
|
|
|
+ <input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
|
|
|
+ <input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </c:forEach>
|
|
|
+ </tbody>
|
|
|
+ </table>
|
|
|
+ </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" >
|
|
|
+ <act:flowChart procInsId="${processInstanceId}"/>
|
|
|
+ <act:histoicFlow procInsId="${processInstanceId}"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="form-group layui-row first hide" id="subProjectInfo">
|
|
|
<table class="oa-table layui-table" id="contentTable1">
|
|
@@ -890,16 +973,15 @@
|
|
|
<div class="layui-input-block">
|
|
|
<c:forEach items="${fns:getMainDictList('charge_criterion')}" var="var">
|
|
|
<c:forEach items="${workContractInfo.chargeCriterion.split(',')}" var="s">
|
|
|
- <c:if test="${s!=var.label}">
|
|
|
- <input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">
|
|
|
- </c:if>
|
|
|
- <c:if test="${s==var.label}">
|
|
|
- <input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>
|
|
|
- </c:if>
|
|
|
+ <c:if test="${s==var.label}">
|
|
|
+ <input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${s!=var.label}">
|
|
|
+ <input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">
|
|
|
+ </c:if>
|
|
|
</c:forEach>
|
|
|
</c:forEach>
|
|
|
-
|
|
|
- <%-- <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="" />--%>
|
|
|
+<%-- <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="" />--%>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="layui-item layui-col-sm12">
|
|
@@ -1255,83 +1337,8 @@
|
|
|
</div>
|
|
|
</c:if>
|
|
|
</div>--%>
|
|
|
- <div class="form-group layui-row">
|
|
|
- <div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
|
|
|
- <div class="layui-item layui-col-sm12 lw6">
|
|
|
- <div class="layui-item nav-btns">
|
|
|
- <table id="bankinfo" class="table table-bordered table-condensed can-edit">
|
|
|
- <thead>
|
|
|
- <tr>
|
|
|
- <th width="60px">编号</th>
|
|
|
- <th ><span class="require-item">*</span>成员名称</th>
|
|
|
- <th >角色</th>
|
|
|
- <th >注册/资格证号</th>
|
|
|
- <th >专业</th>
|
|
|
- <th >本人负责内容</th>
|
|
|
- <th ><span class="require-item">*</span>审核意见</th>
|
|
|
-<%-- <th width="100px">操作</th>--%>
|
|
|
- </tr>
|
|
|
- </thead>
|
|
|
- <tbody id="reportedConsultantList">
|
|
|
- <c:forEach items="${consultantinfo}" var = "info" varStatus="status">
|
|
|
- <tr>
|
|
|
- <td width="60px">
|
|
|
- <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center" value="${status.index+1}" type="text" class="form-control contentDetail"/>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control required"/>
|
|
|
|
|
|
-<%-- <sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
|
|
|
-<%-- title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
|
|
|
- </td>
|
|
|
|
|
|
- <td>
|
|
|
- <input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <input id="reportedConsultantList${status.index+1}_major" readonly="true" name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <c:choose>
|
|
|
- <c:when test="${consultantCount == status.index+1}">
|
|
|
- <input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control required"/>
|
|
|
- </c:when>
|
|
|
- <c:otherwise>
|
|
|
- <input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}" placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control required"/>
|
|
|
- </c:otherwise>
|
|
|
- </c:choose>
|
|
|
-
|
|
|
- </td>
|
|
|
-
|
|
|
-<%-- <td class="text-center op-td" width="10">--%>
|
|
|
-<%-- <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i> 删除</span>--%>
|
|
|
-<%-- </td>--%>
|
|
|
- <td class="hide">
|
|
|
- <input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
|
|
|
- <input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
|
|
|
- <input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
|
|
|
- <input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- </c:forEach>
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
- </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" >
|
|
|
- <act:flowChart procInsId="${processInstanceId}"/>
|
|
|
- <act:histoicFlow procInsId="${processInstanceId}"/>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<div class="form-group layui-row">
|
|
|
<div class="form-group-label"><h2>审批意见</h2></div>
|
|
|
<div class="layui-item layui-col-sm8 lw6 with-textarea">
|