2019-11-18 18:38:18

src/main/java/com/jeeplus/modules/workbidproject/web/WorkBidProjectController.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workbidproject.web;
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -390,6 +391,7 @@ public class  WorkBidProjectController extends BaseController {
 		try {
             String fileName = "投标项目"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<WorkBidProject> page = workBidProjectService.findPage(new Page<WorkBidProject>(request, response, -1), workBidProject);
+			System.out.println("===========================\n"+ JSON.toJSONString(page.getList().toString()));
     		new ExportExcel("投标项目", WorkBidProject.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -34,6 +34,7 @@ import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

src/main/webapp/webpage/modules/workbidproject/workBidProjectForm.jsp

@@ -338,7 +338,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
 					<div class="layui-input-block">
 						<form:select path="projectType" class="form-control required simple-select"><%--onChange="changeTypeExplain(this)--%>
-							<form:option value="" label=""/>
+							<form:option value="" label="--请选择工程分类--"/>
 							<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -373,8 +373,8 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">规模类型：</label>
 					<div class="layui-input-block">
-						<form:select path="scaleType" class="form-control simple-select">
-							<form:option value="" label=""/>
+						<form:select path="scaleType" class="form-control selectpicker required layui-input">
+							<form:option value="" label="--请选择规模类型--"/>
 							<form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -382,9 +382,10 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">规模单位：</label>
 					<div class="layui-input-block">
-						<form:select path="scaleUnit" class="form-control simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						<form:select path="scaleUnit" class="form-control selectpicker required layui-input">
+							<form:option value="" label="--请选择规模--"/>
+							<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label"
+										  itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
 				</div>
@@ -566,7 +567,6 @@
 									workClientLinkmansRowIdx = workClientLinkmansRowIdx + 1;
 								}
 							}
-
 						});
 
 					</script>
@@ -622,8 +622,11 @@
 					<label class="layui-form-label">投标保证金形式：</label>
 					<div class="layui-input-block">
 						<form:select path="bondStyle" class="form-control  simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('bond_style')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							<form:option value="" label="--请选择保证金形式--"/>
+							<form:option value="现金" label="现金"/>
+							<form:option value="支票" label="支票"/>
+							<form:option value="银行汇款" label="银行汇款"/>
+<%--							<form:options items="${fns:getMainDictList('bond_style')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 						</form:select>
 					</div>
 				</div>
@@ -663,7 +666,7 @@
 					<label class="layui-form-label">业务类型：</label>
 					<div class="layui-input-block">
 						<form:select path="businessType" class="form-control simple-select">
-							<form:option value="" label=""/>
+							<form:option value="" label="--请选择业务类型--"/>
 							<form:options items="${fns:getMainDictList('business_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>

src/main/webapp/webpage/modules/workbidproject/workBidProjectList.jsp

@@ -330,8 +330,10 @@
                     ,"id":"${workBidProject.id}"
                     ,"number":"${workBidProject.projectNumber}"
                     ,"name":"${workBidProject.projectName}"
-                    ,"type":"${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"
-                    ,"source":"${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"
+                    ,"type":"${workBidProject.projectType}"
+                    <%--,"type":"${fns:getMainDictLabel(workBidProject.projectType, 'contract_type', '')}"--%>
+                    ,"source":"${workBidProject.projectSource}"
+                    <%--,"source":"${fns:getMainDictLabel(workBidProject.projectSource, 'bidProjectSource', '')}"--%>
                     ,"date":"<fmt:formatDate value="${workBidProject.bidDate}" pattern="yyyy-MM-dd"/>"
                     ,"money":"<fmt:formatNumber value="${workBidProject.investMoney}" pattern="#,#00.00"/>"
                     ,"status":"${workBidProject.status}"

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -284,42 +284,34 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
                     <div class="layui-input-block">&nbsp;&nbsp;
-                        <form:radiobutton class="usccClass i-checks" path="hasUscc" value="1" label="是"
-                                          checked="true"></form:radiobutton>
+                        <form:radiobutton class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
                         &nbsp;&nbsp;
