Przeglądaj źródła

新增项目管理 标段管理 期数管理,审批人审批状态管理

Chente 8 lat temu
rodzic
commit
c639f7c271
10 zmienionych plików z 644 dodań i 175 usunięć
  1. 0 6
      .idea/vcs.xml
  2. 112 86
      .idea/workspace.xml
  3. 4 2
      admin-addUser.html
  4. 3 1
      admin-editUser.html
  5. 293 0
      admin-period.html
  6. 101 0
      admin-project.html
  7. 122 75
      admin-section.html
  8. 1 1
      admin-sms.html
  9. 2 1
      admin-sysinfo.html
  10. 6 3
      admin-userlist.html

+ 0 - 6
.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

+ 112 - 86
.idea/workspace.xml

@@ -21,21 +21,31 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/style.css">
+      <file leaf-file-name="admin-section.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/admin-section.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="20966">
-              <caret line="953" column="21" selection-start-line="953" selection-start-column="21" selection-end-line="954" selection-end-column="19" />
+            <state relative-caret-position="1716">
+              <caret line="93" column="31" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="admin-sms.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/admin-sms.html">
+      <file leaf-file-name="admin-period.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/admin-period.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" />
+            <state relative-caret-position="375">
+              <caret line="32" column="51" selection-start-line="32" selection-start-column="51" selection-end-line="32" selection-end-column="51" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="admin-project.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/admin-project.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="396">
+              <caret line="53" column="48" selection-start-line="53" selection-start-column="48" selection-end-line="53" selection-end-column="48" />
               <folding />
             </state>
           </provider>
@@ -44,7 +54,10 @@
     </leaf>
   </component>
   <component name="Git.Settings">
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="WARN_ABOUT_CRLF" value="false" />
+    <option name="WARN_ABOUT_DETACHED_HEAD" value="false" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -66,9 +79,16 @@
         <option value="$PROJECT_DIR$/w-project-section-files.html" />
         <option value="$PROJECT_DIR$/w-project-section-files-recover.html" />
         <option value="$PROJECT_DIR$/edit-profile.html" />
-        <option value="$PROJECT_DIR$/admin-sms.html" />
         <option value="$PROJECT_DIR$/edit-profile-sms-edit.html" />
         <option value="$PROJECT_DIR$/edit-profile-sms.html" />
+        <option value="$PROJECT_DIR$/admin-sms.html" />
+        <option value="$PROJECT_DIR$/admin-sysinfo.html" />
+        <option value="$PROJECT_DIR$/admin-addUser.html" />
+        <option value="$PROJECT_DIR$/admin-editUser.html" />
+        <option value="$PROJECT_DIR$/admin-userlist.html" />
+        <option value="$PROJECT_DIR$/admin-project.html" />
+        <option value="$PROJECT_DIR$/admin-section.html" />
+        <option value="$PROJECT_DIR$/admin-period.html" />
       </list>
     </option>
   </component>
@@ -84,7 +104,7 @@
     <option name="width" value="1456" />
     <option name="height" value="886" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
     <OptionsSetting value="true" id="Checkout" />
@@ -109,6 +129,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -158,13 +179,12 @@
         </subPane>
       </pane>
       <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="terminal" />
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
     <property name="settings.editor.splitter.proportion" value="0.66111654" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../CLDv1.3" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../building SAAS" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
   </component>
@@ -260,17 +280,19 @@
       <workItem from="1477363292434" duration="597000" />
       <workItem from="1477548960491" duration="202000" />
       <workItem from="1477557872554" duration="209000" />
+      <workItem from="1483511719428" duration="6379000" />
+      <workItem from="1483579381081" duration="4551000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="74485000" />
+    <option name="totallyTimeSpent" value="85415000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
+    <frame x="1912" y="71" width="1456" height="886" extended-state="6" />
     <editor active="true" />
     <layout>
