Merge remote-tracking branch 'origin/master'

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

@@ -929,12 +929,12 @@
             <%--新添加代码建设方信息（start）--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>建设方信息</h2></div>
-                <div class="layui-item nav-btns">
+                <div class="layui-item nav-btns" style="float: left;width: 125px">
                     <sys:gridselectClientBuild url="${ctx}/workclientinfo/workClientInfo/clientInfoBuild" id="buildOrgList"   title="选择建设单位"
                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name">
                     </sys:gridselectClientBuild>
                 </div>
-                <div class="layui-item nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;" >
+                <div class="layui-item nav-btns" style="float: left;">
                     <a href="javascript:void(0)"
                        onclick="openBuild('新增建设方', '${ctx}/workclientinfo/workClientInfo/formType?param=2','95%','95%',false,'inputForm')"
                        class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增建设方</a>
@@ -1011,11 +1011,11 @@
             <%--施工单位--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>施工方信息</h2></div>
-                <div class="layui-item nav-btns">
+                <div class="layui-item nav-btns" style="float: left;width: 125px">
                     <sys:gridselectClientLink url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList"   title="选择施工单位"
                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientLink>
                 </div>
-                <div class="layui-item nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;">
+                <div class="layui-item nav-btns" style="float: left;">
                     <a href="javascript:void(0)"
                        onclick="openBuild('新增施工方', '${ctx}/workclientinfo/workClientInfo/formType?param=3','95%','95%',false,'inputForm')"
                        class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增施工方</a>
@@ -1091,11 +1091,11 @@
             <%--监理单位（start）--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>监理方信息</h2></div>
-                <div class="layui-item nav-btns">
+                <div class="layui-item nav-btns" style="float: left;width: 125px">
                     <sys:gridselectClientSuper url="${ctx}/workclientinfo/workClientInfo/clientInfoSuper" id="superOrgList"   title="选择施工单位"
                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientSuper>
                 </div>
-                <div class="layui-item nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;">
+                <div class="layui-item nav-btns" style="float: left;">
                     <a href="javascript:void(0)"
                        onclick="openBuild('新增监理方', '${ctx}/workclientinfo/workClientInfo/formType?param=4','95%','95%',false,'inputForm')"
                        class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增监理方</a>
@@ -1171,11 +1171,11 @@
             <%--设计单位--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>设计方信息</h2></div>
-                <div class="layui-item nav-btns">
+                <div class="layui-item nav-btns" style="float: left;width: 125px">
                     <sys:gridselectClientDesign url="${ctx}/workclientinfo/workClientInfo/clientInfoDesign" id="designOrgList"   title="选择设计单位"
                                               cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientDesign>
                 </div>
-                <div class="layui-item nav-btns" style="float:left; margin-top: -39px;margin-left: 155px;">
+                <div class="layui-item nav-btns" style="float: left;">
                     <a href="javascript:void(0)"
                        onclick="openBuild('新增设计方', '${ctx}/workclientinfo/workClientInfo/formType?param=5','95%','95%',false,'inputForm')"
                        class="nav-btn nav-btn-add"><i class="fa fa-plus"></i> 新增设计方</a>

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

@@ -695,36 +695,19 @@
                                 var linkType = $("#linkType").val();
                                 for (i in newDataList) {
                                     for (j in showDataList) {
-                                        if (newDataList[i].value == showDataList[j].value) {
+                                        if (newDataList[i].value == showDataList[j].value || newDataList[i].value == linkType) {
                                             var newData = {
                                                 "name": newDataList[i].name,
                                                 "value": newDataList[i].value,
-                                                "selected": true,
-                                                "disabled":"disabled"
-                                            }
-                                            showList.push(newData);
-                                            data.splice(i,1,newData);
-                                        }else{
-                                            var newData = {
-                                                "name": newDataList[i].name,
-                                                "value": newDataList[i].value,
-                                                "disabled":"disabled"
+                                                "selected": true
                                             }
                                             showList.push(newData);
                                             data.splice(i,1,newData);
                                         }
                                     }
                                 }
-                                for (i in newDataList) {
-                                    if(newDataList[i].value == linkType){
-                                        var newData = {
-                                            "name": newDataList[i].name,
-                                            "value": newDataList[i].value,
-                                            "selected": true
-                                        }
-                                        showList.push(newData);
-                                        data.splice(i,1,newData);
-                                    }
+                                for (i in data) {
+                                    data[i].disabled="disabled";
                                 }
                                 xmSelect.render({
                                     el: '#jobType',