客户信息页面修改

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

@@ -454,14 +454,6 @@
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
-                <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">&nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
-                        &nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
-                    </div>
-                </div>
                 <div class="layui-item layui-col-sm6 lw7" id="search">
                     <label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
                     <div class="layui-input-block">
@@ -474,12 +466,21 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>客户编号：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+                    <div class="layui-input-block">&nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
+                        &nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="number" id="number" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                        <form:input path="uscCode" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
+                        <span id="uscPh" style="color:#cc5965"></span>
                     </div>
                 </div>
-
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质：</label>
                     <div class="layui-input-block">
@@ -490,14 +491,7 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
-                    <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
-                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
-                        <span id="uscPh" style="color:#cc5965"></span>
-                    </div>
-                </div>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业：</label>
                     <div class="layui-input-block">
@@ -508,12 +502,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
-                                        labelValue="${workClientInfo.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
-                                        allowClear="true" notAllowSelectParent="false"/>
+                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
+                    <div class="layui-input-block">
+                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
+                            <form:option value="" label="--请选择客户类型--"/>
+                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
+                    <div class="layui-input-block">
+                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -536,15 +536,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
-                            <form:option value="" label="--请选择客户类型--"/>
-                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
                     <div class="layui-input-block">
                         <form:input path="telephone" id="telephone" htmlEscape="false" maxlength="11"
@@ -558,9 +549,12 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
-                    <div class="layui-input-block">
-                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
+                                        labelValue="${workClientInfo.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
+                                        allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
 

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

@@ -18,13 +18,13 @@
             <input type="hidden" id="id" value="${workClientInfo.id}">
             <div class="form-group-label"><h2>基本信息</h2></div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
+                <label class="layui-form-label">客户名称：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.name}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+                <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
                 <div class="layui-input-block">
                     <span class="radio-box">&nbsp;&nbsp;
                         <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
@@ -34,27 +34,37 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label"><span class="require-item">*</span>客户性质：</label>
+                <label class="layui-form-label double-line">统一社会信用代码：</label>
                 <div class="layui-input-block">
-                    <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="${workClientInfo.uscCode}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
+                <label class="layui-form-label">客户性质：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
+                    <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">
-                <label class="layui-form-label"><span class="require-item">*</span>所在行业：</label>
+                <label class="layui-form-label">所在行业：</label>
                 <div class="layui-input-block">
                     <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">
-                <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="${workClientInfo.area.name}"/>
+                <label class="layui-form-label">客户类型：</label>
+                <div class="layui-input-block">
+                    <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">
+                <label class="layui-form-label">代表单位：</label>
+                <div class="layui-input-block">
+                    <div class="input-group">
+                        <div >
+                            <div id="jobType" style="pointer-events: none;" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -76,12 +86,6 @@
                 </div>
             </div>
             <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="<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">
                 <label class="layui-form-label">公司电话：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
@@ -94,18 +98,14 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">代表单位：</label>
-                <div class="layui-input-block">
-                    <div class="input-group">
-                        <div >
-                            <div id="jobType" style="pointer-events: none;" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
-                        </div>
-                    </div>
+                <label class="layui-form-label">所在地区：</label>
+                <div class="layui-input-block with-icon">
+                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
                 </div>
             </div>
 
             <div class="layui-item layui-col-sm12 lw7">
-                <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                <label class="layui-form-label">注册地址：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
                 </div>
@@ -161,7 +161,7 @@
                     <thead>
                     <tr>
                         <th class="hide"></th>
-                        <th width="150px"><font color="red">*</font>联系人姓名</th>
+                        <th width="150px">联系人姓名</th>
                         <th >部门</th>
                         <th width="150px">职务</th>
                         <th width="150px">QQ</th>

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

@@ -209,7 +209,6 @@
                             "<span title=" + d.clientName + ">" + d.clientName.substr(0,40) + "</span></a>";
                         return xml;
                     }}
-				,{field:'number',align:'center', title: '客户编号',width:150}
                 ,{field:'clientProperty',align:'center', title: '客户性质',width:100}
                 ,{field:'trade',align:'center', title: '客户行业', width:80}
                 ,{field:'area', align:'center',title: '所在地区',width:80}