-                        <form:radiobutton class="usccClass i-checks" path="hasUscc" value="2"
-                                          label="否"></form:radiobutton>
+                        <form:radiobutton class="usccClass i-checks" path="hasUscc" value="2" label="否" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质：</label>
                     <div class="layui-input-block">
-                        <form:select path="companyType" class="form-control  simple-select required" id="companyType">
-                            <form:option value="--请选择客户性质--" label="--请选择客户性质--"/>
-                            <form:option value="性质1" label="性质1"/>
-                            <form:option value="性质2" label="性质2"/>
-                            <form:option value="性质3" label="性质3"/>
-                            <%--<form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-                        </form:select>
+                        <form:select path="companyType" class="form-control selectpicker required layui-input" id="companyType">
+                            <form:option value="" label="--请选择客户性质--"/>
+                            <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false"
-                                    class="form-control required isUscCode layui-input"/>
+                        <form:input path="uscCode" htmlEscape="false" class="form-control required isUscCode layui-input"/>
                         <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业：</label>
                     <div class="layui-input-block">
-                        <form:select path="companyIndustry" class="form-control required  simple-select">
-                            <form:option value="--请选择行业--" label="--请选择行业--"/>
-                            <form:option value="行业1" label="行业1"/>
-                            <form:option value="行业2" label="行业2"/>
-                            <%--<form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                        <form:select path="companyIndustry" class="form-control selectpicker required layui-input">
+                            <form:option value="" label="--请选择行业--"/>
+                            <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
                 </div>
@@ -354,16 +346,11 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
                     <div class="layui-input-block width-icon">
-                        <select name="clientType" id="clientType" class="form-control selectpicker required layui-input"
-                                multiple="true">
-                                <%--<form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-                            <option value="类型1">类型1</option>
-                            <option value="类型2">类型2</option>
-                            <option value="类型3">类型3</option>
-                            <c:forEach items="${fns:getMainDictList('client_type')}" var="item">
-                                <option value="${item.value}">${item.label}</option>
-                            </c:forEach>
-                        </select>
+
+                        <form:select path="clientType" class="form-control selectpicker required layui-input">
+                            <form:option value="" label="--请选择客户类型--"/>
+                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -96,12 +96,7 @@
                                                 title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
-						<%--<div class="layui-item query athird">
-							<label class="layui-form-label">联系人：</label>
-							<div class="layui-input-block">
-								<form:input path="workClientLinkman.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>--%>
+
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -139,7 +134,7 @@
 							<div class="layui-input-block">
                                 <form:select path="companyIndustry" class="form-control layui-input">
                                     <form:option value="" label=""/>
-                                    <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+<%--                                    <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
                                 </form:select>
 							</div>
 						</div>
@@ -148,7 +143,7 @@
 							<div class="layui-input-block">
                                 <form:select path="clientType" class="form-control layui-input">
                                     <form:option value="" label=""/>
-                                    <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+<%--                               <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
                                 </form:select>
 							</div>
 						</div>
@@ -238,7 +233,6 @@
                     ,"id":"${workClientInfo.id}"
 					,"linkman":"${workClientInfo.workClientLinkman.id}"
                     ,"clientName":"${workClientInfo.name}"
-                    <%--,"clientName":"<c:out value="${workClientInfo.name}" escapeXml="true"/>"--%>
                     <%--,"clientProperty":"${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"--%>
 					,"clientProperty":"${workClientInfo.companyType}"
 					,"trade":"${workClientInfo.companyIndustry}"
@@ -247,8 +241,8 @@
                     ,"clientType":"${workClientInfo.clientType}"
                     <%--,"clientType":"${fns:getMainDictLabels(workClientInfo.clientType,',','client_type', '')}"--%>
                     ,"code":"${workClientInfo.uscCode}"
