工作内容，界面微调。客户信息修改界面修改，正确显示关联的联系人

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

@@ -49,9 +49,9 @@
 			<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">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectBasedData.name}"/>
+					<label class="layui-form-label"><span class="require-item">*</span>资料类别：</label>
+					<div class="layui-input-block">
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getDictLabel(projectcontentinfo.projectBasedData.type, 'project_document_type', '')}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -61,9 +61,9 @@
 					</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">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getDictLabel(projectcontentinfo.projectBasedData.type, 'project_document_type', '')}"/>
+					<label class="layui-form-label"><span class="require-item">*</span>资料名称：</label>
+					<div class="layui-input-block with-icon">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectBasedData.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -452,18 +452,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">
-                        <form:input path="projectContentData.name" htmlEscape="false" class="form-control required layui-input"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">工作内容编号：</label>
-                    <div class="layui-input-block">
-                        <form:input path="projectContentData.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">
                         <form:select id="projectContentDataType" path="projectContentData.type"  htmlEscape="false"   onchange="changeContentDetail(this)"  class="form-control simple-select required">
@@ -492,6 +480,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">工作内容编号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="projectContentData.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">
+                        <form:input path="projectContentData.name" htmlEscape="false" 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 path="projectContentData.master.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>

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

@@ -402,9 +402,9 @@
             <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>
+                    <label class="layui-form-label"><span class="require-item">*</span>工作内容类型：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectContentData.name}"/>
+                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getContentTypeName(projectcontentinfo.projectContentData.type,"")}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -414,9 +414,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>工作内容类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>工作内容名称：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getContentTypeName(projectcontentinfo.projectContentData.type,"")}"/>
+                        <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectContentData.name}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -569,17 +569,17 @@
                     <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
                 </td>
 
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
                 </td>
                 <td>
-                    <input id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input readonly="true" id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
                 </td>
                 <td class="text-center op-td" >
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}

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

@@ -365,7 +365,7 @@
                 <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">
-                        <form:input path="number" htmlEscape="false" class="form-control isUscCode layui-input" readonly="true"/>
+                        <form:input path="number" htmlEscape="false" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
 
@@ -585,7 +585,47 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
-
+                        <c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                            <tr>
+                                   <td class="hide">
+                                       <input id="workClientLinkmanList${status.index + 1}_id"
+                                              name="workClientLinkmanList${status.index + 1}.id" type="hidden"
+                                              value="${workClientLinkman.id}"/>
+                                       <input id="workClientLinkmanList${status.index + 1}_delFlag"
+                                              name="workClientLinkmanList${status.index + 1}.delFlag" type="hidden"
+                                              value="0" readonly/>
+                                   </td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_name"
+                                              name="workClientLinkmanList${status.index + 1}.name" type="text"
+                                              value="${workClientLinkman.name}" readonly class="form-control required"/></td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_office"
+                                              name="workClientLinkmanList${status.index + 1}.office" type="text"
+                                              value="${workClientLinkman.office}" readonly class="form-control "/></td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_position"
+                                              name="workClientLinkmanList${status.index + 1}.position" type="text"
+                                              value="${workClientLinkman.position}" readonly class="form-control "/></td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_qq"
+                                              name="workClientLinkmanList${status.index + 1}.qq"
+                                              type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
+                                   </td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_linkMobile"
+                                              name="workClientLinkmanList${status.index + 1}.linkMobile" type="text"
+                                              value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
+                                   <td><input id="workClientLinkmanList${status.index + 1}_linkPhone"
+                                              name="workClientLinkmanList${status.index + 1}.linkPhone" type="text"
+                                              value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
+                                   <td><input id="workClientLinkmanList{{idx}}_email"
+                                              name="workClientLinkmanList${status.index + 1}.email" type="text"
+                                              value="${workClientLinkman.email}"
+                                              class="form-control email" readonly/></td>
+                                   <td class="text-center op-td">
+                                    <span class="op-btn op-btn-delete"
+                                          onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"
+                                          title="删除"><i
+                                            class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
+                                   </td>
+                            </tr>
+                        </c:forEach>
                         </tbody>
                     </table>
                     <script type="text/template" id="workClientLinkmanTpl">//<!--

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

@@ -188,44 +188,50 @@
                     </tr>
                     </thead>
                     <tbody id="workClientAttachmentList">
-<c:choose>
-    <c:when test="${not empty workClientInfo.workAttachments}">
-                    <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')
+                    <c:choose>
+                        <c:when test="${not empty workClientInfo.workAttachments}">
+                            <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 href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
+                                            <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>
-                                            <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
+                                            <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>
-                                </c:otherwise>
-                            </c:choose>
-                            <td>${workClientAttachment.createBy.name}</td>
-                            <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                            <td class="op-td">
-                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                            </td>
-                        </tr>
-                    </c:forEach>
-    </c:when>
-    <c:otherwise>
-        <tr>
-            <td colspan="4" align="center">暂无数据</td>
-        </tr>
-    </c:otherwise>
-</c:choose>
+                                    <td>${workClientAttachment.createBy.name}</td>
+                                    <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                    <td class="op-td">
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));"
+                                           class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </c:when>
+                        <c:otherwise>
+                            <tr>
+                                <td colspan="4" align="center">暂无数据</td>
+                            </tr>
+                        </c:otherwise>
+                    </c:choose>
                     </tbody>
                 </table>
             </div>