Merge remote-tracking branch 'origin/master'

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

@@ -390,7 +390,7 @@
         }
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
-                if(id==$(idArr[i]).val()){
+                if(id==$(idArr[i]).find("td").eq(0).find("input").eq(0).val()){
                     return true;
                 }
             }
@@ -408,7 +408,7 @@
 
         function setClientInfo(obj) {
             for(var i=0;i<obj.length;i++){
-                var idArr = $("#workConstructionLinkmanList tr:visible .linkmanId");
+                var idArr = $("#workConstructionLinkmanList tr");
                 if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                     addRow("#workConstructionLinkmanList",workConstructionLinkmanRowIdx,workConstructionLinkmanTpl,obj[i]);
                     workConstructionLinkmanRowIdx=workConstructionLinkmanRowIdx+1;

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

@@ -247,7 +247,7 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"  cssStyle="background-color: #fff"
                                          title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
 				</div>

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

@@ -410,7 +410,7 @@
         }
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
-                if(id==$(idArr[i]).val()){
+                if(id==$(idArr[i]).find("td").eq(0).find("input").eq(0).val()){
                     return true;
                 }
             }
@@ -428,7 +428,7 @@
 
         function setClientInfo(obj) {
             for(var i=0;i<obj.length;i++){
-                var idArr = $("#workConstructionLinkmanList tr:visible .linkmanId");
+                var idArr = $("#workConstructionLinkmanList tr");
                 if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                     addRow("#workConstructionLinkmanList",workConstructionLinkmanRowIdx,workConstructionLinkmanTpl,obj[i]);
                     workConstructionLinkmanRowIdx=workConstructionLinkmanRowIdx+1;