界面展示修改

src/main/resources/mappings/modules/projectrecord/ProjectPlanDao.xml

@@ -100,9 +100,9 @@
 		left join sys_user suf on a.finish_name = suf.id
 		<where>
 			a.del_flag=0 and a.project_id = #{projectId}
-			<if test="loginId!= null and loginId!= ''">
+			<!--<if test="loginId!= null and loginId!= ''">
 				AND a.remind_name  = #{loginId}
-			</if>
+			</if>-->
 		</where>
 		order by a.update_date desc
 	</select>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanForm.jsp

@@ -185,35 +185,35 @@
                 </div>
             </div>
 
-        <div class="form-group layui-row">
-            <div class="layui-item layui-col-sm12 lw7">
-                <label class="layui-form-label double-line">项目计划列表：</label>
-                <div class="layui-input-block">
-                    <div class="layui-item nav-btns" style="padding-left:0px;">
-                        <a class="nav-btn nav-btn-add"
-                           onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
-                           title="新增"><i class="fa fa-plus"></i> 新增</a>
-                        <shiro:hasPermission name="project:projectPlan:export">
-                            <a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>
-                        </shiro:hasPermission>
-                    </div>
-                    <table id="bankinfo" class="table table-bordered table-condensed can-edit">
-                        <thead>
-                        <tr>
-                            <th width="60px">编号</th>
-                            <th >任务阶段</th>
-                            <th >计划开始时间</th>
-                            <th >计划结束时间</th>
-                            <th >提醒人</th>
-                            <th >完成人</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="projectPlanList">
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目计划列表</h2></div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <div class="layui-item nav-btns">
+                        <div class="layui-item nav-btns" style="padding-left:0px;">
+                            <a class="nav-btn nav-btn-add"
+                               onclick="addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+                               title="新增"><i class="fa fa-plus"></i> 新增</a>
+                            <shiro:hasPermission name="project:projectPlan:export">
+                                <a class="nav-btn nav-btn-export" title="导出"  onclick="return confirmx('确认要导出该项目计划列表吗？', '${ctx}/project/projectPlan/export?id=${projectRecords.id}');"><i class="fa fa-file-excel-o"></i> 导出</a>
+                            </shiro:hasPermission>
+                        </div>
+                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
+                            <thead>
+                            <tr>
+                                <th width="60px">编号</th>
+                                <th >任务阶段</th>
+                                <th >计划开始时间</th>
+                                <th >计划结束时间</th>
+                                <th >提醒人</th>
+                                <th >完成人</th>
+                                <th width="100px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="projectPlanList">
 
-                        </tbody>
-                    </table>
-                    <script type="text/template" id="workClientBankTpl">//<!--
+                            </tbody>
+                        </table>
+                        <script type="text/template" id="workClientBankTpl">//<!--
                                 <tr id="projectPlanList{{idx}}">
                                     <td class="hide">
                                         <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
@@ -253,10 +253,10 @@
                                         {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectPlanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
                                     </td>
                                 </tr>//-->
-                    </script>
+                        </script>
+                    </div>
                 </div>
             </div>
-        </div>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanView.jsp

@@ -173,9 +173,9 @@
             </div>
 
         <div class="form-group layui-row">
+            <div class="form-group-label"><h2>项目计划列表</h2></div>
             <div class="layui-item layui-col-sm12 lw7">
-                <label class="layui-form-label double-line">项目计划列表：</label>
-                <div class="layui-input-block">
+                <div class="layui-item nav-btns">
                     <table id="bankinfo" class="table table-bordered table-condensed can-edit">
                         <thead>
                         <tr>

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

@@ -48,11 +48,19 @@
                   parent.layer.msg("请选择联系人类型!", {icon: 5});
                   return false;
               }
+              var telephone = $("#telephone").val();
+              if(!/(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/.test(telephone) && !/^([0-9]{3,4}-)?[0-9]{7,8}$/.test(telephone)){
+                  parent.layer.msg("公司电话有误，请重新填写!", {icon: 5});
+                  return false;
+              }
+
               var tableObj = document.getElementById('contentTable').rows[1];
               if (tableObj == null) {
                   parent.layer.msg("请填写联系人信息!", {icon: 5});
                   return false;
               }
+
+
               if(!exitName){
                   return false;
               }
@@ -539,7 +547,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">
-                        <form:input path="telephone" id="telephone" htmlEscape="false"
+                        <form:input path="telephone" id="telephone" htmlEscape="false" maxlength="11"
                                     class="form-control isTel required layui-input"/>
                     </div>
                 </div>
@@ -996,6 +1004,18 @@
                                         }
                                     }
                                 }
+                                if(0 == showDataList.length){
+                                    var newData = {
+                                        "name": newDataList[0].name,
+                                        "value": newDataList[0].value,
+                                        "selected": true
+
+                                    }
+                                    lists.push(newDataList[0].value);
+                                    showList.push(newData);
+                                    data.splice(0,1,newData);
+                                }
+
                                 $("#jobTypeStr").val(lists);
                                 xmSelect.render({
                                     el: '#jobType',

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

@@ -203,17 +203,18 @@
                         return xml;
                     }}
 				,{field:'number',align:'center', title: '客户编号',width:150}
-                ,{field:'clientProperty',align:'center', title: '客户性质',width:150}
-                ,{field:'trade',align:'center', title: '客户行业', width:150}
-                ,{field:'area', align:'center',title: '所在地区',width:200}
-                ,{field:'clientType', align:'center',title: '客户类型',minWidth:200,templet:function(d){
+                ,{field:'clientProperty',align:'center', title: '客户性质',width:100}
+                ,{field:'trade',align:'center', title: '客户行业', width:80}
+                ,{field:'area', align:'center',title: '所在地区',width:80}
+                ,{field:'clientType', align:'center',title: '客户类型',width:100,templet:function(d){
                         return "<span title='"+ d.clientType +"'>" + d.clientType + "</span>";
                     }}
-                ,{field:'code', align:'center',title: '统一社会信用代码',minWidth:250,templet:function(d){
+                ,{field:'code', align:'center',title: '统一社会信用代码',width:160,templet:function(d){
                         return "<span title='"+ d.code +"'>" + d.code + "</span>";
                     }}
-                ,{field:'userName',align:'center', title: '创建人', width:85}
-                ,{field:'createDate',align:'center', title: '创建时间', width:85}
+				/*,{field:'jobTypeStr', align:'center',title: '代表单位',width:80}*/
+                ,{field:'userName',align:'center', title: '创建人', width:80}
+                ,{field:'createDate',align:'center', title: '创建时间', width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";