-      <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19166666" 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" />
@@ -304,71 +326,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/sign-view-page.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1144">
-          <caret line="52" column="138" selection-start-line="52" selection-start-column="138" selection-end-line="52" selection-end-column="138" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="24926">
-          <caret line="1133" column="30" selection-start-line="1133" selection-start-column="30" selection-end-line="1133" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-list-my_create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1518">
-          <caret line="69" column="126" selection-start-line="69" selection-start-column="126" selection-end-line="69" selection-end-column="126" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-share.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-create_sign.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1188">
-          <caret line="54" column="33" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-view-set_signer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="46" column="135" selection-start-line="46" selection-start-column="135" selection-end-line="46" selection-end-column="135" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-view-signer_sign.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="60" column="52" selection-start-line="60" selection-start-column="52" selection-end-line="60" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sign-view-page.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1144">
-          <caret line="52" column="138" selection-start-line="52" selection-start-column="138" selection-end-line="52" selection-end-column="138" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="24926">
-          <caret line="1133" column="30" selection-start-line="1133" selection-start-column="30" selection-end-line="1133" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sign-list-my_create.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1518">
@@ -603,7 +560,7 @@
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20966">
-          <caret line="953" column="21" selection-start-line="953" selection-start-column="21" selection-end-line="954" selection-end-column="19" />
+          <caret line="954" column="19" selection-start-line="953" selection-start-column="21" selection-end-line="954" selection-end-column="19" />
           <folding />
         </state>
       </provider>
@@ -640,7 +597,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -648,7 +604,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -656,14 +611,85 @@
       <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" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-option.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-addUser.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-editUser.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="594">
+          <caret line="27" column="42" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-sysinfo.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="27" selection-end-column="62" />
           <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" />
+        <state relative-caret-position="506">
+          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="27" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/webstorm.jar!/resources/html5-schema/html5/web-forms.rnc">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="500" column="16" selection-start-line="500" selection-start-column="16" selection-end-line="500" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-userlist.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="748">
+          <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="99" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-project.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="53" column="48" selection-start-line="53" selection-start-column="48" selection-end-line="53" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-section.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1716">
+          <caret line="93" column="31" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/admin-period.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="32" column="51" selection-start-line="32" selection-start-column="51" selection-end-line="32" selection-end-column="51" />
           <folding />
         </state>
       </provider>

+ 4 - 2
admin-addUser.html

@@ -22,8 +22,10 @@
 	<div class="warpAdmin">
 		<div class="adminSidebar fL">
 			<ul>
-				<li><a href="admin-userlist.html">用户列表</a></li>
-				<li><a href="admin-addUser.html" class="now">添加用户</a></li>
+				<li><a href="admin-addUser.html">系统信息</a></li>
+				<li><a href="admin-sms.html">短信通知</a></li>
+				<li><a href="admin-userlist.html" class="now">用户列表</a></li>
+				<li><a href="admin-project.html">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">

+ 3 - 1
admin-editUser.html

@@ -22,8 +22,10 @@
 	<div class="warpAdmin">
 		<div class="adminSidebar fL">
 			<ul>
+				<li><a href="admin-addUser.html">系统信息</a></li>
+				<li><a href="admin-sms.html">短信通知</a></li>
 				<li><a href="admin-userlist.html" class="now">用户列表</a></li>
-				<li><a href="admin-addUser.html">添加用户</a></li>
+				<li><a href="admin-project.html">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">

+ 293 - 0
admin-period.html

