合同&项目の界面微调

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

@@ -44,6 +44,16 @@
 					}
 				}
 			});
+
+			var contractNum = $("#contractNum").val();
+			if (contractNum == null || contractNum === "") {
+				$("#div1").hide();
+				$("#div3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
+			}
 		});
 
         function insertTitle(tValue){
@@ -105,44 +115,42 @@
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>
-				<div class="layui-item layui-col-sm12 lw6">
-					<label class="layui-form-label">合同编号：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+				<div id="div1">
+					<div class="layui-item layui-col-sm12 lw6">
+						<label class="layui-form-label">合同编号：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" id="contractNum"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+						</div>
 					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">合同名称：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">合同名称：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+						</div>
 					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label double-line">合同金额(元)：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">合同金额(元)：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+						</div>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">主委托方：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+						<input htmlEscape="false" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">工程分类：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+				<div id="div3">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">工程分类：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+						</div>
 					</div>
 				</div>
 			</div>
 
-            <div class="tabs-container">
-                <ul class="nav nav-tabs">
-                    <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true" style="margin-top: 25px">项目合同信息</a>
-                    </li>
-                </ul>
-            </div>
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>

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

@@ -531,32 +531,6 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
-<%--                        <c:if test="${not empty projectRecords.workClientLinkmanList}">--%>
-<%--                            <c:forEach items="${projectRecords.workClientLinkmanList}" var="casePeopleNorm" varStatus="index">--%>
-<%--                                <tr id="workClientInfoList${index.index}">--%>
-<%--                                    <td class="hide">--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_id" name="workClientLinkmanList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}" class="clientInfoId"/>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_clientId_id" name="workClientLinkmanList[${index.index}].clientId.id" type="hidden" value="${casePeopleNorm.clientId.id}" class="clientInfoId"/>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_delFlag" name="workClientLinkmanList[${index.index}].delFlag" type="hidden" value="0"/>--%>
-<%--                                    </td>--%>
-<%--                                    <td>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_clientName" name="workClientLinkmanList[${index.index}].clientId.name" type="text" value="${casePeopleNorm.clientId.name}" readonly="true"   class="form-control "/>--%>
-<%--                                    </td>--%>
-<%--                                    <td>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_name" name="workClientLinkmanList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>--%>
-<%--                                    </td>--%>
-<%--                                    <td>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_linkPhone" name="workClientLinkmanList[${index.index}].linkPhone" type="text" value="${casePeopleNorm.linkPhone}" readonly="true"   class="form-control "/>--%>
-<%--                                    </td>--%>
-<%--                                    <td>--%>
-<%--                                        <input id="workClientLinkmanList${index.index}_linkMobile" name="workClientLinkmanList[${index.index}].linkMobile" type="text" value="${casePeopleNorm.linkMobile}" readonly="true"   class="form-control "/>--%>
-<%--                                    </td>--%>
-<%--                                    <td class="text-center op-td">--%>
-<%--                                        <span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientLinkmanList${index.index}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>--%>
-<%--                                    </td>--%>
-<%--                                </tr>--%>
-<%--                            </c:forEach>--%>
-<%--                        </c:if>--%>
                         </tbody>
                     </table>
                     <script type="text/template" id="workClientLinkmanTpl">//<!--

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

@@ -6,9 +6,14 @@
 	<meta name="decorator" content="default"/>
 	<script>
 		$(document).ready(function () {
-			if ($("#contractNum").val() == null || $("#contractNum").val() == "") {
+			var tt = $("#contractNum").val();
+			if (tt == null || tt === "") {
 				$("#divv").hide();
 				$("#divv3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
 			}
 
 		})

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

@@ -56,14 +56,6 @@
 				<c:set var="status" value="${workContractInfo.act.status}" />
 
 				<div class="tabs-container">
-					<ul class="nav nav-tabs">
-						<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>
 					<div class="tab-content">
 						<div id="tab-11" class="tab-pane active">
 							<div class="form-group layui-row first lw9">