联系电话，相关UI调整

.idea/workspace.xml

@@ -31,46 +31,16 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="admin-sms.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="admin-sms.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/admin-sms.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1100">
+            <state relative-caret-position="655">
               <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="edit-profile.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/edit-profile.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="edit-profile-sms-edit.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/edit-profile-sms-edit.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1342">
-              <caret line="61" column="22" selection-start-line="61" selection-start-column="22" selection-end-line="67" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="edit-profile-sms.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/edit-profile-sms.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="61" column="70" selection-start-line="61" selection-start-column="70" selection-end-line="61" selection-end-column="70" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="Git.Settings">
@@ -139,7 +109,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -189,6 +158,7 @@
         </subPane>
       </pane>
       <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -286,18 +256,21 @@
       <workItem from="1476925518004" duration="6529000" />
       <workItem from="1477013111095" duration="2100000" />
       <workItem from="1477038050726" duration="599000" />
-      <workItem from="1477275088166" duration="598000" />
+      <workItem from="1477275088166" duration="1199000" />
+      <workItem from="1477363292434" duration="597000" />
+      <workItem from="1477548960491" duration="202000" />
+      <workItem from="1477557872554" duration="209000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="72876000" />
+    <option name="totallyTimeSpent" value="74485000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12614517" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12614517" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -656,14 +629,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/edit-profile.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/login.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-66">
@@ -671,26 +636,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/admin-sms.html">
+    <entry file="file://$PROJECT_DIR$/edit-profile-sms.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1100">
-          <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" />
+        <state relative-caret-position="22">
+          <caret line="61" column="70" selection-start-line="61" selection-start-column="70" selection-end-line="61" selection-end-column="70" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/edit-profile-sms-edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1342">
+        <state relative-caret-position="655">
           <caret line="61" column="22" selection-start-line="61" selection-start-column="22" selection-end-line="67" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/edit-profile-sms.html">
+    <entry file="file://$PROJECT_DIR$/edit-profile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="61" column="70" selection-start-line="61" selection-start-column="70" selection-end-line="61" selection-end-column="70" />
+        <state relative-caret-position="396">
+          <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-sms.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="655">
+          <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" />
           <folding />
         </state>
       </provider>

admin-addUser.html

@@ -56,15 +56,9 @@
 				        	</div>
 				        </div>
 						<div class="control-group">
-				        	<label class="control-label">电话</label>
+				        	<label class="control-label">联系电话</label>
 				        	<div class="controls">
-				        		<input type="text" placeholder="输入电话号码，0000-0000000">
-				        	</div>
-				        </div>
-						<div class="control-group">
-				        	<label class="control-label">手机</label>
-				        	<div class="controls">
-				        		<input type="text" placeholder="输入用户手机">
+				        		<input type="text" placeholder="输入联系电话（手机）">
 				        	</div>
 				        </div>
 				     <div class="alert alert-info">

admin-editUser.html

@@ -56,17 +56,20 @@
 				        	</div>
 				        </div>
 						<div class="control-group">
-				        	<label class="control-label">电话</label>
+				        	<label class="control-label">联系电话</label>
 				        	<div class="controls">
-				        		<input type="text"  value="0756-3850888">
+				        		<input type="text" placeholder="输入联系电话（手机）">
 				        	</div>
-				        </div>
-						<div class="control-group">
-				        	<label class="control-label">手机</label>
-				        	<div class="controls">
-				        		<input type="text"  value="12345678901">
-				        	</div>
-				        </div>
+				        </div> 
+			              <div class="control-group">
+			                <label class="control-label" for="inputEmail">短信通知</label>
+			                <div class="controls">
+			                  <div class="input-prepend">
+			                    <span class="add-on">手机</span>
+			                    <input type="text" value="12345678901"  class="span2" disabled="">
+			                  </div>
+			                </div>
+			            </div>
 				    <div class="alert alert-error">
 						    <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
 						    </div>

admin-userlist.html