@@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>纵横计量支付系统</title> 
+	<meta name=description content=计量支付> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/bootstrap.css> 
+	<link rel=stylesheet href=css/style.css> 
+	<script src=js/jquery-1.9.1.min.js></script> 
+	<script src=js/bootstrap.js></script>  
+	<script src=js/jl.js></script> 
+</head>
+<body>
+<div class="wrapHeader">
+      <h1 class="mainLogo" title="纵横计量支付"></h1>
+      <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+    </div>
+<div class="width960 userInfoPanel clearfix">
+		<p><b>你好,管理员</b>;<a href="admin-option.html">修改密码</a>&nbsp;<a href="admin-login.html">退出</a></p>
+</div>
+	<div class="warpAdmin">
+		<div class="adminSidebar fL">
+			<ul>
+                <li><a href="admin-addUser.html">系统信息</a></li>
+                <li><a href="admin-sms.html">短信通知</a></li>
+                <li><a href="admin-userlist.html">用户列表</a></li>
+                <li><a href="admin-project.html" class="now">项目管理</a></li>
+			</ul>
+		</div>
+		<div class="adminContent">
+			<div class="adminMain">
+                <legend><a href="admin-section.html">返回标段列表</a></legend>
+                <!--5期#2-->
+                <table class="table table-striped table-hover">
+                    <legend><a href="#delperiod" class="fR btn btn-link colGray" data-toggle="modal" >删除本期#2</a>第5期 #2</legend>
+                    <thead>
+                    <tr>
+                        <th>审批流程</th>
+                        <th>审批人</th>
+                        <th>审批状态</th>
+                        <th>审批意见</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>5审</td>
+                        <td>陈特-XXX公司</td>
+                        <td><span class="colOrange">审批中</span></td>
+                        <td></td>
+                        <td><a href="#unpass" data-toggle="modal" class="colRed">不通过(点我)</a> <a href="#pass" data-toggle="modal" class="colGreen">通过(点我)</a> </td>
+                    </tr>
+                    <tr>
+                        <td>4审</td>
+                        <td>任杰-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td><a href="#work" data-toggle="modal" class="colOrange">审批中(点我)</a></td>
+                    </tr>
+                    <tr>
+                        <td>3审</td>
+                        <td>王丰-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>2审</td>
+                        <td>蔡频-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>1审</td>
+                        <td>欧桃珍-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <!--5期#2点了4审审批中-->
+                <table class="table table-striped table-hover">
+                    <legend><a href="#delperiod" class="fR btn btn-link colGray" data-toggle="modal" >删除本期#2</a>第5期 #2</legend>
+                    <thead>
+                    <tr>
+                        <th>审批流程</th>
+                        <th>审批人</th>
+                        <th>审批状态</th>
+                        <th>审批意见</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>5审</td>
+                        <td>陈特-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td> </td>
+                    </tr>
+                    <tr>
+                        <td>4审</td>
+                        <td>任杰-XXX公司</td>
+                        <td><span class="colOrange">审批中</span></td>
+                        <td></td>
+                        <td><a href="#unpass" data-toggle="modal" class="colRed">不通过(点我)</a> <a href="#pass" data-toggle="modal" class="colGreen">通过(点我)</a></td>
+
+                    </tr>
+                    <tr>
+                        <td>3审</td>
+                        <td>王丰-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td><td><a href="#work" data-toggle="modal" class="colOrange">审批中(点我)</a></td>
+                    </tr>
+                    <tr>
+                        <td>2审</td>
+                        <td>蔡频-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>1审</td>
+                        <td>欧桃珍-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <!--5期#2点了1审审批中-->
+                <table class="table table-striped table-hover">
+                    <legend><a href="#delperiod" class="fR btn btn-link colGray" data-toggle="modal" >删除本期#2</a>第5期 #2</legend>
+                    <thead>
+                    <tr>
+                        <th>审批流程</th>
+                        <th>审批人</th>
+                        <th>审批状态</th>
+                        <th>审批意见</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>5审</td>
+                        <td>陈特-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td> </td>
+                    </tr>
+                    <tr>
+                        <td>4审</td>
+                        <td>任杰-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>3审</td>
+                        <td>王丰-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>2审</td>
+                        <td>蔡频-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>1审</td>
+                        <td>欧桃珍-XXX公司</td>
+                        <td><span class="colOrange">审批中</span></td>
+                        <td></td>
+                        <td><a href="#unpass" data-toggle="modal" class="colRed">不通过(点我)</a> <a href="#pass" data-toggle="modal" class="colGreen">通过(点我)</a></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <!--5期#2删除了#2,现在是#1-->
+                <table class="table table-striped table-hover">
+                    <legend><a href="#delperiod" class="fR btn btn-link colGray" data-toggle="modal" >删除本期#1</a>第5期 #1</legend>
+                    <thead>
+                    <tr>
+                        <th>审批流程</th>
+                        <th>审批人</th>
+                        <th>审批状态</th>
+                        <th>审批意见</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>5审</td>
+                        <td>陈特-XXX公司</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>4审</td>
+                        <td>任杰-XXX公司</td>
+                        <td><span class="colRed">审批不通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td><a href="#work" data-toggle="modal" class="colOrange">审批中(点我)</a></td>
+                    </tr>
+                    <tr>
+                        <td>3审</td>
+                        <td>王丰-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>2审</td>
+                        <td>蔡频-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>1审</td>
+                        <td>欧桃珍-XXX公司</td>
+                        <td><span class="colGreen">审批通过</span></td>
+                        <td>审批意见内容在这显示</td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+			</div>
+		</div>
+	</div>
+	<!--不通过-->
+	<div class="modal hide fade" id="unpass">
+    <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>设置审批不通过</h3>
+    </div>
+    <div class="modal-body">
+    <p>确认是否设置该审批人审批状态为审批不通过?</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-danger">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+  </div>
+<!--通过-->
+<div class="modal hide fade" id="pass">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>设置审批通过</h3>
+    </div>
+    <div class="modal-body">
+        <p>确认是否设置该审批人审批状态为审批通过?</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-success">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+</div>
+<!--审批中-->
+<div class="modal hide fade" id="work">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>设置审批中</h3>
+    </div>
+    <div class="modal-body">
+        <p>确认是否设置该审批人审批状态为审批中过?</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-warning">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+</div>
+<!--删除本期-->
+<div class="modal hide fade" id="delperiod">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除本期#2</h3>
+    </div>
+    <div class="modal-body">
+        <p>删除本期#2(第2次审批)后,将退回至上一次审批。</p>
+        <p>当#1被删除后,将退回至上一期。</p>
+        <p>确认是否删除第5期#2?</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-danger">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+</div>
+
+	<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 101 - 0
admin-project.html

