Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/jeeplus.properties

basename.exe.stackdump

@@ -1,8 +0,0 @@
-MSYS-1.0.12 Build:2011-07-20 17:52
-Exception: STATUS_ACCESS_VIOLATION at eip=00000000
-eax=00000000 ebx=00000001 ecx=6809A25C edx=0000000A esi=6809A16C edi=6809A174
-ebp=0028FE4C esp=0028FE30 program=C:\Users\Meng\AppData\Local\Atlassian\SourceTree\git_local\bin\basename.exe
-cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B
-Stack trace:
-Frame     Function  Args
-End of stack trace

src/main/java/com/jeeplus/common/utils/SmackUtils.java

@@ -102,6 +102,7 @@ public class SmackUtils {
         String strUrl = pres_base_url+id+"@"+openfireServer;
         try{
             URL oUrl  = new URL(strUrl);
+//            System.out.println("========="+oUrl.toString());
             URLConnection oConn = oUrl.openConnection();
             if(oConn!=null){
                 BufferedReader oIn = new BufferedReader(new InputStreamReader(oConn.getInputStream()));

src/main/java/com/jeeplus/modules/leaveapply/service/LeaveApplyService.java

@@ -319,7 +319,6 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
             identityService.setAuthenticatedUserId(leaveApply.getCurrentUser().getId());
             User createUser = UserUtils.getUser();
             String contentStr = "请假编号：" + leaveApply.getNo() + "，请假日期：" + DateUtils.formatDate(leaveApply.getApplyTime());
-            userDao.get(leaveApply.getApplyer()).getName();
             String titleStr = "请假人：" + userDao.get(leaveApply.getApplyer()).getName();
 
             String businessKey = leaveApply.getId();
@@ -330,13 +329,16 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
             StringBuffer buffer = new StringBuffer();
             Activity activity = new Activity();
             WorkProjectNotify workProjectNotify = UtilNotify
-                    .saveNotify(leaveApply.getId(), null, leaveApply.getCompanyId(), titleStr, contentStr, "80", "0", "待审批", ""
-                    );
+                    .saveNotify(leaveApply.getId(), null, leaveApply.getCompanyId(), titleStr, contentStr, "80", "0", "待审批", "");
 
             List<User> users = new ArrayList<>();
+//            部门责任人
             List<User> bmzrList = UserUtils.getByRoleActivityEnname("bmzr", 2, office.getId(), "25", leaveApply.getCreateBy());
+//            分管领导
             List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld", 2, office.getId(), "25", leaveApply.getCreateBy());
+//            总经理
             List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl", 3, office.getId(), "25", leaveApply.getCreateBy());
+
             if (StringUtils.isNotBlank(workActivityMenu.getId())) {
                 workProjectNotify.setNotifyRole("");
                 workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -384,6 +386,8 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
                 processType = "leaveApply";
                 users.addAll(bmzrList);
             }
+
+//            向每个部门负责人发送审批通知
             List<String> userIds = new ArrayList<>(users.size());
             for (User u : users) {
                 userIds.add(u.getId());

src/main/java/com/jeeplus/modules/leaveapply/web/LeaveApplyController.java

@@ -169,7 +169,7 @@ public class LeaveApplyController extends BaseController {
 
 
 	/**
-	 * 保存请假申请
+	 * 保存请假申请,送审
 	 */
 	//@RequiresPermissions(value={"leaveapply:leaveApply:add","leaveapply:leaveApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")

src/main/java/com/jeeplus/modules/serialnum/service/SerialNumTplService.java

@@ -96,6 +96,7 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 
 			SerialNumTpl numTpl = this.querySerialTpl(office, bizCode);
 			if (numTpl==null){
+//			    查询编号模板   {brspnm}DZ-{year}-{serialNum}
                 SerialNumTpl serialNumTpl = dao.queryByComAndBizCode("0", bizCode);
                 serialNumTpl.setCompany(company);
                 serialNumTpl.setSerialNum(0);
@@ -108,10 +109,10 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 			if (numTpl==null){
                 throw new Exception("生成编号失败，请先设置相关业务编号模板");
             }
-            if ("0".equals(office.getParent().getId()))office.setParent(null);
+            if ("0".equals(office.getParent().getId()))
+                office.setParent(null);
             String year = DateUtils.formatDate(new Date(), "yyyy");
 			if(!year.equals(numTpl.getYearBuilt())){
-				//新年，重置SerialNum
 				dao.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
 			}
             Map<String, String> map = new HashMap<>();

src/main/java/com/jeeplus/modules/sys/utils/DictUtils.java

@@ -164,7 +164,7 @@ public class DictUtils {
 		try {
 			jedis = JedisUtils.getResource();
 			String listString=jedis.get(key);
-			if(listString!=null&&!"".equals(listString)){
+			if (listString != null && !"".equals(listString)) {
                 dictList= JSON.parseArray(listString, MainDictDetail.class);
 				return dictList;
 			}else{

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;
@@ -68,7 +69,7 @@ import java.util.Map;
 @SuppressWarnings("all")
 @Controller
 @RequestMapping(value = "${adminPath}/workbidproject/workBidProject")
-public class WorkBidProjectController extends BaseController {
+public class  WorkBidProjectController extends BaseController {
 
 	@Autowired
 	private WorkBidProjectService workBidProjectService;
@@ -110,7 +111,7 @@ public class WorkBidProjectController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 投标项目列表页面
 	 */
@@ -184,20 +185,20 @@ public class WorkBidProjectController extends BaseController {
 		Act act = new Act();
 		HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
 		ProcessInstance processInstance = actTaskService.getProcIns(processInstanceId);
-		if (processInstance!=null) {
-			List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
-			if(taskList!=null && taskList.size()>1){
-				for (Task taskInfok:taskList) {
-					if (taskInfok.getAssignee().equals(UserUtils.getUser().getId())) {
-						act.setTaskId(taskInfok.getId());
-						act.setTaskName(taskInfok.getName());
-						act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
-						act.setProcDefId(taskInfok.getProcessDefinitionId());
-						act.setProcInsId(taskInfok.getProcessInstanceId());
-						act.setTask(taskInfok);
-					}
-				}
-			}else {
+        if (processInstance != null) {
+            List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
+            if (taskList != null && taskList.size() > 1) {
+                for (Task taskInfok : taskList) {
+                    if (taskInfok.getAssignee().equals(UserUtils.getUser().getId())) {
+                        act.setTaskId(taskInfok.getId());
+                        act.setTaskName(taskInfok.getName());
+                        act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                        act.setProcDefId(taskInfok.getProcessDefinitionId());
+                        act.setProcInsId(taskInfok.getProcessInstanceId());
+                        act.setTask(taskInfok);
+                    }
+                }
+            }else {
 				Task task = actTaskService.getCurrentTaskInfo(processInstance);
 				act.setTaskId(task.getId());
 				act.setTaskName(task.getName());
@@ -223,9 +224,9 @@ public class WorkBidProjectController extends BaseController {
 		}*/
 	}
 	@RequestMapping(value = "store")
-	public String store(WorkBidProject workBidProject,
-						Model model,
-						RedirectAttributes redirectAttributes) throws Exception{
+    public String store(WorkBidProject workBidProject,
+                        Model model,
+                        RedirectAttributes redirectAttributes) throws Exception {
 		if (!beanValidator(model, workBidProject)){
 			return form(workBidProject, model);
 		}
@@ -301,9 +302,10 @@ public class WorkBidProjectController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = "saveAudit")
-	public String saveAudit(WorkBidProject workBidProject, Model model,
+	public String saveAudit(WorkBidProject workBidProject,
+							Model model,
 							RedirectAttributes redirectAttributes) {
-		try{
+		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workBidProject.getAct().getTaskDefKey();
 			String flag = workBidProject.getAct().getFlag();
@@ -329,7 +331,7 @@ public class WorkBidProjectController extends BaseController {
 				if (users == null)
 					users = UserUtils.getByRoleActivityEnname("gzr", 1, workBidProject.getOfficeId(), "16", workBidProject.getCreateBy());
 			} else if ("gzr".equals(taskDefKey)) {
-                users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 6);
+				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 6);
 			} else if ("sqr".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 8);
 				if (users == null)
@@ -339,13 +341,13 @@ public class WorkBidProjectController extends BaseController {
 			} else if ("modifyApply".equals(taskDefKey)) {
 				users = UserUtils.getByProssType(workBidProject.getProcessInstanceId(), 1);
 			}
-			if ("yes".equals(flag) && (users==null || users.size()==0)){
+			if ("yes".equals(flag) && (users == null || users.size() == 0)) {
 				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
-			}else {
-				String str = workBidProjectService.auditSave(workBidProject,users);
+			} else {
+				String str = workBidProjectService.auditSave(workBidProject, users);
 				addMessage(redirectAttributes, str);
 			}
-		}catch (Exception e){
+		} catch (Exception e) {
 			addMessage(redirectAttributes, "审批失败");
 		}
 		if (StringUtils.isNotBlank(workBidProject.getHome()) && "home".equals(workBidProject.getHome())) {
@@ -354,17 +356,18 @@ public class WorkBidProjectController extends BaseController {
 			return "redirect:" + Global.getAdminPath() + "/workbidproject/workBidProject/?repage";
 		}
 	}
-			/**
-             * 删除投标项目
-             */
+
+	/**
+	 * 删除投标项目
+	 */
 	@RequiresPermissions("workbidproject:workBidProject:del")
 	@RequestMapping(value = "delete")
 	public String delete(WorkBidProject workBidProject, RedirectAttributes redirectAttributes) {
 		workBidProjectService.delete(workBidProject);
 		addMessage(redirectAttributes, "删除投标申请单成功");
-		return "redirect:"+Global.getAdminPath()+"/workbidproject/workBidProject/?repage";
+		return "redirect:" + Global.getAdminPath() + "/workbidproject/workBidProject/?repage";
 	}
-	
+
 	/**
 	 * 批量删除投标项目
 	 */
@@ -378,7 +381,7 @@ public class WorkBidProjectController extends BaseController {
 		addMessage(redirectAttributes, "删除投标项目成功");
 		return "redirect:"+Global.getAdminPath()+"/workbidproject/workBidProject/?repage";
 	}
-	
+
 	/**
 	 * 导出excel文件
 	 */
@@ -388,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) {
@@ -428,7 +432,7 @@ public class WorkBidProjectController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workbidproject/workBidProject/?repage";
     }
-	
+
 	/**
 	 * 下载导入投标项目数据模板
 	 */
@@ -437,7 +441,7 @@ public class WorkBidProjectController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "投标项目数据导入模板.xlsx";
-    		List<WorkBidProject> list = Lists.newArrayList(); 
+    		List<WorkBidProject> list = Lists.newArrayList();
     		new ExportExcel("投标项目数据", WorkBidProject.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -537,6 +541,6 @@ public class WorkBidProjectController extends BaseController {
 		model.addAttribute("page", page);
 		return "modules/sys/gridselect";
 	}
-	
+
 
 }

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -261,7 +261,6 @@ public class WorkClientInfoController extends BaseController {
 
 	/**
 	 * 导入Excel数据
-
 	 */
 	@RequiresPermissions("workclientinfo:workClientInfo:import")
     @RequestMapping(value = "import", method=RequestMethod.POST)

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkcontractreviewController.java

@@ -41,7 +41,6 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 @Controller
 @RequestMapping(value = "${adminPath}/workcontractreview/workcontractreview")
 public class WorkcontractreviewController extends BaseController {
-
 	@Autowired
 	private WorkContractReviewService workContractReviewService;
 	

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -229,6 +229,7 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 				createBy = UserUtils.getUser();
 				workOfficeChange.setCreateBy(createBy);
 			}
+//			业务标识20:  -> 默认部门调转编号模板:
 			workOfficeChange.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(),"20"));
 		}
 		this.save(workOfficeChange);

src/main/java/com/jeeplus/modules/workout/web/WorkOutController.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.RoleActivityEnname;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysmtree.service.SysMtreeService;
 import com.jeeplus.modules.workactivity.service.ActivityService;
@@ -107,7 +108,7 @@ public class WorkOutController extends BaseController {
 	}
 
 	/**
-	 * 查看，增加，编辑出差申请表单页面
+	 * 查看1，增加2，编辑3,出差申请表单页面
 	 */
 	//@RequiresPermissions(value={"workout:workOut:view","workout:workOut:add","workout:workOut:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")

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;
@@ -98,7 +99,7 @@ public class WorkRegularApplyController extends BaseController {
 	}
 
 	/**
-	 * 查看，增加，编辑转正申请表单页面
+	 * 查看1，增加，编辑转正申请表单页面
 	 */
 	@RequiresPermissions(value={"workregularapply:workRegularApply:view","workregularapply:workRegularApply:add","workregularapply:workRegularApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
@@ -151,7 +152,7 @@ public class WorkRegularApplyController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workregularapply/workRegularApply/?repage";
 	}
 	/**
-	 * 保存转正申请
+	 * 保存转正申请,并送审
 	 */
 	@RequiresPermissions(value={"workregularapply:workRegularApply:add","workregularapply:workRegularApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")

src/main/resources/mappings/modules/leaveapply/LeaveApplyDao.xml

@@ -290,7 +290,7 @@
 		<include refid="leaveApplyJoins"/>
 		WHERE a.company_id=#{companyId} and a.del_flag = '0' and a.status in('5','8','6','7','9')
 		<if test="basicInfo != null and basicInfo.name != null and basicInfo.name != ''">
-			AND w.name  LIKE
+			AND w.name LIKE
 			<if test="dbName == 'oracle'">'%'||#{basicInfo.name}||'%'</if>
 			<if test="dbName == 'mssql'">'%'+#{basicInfo.name}+'%'</if>
 			<if test="dbName == 'mysql'">concat('%',#{basicInfo.name},'%')</if>
@@ -298,12 +298,13 @@
 		<if test="basicInfo != null and basicInfo.office != null  and basicInfo.office.id != null and basicInfo.office.id != ''">
 			AND a.office_id = #{basicInfo.office.id}
 		</if>
-		group by a.staff_id order by w.no ASC
+<!--		有异常-->
+<!--		group by a.staff_id order by w.no ASC-->
 	</select>
 
 	<select id="getSumDays" resultType="LeaveApply" parameterType="java.lang.String">
 		SELECT
-		ifnull(sum(a.sums),0) as "sumDays"
+	ifnull(sum(a.sums),0) as "sumDays"
 		FROM leave_count a
 		where
 			a.del_flag = '0'

src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml

@@ -110,7 +110,7 @@
 		LEFT JOIN work_activity w ON w.process_key = a.process_key and w.count = a.count
 		<include refid="workActivityProcessJoins"/>
 		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
+			a.del_flag = #{DEL_FLAG_NORMAL} and w.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="processInstanceId != null and processInstanceId != ''">
 				and a.process_instance_id = #{processInstanceId}
 			</if>

src/main/webapp/webpage/modules/leaveapply/leaveApplyForm.jsp

@@ -4,6 +4,7 @@
 <head>
 	<title>请假管理</title>
 	<meta name="decorator" content="default"/>
+	<script src="${ctx}/act/rest/js/common/common.js" charset="UTF-8"></script>
 	<script type="text/javascript">
         var validateForm;
         var count1 = 0;
@@ -50,6 +51,9 @@
             });
 
         });
+
+
+
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             var idArr = $("#leaveDetailList tr:visible");
             if(idArr.length<1){
@@ -295,6 +299,8 @@
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
         }
+
+
 	</script>
 	<style>
 		/*超过5个汉字，调整label的长度，以下是配套的*/

src/main/webapp/webpage/modules/leaveapply/leaveMangeList.jsp

@@ -29,7 +29,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="contentShadow layui-row" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="leaveApply" action="${ctx}/leaveapply/leaveManage" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="page" action="${ctx}/leaveapply/leaveManage" method="post" class="form-inline">
 					<%--以下三行照抄--%>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>

src/main/webapp/webpage/modules/workbidingproject/workBidingProjectList.jsp

@@ -90,8 +90,12 @@
 			</form:select>
 			<span style="margin-top: 15px">客户名称： </span>
 			<div class="form-group shows">
-				<sys:gridselectcallproject url="${ctx}/workcontractinfo/workContractInfo/selectclient" id="client" name="client.id"  value="${workBidingProject.client.id}"  title="选择客户" labelName="client.name"
-										   labelValue="${workBidingProject.client.name}"  cssClass="form-control required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" ></sys:gridselectcallproject>
+				<sys:gridselectcallproject url="${ctx}/workcontractinfo/workContractInfo/selectclient" id="client"
+					name="client.id" value="${workBidingProject.client.id}" title="选择客户"
+					labelName="client.name"
+					labelValue="${workBidingProject.client.name}"
+					cssClass="form-control required" fieldLabels="客户名称" fieldKeys="name"
+					searchLabel="客户名称" searchKey="name"></sys:gridselectcallproject>
 			</div>
 		</div>
 	</form:form>

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,7 +622,7 @@
 					<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:option value="" label="--请选择保证金形式--"/>
 							<form:options items="${fns:getMainDictList('bond_style')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -663,7 +663,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

@@ -6,7 +6,7 @@
 %>
 <html>
 <head>
-	<title>客户管理管理</title>
+	<title>客户信息管理</title>
 	<meta name="decorator" content="default"/>
     <%--<style type="text/css">--%>
         <%--.btn-file{--%>
@@ -266,131 +266,140 @@
 
 </head>
 <body>
-    <div class="single-form">
-        <div class="container">
+<div class="single-form">
+    <div class="container">
         <input type="hidden" value="${param.param}" id="param">
-        <form:form id="inputForm" modelAttribute="workClientInfo" enctype="multipart/form-data" onkeydown="if(event.keyCode==13)return false;" action="${ctx}/workclientinfo/workClientInfo/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="workClientInfo" enctype="multipart/form-data"
+                   onkeydown="if(event.keyCode==13)return false;" action="${ctx}/workclientinfo/workClientInfo/save"
+                   method="post" class="form-horizontal">
             <form:hidden path="id"/>
-                <div class="form-group layui-row first">
-                    <div class="form-group-label"><h2>基本信息</h2></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:input path="name" htmlEscape="false"  class="form-control required layui-input"/>
-                        </div>
+            <div class="form-group layui-row first">
+                <div class="form-group-label"><h2>基本信息</h2></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:input path="name" htmlEscape="false" class="form-control required layui-input"/>
                     </div>
-                    <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>
-                            &nbsp;&nbsp;
-                            <form:radiobutton class="usccClass i-checks" path="hasUscc" value="2" label="否"></form:radiobutton>
-                        </div>
+                </div>
+                <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" />
+                        &nbsp;&nbsp;
+                        <form:radiobutton class="usccClass i-checks" path="hasUscc" value="2" label="否" />
                     </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:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </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 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 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"/>
-                            <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
-                        </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"/>
+                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
                     </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:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </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 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 class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
-                        <div class="layui-input-block with-icon">
-                            <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name" labelValue="${workClientInfo.area.name}"
-                                            title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-                        </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 with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
+                                        labelValue="${workClientInfo.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
+                                        allowClear="true" notAllowSelectParent="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">法人代表：</label>
-                        <div class="layui-input-block">
-                            <form:input path="lawerPresint" htmlEscape="false"    class="form-control layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">法人代表：</label>
+                    <div class="layui-input-block">
+                        <form:input path="lawerPresint" htmlEscape="false" class="form-control layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">邮政编码：</label>
-                        <div class="layui-input-block">
-                            <form:input path="zipCode" htmlEscape="false" minlength="6" maxlength="6" class="form-control digits layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">邮政编码：</label>
+                    <div class="layui-input-block">
+                        <form:input path="zipCode" htmlEscape="false" minlength="6" maxlength="6"
+                                    class="form-control digits layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">传真：</label>
-                        <div class="layui-input-block">
-                            <form:input path="fax" htmlEscape="false"  class="form-control isTel layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">传真：</label>
+                    <div class="layui-input-block">
+                        <form:input path="fax" htmlEscape="false" class="form-control isTel layui-input"/>
                     </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 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"/>--%>
-                                <c:forEach items="${fns:getMainDictList('client_type')}" var="item">
-                                    <option value="${item.value}">${item.label}</option>
-                                </c:forEach>
-                            </select>
-                        </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 width-icon">
+
+                        <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 class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
-                        <div class="layui-input-block">
-                            <form:input path="telephone" htmlEscape="false"    class="form-control isTel required layui-input"/>
-                        </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:input path="telephone" htmlEscape="false"
+                                    class="form-control isTel required layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">公司网址：</label>
-                        <div class="layui-input-block">
-                            <form:input path="companyUrl" htmlEscape="false"    class="form-control isUrl layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">公司网址：</label>
+                    <div class="layui-input-block">
+                        <form:input path="companyUrl" htmlEscape="false" class="form-control isUrl layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm12 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
-                        <div class="layui-input-block">
-                            <form:input path="registerAddress" htmlEscape="false"    class="form-control required layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                    <div class="layui-input-block">
+                        <form:input path="registerAddress" htmlEscape="false"
+                                    class="form-control required layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm12 lw7">
-                        <label class="layui-form-label">详细地址：</label>
-                        <div class="layui-input-block">
-                            <form:input path="address" htmlEscape="false"    class="form-control layui-input"/>
-                        </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label">详细地址：</label>
+                    <div class="layui-input-block">
+                        <form:input path="address" htmlEscape="false" class="form-control layui-input"/>
                     </div>
-                    <div class="layui-item layui-col-sm12 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>开户行信息：</label>
-                        <div class="layui-input-block">
-                            <div class="layui-item nav-btns" style="padding-left:0px;">
-                                <a class="nav-btn nav-btn-add" onclick="addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;" title="新增"><i class="fa fa-plus"></i> 新增</a>
-                            </div>
-                            <table id="bankinfo" class="table table-bordered table-condensed can-edit">
-                                <thead>
-                                <tr>
-                                    <th  class="sort-column companyType"><font color="red">*</font>开户银行</th>
-                                    <th width="400px;"><font color="red">*</font>开户账号</th>
-                                    <th width="100px">操作</th>
-                                </tr>
-                                </thead>
-                                <tbody id="workClientBankList">
-
-                                </tbody>
-                            </table>
-                            <script type="text/template" id="workClientBankTpl">//<!--
+                </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>开户行信息：</label>
+                    <div class="layui-input-block">
+                        <div class="layui-item nav-btns" style="padding-left:0px;">
+                            <a class="nav-btn nav-btn-add"
+                               onclick="addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+                               title="新增"><i class="fa fa-plus"></i> 新增</a>
+                        </div>
+                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
+                            <thead>
+                            <tr>
+                                <th class="sort-column companyType"><font color="red">*</font>开户银行</th>
+                                <th width="400px;"><font color="red">*</font>开户账号</th>
+                                <th width="100px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="workClientBankList">
+
+                            </tbody>
+                        </table>
+                        <script type="text/template" id="workClientBankTpl">//<!--
                                 <tr id="workClientBankList{{idx}}">
                                     <td class="hide">
                                         <input id="workClientBankList{{idx}}_id" name="workClientBankList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -409,96 +418,98 @@
                                         {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientBankList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
                                     </td>
                                 </tr>//-->
-                            </script>
-                        </div>
+                        </script>
                     </div>
-                    <div class="layui-item layui-col-sm12 lw7">
-                        <label class="layui-form-label">单位简介：</label>
-                        <div class="layui-input-block">
-                            <form:textarea path="unitIntroduction" htmlEscape="false" rows="4"  maxlength="500"  onkeyup="checkContentKeyUp('unitIntroduction',500);"   class="form-control "/>
-                        </div>
-                        <span id="contentMsg" style="float: right"></span>
+                </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label">单位简介：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="unitIntroduction" htmlEscape="false" rows="4" maxlength="500"
+                                       onkeyup="checkContentKeyUp('unitIntroduction',500);" class="form-control "/>
                     </div>
+                    <span id="contentMsg" style="float: right"></span>
                 </div>
+            </div>
 
 
+            <%--<td class="companyType_orUnicode width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
+            <td class="companyType_orUnicode width-35">
+                <form:input path="orUnicode" htmlEscape="false"  class="form-control required"/>
+            </td>
+
+            <td class="companyType_taxId width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
+            <td class="companyType_taxId width-35" colspan="3">
+                <form:input path="taxId" htmlEscape="false"    class="form-control required"/>
+            </td>
+            <script type="text/javascript">
+                $(function () {
+                    var defaultValue = $("#companyType option:selected").val();
+                    var companyTypeValue = "${workClientInfo.companyType}";
+                    console.log("defaultValue="+defaultValue);
+                    if(defaultValue == 1 || companyTypeValue == 1){
+                        $(".companyType_taxId").hide();
+                        $(".companyType_orUnicode").show();
+                    }else{
+                        $(".companyType_orUnicode").hide();
+                        $(".companyType_taxId").show();
+                    }
+                    $("select#companyType").change(function () {
+                        var currentValue = $(this).val();
+                        if(currentValue == 1){
+                            $(".companyType_taxId").hide();
+                            $(".companyType_orUnicode").show();
+                        }else{
+                            $(".companyType_orUnicode").hide();
+                            $(".companyType_taxId").show();
+                        }
+                    });
+                })
+            </script>--%>
+
+            <%--<tr>
+            <td class="width-15 active"><label class="pull-right"><font color="red">*</font>客户类型：</label></td>
+                   <td class="width-35">
+                       <form:select path="clientType" class="form-control required">
+                           <form:option value="" label=""/>
+                           <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                       </form:select>
+                   </td>
+               <td class="width-15 active"><label class="pull-right">信用等级：</label></td>
+                       <td class="width-35">
+                           <form:select path="creditRank" class="form-control ">
+                               <form:option value="" label=""/>
+                               <form:options items="${fns:getDictList('credit_rank')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                           </form:select>
+                       </td>
+                   </tr>--%>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>联系人信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a class="nav-btn nav-btn-add"
+                       onclick="addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;"
+                       title="新增"><i class="fa fa-plus"></i> 新增</a>
+                </div>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="contentTable" class="table table-bordered table-condensed can-edit">
+                        <thead>
+                        <tr>
+                            <th class="hide"></th>
+                            <th width="100px"><font color="red">*</font>联系人姓名</th>
+                            <th width="100px">部门</th>
+                            <th width="100px">职务</th>
+                            <th width="100px">QQ</th>
+                            <th width="100px">联系方式1</th>
+                            <th width="100px">联系方式2</th>
+                            <th width="150px">E-mail</th>
+                            <th width="100px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="workClientLinkmanList">
 
-                    <%--<td class="companyType_orUnicode width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
-                    <td class="companyType_orUnicode width-35">
-                        <form:input path="orUnicode" htmlEscape="false"  class="form-control required"/>
-                    </td>
-
-                    <td class="companyType_taxId width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
-                    <td class="companyType_taxId width-35" colspan="3">
-                        <form:input path="taxId" htmlEscape="false"    class="form-control required"/>
-                    </td>
-                    <script type="text/javascript">
-                        $(function () {
-                            var defaultValue = $("#companyType option:selected").val();
-                            var companyTypeValue = "${workClientInfo.companyType}";
-                            console.log("defaultValue="+defaultValue);
-                            if(defaultValue == 1 || companyTypeValue == 1){
-                                $(".companyType_taxId").hide();
-                                $(".companyType_orUnicode").show();
-                            }else{
-                                $(".companyType_orUnicode").hide();
-                                $(".companyType_taxId").show();
-                            }
-                            $("select#companyType").change(function () {
-                                var currentValue = $(this).val();
-                                if(currentValue == 1){
-                                    $(".companyType_taxId").hide();
-                                    $(".companyType_orUnicode").show();
-                                }else{
-                                    $(".companyType_orUnicode").hide();
-                                    $(".companyType_taxId").show();
-                                }
-                            });
-                        })
-                    </script>--%>
-
-                        <%--<tr>
-                        <td class="width-15 active"><label class="pull-right"><font color="red">*</font>客户类型：</label></td>
-                               <td class="width-35">
-                                   <form:select path="clientType" class="form-control required">
-                                       <form:option value="" label=""/>
-                                       <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                   </form:select>
-                               </td>
-                           <td class="width-15 active"><label class="pull-right">信用等级：</label></td>
-                                   <td class="width-35">
-                                       <form:select path="creditRank" class="form-control ">
-                                           <form:option value="" label=""/>
-                                           <form:options items="${fns:getDictList('credit_rank')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                       </form:select>
-                                   </td>
-                               </tr>--%>
-
-        <div class="form-group layui-row">
-            <div class="form-group-label"><h2>联系人信息</h2></div>
-            <div class="layui-item nav-btns">
-                <a class="nav-btn nav-btn-add" onclick="addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;" title="新增"><i class="fa fa-plus"></i> 新增</a>
-            </div>
-            <div class="layui-item layui-col-xs12 form-table-container">
-                <table id="contentTable" class="table table-bordered table-condensed can-edit">
-                    <thead>
-                    <tr>
-                        <th class="hide"></th>
-                        <th width="100px"><font color="red">*</font>联系人姓名</th>
-                        <th width="100px">部门</th>
-                        <th width="100px">职务</th>
-                        <th width="100px">QQ</th>
-                        <th width="100px">联系方式1</th>
-                        <th width="100px">联系方式2</th>
-                        <th width="150px">E-mail</th>
-                        <th width="100px">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="workClientLinkmanList">
-
-                    </tbody>
-                </table>
-                <script type="text/template" id="workClientLinkmanTpl">//<!--
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workClientLinkmanTpl">//<!--
             <tr id="workClientLinkmanList{{idx}}">
                 <td class="hide">
                     <input id="workClientLinkmanList{{idx}}_id" name="workClientLinkmanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -539,94 +550,106 @@
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
                 </td>
             </tr>//-->
-                </script>
-                <script type="text/javascript">
-                    var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                    var workClientBankRowIdx = 0, workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                    $(document).ready(function() {
-                        var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
-                        for (var i=0; i<data.length; i++){
-                            addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                            workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                        }
-                        var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
-                        for (var i=0; i<dataBank.length; i++){
-                            addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
-                            workClientBankRowIdx = workClientBankRowIdx + 1;
-                        }
-                    });
+                    </script>
+                    <script type="text/javascript">
+                        var workClientLinkmanRowIdx = 0,
+                            workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                        var workClientBankRowIdx = 0,
+                            workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+                        $(document).ready(function () {
+                            var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
+                            for (var i = 0; i < data.length; i++) {
+                                addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                                workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                            }
+                            var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
+                            for (var i = 0; i < dataBank.length; i++) {
+                                addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+                                workClientBankRowIdx = workClientBankRowIdx + 1;
+                            }
+                        });
 
-                </script>
+                    </script>
+                </div>
             </div>
-        </div>
 
 
-        <div class="form-group layui-row">
-            <div class="form-group-label"><h2>附件信息</h2></div>
-            <div class="layui-item nav-btns">
-                <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-            </div>
-            <div id="addFile_attachment" style="display: none" class="upload-progress">
-                <span id="fileName_attachment" ></span>
-                <b><span id="baifenbi_attachment" ></span></b>
-                <div class="progress">
-                    <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment"></span>
+                    <b><span id="baifenbi_attachment"></span></b>
+                    <div class="progress">
+                            <%--进度条--%>
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
                     </div>
                 </div>
-            </div>
-            <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-            <span id="attachment_title"></span>
-            <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                <table id="upTable" class="table table-bordered table-condensed details">
-                    <thead>
-                    <tr>
-                            <%-- <th>序号</th>--%>
-                        <th>文件</th>
-                        <th>上传人</th>
-                        <th>上传时间</th>
-                        <th width="150px">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="file_attachment">
-                    <c:forEach items="${workClientInfo.workAttachments}" var = "workClientAttachment" varStatus="status">
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple"
+                       style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
                         <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 class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-                                        </c:otherwise>
-                                    </c:choose>
-                                </c:otherwise>
-                            </c:choose>
-                            <td>${workClientAttachment.createBy.name}</td>
-                            <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                            <td class="op-td">
-                                <div class="op-btn-box" >
-                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-                                    <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                </c:if>
-                                </div>
-                            </td>
+                                <%-- <th>序号</th>--%>
+                            <th>文件</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="150px">操作</th>
                         </tr>
-                    </c:forEach>
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${workClientInfo.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 class="attention-info" href="javascript:void(0)"
+                                                       onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a>
+                                                </td>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <td><a class="attention-info" href="javascript:void(0)"
+                                                       onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a>
+                                                </td>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box">
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                           class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+                                            <a href="javascript:void(0)"
+                                               onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"
+                                               class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        </c:if>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
-        <div class="form-group layui-row page-end"></div>
+            <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>
 </div>

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

@@ -101,9 +101,7 @@
             <div class="layui-item layui-col-sm12 lw7">
                 <label class="layui-form-label"><span class="require-item">*</span>开户行信息：</label>
                 <div class="layui-input-block">
-                    <%--<div class="layui-item nav-btns" style="padding-left:0px;">--%>
-                        <%--<a class="nav-btn nav-btn-add" onclick="addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;" title="新增"><i class="fa fa-plus"></i> 新增</a>--%>
-                    <%--</div>--%>
+
                     <table id="bankinfo" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>

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

@@ -1,4 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false"%>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
@@ -95,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>
@@ -147,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>
@@ -236,9 +232,9 @@
                     "index":"${index.index+1}"
                     ,"id":"${workClientInfo.id}"
 					,"linkman":"${workClientInfo.workClientLinkman.id}"
-                    ,"clientName":"<c:out value="${workClientInfo.name}" escapeXml="true"/>"
+                    ,"clientName":"${workClientInfo.name}"
                     ,"clientProperty":"${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"
-                    ,"trade":"${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"
+					,"trade":"${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"
                     ,"area":"${workClientInfo.area.name}"
                     ,"clientType":"${fns:getMainDictLabels(workClientInfo.clientType,',','client_type', '')}"
                     ,"code":"${workClientInfo.uscCode}"
@@ -258,94 +254,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/workContractInfoFormAdd.jsp

@@ -560,7 +560,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>
+<%--						<li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>--%>
 					</ul>
 				</div>
 				<div class="tab-content">
@@ -894,197 +894,197 @@
 						</div>
 						<div class="form-group layui-row page-end"></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"><span class="require-item">*</span>时间要求：</label>
-								<div class="layui-input-block">
-									<form:input id="timeRequirements" path="workContractReview.timeRequirements" htmlEscape="false" maxlength="64"    class="form-control required layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label"><span class="require-item">*</span>特殊要求：</label>
-								<div class="layui-input-block">
-									<form:input id="specialRequirements" path="workContractReview.specialRequirements" htmlEscape="false" maxlength="64"     class="form-control required layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>客户要求是否合法：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isLegitimate" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>客户诚信度的初步判断：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.credibility" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="低"/>
-										<form:option value="2" label="中"/>
-										<form:option value="0" label="高"/>
-									</form:select>
-								</div>
-							</div>
-							<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="workContractReview.preliminaryRiskAssessmen" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="低"/>
-										<form:option value="0" label="高"/>
-										<form:option value="2" label="中"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>被服务对象所处行业环境：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.serviceObjectIndustry" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="正常"/>
-										<form:option value="0" label="不正常"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>与服务有关的客户资料能否恰当获取：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isProperAcquisition" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>人员是否能专业胜任：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isUserQualified" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>是否需要借助外部专家力量：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isExternalExpertPower" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="需要"/>
-										<form:option value="0" label="不需要"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>设备能否满足项目要求：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isEquipmentMeetRequirements" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>时间能否满足客户需求：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isTimeMeetRequirements" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>合同是否可以签定：</label>
-								<div class="layui-input-block">
-									<form:select path="workContractReview.isContractSignature" class="form-control simple-select required">
-										<form:option value="" label=""/>
-										<form:option value="1" label="是"/>
-										<form:option value="0" label="否"/>
-									</form:select>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm12 with-textarea">
-								<label class="layui-form-label">备注信息：</label>
-								<div class="layui-input-block">
-									<form:textarea path="workContractReview.remarks" htmlEscape="false" rows="4"   maxlength="500" class="form-control"/>
-								</div>
-							</div>
-						</div>
-						<div class="form-group layui-row">
-							<div class="form-group-label"><h2>合同评审附件信息</h2></div>
-							<div class="layui-item nav-btns">
-								<a id="attachment_review_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-							</div>
-							<div id="addFile_attachment_review" style="display: none" class="upload-progress">
-								<span id="fileName_attachment_review" ></span>
-								<b><span id="baifenbi_attachment_review" ></span></b>
-								<div class="progress">
-									<div id="jindutiao_attachment_review" class="progress-bar" style="width: 0%" aria-valuenow="0">
-									</div>
-								</div>
-							</div>
-							<input id="attachment_review_file" type="file" multiple="multiple" name="attachment_file" style="display: none;" onChange="if(this.value)insertTitleReview(this.value);"/>
-							<span id="attachment_review_title"></span>
-							<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-								<table id="listAttachmentReview" class="table table-bordered table-condensed details">
-									<thead>
-									<tr>
-											<%-- <th>序号</th>--%>
-										<th>文件预览</th>
-										<th>上传人</th>
-										<th>上传时间</th>
-										<th width="180px">操作</th>
-									</tr>
-									</thead>
-									<tbody id="file_attachment_review">
-									<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 class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-														</c:otherwise>
-													</c:choose>
-												</c:otherwise>
-											</c:choose>
-											<td>${workClientAttachment.createBy.name}</td>
-											<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-											<td class="op-td">
-												<div class="op-btn-box" >
-													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment_review')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-													</c:if>
-												</div>
-											</td>
-										</tr>
-									</c:forEach>
-									</tbody>
-								</table>
-							</div>
-						</div>
-						<div class="form-group layui-row page-end"></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"><span class="require-item">*</span>时间要求：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:input id="timeRequirements" path="workContractReview.timeRequirements" htmlEscape="false" maxlength="64"    class="form-control required layui-input"/>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label"><span class="require-item">*</span>特殊要求：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:input id="specialRequirements" path="workContractReview.specialRequirements" htmlEscape="false" maxlength="64"     class="form-control required layui-input"/>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户要求是否合法：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isLegitimate" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户诚信度的初步判断：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.credibility" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="低"/>--%>
+<%--										<form:option value="2" label="中"/>--%>
+<%--										<form:option value="0" label="高"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<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="workContractReview.preliminaryRiskAssessmen" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="低"/>--%>
+<%--										<form:option value="0" label="高"/>--%>
+<%--										<form:option value="2" label="中"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>被服务对象所处行业环境：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.serviceObjectIndustry" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="正常"/>--%>
+<%--										<form:option value="0" label="不正常"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>与服务有关的客户资料能否恰当获取：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isProperAcquisition" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>人员是否能专业胜任：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isUserQualified" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>是否需要借助外部专家力量：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isExternalExpertPower" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="需要"/>--%>
+<%--										<form:option value="0" label="不需要"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>设备能否满足项目要求：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isEquipmentMeetRequirements" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>时间能否满足客户需求：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isTimeMeetRequirements" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm6">--%>
+<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>合同是否可以签定：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:select path="workContractReview.isContractSignature" class="form-control simple-select required">--%>
+<%--										<form:option value="" label=""/>--%>
+<%--										<form:option value="1" label="是"/>--%>
+<%--										<form:option value="0" label="否"/>--%>
+<%--									</form:select>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--							<div class="layui-item layui-col-sm12 with-textarea">--%>
+<%--								<label class="layui-form-label">备注信息：</label>--%>
+<%--								<div class="layui-input-block">--%>
+<%--									<form:textarea path="workContractReview.remarks" htmlEscape="false" rows="4"   maxlength="500" class="form-control"/>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+<%--						<div class="form-group layui-row">--%>
+<%--                        <div class="form-group-label"><h2>合同评审附件信息</h2></div>--%>
+<%--                        <div class="layui-item nav-btns">--%>
+<%--                            <a id="attachment_review_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
+<%--                        </div>--%>
+<%--                        <div id="addFile_attachment_review" style="display: none" class="upload-progress">--%>
+<%--                            <span id="fileName_attachment_review" ></span>--%>
+<%--                            <b><span id="baifenbi_attachment_review" ></span></b>--%>
+<%--                            <div class="progress">--%>
+<%--                                <div id="jindutiao_attachment_review" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                        <input id="attachment_review_file" type="file" multiple="multiple" name="attachment_file" style="display: none;" onChange="if(this.value)insertTitleReview(this.value);"/>--%>
+<%--                        <span id="attachment_review_title"></span>--%>
+<%--                        <div class="layui-item layui-col-xs12" style="padding:0 16px;">--%>
+<%--                            <table id="listAttachmentReview" class="table table-bordered table-condensed details">--%>
+<%--                                <thead>--%>
+<%--                                <tr>--%>
+<%--                                        &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
+<%--                                    <th>文件预览</th>--%>
+<%--                                    <th>上传人</th>--%>
+<%--                                    <th>上传时间</th>--%>
+<%--                                    <th width="180px">操作</th>--%>
+<%--                                </tr>--%>
+<%--                                </thead>--%>
+<%--                                <tbody id="file_attachment_review">--%>
+<%--                                <c:forEach items="${workContractInfo.workContractReview.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
+<%--                                    <tr>--%>
+<%--                                            &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--                                        <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 class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                                    </c:when>--%>
+<%--                                                    <c:otherwise>--%>
+<%--                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                                    </c:otherwise>--%>
+<%--                                                </c:choose>--%>
+<%--                                            </c:otherwise>--%>
+<%--                                        </c:choose>--%>
+<%--                                        <td>${workClientAttachment.createBy.name}</td>--%>
+<%--                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
+<%--                                        <td class="op-td">--%>
+<%--                                            <div class="op-btn-box" >--%>
+<%--                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
+<%--                                                <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+<%--                                                    <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment_review')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+<%--                                                </c:if>--%>
+<%--                                            </div>--%>
+<%--                                        </td>--%>
+<%--                                    </tr>--%>
+<%--                                </c:forEach>--%>
+<%--                                </tbody>--%>
+<%--                            </table>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--						<div class="form-group layui-row page-end"></div>--%>
+<%--					</div>--%>
 				</div>
 			</div>
 		</form:form>

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>

src/main/webapp/webpage/modules/workfield/workFieldForm.jsp

@@ -150,6 +150,8 @@
                 }
             });
         });
+
+
         function insertTitle(tValue){
             var list = "${workField.workAttachments}";
             var size = (list.split('url')).length-1;

src/main/webapp/webpage/modules/workout/workOutForm.jsp

@@ -49,6 +49,7 @@
             return false;
         }
         $(document).ready(function() {
+
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -151,6 +152,7 @@
                 }
             });
         });
+
         function insertTitle(tValue){
             var list = "${workOut.workAttachments}";
             var size = (list.split('url')).length-1;

src/main/webapp/webpage/modules/workovertime/workOvertimeForm.jsp

@@ -47,6 +47,7 @@
             }
             return false;
         }
+
         $(document).ready(function() {
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){