-                    ,"createDate":"${workClientInfo.createDate}"
-                    <%--,"createDate":"<fmt:formatDate value="${workClientInfo.createDate}" pattern="yyyy-MM-dd"/>"--%>
+                    <%--,"createDate":"${workClientInfo.createDate}"--%>
+                    ,"createDate":"<fmt:formatDate value="${workClientInfo.createDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${flag == '1' or fns:getUser().id == workClientInfo.createBy.id}">
                     <shiro:hasPermission name="workclientinfo:workClientInfo:edit">,"canedit":"1"</shiro:hasPermission>
 					<shiro:hasPermission name="workclientinfo:workClientInfo:del">,"candelete":"1"</shiro:hasPermission>
@@ -264,94 +258,7 @@
     resizeListTable();/*消除由于有竖向滚动条造成table出现横向滚动条*/
     $("a").on("click",addLinkVisied);
 </script>
-	
-	<%--<!-- 表格 -->--%>
-	<%--<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">--%>
-		<%--<thead>--%>
-			<%--<tr>--%>
-				<%--<th style="text-align: center;width: 20%">客户名称</th>--%>
-				<%--<th style="text-align: center;width: 10%">客户性质</th>--%>
-				<%--<th style="text-align: center;width: 10%">所在行业</th>--%>
-				<%--<th style="text-align: center;width: 10%">地区</th>--%>
-				<%--<th style="text-align: center;width: 10%">客户类型</th>--%>
-				<%--<th style="text-align: center;width: 15%">统一社会信用代码</th>--%>
-				<%--<th style="text-align: center;width: 10%" class="sort-column createDate">创建时间</th>--%>
-				<%--<th style="text-align: center;width: 15%">操作</th>--%>
-			<%--</tr>--%>
-		<%--</thead>--%>
-		<%--<tbody>--%>
-		<%--<c:choose>--%>
-			<%--<c:when test="${listSize > 0}">--%>
-				<%--<c:forEach items="${page.list}" var="workClientInfo">--%>
-					<%--<tr>--%>
-						<%--&lt;%&ndash;<td> <input type="checkbox" id="${workClientInfo.id}" class="i-checks"></td>&ndash;%&gt;--%>
-						<%--<td style="text-align: center;"><a  href="javascript:void(0)" onclick="openDialogView('查看客户信息', '${ctx}/workclientinfo/workClientInfo/detail?id=${workClientInfo.id}&wlId=${workClientInfo.workClientLinkman.id}','80%','80%')">--%>
-							<%--<span title="${workClientInfo.name}">${fns:abbr(workClientInfo.name,40)}</span>--%>
-						<%--</a></td>--%>
-						<%--<td style="text-align: center;">--%>
-								<%--${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}--%>
-						<%--</td>--%>
 
-						<%--<td style="text-align: center;">--%>
-								<%--${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}--%>
-						<%--</td>--%>
-						<%--<td style="text-align: center;">--%>
-								<%--${workClientInfo.area.name}--%>
-						<%--</td>--%>
-						<%--<td style="text-align: center;">--%>
-							<%--<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" />--%>
-							<%--<c:forEach items="${clientTypes}" var="cType" varStatus="status">--%>
-								<%--${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if>--%>
-							<%--</c:forEach>--%>
-						<%--</td>--%>
-						<%--<td style="text-align: center;">--%>
-							<%--${workClientInfo.uscCode}--%>
-							<%--&lt;%&ndash;<c:if test="${workClientInfo.companyType eq '1'}">--%>
-								<%--${workClientInfo.orUnicode}--%>
-							<%--</c:if>--%>
-							<%--<c:if test="${workClientInfo.companyType ne '1'}">--%>
-								<%--${workClientInfo.taxId}--%>
-							<%--</c:if>&ndash;%&gt;--%>
-						<%--</td>--%>
-						<%--<td style="text-align: center;">--%>
-							<%--<fmt:formatDate value="${workClientInfo.createDate}" pattern="yyyy-MM-dd"/>--%>
-						<%--</td>--%>
-						<%--<td style="text-align: center;">--%>
-							<%--<div style="text-align: center">--%>
-								<%--<c:choose>--%>
-									<%--<c:when test="${flag == '1' or fns:getUser().id == workClientInfo.createBy.id}">--%>
-										<%--<shiro:hasPermission name="workclientinfo:workClientInfo:edit">--%>
-										<%--<a href="javascript:void(0)" onclick="openDialog('修改客户信息', '${ctx}/workclientinfo/workClientInfo/form?id=${workClientInfo.id}&param=1','80%','80%')" class="btn btn-success btn-xs" ><i class="fa fa-edit"></i>修改</a>--%>
-										<%--</shiro:hasPermission>--%>
-										<%--<shiro:hasPermission name="workclientinfo:workClientInfo:del">--%>
-											<%--<a href="${ctx}/workclientinfo/workClientInfo/delete?id=${workClientInfo.id}" onclick="return confirmx('确认要删除该客户信息吗？', this.href)"   class="btn btn-danger btn-xs"><i class="fa fa-trash"></i>删除</a>--%>
-										<%--</shiro:hasPermission>--%>
-									<%--</c:when>--%>
-									<%--<c:otherwise>--%>
-										<%--<a href="javascript:parent.layer.msg('只有登记人和管理员有权限操作！',{icon:5})"  class="btn btn-default btn-xs" ><i class="fa fa-edit"></i>修改</a>--%>
-										<%--<a href="javascript:parent.layer.msg('只有登记人和管理员有权限操作！',{icon:5})"  class="btn btn-default btn-xs" ><i class="fa fa-trash"></i>删除</a>--%>
-									<%--</c:otherwise>--%>
-								<%--</c:choose>--%>
-							<%--</div>--%>
-						<%--</td>--%>
-					<%--</tr>--%>
-				<%--</c:forEach>--%>
-			<%--</c:when>--%>
-			<%--<c:otherwise>--%>
-				<%--<tr align="center">--%>
-					<%--<td colspan="9">暂无数据</td></tr>--%>
-			<%--</c:otherwise>--%>
-		<%--</c:choose>--%>
-		<%--</tbody>--%>
-	<%--</table>--%>
-	<%----%>
-		<%--<!-- 分页代码 -->--%>
-	<%--<table:page page="${page}"></table:page>--%>
-	<%--<br/>--%>
-	<%--<br/>--%>
-	<%--</div>--%>
-	<%--</div>--%>
-<%--</div>--%>
 <script type="text/javascript">
     resizeListWindow1();
     $(window).resize(function(){

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

@@ -587,17 +587,13 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">总合同名称：</label>
                 <div class="layui-input-block with-icon">
-                   <%-- <c:choose>
-                        <c:when test="${workContractInfo.contractState == 4}">
-                            <form:input path="totalContractName" htmlEscape="false" readonly="true"   class="form-control  layui-input"/>
-                        </c:when>
-                        <c:otherwise>
-                            <sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type="" isTotal="1" id="totalContractId" name="totalContractId"  value="${workContractInfo.totalContractId}"  title="选择合同" labelName="workContractInfo.totalContractName"
-                                                    labelValue="${workContractInfo.totalContractName}" cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
-                        </c:otherwise>
-                    </c:choose>--%>
-                       <sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type="" isTotal="1" id="totalContractId" name="totalContractId"  value="${workContractInfo.totalContractId}"  title="选择合同" labelName="workContractInfo.totalContractName"
-                                               labelValue="${workContractInfo.totalContractName}" cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                    <sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type=""
+                         isTotal="1" id="totalContractId" name="totalContractId"
+                         value="${workContractInfo.totalContractId}" title="选择合同"
+                         labelName="workContractInfo.totalContractName"
+                         labelValue="${workContractInfo.totalContractName}"
+                         cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name"
+                         searchLabel="合同名称" searchKey="name"></sys:gridselectContract>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
@@ -657,7 +653,7 @@
             <div class="layui-item layui-col-sm6 ">
                 <label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
                 <div class="layui-input-block">
-                    <form:select path="contractType" cssClass="form-control required simple-select">
+                    <form:select path="contractType" cssClass="form-control selectpicker required layui-input">
                         <form:option value="" label=""/>
                         <form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                     </form:select>
@@ -771,41 +767,13 @@
                     </c:if>
                     </tbody>
                 </table>
-                <script type="text/template" id="workClientInfoListTpl">//<!--
-                    <tr id="workClientInfoList{{idx}}">
-                        <td class="hide">
-                            <input id="workClientInfoList{{idx}}_id" name="workClientInfoList[{{idx}}].id" type="hidden" value="{{row.id}}" class="clientInfoId"/>
-                            <input id="workClientInfoList{{idx}}_delFlag" name="workClientInfoList[{{idx}}].delFlag" type="hidden" value="0"/>
-                        </td>
-                        <td>
-                            <input id="workClientInfoList{{idx}}_name" name="workClientInfoList[{{idx}}].name" type="text" value="{{row.name}}"  readonly="true"  class="form-control required"/>
-                         </td>
-                         <td>
-                            <input id="workClientInfoList{{idx}}_companyType" name="workClientInfoList[{{idx}}].companyType" type="text" value="{{row.companyType}}" readonly="true"   class="form-control required"/>
-                         </td>
-                        <td>
-                            <input id="workClientInfoList{{idx}}_companyIndustry"  name="workClientInfoList[{{idx}}].companyIndustry" type="text" value="{{row.companyIndustry}}"  readonly="true"  class="form-control required"/>
-                        </td>
-                        <td>
-                            <input id="workClientInfoList{{idx}}_area" name="workClientInfoList[{{idx}}].area.name" type="text" value="{{row.area.name}}"  readonly="true"   class="form-control required"/>
-                        </td>
-                        <td class="text-center op-td" id="workClientInfoList{{idx}}_td">
-                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientInfoList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
-                        </td>
-                    </tr>//-->
-                </script>
+
 					<script type="text/javascript">
                         var workClientInfoListRowIdx = 0, workClientInfoListTpl = $("#workClientInfoListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                         if($("#id").val()||$("#aId").val()){
                             workClientInfoListRowIdx = ${fn:length(workContractInfo.workClientInfoList)};
                         }
-                        /*$(document).ready(function() {
-                            var data = ${fns:toJson(workContractInfo.workClientInfoList)};
-                            for (var i=0; i<data.length; i++){
-                                addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl, data[i]);
-                                workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
-                            }
-                        });*/
+
 					</script>
 
 				</div>

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

@@ -119,7 +119,7 @@
 			<div class="layui-tab" id="tabDiv">
 				<ul class="layui-tab-title" >
 					<li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">合同信息</a></li>
-					<li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>
+
 				</ul>
 			</div>
 			<%--<ul class="nav nav-tabs">--%>
@@ -509,170 +509,6 @@
 						</div>
 					</div>
 				</div>
-				<div id="tab-22" class="tab-pane">
-
-					<div class="form-group layui-row first lw14">
-						<div class="form-group-label"><h2>评审基础信息</h2></div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">时间要求：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.timeRequirements}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">特殊要求：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.specialRequirements}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">客户要求是否合法：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">客户诚信度的初步判断：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">风险初步评价：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">被服务对象所处行业环境：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">与服务有关的客户资料能否恰当获取：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">人员是否能专业胜任：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">是否需要借助外部专家力量：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">设备能否满足项目要求：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">时间能否满足客户需求：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line">合同是否可以签定：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm12">
-							<label class="layui-form-label">备注信息：</label>
-							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.workContractReview.remarks}</textarea>
-							</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" >
-							<table id="contentTable2" class="table table-bordered table-condensed no-bottom-margin details">
-								<thead>
-								<tr>
-									<th>文件</th>
-									<th>上传人</th>
-									<th>上传时间</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody>
-								<c:choose>
-								<c:when test="${not empty workContractInfo.workContractReview.workAttachments}">
-								<c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" varStatus="status">
-									<tr>
-											<%--<td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>${workClientAttachment.createBy.name}</td>
-										<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-										<td  class="op-td">
-											<div class="op-btn-box" >
-                                                <c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
-                                                        <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
-                                                        <c:choose>
-                                                            <c:when test="${signflag == '是'}">
-                                                                <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                    </c:otherwise>
-                                                </c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</c:when>
-									<c:otherwise>
-										<tr>
-											<td colspan="4" align="center">暂无数据</td>
-										</tr>
-									</c:otherwise>
-								</c:choose>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
 
 		</div>
 		</div>