@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>纵横计量支付系统</title> 
+	<meta name=description content=计量支付> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/bootstrap.css> 
+	<link rel=stylesheet href=css/style.css> 
+	<script src=js/jquery-1.9.1.min.js></script> 
+	<script src=js/bootstrap.js></script>  
+	<script src=js/jl.js></script> 
+</head>
+<body>
+<div class="wrapHeader">
+      <h1 class="mainLogo" title="纵横计量支付"></h1>
+      <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+    </div>
+<div class="width960 userInfoPanel clearfix">
+		<p><b>你好,管理员</b>;<a href="admin-option.html">修改密码</a>&nbsp;<a href="admin-login.html">退出</a></p>
+</div>
+	<div class="warpAdmin">
+		<div class="adminSidebar fL">
+			<ul>
+                <li><a href="admin-addUser.html">系统信息</a></li>
+                <li><a href="admin-sms.html">短信通知</a></li>
+                <li><a href="admin-userlist.html">用户列表</a></li>
+                <li><a href="admin-project.html" class="now">项目管理</a></li>
+			</ul>
+		</div>
+		<div class="adminContent">
+			<div class="adminMain">
+				<table class="table table-striped table-hover">
+                    <legend>项目列表</legend>
+              <thead>
+                <tr>
+                  <th>项目名称</th>
+                  <th width="40">id</th>
+                  <th>包含标段类型</th>
+                  <th>创建人</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+              <tr>
+                  <td><a href="admin-section.html">XXX项目</a></td>
+                  <td>1</td>
+                  <td>8</td>
+                  <td>陈特-XXX公司</td>
+                  <td><a <a href="#delpoj" data-toggle="modal" class="colGray" >删除</a></td>
+              </tr>
+              <tr>
+                  <td><a href="admin-section.html">ASASAS项目</a></td>
+                  <td>2</td>
+                  <td>8</td>
+                  <td>陈特-XXX公司</td>
+                  <td><a <a href="#delpoj" data-toggle="modal" class="colGray" >删除</a></td>
+              </tr>
+              <tr>
+                  <td><a href="admin-section.html">1212项目</a></td>
+                  <td>3</td>
+                  <td>0</td>
+                  <td>陈特-XXX公司</td>
+                  <td><a <a href="#delpoj2" data-toggle="modal" class="colGray" >删除</a></td>
+              </tr>
+              </tbody>
+            </table>
+			</div>
+		</div>
+	</div>
+
+<!--删除标段不可删除-->
+<div class="modal hide fade" id="delpoj">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除项目确认</h3>
+    </div>
+    <div class="modal-body">
+        <p>项目下还有标段类型,不能删除该项目。</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn" data-dismiss="modal">关闭</button>
+    </div>
+</div>
+<!--删除标段可删除-->
+<div class="modal hide fade" id="delpoj2">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除项目确认</h3>
+    </div>
+    <div class="modal-body">
+        <p>确认删除项目“XXX项目”?</p>
+        <p>删除后,将无法恢复。</p>
+        <p>请谨慎操作!</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-danger">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+</div>
+	<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 122 - 75
admin-section.html

@@ -22,93 +22,140 @@
 	<div class="warpAdmin">
 		<div class="adminSidebar fL">
 			<ul>