@@ -37,8 +37,8 @@
                   <th>姓名</th>
                   <th>单位（公司）</th>
                   <th>职位</th>
-                  <th>电话</th>
-                  <th>手机</th>
+                  <th>联系电话</th>
+                  <th>短信通知</th>
                   <th>邮箱（登录使用）</th>
                   <th>操作</th>
                 </tr>
@@ -59,7 +59,7 @@
                   <td>蔡工</td>
                   <td>XXX公司</td>
                   <td>审批人</td>
-                  <td>0756-3850888</td>
+                  <td>0756-3850888,1234567890</td>
                   <td>12345678901</td>
                   <td>sp1@qq.com</td>
                   <td><a href="#" class="colGreen">启用</a> <a href="admin-editUser.html" >编辑</a> <a data-toggle="modal" href="#sendpw" data-keyboard="false" data-backdrop="ture" class="colGray">重置密码</a></td>

css/style.css

@@ -956,6 +956,7 @@ left:5px
 }
 .filesWrap .filesList{
   width:70%;
+  min-height: 400px
 }
 .filesWrap .filesDetail{
   position: absolute;

edit-profile-sms.html

@@ -30,10 +30,10 @@
     	<div class="mainSidebar">
     		<div class="mainNav">
     			<ul>
-    				<li><a href="" title="开始计量"><div data-icon="A" aria-hidden="true" class="navIcon"></div>项目</a></li>
-    				<li><a href="" title="查看我的任务"><div data-icon="B" aria-hidden="true" class="navIcon"></div>审批</a></li>
-            <li><a href="" title="生成报表"><div data-icon="C" aria-hidden="true" class="navIcon"></div>报表</a></li>
-            <li><a href="" title="数据统计"><div data-icon="D" aria-hidden="true" class="navIcon"></div>统计</a></li>
+    				<li><a href="" title="开始计量"><div data-icon="A" aria-hidden="true" class="navIcon"></div>项目管理</a></li>
+    				<li><a href="" title="查看我的任务"><div data-icon="B" aria-hidden="true" class="navIcon"></div>项目审批</a></li>
+            <li><a href="" title="生成报表"><div data-icon="B" aria-hidden="true" class="navIcon"></div>编制项目</a></li><!-- 
+            <li><a href="" title="数据统计"><div data-icon="D" aria-hidden="true" class="navIcon"></div>统计</a></li> -->
     			</ul>
     		</div>
     	</div>
@@ -90,6 +90,12 @@
                     <label class="checkbox inline">
                         <input type="checkbox" checked value="option1" disabled> 到我审批
                     </label>
+                    <label class="checkbox inline">
+                        <input type="checkbox" checked value="option1" disabled> 标段审批通过（上报人接收）
+                    </label>
+                    <label class="checkbox inline">
+                        <input type="checkbox" checked value="option1" disabled> 标段审批不通过（上报人接收）
+                    </label>
                 </div>
               </div>
                 <!--正常使用-->

edit-profile.html

@@ -82,19 +82,17 @@
                 <label class="control-label" for="inputEmail">联系电话</label>
                 <div class="controls">
                   <div class="input-prepend">
-                    <span class="add-on">固话</span>
-                    <input type="text" placeholder="格式：0000-00000000" style="width:167px">
-                  </div>
-                  <div class="input-prepend">
-                    <span class="add-on">手机</span>
-                    <input type="text" placeholder="输入11位手机号码"  class="span2">
+                    <input type="text" placeholder="输入您的联系电话（手机）">
                   </div>
                 </div>
               </div>
               <div class="control-group">
-                <label class="control-label" for="inputEmail">QQ</label>
+                <label class="control-label" for="inputEmail">短信通知</label>
                 <div class="controls">
-                  <input type="text" placeholder="输入您的QQ号码">
+                  <div class="input-prepend">
+                    <span class="add-on">手机</span>
+                    <input type="text" value="12345678901"  class="span2" disabled="">
+                  </div>
                 </div>
               </div>
               <div class="control-group">