1.依据性资料页面微调

2. 项目登记，修复同一个委托方可以重复添加的问题

src/main/webapp/webpage/modules/projectcontentinfo/basedDataForm.jsp

@@ -81,18 +81,6 @@
 			<div class="form-group layui-row first lw12">
 				<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 with-icon">
-						<form:input  path="projectBasedData.name" htmlEscape="false"  class="form-control layui-input required"/>
-					</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  path="projectBasedData.number" htmlEscape="false"   readonly="true" class="form-control 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 width-icon">
 						<c:choose>
@@ -112,6 +100,18 @@
 					</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  path="projectBasedData.number" htmlEscape="false"   readonly="true" class="form-control 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 with-icon">
+						<form:input  path="projectBasedData.name" htmlEscape="false"  class="form-control layui-input required"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">资料提供者：</label>
 					<div class="layui-input-block">
 						<form:input  path="projectBasedData.provider" htmlEscape="false"  class="form-control layui-input"/>

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -19,6 +19,7 @@
     <script type="text/javascript">
         var validateForm;
         var isMasterClient = true;//是否是主委托方
+        var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
                 // if($(".trIdAdds").length==0){
@@ -119,6 +120,7 @@
                     if(clientId != newClientId){
                         $("#workClientLinkmanList tr").remove();
                         if(isMasterClient){
+                            clientCount++;
                             setLinkMan(newClientId);
                             isMasterClient = false;
                         }
@@ -153,13 +155,33 @@
             });
         }
         function setValuee(obj){
-            for(var i=0;i<obj.length;i++){
-                var idArr = $("#workClientLinkmanList tr:visible .clientId");
-                if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
-                    addRow("#workClientLinkmanList",workClientLinkmanRowIdx,workClientLinkmanTpl,obj[i]);
-                    workClientLinkmanRowIdx=workClientLinkmanRowIdx+1;
+            var successRows = 0;
+            clientCount = $("#workClientInfoList tr").length+clientCount;
+            for (var i = 0; i < obj.length; i++) {
+                //没有重复的客户id，就可以插入
+                var canInsert = true;
+                for (var j = 0; j < clientCount; j++) {
+                    var cid = $("#workClientLinkmanList" + j + "_id").val();
+                    if(cid == obj[i].id){
+                        canInsert = false;
+                        console.log("重复！！");
+                        break;
+                    }
+                }
+                if(canInsert==true){
+                    var idArr = $("#workClientLinkmanList tr:visible .clientId");
+                    if (obj[i].id != '' && !hasInArr(obj[i].id, idArr)) {
+                        addRow("#workClientLinkmanList", workClientLinkmanRowIdx, workClientLinkmanTpl, obj[i]);
+                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                        successRows++;
+                    }
                 }
             }
+            clientCount=successRows+clientCount;
+            // console.log("success==="+successRows);
+            // console.log("clientCount==="+clientCount);
+
+            //如果主委托方还没有设置，则将第一个客户设置为主委托方
             if(obj[0].name != null){
                 if(isMasterClient){
                     $("#contractClientName").val(obj[0].clientId.name);