-				<li><a href="admin-userlist.html" class="now">标段管理</a></li>
+                <li><a href="admin-addUser.html">系统信息</a></li>
+                <li><a href="admin-sms.html">短信通知</a></li>
+                <li><a href="admin-userlist.html">用户列表</a></li>
+                <li><a href="admin-project.html" class="now">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">
 			<div class="adminMain">
-				<fieldset>
-					<legend><select><option>下拉选择项目</option></select></legend>
-				<table class="table table-striped table-hover">
-              <thead>
-                <tr>
-                  <th>标段名称</th>
-                  <th>标段类型</th>
-                  <th>标段总额</th>
-                  <th>标段状态</th>
-                  <th>审批人</th>
-                  <th>操作</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td>A</td>
-                  <td>类型1</td>
-                  <td>0</td>
-                  <th><span class="colOrange">#1 审批中</span></th>
-                  <th><span class="colGreen">陈特(5审)完成</span></th>
-                  <td><a href="" class="colGray" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-                <tr>
-                  <td>A</td>
-                  <td>类型1</td>
-                  <td>0</td>
-                  <th><span class="colOrange">#2 审批中</span></th>
-                  <th><span class="colGreen">陈特(5审)完成</span></th>
-                  <td><a href="" class="colGray" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-                <tr>
-                  <td>B</td>
-                  <td>类型2</td>
-                  <td>0</td>
-                  <th><span class="colGreen">#1 完成</span></th>
-                  <th><span class="colGreen">陈特(终审)完成</span></th>
-                  <td><a href="" class="colGray" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-                <tr>
-                  <td>C</td>
-                  <td>类型3</td>
-                  <td>0</td>
-                  <th><span class="colRed">#1 不通过</span></th>
-                  <th><span class="colRed">陈特(2审)不通过</span></th>
-                  <td><a href="" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-                <tr>
-                  <td>C</td>
-                  <td>类型3</td>
-                  <td>0</td>
-                  <th><span class="colRed">#1 不通过</span></th>
-                  <th><span class="colRe">陈特(上报)</span></th>
-                  <td><a href="" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-                <tr>
-                  <td>D</td>
-                  <td>类型4</td>
-                  <td>0</td>
-                  <th><span class="colGray">#1 未上报</span></th>
-                  <th></th>
-                  <td><a href="" class="colGray" class="colGray" data-original-title="数据诚可贵,删除有风险" data-toggle="tooltip" data-placement="bottom">删除</a></td>
-                </tr>
-              </tbody>
-            </table>
-				</fieldset>
+                <table class="table table-striped table-hover">
+                    <legend><a href="#deltype" data-toggle="modal" class="fR btn btn-link colGray">删除标段类型</a>类型1,key:cl83jd</legend>
+                    <thead>
+                    <tr>
+                        <th width="40">id</th>
+                        <th>标段名称</th>
+                        <th>创建人</th>
+                        <th>标段总额</th>
+                        <th>标段状态</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>23</td>
+                        <td><a href="admin-period.html">AAAAAAAAAAAAA(dianwo)</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colOrange">#1 审批中</span></th>
+                        <td><a href="#delsection" class="colGray" data-toggle="modal">删除(点我)</a></td>
+                    </tr>
+                    <tr>
+                        <td>24</td>
+                        <td><a href="#">BBBBBBBBBB</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colOrange">#2 审批中</span></th>
+                        <td><a href="" class="colGray" >删除</a></td>
+                    </tr>
+                    <tr>
+                        <td>25</td>
+                        <td><a href="#">CCCCCCCC</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colGreen">#1 完成</span></th>
+                        <td><a href="" class="colGray" >删除</a></td>
+                    </tr>
+                    <tr>
+                        <td>27</td>
+                        <td><a href="#">DDDDDDDDDD</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colRed">#1 不通过</span></th>
+                        <td><a href="" class="colGray">删除</a></td>
+                    </tr>
+                    <tr>
+                        <td>42</td>
+                        <td><a href="#">EEEEEEEEEE</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colRed">#1 不通过</span></th>
+                        <td><a href="" class="colGray">删除</a></td>
+                    </tr>
+                    <tr>
+                        <td>43</td>
+                        <td><a href="#">FFFFFFFFF</a></td>
+                        <th>陈特-XXX公司</th>
+                        <td>0</td>
+                        <th><span class="colGray">#1 未上报</span></th>
+                        <td><a href="" class="colGray" class="colGray">删除</a></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <table class="table table-striped table-hover">
+                    <legend><a href="#deltype2" data-toggle="modal" class="fR btn btn-link colGray">删除标段类型</a>类型2,key:A2F345</legend>
+                    <thead>
+                    <tr>
+                        <th width="40">id</th>
+                        <th>标段名称</th>
+                        <th>创建人</th>
+                        <th>标段总额</th>
+                        <th>标段状态</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+
+                    </tbody>
+                </table>
 			</div>
 		</div>
 	</div>
