1111

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

@@ -29,8 +29,7 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <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="${workClientInfo.companyType}"/>
-<%--                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>--%>
+                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -42,8 +41,7 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <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="${workClientInfo.companyIndustry}"/>
-<%--                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>--%>
+                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -73,8 +71,7 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户类型：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.clientType}">
-<%--                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>--%>
+                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">

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

@@ -134,7 +134,7 @@
 							<div class="layui-input-block">
                                 <form:select path="companyIndustry" class="form-control layui-input">
                                     <form:option value="" label=""/>
-<%--                                    <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                                    <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                                 </form:select>
 							</div>
 						</div>
@@ -143,7 +143,7 @@
 							<div class="layui-input-block">
                                 <form:select path="clientType" class="form-control layui-input">
                                     <form:option value="" label=""/>
-<%--                               <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                               		<form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                                 </form:select>
 							</div>
 						</div>
@@ -233,15 +233,11 @@
                     ,"id":"${workClientInfo.id}"
 					,"linkman":"${workClientInfo.workClientLinkman.id}"
                     ,"clientName":"${workClientInfo.name}"
-                    <%--,"clientProperty":"${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"--%>
-					,"clientProperty":"${workClientInfo.companyType}"
-					,"trade":"${workClientInfo.companyIndustry}"
-					<%--,"trade":"${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"--%>
+                    ,"clientProperty":"${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"
+					,"trade":"${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"
                     ,"area":"${workClientInfo.area.name}"
-                    ,"clientType":"${workClientInfo.clientType}"
-                    <%--,"clientType":"${fns:getMainDictLabels(workClientInfo.clientType,',','client_type', '')}"--%>
+                    ,"clientType":"${fns:getMainDictLabels(workClientInfo.clientType,',','client_type', '')}"
                     ,"code":"${workClientInfo.uscCode}"
-                    <%--,"createDate":"${workClientInfo.createDate}"--%>
                     ,"createDate":"<fmt:formatDate value="${workClientInfo.createDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${flag == '1' or fns:getUser().id == workClientInfo.createBy.id}">
                     <shiro:hasPermission name="workclientinfo:workClientInfo:edit">,"canedit":"1"</shiro:hasPermission>