-	<!--重置密码-->
-	<div class="modal hide fade" id="sendpw">
+
+<!--删除本期-->
+<div class="modal hide fade" id="delsection">
     <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3>重置密码成功</h3>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除标段确认</h3>
     </div>
     <div class="modal-body">
-    <p>系统已将新密码发送至该用户的登录邮箱:<b>sp1@qq.com</b></p>
-    <p>如果长时间无法接收到邮件,请确认该邮箱是否可以正常接收邮件;</p>
-    <p>添加 test@abc.com 至邮箱白名单,再重新操作<b>重置密码</b>。</p>
+        <p>确认删除标段“AAAAAAAAAAAAA”?</p>
+        <p>删除后,将无法恢复。</p>
+        <p>请谨慎操作!</p>
     </div>
     <div class="modal-footer">
+        <button class="btn btn-danger">确认</button> <button class="btn" data-dismiss="modal">取消</button>
     </div>
-  </div>
-	<!--重置密码-->
+</div>
+<!--删除标段不可删除-->
+<div class="modal hide fade" id="deltype">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除标段类型确认</h3>
+    </div>
+    <div class="modal-body">
+        <p>标段类型下还有标段,不能删除该标段类型。</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn" data-dismiss="modal">关闭</button>
+    </div>
+</div>
+<!--删除标段可删除-->
+<div class="modal hide fade" id="deltype2">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>删除标段类型确认</h3>
+    </div>
+    <div class="modal-body">
+        <p>确认删除标段类型“类型1”?</p>
+        <p>删除后,将无法恢复。</p>
+        <p>请谨慎操作!</p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-danger">确认</button> <button class="btn" data-dismiss="modal">取消</button>
+    </div>
+</div>
+
 	<script type="text/javascript">autoFlashHeight();</script>
 </body>

+ 1 - 1
admin-sms.html

@@ -25,7 +25,7 @@
 				<li><a href="admin-addUser.html">系统信息</a></li>
 				<li><a href="admin-sms.html" class="now">短信通知</a></li>
 				<li><a href="admin-userlist.html">用户列表</a></li>
-				<li><a href="admin-addUser.html">添加用户</a></li>
+				<li><a href="admin-project.html">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">

+ 2 - 1
admin-sysinfo.html

@@ -23,8 +23,9 @@
 		<div class="adminSidebar fL">
 			<ul>
 				<li><a href="admin-addUser.html" class="now">系统信息</a></li>
+				<li><a href="admin-sms.html">短信通知</a></li>
 				<li><a href="admin-userlist.html">用户列表</a></li>
-				<li><a href="admin-addUser.html">添加用户</a></li>
+				<li><a href="admin-project.html">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">

+ 6 - 3
admin-userlist.html

@@ -22,14 +22,17 @@
 	<div class="warpAdmin">
 		<div class="adminSidebar fL">
 			<ul>
-				<li><a href="admin-userlist.html" class="now">用户列表</a></li>
-				<li><a href="admin-addUser.html">添加用户</a></li>
+
+                <li><a href="admin-addUser.html">系统信息</a></li>
+                <li><a href="admin-sms.html">短信通知</a></li>
+                <li><a href="admin-userlist.html" class="now">用户列表</a></li>
+                <li><a href="admin-project.html">项目管理</a></li>
 			</ul>
 		</div>
 		<div class="adminContent">
 			<div class="adminMain">
 				<fieldset>
-					<legend>用户列表</legend>
+					<legend><a href="admin-addUser.html" class="fR btn btn-sm btn-primary">添加用户</a>用户列表</legend>
 				<table class="table table-striped">
               <thead>
                 <tr>