报销单 新增 执行人添加页面，新增开票系统

.idea/workspace.xml

@@ -21,73 +21,60 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="global.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/global.css">
+      <file leaf-file-name="invoice-input-billing.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/invoice-input-billing.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="245">
-              <caret line="437" column="24" selection-start-line="437" selection-start-column="24" selection-end-line="437" selection-end-column="24" />
+            <state relative-caret-position="1166">
+              <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-myList.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/saea-myList.html">
+      <file leaf-file-name="invoice-print-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/invoice-print-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="61" column="274" selection-start-line="61" selection-start-column="274" selection-end-line="61" selection-end-column="274" />
+            <state relative-caret-position="3212">
+              <caret line="146" column="65" selection-start-line="146" selection-start-column="65" selection-end-line="146" selection-end-column="65" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-borad.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/saea-borad.html">
+      <file leaf-file-name="invoice-my.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/invoice-my.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="60" column="363" selection-start-line="60" selection-start-column="363" selection-end-line="60" selection-end-column="363" />
+            <state relative-caret-position="5566">
+              <caret line="360" column="51" selection-start-line="360" selection-start-column="51" selection-end-line="360" selection-end-column="51" />
               <folding>
-                <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#2;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#6;n#body#0;n#html#0;n#!!top" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-reportList-detail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/saea-reportList-detail.html">
+      <file leaf-file-name="invoice-shipping.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/invoice-shipping.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="88">
-              <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
+            <state relative-caret-position="678">
+              <caret line="154" column="30" selection-start-line="154" selection-start-column="30" selection-end-line="154" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="admin-myinfo.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/admin-myinfo.html">
+      <file leaf-file-name="invoice-input-billing-all.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/invoice-input-billing-all.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="484">
-              <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
+            <state relative-caret-position="1122">
+              <caret line="51" column="49" selection-start-line="51" selection-start-column="49" selection-end-line="51" selection-end-column="49" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-reportList-pay.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/saea-reportList-pay.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1024">
-              <caret line="154" column="59" selection-start-line="154" selection-start-column="59" selection-end-line="154" selection-end-column="59" />
-              <folding>
-                <element signature="n#style#0;n#th#0;n#tr#18;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#b#0;n#td#1;n#tr#20;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#b#0;n#td#1;n#tr#21;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#b#0;n#td#1;n#tr#22;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="Git.Settings">
@@ -97,15 +84,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lock-ccount.html" />
-        <option value="$PROJECT_DIR$/saea-create.html" />
-        <option value="$PROJECT_DIR$/saea-add-loan.html" />
-        <option value="$PROJECT_DIR$/saea-add-receipt.html" />
-        <option value="$PROJECT_DIR$/saea-add-public.html" />
-        <option value="$PROJECT_DIR$/saea-edit.html" />
-        <option value="$PROJECT_DIR$/saea-loan-add.html" />
-        <option value="$PROJECT_DIR$/saea-receipt-add.html" />
-        <option value="$PROJECT_DIR$/saea-public-add.html" />
         <option value="$PROJECT_DIR$/saea-loan-add-receipt.html" />
         <option value="$PROJECT_DIR$/../smartcostv2/css/global.css" />
         <option value="$PROJECT_DIR$/saea-myList-detail.html" />
@@ -126,9 +104,37 @@
         <option value="$PROJECT_DIR$/admin-myinfo.html" />
         <option value="$PROJECT_DIR$/saea-myList.html" />
         <option value="$PROJECT_DIR$/saea-reportList.html" />
-        <option value="$PROJECT_DIR$/css/global.css" />
         <option value="$PROJECT_DIR$/saea-borad.html" />
         <option value="$PROJECT_DIR$/saea-reportList-pay.html" />
+        <option value="$PROJECT_DIR$/admin-demand.html" />
+        <option value="$PROJECT_DIR$/admin-reportGroup.html" />
+        <option value="$PROJECT_DIR$/admin-reportGroup-role.html" />
+        <option value="$PROJECT_DIR$/admin-reportGroup-carriedout.html" />
+        <option value="$PROJECT_DIR$/js/global.js" />
+        <option value="$PROJECT_DIR$/css/global.css" />
+        <option value="$PROJECT_DIR$/invoice-billing-list.html" />
+        <option value="$PROJECT_DIR$/invoice-addn.html" />
+        <option value="$PROJECT_DIR$/invoice-approval-detail.html" />
+        <option value="$PROJECT_DIR$/invoice-approval-all.html" />
+        <option value="$PROJECT_DIR$/invoice-approval.html" />
+        <option value="$PROJECT_DIR$/invoice-billing-my.html" />
+        <option value="$PROJECT_DIR$/invoice-billing-all.html" />
+        <option value="$PROJECT_DIR$/invoice-billing.html" />
+        <option value="$PROJECT_DIR$/invoice-dlist-staff-year.html" />
+        <option value="$PROJECT_DIR$/invoice-dlist-category-year.html" />
+        <option value="$PROJECT_DIR$/invoice-dlist-category-detail.html" />
+        <option value="$PROJECT_DIR$/invoice-edit.html" />
+        <option value="$PROJECT_DIR$/invoice-print-all.html" />
+        <option value="$PROJECT_DIR$/invoice-print.html" />
+        <option value="$PROJECT_DIR$/invoice-pall.html" />
+        <option value="$PROJECT_DIR$/invoice-return-all.html" />
+        <option value="$PROJECT_DIR$/invoice-return.html" />
+        <option value="$PROJECT_DIR$/invoice-shipping-all.html" />
+        <option value="$PROJECT_DIR$/invoice-input-billing-all.html" />
+        <option value="$PROJECT_DIR$/invoice-input-billing.html" />
+        <option value="$PROJECT_DIR$/invoice-print-detail.html" />
+        <option value="$PROJECT_DIR$/invoice-my.html" />
+        <option value="$PROJECT_DIR$/invoice-shipping.html" />
       </list>
     </option>
   </component>
@@ -169,6 +175,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -187,47 +195,72 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CLDv1.3" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CLDv1.3" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CLDv1.3" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CLDv1.3" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <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$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../building SAAS" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
   </component>
+  <component name="RunManager">
+    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
+      <method />
+    </configuration>
+    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
+      <method />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
+      <config-file value="" />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+      <command value="run-script" />
+      <scripts />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <working-directory />
+      <pass-parent-env>true</pass-parent-env>
+      <envs />
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>DIRECTORY</test-kind>
+      <test-directory />
+      <recursive>false</recursive>
+      <method />
+    </configuration>
+  </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
@@ -252,23 +285,60 @@
       <workItem from="1474613576957" duration="11333000" />
       <workItem from="1474856454943" duration="13187000" />
       <workItem from="1474940103302" duration="15208000" />
-      <workItem from="1475027900309" duration="6627000" />
+      <workItem from="1475027900309" duration="7874000" />
+      <workItem from="1475200584687" duration="2268000" />
+      <workItem from="1476081640876" duration="615000" />
+      <workItem from="1476755748410" duration="5134000" />
+      <workItem from="1477549166125" duration="238000" />
+      <workItem from="1477558083933" duration="3037000" />
+      <workItem from="1477619397572" duration="1541000" />
+      <workItem from="1477641718628" duration="2851000" />
+      <workItem from="1477963518970" duration="4222000" />
+      <workItem from="1478054943262" duration="1811000" />
+      <workItem from="1478501477996" duration="1307000" />
+      <workItem from="1478675584331" duration="5638000" />
+      <workItem from="1478741246837" duration="14902000" />
+      <workItem from="1478827743090" duration="6106000" />
+      <workItem from="1478845228075" duration="6881000" />
+      <workItem from="1479176398556" duration="441000" />
+      <workItem from="1479191898495" duration="8689000" />
+      <workItem from="1479203517153" duration="1860000" />
+      <workItem from="1479261639527" duration="3110000" />
+      <workItem from="1479279726826" duration="9361000" />
+      <workItem from="1479364662455" duration="7756000" />
+      <workItem from="1479433095845" duration="6928000" />
+      <workItem from="1479449871862" duration="3312000" />
+      <workItem from="1479888287198" duration="4995000" />
+      <workItem from="1479953097004" duration="3030000" />
+      <workItem from="1480059062369" duration="7976000" />
+      <workItem from="1480295715469" duration="3671000" />
+      <workItem from="1480390667968" duration="122000" />
+      <workItem from="1480402226875" duration="761000" />
+      <workItem from="1480479753999" duration="9000" />
+      <workItem from="1480555239073" duration="598000" />
+      <workItem from="1480575663341" duration="1193000" />
+      <workItem from="1480642976580" duration="599000" />
+      <workItem from="1480990286102" duration="605000" />
+      <workItem from="1481007033709" duration="601000" />
+      <workItem from="1481075036154" duration="616000" />
+      <workItem from="1481161372569" duration="2127000" />
+      <workItem from="1481164808670" duration="113000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="68685000" />
+    <option name="totallyTimeSpent" value="194956000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <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.1465821" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16180556" 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.32980132" sideWeight="0.5024665" 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" />
+      <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.32904884" sideWeight="0.50528544" 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="9" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.49753347" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.4947146" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
@@ -300,411 +370,344 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/saea-borad.html">
+    <entry file="file://$PROJECT_DIR$/saea-dlist-category-year.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="50" column="72" selection-start-line="50" selection-start-column="66" selection-end-line="50" selection-end-column="72" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="286">
+          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="42" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/saea-reportList.html___jb_tmp___" />
+    <entry file="file://$PROJECT_DIR$/saea-reportList.html___jb_old___" />
+    <entry file="file://$PROJECT_DIR$/saea-slist-1.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43692">
-          <caret line="1986" column="4" selection-start-line="1986" selection-start-column="4" selection-end-line="1986" selection-end-column="4" />
-          <folding />
+        <state relative-caret-position="330">
+          <caret line="39" column="72" selection-start-line="39" selection-start-column="72" selection-end-line="39" selection-end-column="72" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-borad.html">
+    <entry file="file://$PROJECT_DIR$/saea-slist-2.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="42" column="25" selection-start-line="42" selection-start-column="25" selection-end-line="42" selection-end-column="25" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="330">
+          <caret line="39" column="72" selection-start-line="39" selection-start-column="72" selection-end-line="39" selection-end-column="72" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-add-loan.html" />
-    <entry file="file://$PROJECT_DIR$/saea-add-public.html" />
-    <entry file="file://$PROJECT_DIR$/saea-add-receipt.html" />
-    <entry file="file://$PROJECT_DIR$/saea-borad.html">
+    <entry file="file://$PROJECT_DIR$/saea-reportList-report.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>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="462">
+          <caret line="50" column="58" selection-start-line="50" selection-start-column="58" selection-end-line="50" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/saea-reportList-history.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6886">
-          <caret line="313" column="1" selection-start-line="313" selection-start-column="1" selection-end-line="313" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="308">
+          <caret line="50" column="115" selection-start-line="50" selection-start-column="115" selection-end-line="50" selection-end-column="115" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-borad.html">
+    <entry file="file://$PROJECT_DIR$/saea-reportList-detail.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>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="682">
+          <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/admin-myinfo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6886">
-          <caret line="313" column="1" selection-start-line="313" selection-start-column="1" selection-end-line="313" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="1804">
+          <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-myList.html">
+    <entry file="file://$PROJECT_DIR$/saea-reportList.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 relative-caret-position="374">
+          <caret line="59" column="308" selection-start-line="59" selection-start-column="308" selection-end-line="59" selection-end-column="308" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/saea-confirm.html" />
     <entry file="file://$PROJECT_DIR$/saea-myList.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 relative-caret-position="1342">
+          <caret line="61" column="274" selection-start-line="61" selection-start-column="274" selection-end-line="61" selection-end-column="274" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-myList.html">
+    <entry file="file://$PROJECT_DIR$/saea-reportList-pay.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 relative-caret-position="4466">
+          <caret line="203" column="12" selection-start-line="203" selection-start-column="12" selection-end-line="203" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lock-ccount.html">
+    <entry file="file://$PROJECT_DIR$/admin-demand.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="946">
-          <caret line="43" column="25" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="374">
+          <caret line="35" column="49" selection-start-line="35" selection-start-column="49" selection-end-line="42" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/admin-reportGroup.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 relative-caret-position="858">
+          <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lock-ccount.html">
+    <entry file="file://$PROJECT_DIR$/admin-reportGroup-carriedout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="946">
-          <caret line="43" column="25" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="1540">
+          <caret line="70" column="195" selection-start-line="70" selection-start-column="195" selection-end-line="70" selection-end-column="195" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/saea-borad.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 relative-caret-position="1012">
+          <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="96" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lock-ccount.html">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/webstorm.jar!/resources/html5-schema/html5/phrase.rnc">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="655">
-          <caret line="43" column="25" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="242">
+          <caret line="192" column="16" selection-start-line="192" selection-start-column="16" selection-end-line="192" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-create.html" />
-    <entry file="file://$PROJECT_DIR$/saea-add-loan.html" />
-    <entry file="file://$PROJECT_DIR$/saea-add-receipt.html" />
-    <entry file="file://$PROJECT_DIR$/saea-add-public.html" />
-    <entry file="file://$PROJECT_DIR$/saea-publi-addc.html" />
-    <entry file="file://$PROJECT_DIR$/saea-edit.html">
+    <entry file="file://$USER_HOME$/Desktop/bootstrap/js/bootstrap.js" />
+    <entry file="file://$PROJECT_DIR$/saea-dlist-staff-month-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="36" column="57" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="57" />
+        <state relative-caret-position="1298">
+          <caret line="59" column="34" selection-start-line="59" selection-start-column="34" selection-end-line="60" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-loan-add.html">
+    <entry file="file://$PROJECT_DIR$/admin-admininfo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="36" column="57" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="57" />
+        <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$/saea-receipt-add.html">
+    <entry file="file://$PROJECT_DIR$/admin-reportGroup-role.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="36" column="57" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
+        <state relative-caret-position="-465">
+          <caret line="44" column="30" selection-start-line="44" selection-start-column="30" selection-end-line="44" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-public-add.html">
+    <entry file="file://$PROJECT_DIR$/admin-product.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2288">
-          <caret line="104" column="10" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
+        <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$/saea-loan-add-receipt.html">
+    <entry file="file://$PROJECT_DIR$/admin-invoice.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1210">
-          <caret line="55" column="76" selection-start-line="55" selection-start-column="76" selection-end-line="55" selection-end-column="76" />
-          <folding />
+        <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$/../smartcostv2/css/global.css">
+    <entry file="file://$PROJECT_DIR$/admin-group.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="2822" column="8" selection-start-line="2822" selection-start-column="8" selection-end-line="2822" selection-end-column="8" />
+        <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$/js/global.js">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/webstorm.jar!/resources/html5-schema/html5/tables.rnc">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="23" column="30" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+        <state relative-caret-position="333">
+          <caret line="231" column="16" selection-start-line="231" selection-start-column="16" selection-end-line="231" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-myList-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/global.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="821" column="42" selection-start-line="821" selection-start-column="42" selection-end-line="821" selection-end-column="42" />
+        <state relative-caret-position="418">
+          <caret line="19" column="52" selection-start-line="19" selection-start-column="52" selection-end-line="19" selection-end-column="52" />
           <folding>
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#2;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#2;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#2;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#3;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#3;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#3;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#4;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#4;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#4;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#1;n#div#1;n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#1;n#div#1;n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#table#1;n#div#1;n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#1;n#div#1;n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#1;n#div#1;n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#table#1;n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#1;n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#1;n#div#1;n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#5;n#tbody#0;n#table#0;n#div#1;n#div#8;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#8;n#tbody#0;n#table#0;n#div#1;n#div#8;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#table#1;n#div#1;n#div#8;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#1;n#div#1;n#div#8;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#1;n#div#1;n#div#8;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#9;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#15;n#tbody#0;n#table#0;n#div#0;n#div#9;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#0;n#div#0;n#div#9;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#10;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#0;n#div#1;n#div#10;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#0;n#div#1;n#div#10;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#11;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#0;n#div#1;n#div#11;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#0;n#div#1;n#div#11;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#12;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#0;n#div#1;n#div#12;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#0;n#div#1;n#div#12;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#13;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#14;n#tbody#0;n#table#0;n#div#1;n#div#13;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#17;n#tbody#0;n#table#0;n#div#1;n#div#13;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#14;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#7;n#tbody#0;n#table#0;n#div#1;n#div#14;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#10;n#tbody#0;n#table#0;n#div#1;n#div#14;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#15;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#7;n#tbody#0;n#table#0;n#div#1;n#div#15;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#10;n#tbody#0;n#table#0;n#div#1;n#div#15;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#16;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#7;n#tbody#0;n#table#0;n#div#0;n#div#16;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#10;n#tbody#0;n#table#0;n#div#0;n#div#16;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#17;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#7;n#tbody#0;n#table#0;n#div#1;n#div#17;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#10;n#tbody#0;n#table#0;n#div#1;n#div#17;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#18;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#th#0;n#tr#7;n#tbody#0;n#table#0;n#div#1;n#div#18;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#10;n#tbody#0;n#table#0;n#div#1;n#div#18;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="e#5102#5523#0" expanded="false" />
+            <element signature="e#5540#14218#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-staff-year-detail.html">
+    <entry file="file://$PROJECT_DIR$/css/global.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="43" column="25" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="678">
+          <caret line="284" column="56" selection-start-line="284" selection-start-column="56" selection-end-line="284" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-staff-year.html">
+    <entry file="file://$PROJECT_DIR$/invoice-billing-list.html" />
+    <entry file="file://$PROJECT_DIR$/invoice-approval-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="45" column="25" selection-start-line="45" selection-start-column="25" selection-end-line="45" selection-end-column="25" />
+        <state relative-caret-position="277">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-staff-month-detail.html">
+    <entry file="file://$PROJECT_DIR$/invoice-approval-all.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="45" column="25" selection-start-line="45" selection-start-column="25" selection-end-line="45" selection-end-column="25" />
+        <state relative-caret-position="330">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-category-year-detail.html">
+    <entry file="file://$PROJECT_DIR$/invoice-approval.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="43" column="25" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="399">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-category-month-detail.html">
+    <entry file="file://$PROJECT_DIR$/invoice-addn.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="45" column="25" selection-start-line="45" selection-start-column="25" selection-end-line="45" selection-end-column="25" />
+        <state relative-caret-position="277">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-dlist-category-year.html">
+    <entry file="file://$PROJECT_DIR$/invoice-billing-my.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="42" selection-end-column="25" />
+        <state relative-caret-position="311">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList.html___jb_tmp___" />
-    <entry file="file://$PROJECT_DIR$/saea-reportList.html___jb_old___" />
-    <entry file="file://$PROJECT_DIR$/saea-slist-1.html">
+    <entry file="file://$PROJECT_DIR$/invoice-billing-all.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="39" column="72" selection-start-line="39" selection-start-column="72" selection-end-line="39" selection-end-column="72" />
+        <state relative-caret-position="396">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-slist-2.html">
+    <entry file="file://$PROJECT_DIR$/invoice-billing.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="39" column="72" selection-start-line="39" selection-start-column="72" selection-end-line="39" selection-end-column="72" />
+        <state relative-caret-position="379">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList-report.html">
+    <entry file="file://$PROJECT_DIR$/invoice-dlist-staff-year.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="50" column="58" selection-start-line="50" selection-start-column="58" selection-end-line="50" selection-end-column="58" />
-          <folding>
-            <element signature="n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#div#2;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#2;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#7;n#tbody#0;n#table#0;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="245">
+          <caret line="44" column="74" selection-start-line="44" selection-start-column="74" selection-end-line="44" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList-history.html">
+    <entry file="file://$PROJECT_DIR$/invoice-dlist-category-year.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="308">
-          <caret line="50" column="115" selection-start-line="50" selection-start-column="115" selection-end-line="50" selection-end-column="115" />
-          <folding />
+          <caret line="44" column="74" selection-start-line="44" selection-start-column="74" selection-end-line="44" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList-detail.html">
+    <entry file="file://$PROJECT_DIR$/invoice-dlist-category-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
-          <folding />
+        <state relative-caret-position="308">
+          <caret line="44" column="74" selection-start-line="44" selection-start-column="74" selection-end-line="44" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/admin-myinfo.html">
+    <entry file="file://$PROJECT_DIR$/invoice-edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
-          <folding />
+        <state relative-caret-position="194">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList.html">
+    <entry file="file://$PROJECT_DIR$/invoice-print-all.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="59" column="308" selection-start-line="59" selection-start-column="308" selection-end-line="59" selection-end-column="308" />
-          <folding />
+        <state relative-caret-position="406">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-confirm.html">
+    <entry file="file://$PROJECT_DIR$/invoice-print.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="32" column="36" selection-start-line="32" selection-start-column="36" selection-end-line="32" selection-end-column="36" />
-          <folding />
+        <state relative-caret-position="266">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-myList.html">
+    <entry file="file://$PROJECT_DIR$/invoice-pall.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="61" column="274" selection-start-line="61" selection-start-column="274" selection-end-line="61" selection-end-column="274" />
+        <state relative-caret-position="462">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/invoice-return-all.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/invoice-return.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="312">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/invoice-shipping-all.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="42" column="74" selection-start-line="42" selection-start-column="74" selection-end-line="42" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/invoice-input-billing.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1166">
+          <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/global.css">
+    <entry file="file://$PROJECT_DIR$/invoice-print-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="437" column="24" selection-start-line="437" selection-start-column="24" selection-end-line="437" selection-end-column="24" />
+        <state relative-caret-position="3212">
+          <caret line="146" column="65" selection-start-line="146" selection-start-column="65" selection-end-line="146" selection-end-column="65" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-borad.html">
+    <entry file="file://$PROJECT_DIR$/invoice-my.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="60" column="363" selection-start-line="60" selection-start-column="363" selection-end-line="60" selection-end-column="363" />
+        <state relative-caret-position="5566">
+          <caret line="360" column="51" selection-start-line="360" selection-start-column="51" selection-end-line="360" selection-end-column="51" />
           <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#2;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#6;n#body#0;n#html#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList-pay.html">
+    <entry file="file://$PROJECT_DIR$/invoice-shipping.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1024">
-          <caret line="154" column="59" selection-start-line="154" selection-start-column="59" selection-end-line="154" selection-end-column="59" />
-          <folding>
-            <element signature="n#style#0;n#th#0;n#tr#18;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#20;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#21;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#22;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="678">
+          <caret line="154" column="30" selection-start-line="154" selection-start-column="30" selection-end-line="154" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/invoice-input-billing-all.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1122">
+          <caret line="51" column="49" selection-start-line="51" selection-start-column="49" selection-end-line="51" selection-end-column="49" />
+          <folding />
         </state>
       </provider>
     </entry>

admin-demand.html

@@ -40,8 +40,8 @@
 					  <li><a href="admin-demand-library.html">档案库类别</a></li>
 					  <li><a href="admin-demand-develop.html">开发库类别</a></li>
 					</ul>
-				</div>
-				<div class="control-group">
+			</div>
+			<div class="control-group">
 	        <label class="control-label">开发库可见</label>
 	        <div class="controls">
 	          <input type="text" class="span5" value="冷淑梅、谭玉堂" readonly>&nbsp;<a href="#pikUser" data-toggle="modal">翻牌</a>

admin-reportGroup-carriedout.html

@@ -0,0 +1,216 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="后台管理"><a href="#" class="icon-  selected">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li><a href="admin-admininfo.html">管理员设置</a></li>
+						<li><a href="admin-group.html">办事处</a></li>
+						<li><a href="admin-user.html">员工列表</a></li>
+						<li><a href="admin-product.html">产品列表</a></li>
+						<li><a href="admin-reportGroup.html" class="selected">报销审查组</a></li>
+						<li><a href="admin-demand.html">需求中心</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li><a href="admin-reportGroup.html">审批组</a></li>
+						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
+						<li class="active"><a href="">费用执行人</a></li>
+					</ul>
+				</div>
+					<legend>编辑执行人</legend><form method="post" action="/addCategory" name="group">
+				<table class="table table-striped">
+              <thead>
+                <tr>
+                  <th width="30%">执行人位置</th>
+                  <th>成员</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+			  <tr>
+				  <td>借款执行人</td>
+				  <td>杨福芳</td>
+				  <td><a href="#add" data-toggle="modal" >添加</a></td>
+			  </tr>
+			  <tr>
+				  <td>借款费用执行人</td>
+				  <td>杨福芳</td>
+				  <td><a href="#add" data-toggle="modal" >添加</a></td>
+			  </tr>
+			  <tr>
+				  <td>报销单执行人</td>
+				  <td>杨福芳</td>
+				  <td><a href="#add" data-toggle="modal" >添加</a></td>
+			  </tr>
+			  <tr>
+				  <td>对公汇款执行人</td>
+				  <td>赵淑燕 <a href="#change" data-toggle="modal" role="button" title="删除" class="icon-">k</a>，杨福芳 <a href="#change" data-toggle="modal" role="button" title="删除" class="icon-">k</a></td>
+				  <td><a href="#add" data-toggle="modal" >添加</a></td>
+			  </tr>
+              </tbody>
+          	</table>
+					</form>
+			</div>
+		</div>
+	</div>
+	<!--弹出（添加执行人）-->
+	<div class="modal hide fade" id="add">
+		<div class="modal-header">
+			<h3>添加执行人</h3>
+		</div>
+		<div class="modal-body">
+
+			<div class="control-group">
+				<label class="control-label">成员</label>
+				<div class="controls">
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra">admin			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="2:陈帅:/global/avatar/avatar_2">陈帅			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="3:范月光:/global/avatar/avatar_3">范月光			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="4:王涛:/global/avatar/avatar_4">王涛			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="5:苟彦刚:/global/avatar/avatar_5">苟彦刚			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="6:刘飞:/global/avatar/avatar_6">刘飞			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="7:王洪生:/global/avatar/avatar_7">王洪生			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="8:姜栋:/global/avatar/avatar_8">姜栋			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="9:刘庆:/global/avatar/avatar_9">刘庆			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="10:黄巾桃:/global/avatar/avatar_10">黄巾桃			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="11:祝海宾:/global/avatar/avatar_11">祝海宾			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="12:王文鹏:/global/avatar/avatar_12">王文鹏			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="13:周江红:/global/avatar/avatar_13">周江红			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="14:王智:/global/avatar/avatar_14">王智			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="15:全冰:/global/avatar/avatar_15">全冰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="16:wq:/global/img/avtra">wq			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="17:lfm:/global/img/avtra">lfm			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="18:王星植:/global/avatar/avatar_18">王星植			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="19:张文远:/global/avatar/avatar_19">张文远			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="20:赵君红:/global/avatar/avatar_20">赵君红			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="21:李清学:/global/avatar/avatar_21">李清学			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="22:孙燕娇:/global/avatar/avatar_22">孙燕娇			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="23:张晓娟:/global/avatar/avatar_23">张晓娟			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="24:杨卫东:/global/avatar/avatar_24">杨卫东			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="28:林森:/global/avatar/avatar_28">林森			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="29:周洪波:/global/avatar/avatar_29">周洪波			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="30:谭玉堂:/global/avatar/avatar_30">谭玉堂			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="31:何银龄:/global/avatar/avatar_31">何银龄			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="32:张引:/global/avatar/avatar_32">张引			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="33:杨福芳:/global/avatar/avatar_33">杨福芳			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="34:赵淑燕:/global/avatar/avatar_34">赵淑燕			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="35:陈世龙:/global/avatar/avatar_35">陈世龙			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="36:冷淑梅:/global/avatar/avatar_36">冷淑梅			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="37:麦心蓉:/global/avatar/avatar_37">麦心蓉			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="51:陈叶婷:/global/avatar/avatar_51">陈叶婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="39:陈特:/global/avatar/avatar_39">陈特			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="40:任杰:/global/avatar/avatar_40">任杰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="41:蔡频:/global/avatar/avatar_41">蔡频			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="42:王晶:/global/avatar/avatar_42">王晶			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="43:张少珊:/global/avatar/avatar_43">张少珊			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="44:黄爱玲:/global/avatar/avatar_44">黄爱玲			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="45:欧汝:/global/avatar/avatar_45">欧汝			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="46:付青青:/global/avatar/avatar_46">付青青			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="52:舒媚:/global/avatar/avatar_52">舒媚			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="38:王丰:/global/avatar/avatar_38">王丰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="54:lmh:/global/avatar/avatar_54">lmh			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="55:李凯:/global/avatar/avatar_55">李凯			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="58:田洪武:/global/avatar/avatar_58">田洪武			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="59:刘婷:/global/avatar/avatar_59">刘婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="60:冯娟:/global/avatar/avatar_60">冯娟			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="61:罗颖:/global/avatar/avatar_61">罗颖			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="62:zss:/global/img/avtra">zss			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="63:余婷:/global/avatar/avatar_63">余婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="64:何耀:/global/avatar/avatar_64">何耀			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="65:杨克松:/global/avatar/avatar_65">杨克松			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="68:张欣:/global/avatar/avatar_68">张欣			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="69:李建霞:/global/avatar/avatar_69">李建霞			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="71:杨孟雅:/global/avatar/avatar_71">杨孟雅			               </label>
+				</div>
+			</div>
+		</div>
+		<div class="modal-footer">
+			<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定添加</a>
+		</div>
+	</div>
+	<!--弹出-->
+	<script type="text/javascript">autoFlashHeight();</script>
+</body>

admin-reportGroup-role.html

@@ -34,8 +34,15 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li><a href="admin-reportGroup.html">审批组</a></li>
+						<li class="active"><a href="">审批角色</a></li>
+						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
+					</ul>
+				</div>
 					<form>
-					<legend>审批角色</legend><form method="post" action="/addCategory" name="group">
+					<legend>添加角色</legend><form method="post" action="/addCategory" name="group">
 					    <div class="control-group">
 			              <label class="control-label">角色名称</label>
 			              <div class="controls">

admin-reportGroup.html

@@ -34,6 +34,13 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li class="active"><a href="">审批组</a></li>
+						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
+						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
+					</ul>
+				</div>
 					<form>
 					<legend>添加审批组</legend><form method="post" action="/addCategory" name="group">
 					    <div class="control-group">

invoice-add.html

@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn> 
-<head>
-	<meta charset=utf-8> 
-	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
-	<link rel="shortcut icon" href="images/favicon.ico"> 
-	<meta name=copyright content=smartcost.com.cn> 
-	<link rel=stylesheet href=css/global.css> 
-	<script src=js/jquery-1.7.1.min.js></script> 
-	<script src=js/global.js></script>
-</head>
-<body>
-	<div class="mainLayout">
-		<div class="mainMenu">
-			<div class="menuItem">
-				<a href="#" class="mLogo">CLD</a>
-				<ul>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
-				</ul>
-			</div>
-			<div class="userMenu">
-				<ul>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
-				</ul>
-			</div>
-		</div>
-		<div class="warpContent">
-			<div class="subMenu fL">
-				<div class="menuItem">
-					<ul>
-						<li class="invoiceTitle">发票申请</li>
-						<li><a href="invoice-my.html" class="selected">我的发票</a></li>
-						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
-						<li><a href="invoice-approval.html">发票审批</a></li>
-						<li><a href="invoice-print.html">发票打印</a></li>
-						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
-					</ul>
-				</div>
-			</div>
-			<div class="adminContent autoHeight">
-				<legend>
-					<div class="fR">
-						<a href="invoice-addn.html" class="button">新建开票</a>
-					</div>
-					从收款中开票
-				</legend>
-		  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state">银行到款<br>2016-04-11</div>
-							<div class="info">
-								<h4 class="colOrange">￥200000.00</h4>
-								<p>陈宇</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a href="invoice-addb.html" class="button">收款开票</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥12000.00</h4>
-								<p>李艳芬/鹅蛋山</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a href="invoice-addb.html" class="button">收款开票</a>
-								</div>
-							</div>
-						</li>
-						<!--没数据提示-->
-						<li class="colGray">
-							没有可以开票的收款，你可以使用“新建开票”申请开票
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</div>	
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invoiced">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-05">审核中</span></td><td colspan="3">2016-11-01 11:03:03<br>张少珊：审批意见</td></tr>
-    			<tr><td><span class="contactsTag tagCol-02">打印中</span></td><td colspan="3">2016-11-01 11:03:03<br>赵淑燕：可以打印</td></tr>
-    			<tr><td><span class="contactsTag tagCol-04">退回</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：申请金额有误</td></tr>
-    		</thead>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    		<tr>
-    			<th>申请物品</th><td colspan="3">合同x1、锁套装x1</td>
-    		</tr>     		
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容--> 	
-<script type="text/javascript">autoFlashHeight();</script>	
-</body>

invoice-addb.html

@@ -1,214 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn> 
-<head>
-	<meta charset=utf-8> 
-	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
-	<link rel="shortcut icon" href="images/favicon.ico"> 
-	<meta name=copyright content=smartcost.com.cn> 
-	<link rel=stylesheet href=css/global.css> 
-	<script src=js/jquery-1.7.1.min.js></script> 
-	<script src=js/global.js></script>
-</head>
-<body>
-	<div class="mainLayout">
-		<div class="mainMenu">
-			<div class="menuItem">
-				<a href="#" class="mLogo">CLD</a>
-				<ul>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
-				</ul>
-			</div>
-			<div class="userMenu">
-				<ul>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
-				</ul>
-			</div>
-		</div>
-		<div class="warpContent">
-			<div class="subMenu fL">
-				<div class="menuItem">
-					<ul>
-						<li class="invoiceTitle">发票申请</li>
-						<li><a href="invoice-my.html" class="selected">我的发票</a></li>
-						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
-						<li><a href="invoice-approval.html">发票审批</a></li>
-						<li><a href="invoice-print.html">发票打印</a></li>
-						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
-					</ul>
-				</div>
-			</div>
-			<div class="adminContent autoHeight">
-				<legend>
-					收款开票
-				</legend>
-				<table class="table" style="width:60%">
-					<thead><tr><th>收款信息</th></tr></thead>
-					<tr>
-						<th width="60">收款金额</th><td><b class="colOrange">￥20000.00</b></td>
-						<th width="60">收款信息</th><td>陈宇</td>
-					</tr>
-					<tr>
-						<th width="60">银行到帐</th><td>2016-04-11</td>
-						<th width="60">收款录入</th><td>张少珊<br>2015-04-12 11:30:02</td>
-					</tr>
-					<tr>
-						<th width="60">收款认领</th><td>陈特 认领<br>2015-04-13 11:30:02</td>
-						<th width="60"></th><td></td>
-					</tr>
-				</table>
-				<form class="form-horizontal">
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票金额</label>
-		              <div class="controls">
-		                <input value="20000.00" type="number">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票类型</label>
-		              <div class="controls">
-		                <label class="radio inline"><input type="radio">普通发票</label>
-		                <label class="radio inline"><input type="radio">增值税发票</label>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票内容</label>
-		              <div class="controls">
-		                <select>
-		                	<option>纵横公路工程造价管理系统V9.0</option>
-		                	<option>纵横公路造价编审软件V9.0</option>
-		                	<option>纵横公路工程设计数量表算量软件V3.1</option>
-		                	<option>纵横公路工程计量支付决算一体化软件V3.1</option>
-		                	<option>建材在线</option>
-		                	<option>服务费</option>
-		                	<option>培训费</option>
-		                	<option>软件升级费</option>
-		                	<option>软件报表定制费</option>
-		                	<option>技术服务费</option>
-		                </select>
-		              </div>
-		            </div>
-		            <!--普通发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票抬头</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-		            <!--增值税发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>单位名称</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>纳税人识别码</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开户银行</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>银行账户</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">所在办事处</label>
-		              <div class="controls">
-		                <select><option>广东办</option></select>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">备注</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"></label>
-		              <div class="controls">
-		              	<label class="checkbox">
-		                	<input type="checkbox"> 需要邮寄
-		            	</label>
-		              </div>
-		            </div>
-		            <legend>邮寄信息</legend>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件人</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>手机/电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>	
-		           	<div class="control-group">
-		              <label class="control-label">邮寄物品</label>
-		              <div class="controls">
-		                <input type="text" placeholder="请详细填写需要邮寄的物品及数量">
-		                <p>如：锁套装x1、合同x1</p>
-		              </div>
-		            </div>		            
-		            <div class="control-group">
-		              <div class="controls clearfix">
-				   		 <button type="submit" class="button"  href="#confirm" data-toggle="modal">提交申请</button>
-		              </div>
-		            </div>				
-				</form>
-			</div>
-		</div>
-	</div>
-	<!--申请确认-->
-<div class="modal hide fade" id="confirm">
-    <div class="modal-header">
-    <h3>确认信息无误</h3>
-    </div>
-    <div class="modal-body">
-    	申请提交后开票信息将不能修改，请确认信息无误；邮寄信息变动可在发票邮寄前联系相关人员修改。
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button">无误，提交申请</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">我要检查一下</a>
-	</div>
-</div>
-    <!--申请确认-->  	
-<script type="text/javascript">autoFlashHeight();</script>	
-</body>

invoice-addn.html

@@ -39,145 +39,107 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html" class="selected">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html" class="selected">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					开票信息
-				</legend>
-				<form class="form-horizontal">
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票金额</label>
-		              <div class="controls">
-		                <input value="0" placeholder="输入开票金额" pattern="[0-9]" type="number" min="0" step="0.01">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票类型</label>
-		              <div class="controls">
-		                <label class="radio inline"><input type="radio">普通发票</label>
-		                <label class="radio inline"><input type="radio">增值税发票</label>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票内容</label>
-		              <div class="controls">
-		                <select>
-		                	<option>纵横公路工程造价管理系统V9.0</option>
-		                	<option>纵横公路造价编审软件V9.0</option>
-		                	<option>纵横公路工程设计数量表算量软件V3.1</option>
-		                	<option>纵横公路工程计量支付决算一体化软件V3.1</option>
-		                	<option>建材在线</option>
-		                	<option>服务费</option>
-		                	<option>培训费</option>
-		                	<option>软件升级费</option>
-		                	<option>软件报表定制费</option>
-		                	<option>技术服务费</option>
-		                </select>
-		              </div>
-		            </div>
-		            <!--普通发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票抬头</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-		            <!--增值税发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>单位名称</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>纳税人识别码</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开户银行</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>银行账户</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">所在办事处</label>
-		              <div class="controls">
-		                <select><option>广东办</option></select>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">备注</label>
-		              <div class="controls">
-		                <input type="text" placeholder="">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"></label>
-		              <div class="controls">
-		              	<label class="checkbox">
-		                	<input type="checkbox"> 需要邮寄
-		            	</label>
-		              </div>
-		            </div>
-		            <legend>邮寄信息</legend>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件人</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>手机/电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>	
-		           	<div class="control-group">
-		              <label class="control-label">邮寄物品</label>
-		              <div class="controls">
-		                <input type="text" placeholder="请详细填写需要邮寄的物品及数量">
-		                <p>如：锁套装x1、合同x1</p>
-		              </div>
-		            </div>
-		            <div class="control-group">
-		              <div class="controls clearfix">
-				   		 <button type="submit" class="button"  href="#confirm" data-toggle="modal">提交申请</button>
-		              </div>
-		            </div>				
-				</form>
+				<legend>填写申请开票</legend>
+				<div class="borad-news">
+					<div class="saeaList">
+						<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th class="taC" width="150">所在办事处</th><td><select><option>广东办</option></select></td>
+									<th class="taC" width="150">备注</th><td><input placeholder="" type="text"></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed">*</span>开票金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" type="number" min="0" step="0.01"></td>
+									<th class="taC"><span class="colRed">*</span>开票内容</th><td><select>
+									<option>纵横公路工程造价管理系统V9.0</option>
+									<option>纵横公路造价编审软件V9.0</option>
+									<option>纵横公路工程设计数量表算量软件V3.1</option>
+									<option>纵横公路工程计量支付决算一体化软件V3.1</option>
+									<option>建材在线</option>
+									<option>服务费</option>
+									<option>培训费</option>
+									<option>软件升级费</option>
+									<option>软件报表定制费</option>
+									<option>技术服务费</option>
+								</select></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									<label class="radio inline"><input type="radio">增值税普通发票</label>
+									<label class="radio inline"><input type="radio">增值税专用发票</label>
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">增值税普通发票</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150"><span class="colRed">*</span>发票抬头</th><td colspan="3"><input type="text" class="span6"></td>
+
+								</tr>
+								</tbody>
+							</table>
+						<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">增值税专用发票</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150"><span class="colRed">*</span>单位名称</th><td><input type="text"></td>
+									<th class="taC" width="150"><span class="colRed">*</span>纳税人识别码</th><td><input type="text"></td>
+
+								</tr>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed">*</span>注册地址</th><td><input type="text"></td>
+									<th class="taC"><span class="colRed">*</span>注册电话</th><td><input type="text"></td>
+								</tr>
+								<tr>
+									<th class="taC"><span class="colRed">*</span>开户银行</th><td><input type="text"></td>
+									<th class="taC"><span class="colRed">*</span>银行账户</th><td><input type="text"></td>
+								</tr>
+								</tbody>
+							</table>
+						<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">邮寄信息</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150"><span class="colRed">*</span>是否邮寄</th><td colspan="3">
+									<label class="radio inline"><input type="radio">是</label>
+									<label class="radio inline"><input type="radio">否</label>
+								</td>
+								</tr>
+								<tr>
+									<th class="taC" width="150"><span class="colRed">*</span>收件人</th><td><input type="text"></td>
+									<th class="taC" width="150"><span class="colRed">*</span>收件人手机/电话</th><td><input type="text"></td>
+								</tr>
+								<tr>
+									<th class="taC" width="150"><span class="colRed">*</span>收件地址</th><td colspan="3"><input type="text" class="span6"></td>
+								</tr>
+								<tr>
+									<th class="taC" width="150">邮寄物品</th><td colspan="3"><input placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" type="text" class="span6"></td>
+								</tr>
+								</tbody>
+							</table>
+						<p class="taR"><button type="submit" class="button" href="#confirm" data-toggle="modal">提交申请</button></p>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>	

invoice-approval-all.html

@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html" class="selected">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					已审批发票
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#">今年</a><a href="#">更旧</a></li>
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="span3" placeholder="发票抬头、开票金额" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>提交开票</th><th>完成审批</th></tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td><span class="colGreen">同意</span> 黄爱玲 2016-03-03 12:20:20</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td><span class="colOrange">退回</span> 黄爱玲 2016-03-03 12:20:20</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td><span class="colRed">终止</span> 黄爱玲 2016-03-03 12:20:20</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+						<li><a href="#">&lt;</a></li>
+						<li><a href="#">1</a></li>
+						<li class="active"><a href="#">2</a></li>
+						<li><a href="#">3</a></li>
+						<li><a href="#">4</a></li>
+						<li><a href="#">5</a></li>
+						<li><a href="#">&gt;</a></li>
+					</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+	<!--弹出（录入收款）-->
+<div class="modal hide fade" id="inputbill">
+    <div class="modal-header">
+    <h3>录入收款</h3>
+    </div>
+    <div class="modal-body">
+    	<form>
+    		<div class="control-group">
+              <label class="control-label"><span class="colRed">*</span>到款金额</label>
+              <div class="controls">
+                <input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
+              </div>
+            </div>
+    		<div class="control-group">
+              <label class="control-label"><span class="colRed">*</span>到款信息</label>
+              <div class="controls">
+                <input type="text">
+              </div>
+            </div>
+    		<div class="control-group">
+              <label class="control-label"><span class="colRed">*</span>到款银行</label>
+              <div class="controls">
+                <select>
+	            	<option>广发银行珠海分行柠溪支行</option>
+	            </select>
+              </div>
+            </div>
+    		<div class="control-group">
+              <label class="control-label"><span class="colRed">*</span>银行到款时间</label>
+              <div class="controls">
+                <input type="date">
+              </div>
+            </div>
+    		<div class="control-group">
+              <label class="control-label">指定认领人</label>
+              <div class="controls">
+                <select>
+	            	<option>待认领款项</option>
+	            	<option>广东办-刘飞</option>
+	            </select>
+              </div>
+            </div>
+    		<div class="control-group">
+              <label class="control-label">未收款发票</label>
+              <div class="controls">
+                <select>
+	            	<option>￥30000.00-珠海XXXXXXX公司-441027465</option>
+	            	<option>￥40000.00-珠海XXXXXXX公司-441027465</option>
+	            </select>
+              </div>
+            </div>
+    	</form>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+</div>
+    <!--弹出内容-->
+	<!--弹出（录入收款）-->
+<div class="modal hide fade" id="receive">
+    <div class="modal-header">
+    <h3>认领收款</h3>
+    </div>
+    <div class="modal-body">
+    	<table class="table">
+    		<thead><tr><th width="50">收款信息</th><td></td>
+    			<th width="60"></th><td></td></tr></thead>
+    		<tr>
+    		</tr>
+    		<tr>
+    			<th>收款金额</th><td><b class="colOrange">￥200000.00</b></td>
+    			<th>收款信息</th><td>陈宇</td>
+    		</tr>
+    		<tr>
+    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
+    			<th>银行到帐</th><td>2016-04-11</td>
+    		</tr>
+    		<tr>
+    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
+    			<th></th><td></td>
+    		</tr>
+    	</table>
+    	<p class="colRed">请确认该收款属于您</p>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认认领</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+</div>
+    <!--弹出内容-->        	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-approval-detail.html

@@ -39,90 +39,117 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html" class="selected">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					开票审批
-				</legend>
-				<div class="fR " style="width:35%;">
+				<div class="borad-news">
+					<div class="saeaList">
+						<legend>
+							开票审批
+						</legend>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
+								<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">所在办事处</th><td>广东办</td>
+								<th class="taC" width="150">备注</th><td></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
+								<th class="taC">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税普通发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
 
-					<textarea style="width:98%">审批意见暂无</textarea>
-					<div class="invoButton clearfix">
-							<a href="" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后重新审批">退回</a>
-							<a href="" class="buttonInvalid" data-placement="top" data-toggle="ctooltip" data-original-title="作废发票申请">作废</a>
-							<a href="" class="buttonDone buttonBlock"  data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票">同意</a>
-	  				</div>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税专用发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+								<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+							</tr>
+							</tr>
+							<tr>
+								<th class="taC">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
+								<th class="taC">注册电话</th><td>0756-34324</td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行</th><td>广发银行</td>
+								<th class="taC">银行账户</th><td>234324234</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">邮寄信息</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件人</th><td>陈工</td>
+								<th class="taC" width="150">收件人手机/电话</th><td>12345678901</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+								<tr><th width="60%" class="taC">审批流程</th><th class="taC">发票审批</th></tr>
+								<tr><td>
+									<blockquote>
+										<p><span class="colGray">2016-11-10 11:03:11</span>&nbsp;广东办-刘飞&nbsp;创建</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-10 11:15:23</span>&nbsp;广东办-刘飞&nbsp;提交审批</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colGreen">同意</span> 审批意见文本</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colOrange">退回</span> 审批意见文本</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colRed">终止</span> 审批意见文本</p>
+									</blockquote>
+								</td><td>
+									<textarea style="width:98%" placeholder="在这写下您的审批意见，选填。"></textarea>
+									<div class="invoButton clearfix">
+										<a href="" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后重新审批">退回</a>
+										<a href="" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止发票申请">终止</a>
+										<a href="" class="buttonDone buttonBlock"  data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票">同意</a>
+									</div></td></tr>
+							</tbody>
+						</table>
+					</div>
 				</div>
-				<table class="table" style="width:60%">
-					<thead><tr><th>收款信息</th></tr></thead>
-					<tr>
-						<th width="60">收款金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
-						<th width="60">收款信息</th><td>陈宇</td>
-					</tr>
-					<tr>
-						<th width="60">银行到帐</th><td>2016-04-11</td>
-						<th width="60">收款录入</th><td>张少珊<br>2015-04-12 11:30:02</td>
-					</tr>
-					<tr>
-						<th width="60">收款认领</th><td>陈特 认领<br>2015-04-13 11:30:02</td>
-						<th width="60"></th><td></td>
-					</tr>
-				</table>
-				<table class="table" style="width:60%">
-					<thead><tr><th>发票信息</th></tr></thead>
-					<tr>
-						<th width="60">开票金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
-						<th width="60"></th><td></td>
-					</tr>
-					<tr>
-						<th width="60">发票类型</th><td><span class="colGreen">普通发票</span> <span class="colBlue">增值税发票</span></td>
-						<th width="60">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-					</tr>
-					<!--普通发票信息-->
-					<tr>
-						<th width="60">发票抬头</th><td><span class="colGreen">珠海纵横创建软件有限公司</span></td>
-						<th width="60"></th><td></td>
-					</tr>
-					<!--增值税发票信息-->
-					<tr>
-						<th width="60">单位名称</th><td><span class="colBlue">珠海纵横创建软件有限公司</span></td>
-						<th width="60">识别码</th><td><span class="colBlue">1212123123123</span></td>
-					</tr>
-					<tr>
-						<th width="60">注册地址</th><td><span class="colBlue">广东省珠海市香洲区银桦路8号24D</span></td>
-						<th width="60">注册电话</th><td><span class="colBlue">0756-34324</span></td>
-					</tr>
-					<tr>
-						<th width="60">开户银行</th><td><span class="colBlue">广发银行</span></td>
-						<th width="60">银行账号</th><td><span class="colBlue">234324234</span></td>
-					</tr>
-						<th width="60">申请单号</th><td>#F20160316001</td>
-						<th width="60">提交时间</th><td>2016-03-01 12:30:01</td>
-					</tr>
-					<tr>
-						<th width="60">备注</th><td colspan="3">备注内容</td>
-					</tr>
-				</table>
-				<table class="table" style="width:60%">
-					<thead><tr><th>邮寄信息</th></tr></thead>
-					<tr>
-						<th width="60">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-					</tr>
-					<tr>
-						<th width="60">收件人</th><td>陈工</td>
-						<th width="60">手机/电话</th><td>12345678901</td>
-					</tr>
-					<tr>
-						<th width="60">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
-					</tr>
-				</table>
 			</div>
 		</div>
 	</div>

invoice-approval.html

@@ -39,106 +39,103 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
-						<li class="news"><a href="invoice-approval.html" class="selected">发票审批</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+                        <li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html" class="selected">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+                        <li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-                    以下发票需要您审批</legend>
-	  			<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state">广东办<br>刘飞</div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry">
-									<a href="invoice-approval-detail.html" class="button">审批</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">广东办<br>刘飞</div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									黄爱玲<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="invoice-approval-detail.html" class="button">审批</a>
-								</div>
-							</div>
-						</li>
-					</ul>
-				</div>
-                <legend>
-                    <div class="fR">
-                    <a href="invoice-approval-all.html">查看更多</a></div>
-                    最近审批</legend>
-                <div class="invoList">
-                    <ul class="entry">
-                        <li>
-                            <div class="state">广东办<br>刘飞</div>
-                            <div class="info">
-                                <h4>珠海XXXX公司</h4>
-                                <p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-                            </div>
-                            <div class="update">
-                                <div class="entry colGray">
-                                    黄爱玲<br>2016-03-03 11:30:03
-                                </div>
-                                <div class="entry">
-                                    <a href="#invdetail" data-toggle="modal">详情（点我）</a>
-                                </div>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="state">广东办<br>刘飞</div>
-                            <div class="info">
-                                <h4>珠海XXXX公司</h4>
-                                <p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-                            </div>
-                            <div class="update">
-                                <div class="entry colGray">
-                                    张少珊<br>2016-03-03 11:30:03
-                                </div>
-                                <div class="entry">
-                                    <a href="#invdetail" data-toggle="modal">详情（点我）</a>
-                                </div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>                                
+                <div class="borad-menu">
+                </div>
+                <div class="borad-news">
+                    <div class="saeaList">
+                        <div class="clearfix">
+                            <legend><div class="fR"></div>待审批开票</legend>
+                            <table class="table table-bordered table-condensed">
+                                <tbody>
+                                <tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">上一位审批</th><th class="taC" width="120">操作</th></tr>
+                                <tr>
+                                    <td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+                                    <td>珠海XXXX公司</td>
+                                    <td><b>￥3000.00</b></td>
+                                    <td>广东办刘飞 2016-03-03 12:20:20</td>
+                                    <td></td>
+                                    <td><a class="button btn-block" href="invoice-approval-detail.html" >审批开票</a></td>
+                                </tr>
+                                <tr>
+                                    <td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+                                    <td>珠海XXXX公司</td>
+                                    <td><b>￥3000.00</b><sup>专</sup></td>
+                                    <td>广东办刘飞 2016-03-03 12:20:20</td>
+                                    <td>张少珊 2016-03-03 12:20:20</td>
+                                    <td><a class="button btn-block" href="invoice-approval-detail.html" >审批开票</a></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <blockquote><p class="colGray">暂时没有需要审批的开票</p></blockquote>
+                        </div>
+                        <div class="clearfix">
+                            <legend><div class="fR"><a href="invoice-approval-all.html">查看更多</a></div>最近审批完成</legend>
+                            <table class="table table-bordered table-condensed">
+                                <tbody>
+                                <tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">完成审批</th></tr>
+                                <tr>
+                                    <td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+                                    <td>珠海XXXX公司</td>
+                                    <td><b>￥3000.00</b></td>
+                                    <td>广东办刘飞 2016-03-03 12:20:20</td>
+                                    <td><span class="colGreen">同意</span> 黄爱玲 2016-03-03 12:20:20</td>
+                                </tr>
+                                <tr>
+                                    <td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+                                    <td>珠海XXXX公司</td>
+                                    <td><b>￥3000.00</b><sup>专</sup></td>
+                                    <td>广东办刘飞 2016-03-03 12:20:20</td>
+                                    <td><span class="colOrange">退回</span> 黄爱玲 2016-03-03 12:20:20</td>
+                                </tr>
+                                <tr>
+                                    <td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+                                    <td>珠海XXXX公司</td>
+                                    <td><b>￥3000.00</b><sup>专</sup></td>
+                                    <td>广东办刘飞 2016-03-03 12:20:20</td>
+                                    <td><span class="colRed">终止</span> 黄爱玲 2016-03-03 12:20:20</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <blockquote><p class="colGray">暂时没有已审批的开票</p></blockquote>
+                        </div>
+                    </div>
+                </div>
 			</div>
 		</div>
 	</div>
     <!--弹出（发票详情）-->
 <div class="modal hide fade" id="invdetail">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
     <div class="modal-header">
-    <h3>发票单详情</h3>
+        <h3>发票单详情</h3>
     </div>
     <div class="modal-body">
         <table class="table">
             <thead>
-                <tr><td><span class="contactsTag tagCol-05">审核中</span></td><td colspan="3">2016-11-01 11:03:03<br>张少珊：审批意见</td></tr>
-                <tr><td><span class="contactsTag tagCol-02">打印中</span></td><td colspan="3">2016-11-01 11:03:03<br>赵淑燕：可以打印</td></tr>
-                <tr><td><span class="contactsTag tagCol-04">退回</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：申请金额有误</td></tr>
-                <tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">赵淑燕 2016-11-01 11:03:03</td></tr>
-                <tr><td><span class="contactsTag tagCol-01">已邮寄</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-                <tr><td><span class="contactsTag tagCol-06">作废</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：作废意见</td></tr>
+            <tr><td><span class="contactsTag tagCol-05">审核中</span></td><td colspan="3">2016-11-01 11:03:03<br>张少珊：审批意见</td></tr>
+            <tr><td><span class="contactsTag tagCol-02">出票中</span></td><td colspan="3">2016-11-01 11:03:03<br>赵淑燕：可以打印</td></tr>
+            <tr><td><span class="contactsTag tagCol-07">退回</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：申请金额有误</td></tr>
+            <tr><td><span class="contactsTag tagCol-02">已出票</span></td><td colspan="3">赵淑燕 2016-11-01 11:03:03</td></tr>
+            <tr><td><span class="contactsTag tagCol-02">已出票</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
+            <tr><td><span class="contactsTag tagCol-04">终止</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：终止意见</td></tr>
+            <tr><td><span class="contactsTag tagCol-06">作废</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：作废意见</td></tr>
+            <tr><td><span class="contactsTag tagCol-01">入账完成</span></td><td colspan="3" class="">2016-11-01 11:03:03<br></td></tr>
             </thead>
-            <tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-                <th width="50">发票号</th><td class="colGreen">No.07957263</td>
+            <tr>
+                <th>申请单号</th><td>#F20160316001</td>
+                <th>提交时间</th><td>2016-03-01 12:30:01</td>
             </tr>
             <tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
             </tr>
@@ -162,10 +159,6 @@
             </tr>
 
             <tr>
-                <th>申请单号</th><td>#F20160316001</td>
-                <th>提交时间</th><td>2016-03-01 12:30:01</td>
-            </tr>
-            <tr>
                 <th>备注</th><td colspan="3">备注内容</td>
             </tr>
         </table>
@@ -207,6 +200,7 @@
     <div class="modal-footer">
         <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
     </div>
+            </div></div>
 </div>
     <!--弹出内容-->      	
 <script type="text/javascript">autoFlashHeight();</script>	

invoice-billing-all.html

@@ -38,83 +38,42 @@
 					<ul>
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
-						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine news"><a href="invoice-billing.html" class="selected">收款认领</a></li>
+						<li><a href="invoice-billing-my.html" class="selected">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					最近认领
+					入账完成收款
 				</legend>
-		  		<div class="invoList">
-					<ul class="entry">
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#">今年</a><a href="#">更旧</a></li>
 						<li>
-							<div class="state">银行到款<br>2016-04-11</div>
-							<div class="info">
-								<h4 class="colOrange">￥200000.00</h4>
-								<p>陈宇</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
+							<div class="search">
+								<div class="input-append">
+									<input class="span3" placeholder="到款信息、收款金额" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
 								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥12000.00</h4>
-								<p>李艳芬/鹅蛋山</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									任杰 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									任杰 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
+							</div></li>
 					</ul>
-				</div>	
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>收款流水号</th><th>收款金额</th><th>银行到款信息</th><th>到款银行</th><th>收款处理</th><th>开票流水号</th><th>发票金额</th><th>入账时间</th></tr>
+						<tr><td><a href="">#SK20160316001</a></td><td><b>￥200000.00</b></td><td>陈宇</td><td>广发银行珠海分行柠溪支行<br>2016-04-11</td><td>张少珊 转入<br>2016-4-11 11:30:03</td><td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td><td><b>￥20000.00</b><sup>专</sup></td><td>2016-4-11<br>11:30:03</td></tr>
+						<tr><td><a href="">#SK20160316001</a></td><td><b>￥120000.00</b></td><td>李艳芬/鹅蛋山</td><td>广发银行珠海分行柠溪支行<br>2016-04-11</td><td>陈特 认领<br>2016-4-11 11:30:03</td><td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td><td><b>￥20000.00</b></td><td>2016-4-11<br>11:30:03</td></tr>
+						</tbody>
+					</table>
+				</div>
 						  		<!--翻页-->
 				<div class="demandPage">
 					<ul class="pagination fL">

invoice-billing-my.html

@@ -39,257 +39,117 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html" class="selected">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					我的收款
-				</legend>
-				<div class="demandCate">
-					<ul class="cateList">
-	  					<li><a class="now" href="#">所有</a><a href="#" title="认领">认领</a><a href="#" title="转入">转入</a></li>
-	  					<li><select><option>2016年</option></select> <select><option>不限</option><option>1月</option></select></li>
-	  				</ul>
-	  			</div>				
-		  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state">银行到款<br>2016-04-11</div>
-							<div class="info">
-								<h4 class="colOrange">￥200000.00</h4>
-								<p>陈宇</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a href="invoice-addb.html" class="button">收款开票</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥12000.00</h4>
-								<p>李艳芬/鹅蛋山</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									张少珊 转入 陈特<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a href="invoice-addb.html" class="button">收款开票</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									张少珊 转入 陈特<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									申请单号：<a href="#invoiced" data-toggle="modal">#1238823490</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									张少珊 转入 陈特<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									发票号码：<a href="#invoiced_d" data-toggle="modal">NO.726348</a>
-								</div>
-							</div>
-						</li>
-					</ul>
+				<div class="borad-menu">
+				</div>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">本月累计收款</th><td>￥3999.00</td><th class="taC">本月累计入账</th><td>￥3999.00</td></tr>
+								<tr><th class="taC">10月累计收款</th><td>￥838,273.00</td><th class="taC">10月累计入账</th><td>￥838,273.00</td></tr>
+								<tr><th class="taC">今年累计收款</th><td>￥209,484,765.00</td><th class="taC">今年累计入账</th><td>￥209,484,765.00</td></tr>
+								</tbody>
+
+							</table>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"></div>待入账</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行到帐时间</th><th class="taC">收款处理</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>2016-03-03</td>
+									<td>张少珊 转入 2016-03-03</td>
+									<td width=""><a class="button btn-green  btn-block" href="#recorded" data-toggle="modal">收款入账</a></td>
+								</tr>
+								<tr>
+									<td><b>￥4000.00</b></td>
+									<td>珠海</td>
+									<td>2016-03-03</td>
+									<td>陈特 认领 2016-03-03</td>
+									<td width=""><a class="button btn-green  btn-block" href="#recorded" data-toggle="modal">收款入账</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要处理的收款</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-billing-all.html">查看更多</a></div>最近入账</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">银行到帐信息</th><th class="taC" width="90">收款金额</th><th class="taC">收款流水号</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC">入账时间</th></tr>
+								<tr>
+									<td>张宇</td>
+									<td><b>￥3000.00</b></td>
+									<td><a href="#" data-toggle="modal">#SK20160316001</a></td>
+									<td><b>￥3000.00</b></td>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>2016-03-03 11:30:03</td>
+								</tr>
+								<tr>
+									<td>李艳芬/鹅蛋山</td>
+									<td><b>￥3000.00</b></td>
+									<td><a href="#" data-toggle="modal">#SK20160316001</a></td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>2016-03-03 11:30:03</td>
+								</tr>
+								<tr>
+									<td>周静</td>
+									<td><b>￥3000.00</b></td>
+									<td><a href="#" data-toggle="modal">#SK20160316001</a></td>
+									<td><b>￥3000.00</b></td>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>2016-03-03 11:30:03</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有入账完成的收款</p></blockquote>
+						</div>
+					</div>
 				</div>
-		  		<!--翻页-->
-				<div class="demandPage">
-					<ul class="pagination fL">
-						<li><a href="#">&lt;</a></li>
-						<li><a href="#">1</a></li>
-						<li class="active"><a href="#">2</a></li>
-						<li><a href="#">3</a></li>
-						<li><a href="#">4</a></li>
-						<li><a href="#">5</a></li>
-						<li><a href="#">&gt;</a></li>
-					</ul>
-			  	</div>					
 			</div>
 		</div>
-	</div>	
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invoiced">
-    <div class="modal-header">
-    <h3>发票详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-05">审核中</span></td><td colspan="3">2016-11-01 11:03:03<br>张少珊：审批意见</td></tr>
-    			<tr><td><span class="contactsTag tagCol-02">打印中</span></td><td colspan="3">2016-11-01 11:03:03<br>赵淑燕：可以打印</td></tr>
-    			<tr><td><span class="contactsTag tagCol-04">退回</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：申请金额有误</td></tr>
-    		</thead>   		
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
-</div>
-    <!--弹出内容--> 	
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invoiced_d">
-    <div class="modal-header">
-    <h3>发票详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">No.07957263</td>
-    		</tr> 
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    		<tr>
-    			<th>申请物品</th><td colspan="3">合同x1、锁套装x1</td>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容--> 	
-	<!--弹出邮寄-->
-<div class="modal hide fade" id="shipping">
-    <div class="modal-header">
-    <h3>邮寄信息</h3>
-    </div>
-    <div class="modal-body">
-    	<p>申请物品：发票×1、软件锁套装x1</p>
-    	<p>邮寄物品：<b>发票×1、软件锁套装x1</b></p>
-    	<br>
-    	<ul>
-    		<li>• 2016-04-09 20:16:17【珠海市】圆通速递 广东省珠海市收件员 已揽件</li>
-    		<li>• 2016-04-09 20:16:17【珠海市】广东省珠海市香洲区2派件员：陈华辉 13676058042正在为您派件</li>
-    	</ul>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	<!--弹出入账-->
+	<div class="modal hide fade" id="recorded">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>收款入账</h3>
+				</div>
+				<div class="modal-body">
+					<p class="alert alert-block">收款与发票进行绑定，完成入账；入账后，收款金额将作为您的最终销售收入。</p>
+					<table class="table table-bordered table-condensed">
+						<thead><th>开票内容</th><th>开票金额</th><th>发票类型</th><th>单位/抬头</th><th>入账操作</th></thead>
+						<tbody>
+						<tr class="success"><td>纵横公路工程造价管理系统V9.0</td><td>￥3000.00</td><td>增值税专用发票</td><td>珠海XX公司</td><td><label><input type="radio"> 使用Ta</label></td></tr>
+						<tr class=""><td>纵横公路工程造价管理系统V9.0</td><td>￥5000.00</td><td>增值税普通发票</td><td>ABC公司</td><td><label><input type="radio"> 使用Ta</label></td></tr>
+						<tr class=""><td>纵横公路工程造价管理系统V9.0</td><td>￥6900.00</td><td>增值税普通发票</td><td>123公司</td><td><label><input type="radio"> 使用Ta</label></td></tr>
+						</tbody>
+					</table>
+					<p class="alert alert-erro">收款金额超出开票金额 ￥2000.00元，请谨慎操作。</p>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button " data-dismiss="modal" aria-hidden="true">确定入账</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
 	</div>
-</div>
-    <!--邮寄-->         
+	<!--入账-->
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>

invoice-billing.html

@@ -39,261 +39,106 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine news"><a href="invoice-billing.html" class="selected">收款认领</a></li>
+						<li><a href="invoice-billing.html" class="selected">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					<div class="fR"><a href="#inputbill" data-toggle="modal" class="button">录入收款</a></div>
-					待认领款项
-				</legend>
-		  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state">银行到款<br>2016-04-11</div>
-							<div class="info">
-								<h4 class="colBlue">￥200000.00</h4>
-								<p>陈宇</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a class="button" href="#receive" data-toggle="modal">认领（点我）</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colBlue">￥12000.00</h4>
-								<p>李艳芬/鹅蛋山</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a class="button">认领</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colBlue">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a class="button">认领</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colBlue">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry">
-									<a class="button">认领</a>
-								</div>
-							</div>
-						</li>
-						<!--没数据提示-->
-						<li class="colGray">
-							暂时没有待认领的款项
-						</li>
-					</ul>
-				</div>	
-				<legend>
-					<div class="fR">
-						<a href="invoice-billing-list.html">收款管理</a>
+				<div class="borad-menu">
+				</div>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<legend><div class="fR"></div>公共·待认领款项</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">到帐银行/到帐时间</th><th class="taC">收款录入</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td><a class="button btn-block" href="#receive" data-toggle="modal">认领收款</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要处理的收款</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"></div>办事处·待认领款项</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">到帐银行/到帐时间</th><th class="taC">收款录入</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td><a class="button btn-block" href="#receive" data-toggle="modal">认领收款</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要处理的收款</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend>最近认领</legend>
+
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">收款录入</th><th class="taC">收款认领</th></tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td>陈特 2016-03-03 11:28:19</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有已认领的收款</p></blockquote>
+						</div>
 					</div>
-					最近认领
-				</legend>
-		  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state">银行到款<br>2016-04-11</div>
-							<div class="info">
-								<h4 class="colOrange">￥200000.00</h4>
-								<p>陈宇</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥12000.00</h4>
-								<p>李艳芬/鹅蛋山</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									陈特 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									任杰 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state">银行到款<br>2016-04-08</div>
-							<div class="info">
-								<h4 class="colOrange">￥9800.00</h4>
-								<p>周静</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊 录入<br>2016-04-11 11:30:03
-								</div>
-								<div class="entry colBlue">
-									任杰 认领<br>2016-04-11 11:30:03
-								</div>
-							</div>
-						</li>
-					</ul>
-				</div>				
+				</div>
 			</div>
 		</div>
 	</div>
-	<!--弹出（录入收款）-->
-<div class="modal hide fade" id="inputbill">
-    <div class="modal-header">
-    <h3>录入收款</h3>
-    </div>
-    <div class="modal-body">
-    	<form class="form-horizontal">
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款金额</label>
-              <div class="controls">
-                <input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款信息</label>
-              <div class="controls">
-                <input type="text">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款银行</label>
-              <div class="controls">
-                <select>
-	            	<option>广发银行珠海分行柠溪支行</option>
-	            </select>
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>银行到款时间</label>
-              <div class="controls">
-                <input type="date">
-              </div>
-            </div>
-           	<!--待认领-->
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>指定认领人</label>
-              <div class="controls">
-                <select>
-	            	<option>待认领款项</option>
-	            	<option>广东办-刘飞</option>
-	            </select>
-              </div>
-            </div>
-           	<!--指定认领-->
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>指定认领人</label>
-              <div class="controls">
-                <select>
-	            	<option>广东办-刘飞</option>
-	            	<option>待认领款项</option>
-	            </select>
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label">绑定未收款发票</label>
-              <div class="controls">
-                <select>
-                	<option>不绑定</option>
-	            	<option>￥30000.00-珠海XXXXXXX公司-No.441027465</option>
-	            	<option>￥40000.00-珠海XXXXXXX公司-No.441027465</option>
-	            </select>
-              </div>
-            </div>
-    	</form>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容-->
+
 	<!--弹出（录入收款）-->
 <div class="modal hide fade" id="receive">
+	<div class="modal-dialog ">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>认领收款</h3>
     </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead><tr><th width="50">收款信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>收款金额</th><td><b class="colOrange">￥200000.00</b></td>
-    			<th>收款信息</th><td>陈宇</td>
-    		</tr>
-    		<tr>
-    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
-    			<th>银行到帐</th><td>2016-04-11</td>
-    		</tr>
-    		<tr>
-    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
-    			<th></th><td></td>
-    		</tr>
-    	</table>
-    	<div class="alert">请确认该收款属于您。</div>
-    </div>
+			<div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr><th class="taC" colspan="4">收款详情</th></tr>
+					<tr>
+						<th class="taC">收款流水号</th><td>#SK20160316001</td>
+						<th class="taC">录入收款</th><td>张少珊 2015-04-12 11:30:02</td>
+					</tr>
+					<tr>
+						<th class="taC">收款金额</th><td><b>￥200000.00</b></td>
+						<th class="taC">收款信息</th><td>陈宇</td>
+					</tr>
+					<tr>
+						<th class="taC">收款银行</th><td>广发银行珠海分行柠溪支行</td>
+						<th class="taC">银行到帐</th><td>2016-04-11</td>
+					</tr>
+					</tbody></table>
+			</div>
 	<div class="modal-footer">
 	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认认领</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
     <!--弹出内容-->        	
 <script type="text/javascript">autoFlashHeight();</script>	

invoice-dlist-category-detail.html

@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css>
+	<link rel=stylesheet href=css/fixedheadertable.css>
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+	<script src=js/jquery.fixedheadertable.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-dlist-category-year.html" class="selected">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					广东办 全年开票收款汇总
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><select><option>2016</option></select></li>
+						<li>开票总计：￥5470.00</li>
+						<li>收款总计：￥2160.00</li>
+						<li>完成入账：￥1150.00</li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<div class="entry autoHeightI2" style="margin-bottom:0">
+					<script type="text/javascript">$(document).ready(function() {
+						$('#invoiceTable').fixedHeaderTable({ fixedColumns:2 });
+					});</script>
+					<table class="table table-bordered table-condensed table-hover">
+						<thead>
+						<tr><th class="taC">姓名</th><th class="taC">项目</th><th class="taC">1月</th><th class="taC">2月</th><th class="taC">3月</th><th class="taC">4月</th><th class="taC">5月</th><th class="taC">6月</th><th class="taC">7月</th><th class="taC">8月</th><th class="taC">9月</th><th class="taC">10月</th><th class="taC">11月</th><th class="taC">12月</th><th class="taC">年总计</th></tr>
+						</thead>
+						<tbody>
+						<tr><th rowspan="3">刘飞</th><th class="taC">开票</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colRed">￥5000.00</td></tr>
+						<tr><th class="taC">收款</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colOrange">￥5000.00</td></tr>
+						<tr><th class="taC">入账</th><td class="taR"><b>￥5000.00</b></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥5000.00</b></td></tr>
+
+						<tr><th rowspan="3">刘飞</th><th class="taC">开票</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colRed">￥5000.00</td></tr>
+						<tr><th class="taC">收款</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colOrange">￥5000.00</td></tr>
+						<tr><th class="taC">入账</th><td class="taR"><b>￥5000.00</b></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥5000.00</b></td></tr>
+
+						<tr><th rowspan="3">刘飞</th><th class="taC">开票</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colRed">￥5000.00</td></tr>
+						<tr><th class="taC">收款</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colOrange">￥5000.00</td></tr>
+						<tr><th class="taC">入账</th><td class="taR"><b>￥5000.00</b></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥5000.00</b></td></tr>
+
+						<tr><th rowspan="3">刘飞</th><th class="taC">开票</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colRed">￥5000.00</td></tr>
+						<tr><th class="taC">收款</th><td class="taR">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colOrange">￥5000.00</td></tr>
+						<tr><th class="taC">入账</th><td class="taR"><b>￥5000.00</b></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥5000.00</b></td></tr>
+
+						<tr class="warning"><th rowspan="3">月合计</th><th class="taC">开票</th><td class="taR colRed">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colRed">￥5000.00</td></tr>
+						<tr class="warning"><th class="taC">收款</th><td class="taR colOrange">￥5000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colOrange">￥5000.00</td></tr>
+						<tr class="warning"><th class="taC">入账</th><td class="taR colGreen"><b>￥5000.00</b></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥5000.00</b></td></tr>
+
+						</tbody>
+					</table>
+				</div>
+					</div>
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-edit.html

@@ -39,11 +39,13 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html" class="selected">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
@@ -51,159 +53,107 @@
 				<legend>
 					开票重新申请
 				</legend>
-				<table class="table" style="width:50%">
-					<thead><tr><th>收款信息</th></tr></thead>
-					<tr>
-						<th width="60">收款金额</th><td><b class="colOrange">￥20000.00</b></td>
-						<th width="60">收款信息</th><td>陈宇</td>
-					</tr>
-					<tr>
-						<th width="60">银行到帐</th><td>2016-04-11</td>
-						<th width="60">收款录入</th><td>张少珊<br>2015-04-12 11:30:02</td>
-					</tr>
-					<tr>
-						<th width="60">收款认领</th><td>陈特 认领<br>2015-04-13 11:30:02</td>
-						<th width="60"></th><td></td>
-					</tr>
-				</table>
-				<form class="form-horizontal">
-				    <div class="control-group">
-		              <label class="control-label">退回意见</label>
-		              <div class="controls colRed">
-		                赵淑燕 2016-11-03 11:01:03
-		                <p>审批意见文本</p>
-		              </div>
-		            </div>					
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票金额</label>
-		              <div class="controls">
-		                <input value="0" placeholder="输入开票金额" pattern="[0-9]" type="number" min="0" step="0.01">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票类型</label>
-		              <div class="controls">
-		                <label class="radio inline"><input type="radio">普通发票</label>
-		                <label class="radio inline"><input type="radio">增值税发票</label>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开票内容</label>
-		              <div class="controls">
-		                <select>
-		                	<option>纵横公路工程造价管理系统V9.0</option>
-		                	<option>纵横公路造价编审软件V9.0</option>
-		                	<option>纵横公路工程设计数量表算量软件V3.1</option>
-		                	<option>纵横公路工程计量支付决算一体化软件V3.1</option>
-		                	<option>建材在线</option>
-		                	<option>服务费</option>
-		                	<option>培训费</option>
-		                	<option>软件升级费</option>
-		                	<option>软件报表定制费</option>
-		                	<option>技术服务费</option>
-		                </select>
-		              </div>
-		            </div>
-		            <!--普通发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>发票抬头</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-		            <!--增值税发票-->
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>单位名称</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>纳税人识别码</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>注册电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>开户银行</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>银行账户</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">所在办事处</label>
-		              <div class="controls">
-		                <select><option>广东办</option></select>
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label">备注</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"></label>
-		              <div class="controls">
-		              	<label class="checkbox">
-		                	<input type="checkbox"> 需要邮寄
-		            	</label>
-		              </div>
-		            </div>
-		            <legend>邮寄信息</legend>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件地址</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>收件人</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>
-				    <div class="control-group">
-		              <label class="control-label"><span class="colRed">*</span>手机/电话</label>
-		              <div class="controls">
-		                <input type="text">
-		              </div>
-		            </div>	
-		            <div class="control-group">
-		              <label class="control-label">邮寄物品</label>
-		              <div class="controls">
-		                <input placeholder="请详细填写需要邮寄的物品及数量" type="text">
-		                <p>如：锁套装x1、合同x1</p>
-		              </div>
-		            </div>
-		            <div class="control-group">
-		              <div class="controls clearfix">
-				   		 <button type="submit" class="button">c重新申请</button>
-		              </div>
-		            </div>		
-		            <div class="control-group">
-		              <label class="control-label"> </label>
-		            	<div class="">重新提交审批，将由退回人继续审批，无需从头开始审批。</div>
-		            </div>				
-				</form>
+				<div class="borad-news">
+					<div class="saeaList">
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC">审批人退回意见</th>
+							</tr>
+							<tr>
+								<td colspan="3" class="colRed">赵淑燕：金额有误</td>
+
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC" width="150">所在办事处</th><td><select><option>广东办</option></select></td>
+								<th class="taC" width="150">备注</th><td><input placeholder="" type="text"></td>
+							</tr>
+							<tr>
+								<th class="taC"><span class="colRed">*</span>开票金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" type="number" min="0" step="0.01"></td>
+								<th class="taC"><span class="colRed">*</span>开票内容</th><td><select>
+								<option>纵横公路工程造价管理系统V9.0</option>
+								<option>纵横公路造价编审软件V9.0</option>
+								<option>纵横公路工程设计数量表算量软件V3.1</option>
+								<option>纵横公路工程计量支付决算一体化软件V3.1</option>
+								<option>建材在线</option>
+								<option>服务费</option>
+								<option>培训费</option>
+								<option>软件升级费</option>
+								<option>软件报表定制费</option>
+								<option>技术服务费</option>
+							</select></td>
+							</tr>
+							<tr>
+								<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+								<label class="radio inline"><input type="radio">增值税普通发票</label>
+								<label class="radio inline"><input type="radio">增值税专用发票</label>
+							</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税普通发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150"><span class="colRed">*</span>发票抬头</th><td colspan="3"><input type="text" class="span6"></td>
+
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税专用发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150"><span class="colRed">*</span>单位名称</th><td><input type="text"></td>
+								<th class="taC" width="150"><span class="colRed">*</span>纳税人识别码</th><td><input type="text"></td>
+
+							</tr>
+							</tr>
+							<tr>
+								<th class="taC"><span class="colRed">*</span>注册地址</th><td><input type="text"></td>
+								<th class="taC"><span class="colRed">*</span>注册电话</th><td><input type="text"></td>
+							</tr>
+							<tr>
+								<th class="taC"><span class="colRed">*</span>开户银行</th><td><input type="text"></td>
+								<th class="taC"><span class="colRed">*</span>银行账户</th><td><input type="text"></td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">邮寄信息</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150"><span class="colRed">*</span>是否邮寄</th><td colspan="3">
+								<label class="radio inline"><input type="radio">是</label>
+								<label class="radio inline"><input type="radio">否</label>
+							</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150"><span class="colRed">*</span>收件人</th><td><input type="text"></td>
+								<th class="taC" width="150"><span class="colRed">*</span>收件人手机/电话</th><td><input type="text"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150"><span class="colRed">*</span>收件地址</th><td colspan="3"><input type="text" class="span6"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">邮寄物品</th><td colspan="3"><input placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" type="text" class="span6"></td>
+							</tr>
+							</tbody>
+						</table>
+						<p class="alert">重新提交审批，将由退回人继续审批，无需从头开始审批。</p>
+						<p class="taR"><button type="submit" class="button" href="#confirm" data-toggle="modal">重新审批</button></p>
+					</p>
+				</div>
 			</div>
 		</div>
 	</div>

invoice-billing-list.html

@@ -39,11 +39,13 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html" class="selected">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html" class="selected">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
@@ -53,64 +55,64 @@
 				</legend>
 				<div class="demandCate">
 					<ul class="cateList">
-	  					<li><a class="now" href="#">所有</a><a href="#" title="未认领">未认领</a><a href="#" title="已开票">已开票</a></li>
+	  					<li><a class="now" href="#">所有</a><a href="#" title="未认领">未认领</a><a href="#" title="已入账">已入账</a></li>
 	  					<li><select><option>2016年</option></select> <select><option>不限</option><option>1月</option></select></li>
-	  			</ul>
+						<li><div class="search"><div class="input-append">
+									<input class="span3" placeholder="收款金额，收款信息" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
 	  			</div>
-		  		<table class="table">
-		  			<thead>
-		  				<tr>
-		  					<th>收款金额</th>
-		  					<th>收款信息</th>
-		  					<th>收款银行</th>
-		  					<th>银行到帐时间</th>
-		  					<th>录入收款</th>
-		  					<th>认领收款</th>
-		  					<th>发票</th>
-		  					<th>操作</th>
-		  				</tr>
-		  			</thead>
+				<div class="saeaList">
+		  		<table class="table table-hover">
+					<tr class="thead">
+						<th>收款金额</th>
+						<th>收款信息</th>
+						<th>到帐银行/到帐时间</th>
+						<th>录入收款</th>
+						<th>收款认领</th>
+						<th>开票流水号</th>
+						<th>操作</th>
+					</tr>
 	  				<tr>
-	  					<td><b class="colOrange">￥30000.00</b></td>
+	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-	  					<td>广发银行珠海分行柠溪支行</td>
-	  					<td>2015-04-12</td>
+	  					<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td><a href="#receive"  data-toggle="modal">变更</a></td>
 	  				</tr>
 	  				<tr>
-	  					<td><b class="colOrange">￥30000.00</b></td>
+	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-	  					<td>广发银行珠海分行柠溪支行</td>
-	  					<td>2015-04-12</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td><a href="#receive"  data-toggle="modal">变更</a></td>
 	  				</tr>
 	  				<tr>
-	  					<td><b class="colOrange">￥30000.00</b></td>
+	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-	  					<td>广发银行珠海分行柠溪支行</td>
-	  					<td>2015-04-12</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
-	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a><br>4401204785 / NO.726348</td>
+	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a></td>
 	  					<td></td>
 	  				</tr>
 	  				<tr>
-	  					<td><b class="colBlue">￥30000.00</b></td>
+	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-	  					<td>广发银行珠海分行柠溪支行</td>
-	  					<td>2015-04-12</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td></td>
 	  					<td><a href="#billeidt" data-toggle="modal">修改</a> <a  href="#billdel" data-toggle="modal">删除</a></td>
 	  				</tr>
 		  		</table>
+					</div>
 		  						<!--翻页-->
 				<div class="demandPage">
 					<ul class="pagination fL">
@@ -126,134 +128,92 @@
 			</div>
 		</div>
 	</div>
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invoiced">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">NO.07957263</td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
 
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    		<tr>
-    			<th>邮寄物品</th><td colspan="3">锁x1、宣传但x2</td>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容-->   
-	<!--弹出认领-->
+	<!--弹出变更-->
 <div class="modal hide fade" id="receive">
+	<div class="modal-dialog">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>变更认领人</h3>
     </div>
     <div class="modal-body">
     	<form class="form-horizontal">
 			<div class="control-group">
-	          <label class="control-label"><span class="colRed">*</span>认领人</label>
-	          <div class="controls">
-	           	<select><option>广东办-刘飞</option><option>广东办-姜栋</option></select>
-	          </div>
-		    </div>   		
-    	</form>
+				<label class="control-label"><span class="colRed">*</span>办事处</label>
+				<div class="controls">
+					<select><option>公共待认领收款</option><option>广西办</option></select>
+				</div>
+			</div>
+			<div class="control-group">
+				<label class="control-label"></label>
+				<div class="controls">
+					<select><option>办事处待认领收款</option><option>姜栋</option></select>
+				</div>
+			</div>
+		</form>
     </div>
 	<div class="modal-footer">
 	    <a href="#" class="button">确定</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--弹出认领--> 
+    <!--弹出变更-->
 	<!--弹出修改-->
 <div class="modal hide fade" id="billeidt">
+	<div class="modal-dialog">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>修改收款</h3>
     </div>
-    <div class="modal-body">
-    	<form class="form-horizontal">
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款金额</label>
-              <div class="controls">
-                <input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款信息</label>
-              <div class="controls">
-                <input type="text">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款银行</label>
-              <div class="controls">
-                <select>
-	            	<option>广发银行珠海分行柠溪支行</option>
-	            </select>
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>银行到款时间</label>
-              <div class="controls">
-                <input type="date">
-              </div>
-            </div>
-    	</form>
-    </div>
+			<div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" colspan="4">收款信息填写</th>
+					</tr>
+					<tr>
+						<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款信息</th><td><input type="text"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款银行</th><td>
+						<select>
+							<option>广发银行珠海分行柠溪支行</option>
+						</select></td>
+					</tr>
+					<tr>
+						<th class="taC">银行到帐时间</th><td><input type="date"></td>
+					</tr>
+					<tr>
+						<th class="taC">认领收款</th><td colspan="3">
+						<select>
+							<option>公共待认领款项</option>
+							<option>广东办</option>
+							<option>广西办</option>
+							<option>重庆办</option>
+						</select>
+
+						<select>
+							<option>办事处待认领款项</option>
+							<option>广东办-刘飞</option>
+						</select></td>
+					</tr>
+					</tbody></table>
+			</div>
 	<div class="modal-footer">
 	    <a href="#" class="button">确定</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
     <!--弹出修改-->   
 	<!--弹出删除-->
 <div class="modal hide fade" id="billdel">
+	<div class="modal-dialog">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>删除收款</h3>
     </div>
@@ -264,7 +224,59 @@
 	    <a href="#" class="button">删除</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--弹出删除-->             	
+    <!--弹出删除-->
+	<!--弹出（录入收款）-->
+	<div class="modal hide fade" id="inputbill">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>录入收款</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" colspan="4">收款信息填写</th>
+						</tr>
+						<tr>
+							<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款信息</th><td><input type="text"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款银行</th><td>
+							<select>
+								<option>广发银行珠海分行柠溪支行</option>
+							</select></td>
+						</tr>
+						<tr>
+							<th class="taC">银行到帐时间</th><td><input type="date"></td>
+						</tr>
+						<tr>
+							<th class="taC">认领收款</th><td colspan="3">
+							<select>
+								<option>公共待认领款项</option>
+								<option>广东办</option>
+								<option>广西办</option>
+								<option>重庆办</option>
+							</select>
+
+							<select>
+								<option>办事处待认领款项</option>
+								<option>广东办-刘飞</option>
+							</select></td>
+						</tr>
+						</tbody></table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--弹出内容-->
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>

invoice-input-billing.html

@@ -0,0 +1,251 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html" class="selected">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="borad-menu">
+					<a href="#inputbill" data-toggle="modal" class="invoice">录入收款</a>
+				</div>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-input-billing-all.html">查看更多</a></div>最近入账</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">收款录入</th><th class="taC">收款认领</th></tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td>陈特 认领 2016-03-03</td>
+								</tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td>张少珊 转入 公共待认领款项 2016-03-03</td>
+								</tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td>张少珊 转入 办事处待认领款项 2016-03-03</td>
+								</tr>
+								<tr>
+									<td><b>￥3000.00</b></td>
+									<td>张宇</td>
+									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
+									<td>张少珊 2016-03-03</td>
+									<td>张少珊 转入 刘飞 2016-03-03</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有已认领的收款</p></blockquote>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!--弹出变更-->
+<div class="modal hide fade" id="receive">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>变更认领人</h3>
+    </div>
+    <div class="modal-body">
+    	<form class="form-horizontal">
+			<div class="control-group">
+				<label class="control-label"><span class="colRed">*</span>办事处</label>
+				<div class="controls">
+					<select><option>公共待认领收款</option><option>广西办</option></select>
+				</div>
+			</div>
+			<div class="control-group">
+				<label class="control-label"></label>
+				<div class="controls">
+					<select><option>办事处待认领收款</option><option>姜栋</option></select>
+				</div>
+			</div>
+		</form>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button">确定</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出变更-->
+	<!--弹出修改-->
+<div class="modal hide fade" id="billeidt">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>修改收款</h3>
+    </div>
+			<div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" colspan="4">收款信息填写</th>
+					</tr>
+					<tr>
+						<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款信息</th><td><input type="text"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款银行</th><td>
+						<select>
+							<option>广发银行珠海分行柠溪支行</option>
+						</select></td>
+					</tr>
+					<tr>
+						<th class="taC">银行到帐时间</th><td><input type="date"></td>
+					</tr>
+					<tr>
+						<th class="taC">认领收款</th><td colspan="3">
+						<select>
+							<option>公共待认领款项</option>
+							<option>广东办</option>
+							<option>广西办</option>
+							<option>重庆办</option>
+						</select>
+
+						<select>
+							<option>办事处待认领款项</option>
+							<option>广东办-刘飞</option>
+						</select></td>
+					</tr>
+					</tbody></table>
+			</div>
+	<div class="modal-footer">
+	    <a href="#" class="button">确定</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出修改-->   
+	<!--弹出删除-->
+<div class="modal hide fade" id="billdel">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>删除收款</h3>
+    </div>
+    <div class="modal-body">
+    	数据诚可贵，删除需谨慎！
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button">删除</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出删除-->
+	<!--弹出（录入收款）-->
+	<div class="modal hide fade" id="inputbill">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>录入收款</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" colspan="4">收款信息填写</th>
+						</tr>
+						<tr>
+							<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款信息</th><td><input type="text"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款银行</th><td>
+							<select>
+								<option>广发银行珠海分行柠溪支行</option>
+							</select></td>
+						</tr>
+						<tr>
+							<th class="taC">银行到帐时间</th><td><input type="date"></td>
+						</tr>
+						<tr>
+							<th class="taC">认领收款</th><td colspan="3">
+							<select>
+								<option>公共待认领款项</option>
+								<option>广东办</option>
+								<option>广西办</option>
+								<option>重庆办</option>
+							</select>
+
+							<select>
+								<option>办事处待认领款项</option>
+								<option>广东办-刘飞</option>
+							</select></td>
+						</tr>
+						</tbody></table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-my.html

@@ -39,307 +39,379 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li class="news"><a href="invoice-my.html" class="selected">我的发票</a></li>
 						<li class="news"><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine news"><a href="invoice-billing.html">收款认领</a></li>
-						<li class="news"><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li class="news"><a href="invoice-print.html">发票打印</a></li>
 						<li class="news"><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					<div class="fR">
-					<div class="search fL">
-						<div class="input-append">
-	      			<input class="span3" type="text" placeholder="输入发票抬头、金额搜索">
-	      			<button class="btn btn-small" type="button">搜索</button>
-	    			</div>
-	    			</div>
-	    			<a href="invoice-add.html" class="button">申请开票</a></div>
-				</legend>
-				<!--待处理-->
-				<legend>待处理</legend>
-	  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state"><span class="contactsTag tagCol-04">退回</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#invdetail" data-toggle="modal">详情（点我）</a>
-								</div>
-								<div class="entry">
-									<a href="invoice-edit.html">重新申请</a>
-								</div>
-								<div class="entry">
-									<a href="#invalid" data-toggle="modal">作废</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-06">作废</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a>
-								</div>
-								<div class="entry">
-									<a href="#">移除</a>
-								</div>
-							</div>
-						</li>
-						<!--没数据提示-->
-						<li class="colGray">
-							暂时没有需要您处理的发票
-						</li>
-					</ul>
-				</div>
-				<!--审核中-->
-				<legend>进行中</legend>				
-	  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state"><span class="contactsTag tagCol-05">审核中</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									
-								</div>
-								<div class="entry">
-									<a href="#">详情</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-05">审核中</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-02">打印中</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									赵淑燕<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a data-toggle="modal">详情</a>
-								</div>
-							</div>
-						</li>
-						<!--没数据提示-->
-						<li class="colGray">
-							暂时没有进行中的发票
-						</li>
-					</ul>
-				</div>
-				<!--完成-->
-				<legend>
-				<div class="fR"><a href="invoice-pall.html">查看更多</a></div>
-				处理完成</legend>				
-	  			<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已邮寄</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray">顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已邮寄</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray">顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></p>
+				<div class="saea-borad">
+					<div class="borad-menu">
+						<a href="invoice-addn.html" class="invoice">申请开票</a>
+					</div>
+					<div class="borad-news">
+						<div class="saeaList">
+							<div class="clearfix">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC">本月累计开票</th><td>￥3999.00</td><th class="taC">本月累计入账</th><td>￥3999.00</td></tr>
+									<tr><th class="taC">10月累计开票</th><td>￥838,273.00</td><th class="taC">10月累计入账</th><td>￥838,273.00</td></tr>
+									<tr><th class="taC">今年累计开票</th><td>￥209,484,765.00</td><th class="taC">今年累计入账</th><td>￥209,484,765.00</td></tr>
+									</tbody>
+
+								</table>
 							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a></p>
-								</div>
+							<div class="clearfix">
+								<legend><div class="fR"></div>待处理</legend>
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC" width="70">状态</th><th class="taC">开票单位（抬头）</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC">处理时间</th><th class="taC" width="120">操作</th></tr>
+									<tr>
+										<td><span class="colOrange">已退回</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+										<td width=""><div class="btn-group"><a class="button btn-red  btn-inline"  data-toggle="modal" href="#invalid">终止开票</a><a class="button btn-inline" href="invoice-edit.html">重新提交</a></div></td>
+									</tr>
+									<tr>
+										<td><span class="colRed">已终止</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b><sup>专</sup></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+										<td width=""><a class="button btn-gray btn-block" href="">从待处理移除</a></td>
+									</tr>
+									<tr>
+										<td><span class="colRed">已退票</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+										<td width=""><a class="button btn-gray btn-block" href="">从待处理移除</a></td>
+									</tr>
+									<tr>
+										<td><span class="colBlue">已出票</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+										<td width=""><div class="btn-group"><a class="button btn-red  btn-inline" href="#return" data-toggle="modal">申请退票</a><a class="button btn-green" href="#recorded" data-toggle="modal">收款入账</a></div></td>
+									</tr>
+									<tr>
+										<td><span class="colBlue">已出票</span> <a href="#shipping" data-toggle="modal">邮寄</a></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b><sup>专</sup></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+										<td width=""><div class="btn-group"><a class="button btn-red  btn-inline" href="#return" data-toggle="modal">申请退票</a><a class="button btn-green" href="#recorded" data-toggle="modal">收款入账</a></div></td>
+									</tr>
+									</tbody>
+								</table>
+								<blockquote><p class="colGray">暂时没有需要处理的发票 </p></blockquote>
 							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已打印</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray"></p>
+							<div class="clearfix">
+								<legend><div class="fR"></div>处理中</legend>
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC" width="70">状态</th><th class="taC">开票单位（抬头）</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC">处理时间</th></tr>
+									<tr>
+										<td><span class="">审核中</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td><span class="">审核中</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td><span class="colBlue">出票中</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td><span class="colRed">退票中</span></td>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									</tbody>
+								</table>
+								<blockquote><p class="colGray">暂时没有正在处理的发票 </p></blockquote>
 							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a></p>
-								</div>
+							<div class="clearfix">
+								<legend><div class="fR"><a href="invoice-pall.html">查看更多</a></div>最近入账</legend>
+								<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC">开票单位（抬头）</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC" width="90">收款金额</th><th class="taC">收款流水号</th><th class="taC">处理时间</th></tr>
+									<tr>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b><sup>专</sup></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									<tr>
+										<td>珠海XXXX公司</td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+										<td><b>￥3000.00</b></td>
+										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
+										<td>张少珊 2016-03-03 11:30:03</td>
+									</tr>
+									</tbody>
+								</table>
+								<blockquote><p class="colGray">暂时没有入账完成的发票 </p></blockquote>
 							</div>
-						</li>
-					</ul>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
 	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invdetail">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-05">审核中</span></td><td colspan="3">2016-11-01 11:03:03<br>张少珊：审批意见</td></tr>
-    			<tr><td><span class="contactsTag tagCol-02">打印中</span></td><td colspan="3">2016-11-01 11:03:03<br>赵淑燕：可以打印</td></tr>
-    			<tr><td><span class="contactsTag tagCol-04">退回</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：申请金额有误</td></tr>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">赵淑燕 2016-11-01 11:03:03</td></tr>
-    			<tr><td><span class="contactsTag tagCol-01">已邮寄</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-    			<tr><td><span class="contactsTag tagCol-06">作废</span></td><td colspan="3" class="colRed">2016-11-01 11:03:03<br>赵淑燕：作废意见</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">No.07957263</td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
+	<div class="modal hide fade" id="invdetail">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>发票单详情</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
+							<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">所在办事处</th><td>广东办（刘飞）</td>
+							<th class="taC" width="150">备注</th><td></td>
+						</tr>
+						<tr>
+							<th class="taC">开票金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
+							<th class="taC">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
+						</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">增值税普通发票</th>
+						</tr>
+						<tr>
+							<th class="taC" width="150">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
 
-    		<tr>
-    			<th>申请单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    		<tr>
-    			<th>邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">收款信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>收款金额</th><td>￥200000.00</td>
-    			<th>收款信息</th><td>陈宇</td>
-    		</tr>
-    		<tr>
-    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
-    			<th>银行到帐</th><td>2016-04-11</td>
-    		</tr>
-    		<tr>
-    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
-    			<th>认领收款</th><td>张少珊 转入 陈特<br>2015-04-12 11:30:02</td>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+						</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">增值税专用发票</th>
+						</tr>
+						<tr>
+							<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+							<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+						</tr>
+
+						<tr>
+							<th class="taC">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
+							<th class="taC">注册电话</th><td>0756-34324</td>
+						</tr>
+						<tr>
+							<th class="taC">开户银行</th><td>广发银行</td>
+							<th class="taC">银行账户</th><td>234324234</td>
+						</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">邮寄信息</th>
+						</tr>
+						<tr>
+							<th class="taC" width="150">收件人</th><td>陈工</td>
+							<th class="taC" width="150">收件人手机/电话</th><td>12345678901</td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+						</tr>
+						<tr>
+							<th class="taC" width="150">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
 	</div>
-</div>
-    <!--弹出内容-->
-	<!--弹出作废-->
-<div class="modal hide fade" id="invalid">
+	<!--弹出发票详情-->
+	<!--弹出收款-->
+	<div class="modal hide fade" id="billing">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>收款单详情</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC">收款流水号</th><td>#SK20160316001</td>
+							<th class="taC">录入收款</th><td>张少珊 2015-04-12 11:30:02</td>
+						</tr>
+						<tr>
+							<th class="taC">收款金额</th><td><b>￥200000.00</b></td>
+							<th class="taC">收款信息</th><td>陈宇</td>
+						</tr>
+						<tr>
+							<th class="taC">收款银行</th><td>广发银行珠海分行柠溪支行</td>
+							<th class="taC">银行到帐</th><td>2016-04-11</td>
+						</tr>
+						<tr>
+							<th class="taC">认领收款</th><td colspan="3">张少珊 转入 陈特 2015-04-12 11:30:02</td>
+						</tr>
+						</tbody></table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--弹出收款-->
+	<!--弹出终止-->
+	<div class="modal hide fade" id="invalid">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>是否终止该发票</h3>
+				</div>
+				<div class="modal-body">
+					终止后该发票申请将无法继续审批。
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button">是的</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--终止-->
+	<!--弹出 退票-->
+	<div class="modal hide fade" id="return">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>申请退票</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC"><span class="colRed">*</span>退票原因</th><td><textarea class="span4" placeholder="请详细填写退票原因"></textarea></td>
+						</tr>
+						<tr>
+							<th class="taC"><span class="colRed">*</span>是否邮寄</th><td><label class="radio inline"><input type="radio">是</label>
+							<label class="radio inline"><input type="radio">否</label></td>
+						</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="2" class="taC">退票邮寄信息</th>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递公司</th><td>
+							<select><option>顺丰速运</option><option>圆通速运</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递单号</th><td><input type="text" placeholder="请正确填写单号，方便跟踪查询。"></td></tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>邮寄物品</th><td><textarea class="span4" placeholder="请详细填写邮寄回总部的快递包含什么物件。"></textarea></td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button">确认提交</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--退票-->
+	<!--弹出入账-->
+<div class="modal hide fade" id="recorded">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
     <div class="modal-header">
-    <h3>是否作废该发票</h3>
+    <h3>发票入账</h3>
     </div>
     <div class="modal-body">
-    	作废后该发票申请将无法继续审批。如果你的发票通过“收款”开具，作废后，收款与发票将解除绑定。
+    	<p class="alert">发票与收款进行绑定，完成入账；入账后，已绑定发票的收款金额将作为您的最终销售收入。</p>
+		<table class="table table-bordered table-condensed">
+			<thead><th>金额</th><th>到款信息</th><th>到款银行</th><th>到款时间</th><th>入账操作</th></thead>
+			<tbody>
+			<tr class="success"><td>￥3000.00</td><td>李艳芬/鹅蛋山</td><td>广发银行珠海分行柠溪份支行</td><td>2016-04-11</td><td><label><input type="checkbox"> 使用Ta</label></td></tr>
+			<tr class=""><td>￥5000.00</td><td>到款信息</td><td>广发银行珠海分行柠溪份支行</td><td>2016-04-12</td><td><label><input type="checkbox"> 使用Ta</label></td></tr>
+			<tr class=""><td>￥6900.00</td><td>到款信息</td><td>广发银行珠海分行柠溪份支行</td><td>2016-04-13</td><td><label><input type="checkbox"> 使用Ta</label></td></tr>
+			</tbody>
+		</table>
+		<p class="alert alert-erro">收款金额超出开票金额 ￥2000.00元，请谨慎操作。</p>
     </div>
 	<div class="modal-footer">
-	    <a href="#" class="button">是的</a>
+		<a href="#" class="button " data-dismiss="modal" aria-hidden="true">确定入账</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--作废-->  
+    <!--入账-->
 	<!--弹出邮寄-->
 <div class="modal hide fade" id="shipping">
-    <div class="modal-header">
-    <h3>邮寄物品</h3>
-    </div>
-    <div class="modal-body">
-    	<p>申请物品：发票×1、软件锁套装x1</p>
-    	<p>邮寄物品：<b>发票×1、软件锁套装x1</b></p>
-    	<br>
-    	<ul>
-    		<li>• 2016-04-09 20:16:17【珠海市】圆通速递 广东省珠海市收件员 已揽件</li>
-    		<li>• 2016-04-09 20:16:17【珠海市】广东省珠海市香洲区2派件员：陈华辉 13676058042正在为您派件</li>
-    	</ul>
-    </div>
+	<div class="modal-dialog ">
+		<div class="modal-content">
+	<div class="modal-header">
+		<h3>邮寄物品</h3>
+	</div>
+	<div class="modal-body">
+		<p>申请物品：发票×1、软件锁套装x1</p>
+		<p>邮寄物品：<b>发票×1、软件锁套装x1</b></p>
+		<p>顺丰速运：01239812382398</p>
+		<br>
+		<ul>
+			<li>• 2016-04-09 20:16:17【珠海市】圆通速递 广东省珠海市收件员 已揽件</li>
+			<li>• 2016-04-09 20:16:17【珠海市】广东省珠海市香洲区2派件员：陈华辉 13676058042正在为您派件</li>
+		</ul>
+	</div>
 	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+		<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--邮寄-->           	
+	<!--邮寄-->
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>

invoice-pall.html

@@ -39,83 +39,64 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html" class="selected">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					<div class="fR">
-					<div class="search fL">
-						<div class="input-append">
-	      			<input class="span3" type="text" placeholder="输入发票抬头进行搜索">
-	      			<button class="btn btn-small" type="button">搜索</button>
-	    			</div>
-	    			</div>
-	    			<a href="invoice-add.html" class="button">申请开票</a></div>
-				</legend>
-				<legend>
-				处理完成</legend>	
+				入账完成发票</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 	  					<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#" >今年</a><a href="#" >更旧</a></li>
-	  			</ul>
-	  		</div>		
-		  		<div class="invoList">
-					<ul class="entry">
-						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已邮寄</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray">顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#invdetail" data-toggle="modal">详情（点我）</a>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已邮寄</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray">顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a></p>
-								</div>
-							</div>
-						</li>
 						<li>
-							<div class="state"><span class="contactsTag tagCol-01">已打印</span></div>
-							<div class="info">
-								<h4>珠海XXXX公司</h4>
-								<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								<p class="colGray"></p>
-							</div>
-							<div class="update">
-								<div class="entry colGray">
-									张少珊<br>2016-03-03 11:30:03
-								</div>
-								<div class="entry">
-									<a href="#">详情</a></p>
-								</div>
+							<div class="search">
+							<div class="input-append">
+								<input class="span3" type="text" placeholder="发票抬头、开票金额">
+								<button class="btn btn-small" type="button">搜索</button>
 							</div>
 						</li>
-					</ul>
+	  			</ul>
+	  		</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票金额</th><th>开票单位（抬头）</th><th>开票内容</th><th>收款流水号</th><th>收款金额</th><th>入账时间</th></tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td><b>￥3000.00</b></td>
+							<td>珠海XXXX公司</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td><a href="#" data-toggle="modal">#SK20160316001</a>，<a href="#" data-toggle="modal">#SK20160316001</a>，<a href="#" data-toggle="modal">#SK20160316001</a></td>
+							<td><b>￥3000.00</b></td>
+							<td>2016-03-03<br>11:30:03</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>珠海XXXX公司</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td><a href="#" data-toggle="modal">#SK20160316001</a></td>
+							<td><b>￥3000.00</b></td>
+							<td>2016-03-03<br>11:30:03</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td><b>￥3000.00</b></td>
+							<td>珠海XXXX公司</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td><a href="#" data-toggle="modal">#SK20160316001</a></td>
+							<td><b>￥3000.00</b></td>
+							<td>2016-03-03<br>11:30:03</td>
+						</tr>
+						</tbody>
+					</table>
 				</div>
 				<!--翻页-->
 				<div class="demandPage">
@@ -132,86 +113,5 @@
 			</div>
 		</div>
 	</div>
-	<!--弹出（锁信息）-->
-<div class="modal hide fade" id="invdetail">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">张少珊 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">No.07957263</td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-    		
-    		<tr>
-    			<th>申请单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td>广东省珠海市XXX路XXX号</td>
-    			<th></th><td></td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">收款信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>收款金额</th><td>￥200000.00</td>
-    			<th>收款信息</th><td>陈宇</td>
-    		</tr>
-    		<tr>
-    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
-    			<th>银行到帐</th><td>2016-04-11</td>
-    		</tr>
-    		<tr>
-    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
-    			<th>认领收款</th><td>陈特 认领<br>2015-04-12 11:30:02</td>
-    		</tr>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容-->  	
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>

invoice-print-all.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html" class="selected">发票打印</a></li>
+						<li><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					已打印发票
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#">今年</a><a href="#">更旧</a></li>
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="span3" placeholder="发票抬头、开票金额" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>提交开票</th><th>发票号</th><th>打印发票</th></tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>No.99028</td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>No.99028</td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+						<li><a href="#">&lt;</a></li>
+						<li><a href="#">1</a></li>
+						<li class="active"><a href="#">2</a></li>
+						<li><a href="#">3</a></li>
+						<li><a href="#">4</a></li>
+						<li><a href="#">5</a></li>
+						<li><a href="#">&gt;</a></li>
+					</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-print-detail.html

@@ -39,103 +39,118 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html" class="selected">发票打印</a></li>
 						<li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>
-					开票打印
-				</legend>
-				<div class="fR " style="width:35%;">
-					<form class="form-horizo1ntal">
-						<div class="control-group">
-			              <label class="control-label"><span class="colRed">*</span>发票代码</label>
-			              <div class="controls">
-			                <input type="text">
-			              </div>
-			            </div>
-						<div class="control-group">
-			              <label class="control-label"><span class="colRed">*</span>发票号</label>
-			              <div class="controls">
-			                <input type="text" value="No.">
-			              </div>
-			            </div>
-			            <div class="control-group">
-			            </div>
-					</form>
-					<div class="invoButton clearfix">
-							<a href="" class="buttonDone buttonBlock"  data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票">完成打印</a>
-	  				</div>
+				<div class="borad-news">
+					<div class="saeaList">
+						<legend>
+							打印发票
+						</legend>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
+								<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">所在办事处</th><td>广东办</td>
+								<th class="taC" width="150">备注</th><td></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
+								<th class="taC">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税普通发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
+
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税专用发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+								<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+							</tr>
+							</tr>
+							<tr>
+								<th class="taC">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
+								<th class="taC">注册电话</th><td>0756-34324</td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行</th><td>广发银行</td>
+								<th class="taC">银行账户</th><td>234324234</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">邮寄信息</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件人</th><td>陈工</td>
+								<th class="taC" width="150">收件人手机/电话</th><td>12345678901</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr><th width="60%" class="taC">审批流程</th><th class="taC">发票打印</th></tr>
+							<tr><td>
+								<blockquote>
+									<p><span class="colGray">2016-11-10 11:03:11</span>&nbsp;广东办-刘飞&nbsp;创建</p>
+								</blockquote>
+								<blockquote>
+									<p><span class="colGray">2016-11-10 11:15:23</span>&nbsp;广东办-刘飞&nbsp;提交审批</p>
+								</blockquote>
+								<blockquote>
+									<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colGreen">同意</span> 审批意见文本</p>
+								</blockquote>
+								<blockquote>
+									<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colOrange">退回</span> 审批意见文本</p>
+								</blockquote>
+								<blockquote>
+									<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colRed">终止</span> 审批意见文本</p>
+								</blockquote>
+								<blockquote>
+									<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-赵淑燕&nbsp;<span class="colGreen">打印</span> No.0987235</p>
+								</blockquote>
+							</td><td>
+								<p><span class="colRed">*</span>No.<input value="" type="text" placeholder="输入发票号"></p><br>
+								<div class="invoButton clearfix">
+									<a href="" class="buttonDone buttonBlock"  data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票">完成打印</a>
+								</div></td></tr>
+							</tbody>
+						</table>
+					</div>
 				</div>
-				<table class="table" style="width:60%">
-					<thead><tr><th>收款信息</th></tr></thead>
-					<tr>
-						<th width="60">收款金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
-						<th width="60">收款信息</th><td>陈宇</td>
-					</tr>
-					<tr>
-						<th width="60">银行到帐</th><td>2016-04-11</td>
-						<th width="60">收款录入</th><td>张少珊<br>2015-04-12 11:30:02</td>
-					</tr>
-					<tr>
-						<th width="60">收款认领</th><td>陈特 认领<br>2015-04-13 11:30:02</td>
-						<th width="60"></th><td></td>
-					</tr>
-				</table>
-				<table class="table" style="width:60%">
-					<thead><tr><th>发票信息</th></tr></thead>
-					<tr>
-						<th width="60">开票金额</th><td><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
-						<th width="60"></th><td></td>
-					</tr>
-					<tr>
-						<th width="60">发票类型</th><td><span class="colGreen">普通发票</span> <span class="colBlue">增值税发票</span></td>
-						<th width="60">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-					</tr>
-					<!--普通发票信息-->
-					<tr>
-						<th width="60">发票抬头</th><td><span class="colGreen">珠海纵横创建软件有限公司</span></td>
-						<th width="60"></th><td></td>
-					</tr>
-					<!--增值税发票信息-->
-					<tr>
-						<th width="60">单位名称</th><td><span class="colBlue">珠海纵横创建软件有限公司</span></td>
-						<th width="60">识别码</th><td><span class="colBlue">1212123123123</span></td>
-					</tr>
-					<tr>
-						<th width="60">注册地址</th><td><span class="colBlue">广东省珠海市香洲区银桦路8号24D</span></td>
-						<th width="60">注册电话</th><td><span class="colBlue">0756-34324</span></td>
-					</tr>
-					<tr>
-						<th width="60">开户银行</th><td><span class="colBlue">广发银行</span></td>
-						<th width="60">银行账号</th><td><span class="colBlue">234324234</span></td>
-					</tr>
-					<tr>
-						<th width="60">单号</th><td>#F20160316001</td>
-						<th width="60">提交时间</th><td>2016-03-01 12:30:01</td>
-					</tr>
-					<tr>
-						<th width="60">备注</th><td colspan="3">备注内容</td>
-					</tr>
-				</table>
-				<table class="table" style="width:60%">
-					<thead><tr><th>邮寄信息</th></tr></thead>
-					<tr>
-						<th width="60">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-					</tr>
-					<tr>
-						<th width="60">收件人</th><td>陈工</td>
-						<th width="60">手机/电话</th><td>12345678901</td>
-					</tr>
-					<tr>
-						<th width="60">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
-					</tr>
-				</table>
 			</div>
 		</div>
 	</div>

invoice-print.html

@@ -39,58 +39,73 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html" class="selected">发票打印</a></li>
                         <li><a href="invoice-shipping.html">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>待打印</legend>
-		  		<div class="invoList">
-						<ul class="entry">
-							<li>
-								<div class="state"><span class="contactsTag tagCol-02">打印中</span></div>
-								<div class="info">
-									<h4>珠海XXXX公司</h4>
-									<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-								</div>
-								<div class="update">
-									<div class="entry colGray">
-										赵淑燕<br>2016-03-03 11:30:03
-									</div>
-									<div class="entry">
-										<a href="invoice-print-detail.html" class="button">打印</a>
-									</div>
-								</div>
-							</li>
-						</ul>
+
+				<div class="borad-menu">
 				</div>
-                <legend><div class="fR"><a href="invoice-print-all.html">查看更多</a></div>最近打印</legend>
-		  		<div class="invoList">
-						<ul class="entry">
-							<li>
-								<div class="state"><span class="contactsTag tagCol-01">已打印</span></div>
-								<div class="info">
-									<h4>珠海XXXX公司</h4>
-									<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p> 
-									<p class="colGreen">4400152320 / No.07957263</p>
-								</div>
-								<div class="update">
-									<div class="entry colGray">
-										赵淑燕 打印<br>2016-03-03 11:30:03
-									</div>
-                                    <div class="entry">
-                                        <a href="#editshipping" data-toggle="modal">修改邮寄</a>
-                                    </div>
-                                    <div class="entry">
-                                        <a href="#invdetail" data-toggle="modal">详情</a>
-                                    </div>
-								</div>
-							</li>
-						</ul>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<legend><div class="fR"></div>待打印</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">完成审批</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+									<td><a class="button btn-block" href="invoice-print-detail.html" >打印发票</a></td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+									<td><a class="button btn-block" href="invoice-print-detail.html" >打印发票</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要打印的发票</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-print-all.html">查看更多</a></div>最近打印发票</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">发票号</th><th class="taC">打印发票</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>No.99028</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>No.99028</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有已打印的发票</p></blockquote>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -103,12 +118,14 @@
     <div class="modal-body">
     	<table class="table">
     		<thead>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">黄爱玲 邮寄 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
+    			<tr><td><span class="contactsTag tagCol-02">已出票</span></td><td colspan="3">黄爱玲 邮寄 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
     		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">No.07957263</td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
+			<tr>
+				<th>申请单号</th><td>#F20160316001</td>
+				<th>提交时间</th><td>2016-03-01 12:30:01</td>
+			</tr>
+    		<tr><th width="50">金额</th><td><b class="colOrange">￥3000.00</b>
+				<th width="50">发票号</th><td>No.07957263</td></td>
     		</tr>
     		<tr><th width="50">发票类型</th><td>普通发票</td>
     			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
@@ -128,11 +145,6 @@
     			<th width="50">开户银行</th><td>广发银行</td>
     			<th width="50">银行账号</th><td>234324234</td>
     		</tr>
-
-    		<tr>
-    			<th>申请单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
     		<tr>
     			<th>备注</th><td colspan="3">备注内容</td>
     		</tr>
@@ -179,28 +191,19 @@
     <!--弹出内容-->   
 
     <!--弹出（打印发票）-->
-<div class="modal hide fade" id="editshipping">
+<div class="modal hide fade" id="editprint">
     <div class="modal-header">
-    <h3>修改邮寄信息</h3>
+    <h3>修改打印信息</h3>
     </div>
     <div class="modal-body">
-        <table class="table">
-            <thead>
-            <tr>
-                <td colspan="4">邮寄信息</td>
-            </tr>
-        </thead>
-            <tr>
-                <th width="60">收件地址</th><td colspan="3"><input type="text" class="span5" value="广东省珠海市XXX路XXX号"></td>
-            </tr>
-            <tr>
-                <th width="60">收件人</th><td><input type="text" value="陈工" class="span2"></td>
-                <th width="60">手机/电话</th><td><input type="text" value="12345678901" class="span2"></td>
-            </tr>
-            <tr>
-                <th width="60">邮寄物品</th><td colspan="3"><input type="text" class="span5" value="合同x1、锁套装x1"></td>
-            </tr>
-        </table>
+		<form class="form-horizontal">
+			<div class="control-group">
+				<label class="control-label"><span class="colRed">*</span>发票号</label>
+				<div class="controls">
+					No.<input value="07957263" type="text">
+				</div>
+			</div>
+		</form>
     </div>
     <div class="modal-footer">
         <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>

invoice-return-all.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-return.html" class="selected">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					已退发票
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#">今年</a><a href="#">更旧</a></li>
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="span3" placeholder="发票抬头、开票金额" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>提交退票</th><th>快递信息</th><th>确认退票</th></tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+						<li><a href="#">&lt;</a></li>
+						<li><a href="#">1</a></li>
+						<li class="active"><a href="#">2</a></li>
+						<li><a href="#">3</a></li>
+						<li><a href="#">4</a></li>
+						<li><a href="#">5</a></li>
+						<li><a href="#">&gt;</a></li>
+					</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-return.html

@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li class="news"><a href="invoice-shipping.html">发票邮寄</a></li>
+						<li><a href="invoice-return.html" class="selected">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="borad-menu">
+				</div>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<legend><div class="fR"></div>待确认退票</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交退票</th><th class="taC">退票快递</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td><a class="button btn-block"  href="#return" data-toggle="modal">确认退票</a></td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td><a class="button btn-block"  href="#return" data-toggle="modal">确认退票</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要邮寄的发票</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-return-all.html">查看更多</a></div>最近退票</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">快递信息</th><th class="taC">确认退票</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有已邮寄的发票</p></blockquote>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!--弹出退票确认-->
+<div class="modal hide fade" id="return">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>邮寄物品</h3>
+    </div>
+    <div class="modal-body">
+
+		若发票是邮寄回来的，请确认已经接收到发票。
+
+	</div>
+	<div class="modal-footer">
+	    <a href="#" class="button" data-dismiss="modal">确认退票</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--退票确认-->
+	<!--弹出快递跟踪-->
+<div class="modal hide fade" id="shipping">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>邮寄物品</h3>
+    </div>
+    <div class="modal-body saeaList">
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th class="taC">退票邮寄物品</th>
+			</tr>
+			<tr>
+				<td>发票</td>
+			</tr>
+			</tbody>
+		</table>
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th class="taC">快递跟踪</th>
+			</tr>
+			<tr>
+				<td class="taC">
+					<blockquote>
+						<p><span class="colGray">2016-11-22 周二 15:40:53</span>&nbsp;您的包裹已出库</p>
+					</blockquote>
+					<blockquote>
+						<p><span class="colGray">2016-11-22 周二 15:40:53</span>&nbsp;包裹正在等待揽收</p>
+					</blockquote>
+					<blockquote>
+						<p><span class="colGray">2016-11-21 周一 18:04:23</span>&nbsp;[泰州市]申通快递 兴化恒通婴儿用品公司收件员 已揽件</p>
+					</blockquote>
+
+				</td>
+			</tr>
+			</tbody>
+		</table>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--邮寄-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-shipping-all.html

@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
+	<link rel="shortcut icon" href="images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/global.css> 
+	<script src=js/jquery-1.7.1.min.js></script> 
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon- selected">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="invoiceTitle">发票申请</li>
+						<li><a href="invoice-my.html">我的发票</a></li>
+						<li><a href="invoice-billing-my.html">我的收款</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
+						<li><a href="invoice-approval.html">发票审批</a></li>
+						<li><a href="invoice-print.html">发票打印</a></li>
+						<li><a href="invoice-shipping.html" class="selected">发票邮寄</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					已打印发票
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a class="now" href="#">最近一个月</a><a href="#">最近三个月</a><a href="#">今年</a><a href="#">更旧</a></li>
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="span3" placeholder="发票抬头、开票金额" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>提交开票</th><th>快递信息</th><th>邮寄发票</th><th>操作</th></tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+							<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
+						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+							<td>赵淑燕 2016-03-03 12:20:20</td>
+							<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+						<li><a href="#">&lt;</a></li>
+						<li><a href="#">1</a></li>
+						<li class="active"><a href="#">2</a></li>
+						<li><a href="#">3</a></li>
+						<li><a href="#">4</a></li>
+						<li><a href="#">5</a></li>
+						<li><a href="#">&gt;</a></li>
+					</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+	<!--弹出修改邮寄-->
+	<div class="modal hide fade" id="editshipping">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>邮寄物品</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<div class="alert">
+						已邮寄发票，3天内可修改邮寄信息。
+					</div>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">申请邮寄信息</th>
+						</tr>
+						<tr>
+							<th class="taC" width="100">收件人</th><td>陈工</td>
+							<th class="taC" width="100">收件人手机/电话</th><td>12345678901</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+						</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">实际邮寄信息</th>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递公司</th><td>
+							<select><option>顺丰速运</option><option>圆通速运</option></select></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递单号</th><td><input type="text"></td></tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>邮寄物品</th><td colspan="3"><textarea class="span4"></textarea></td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button" data-dismiss="modal">确定</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--编辑-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

invoice-shipping.html

@@ -39,317 +39,193 @@
 						<li class="invoiceTitle">发票申请</li>
 						<li><a href="invoice-my.html">我的发票</a></li>
 						<li><a href="invoice-billing-my.html">我的收款</a></li>
-						<li class="topLine"><a href="invoice-billing.html">收款认领</a></li>
+						<li><a href="invoice-billing.html">收款认领</a></li>
+						<li class="topLine"><a href="invoice-input-billing.html">收款录入</a></li>
 						<li><a href="invoice-approval.html">发票审批</a></li>
 						<li><a href="invoice-print.html">发票打印</a></li>
                         <li class="news"><a href="invoice-shipping.html" class="selected">发票邮寄</a></li>
-						<li><a href="">报表</a></li>
+						<li><a href="invoice-return.html">发票退票</a></li>
+						<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
 					</ul>
 				</div>
 			</div>
 			<div class="adminContent autoHeight">
-				<legend>待邮寄</legend>
-		  		<div class="invoList">
-						<ul class="entry">
-							<li>
-								<div class="state"><span class="contactsTag tagCol-01">已打印</span></div>
-								<div class="info">
-									<h4>珠海XXXX公司</h4>
-									<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p> 
-									<p class="colGreen">No.07957263</p>
-								</div>
-								<div class="update">
-									<div class="entry colGray">
-										赵淑燕 打印<br>2016-03-03 11:30:03
-									</div>
-                                    <div class="entry">
-                                        <a href="#invdetail" data-toggle="modal">详情</a>
-                                    </div>
-									<div class="entry">
-										<a href="#addshipping" data-toggle="modal" class="button">邮寄</a>
-									</div>
-								</div>
-							</li>
-						</ul>
+				<div class="borad-menu">
 				</div>
-				<legend><div class="fR"><a href="invoice-shipping-all.html">查看更多</a></div>最近邮寄</legend>
-		  		<div class="invoList">
-						<ul class="entry">
-							<li>
-								<div class="state"><span class="contactsTag tagCol-01">已邮寄</span></div>
-								<div class="info">
-									<h4>珠海XXXX公司</h4>
-									<p class="colGray"><b class="colOrange">￥3000.00</b> • 2016-03-01 12:30:01 提交</p>
-									<p>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></p>
-								</div>
-								<div class="update">
-									<div class="entry colGray">
-										黄爱玲 邮寄<br>2016-03-03 11:30:03
-									</div>
-									<div class="entry">
-										<a href="#invdetail" data-toggle="modal">详情</a>
-									</div>
-									<div class="entry">
-										<a href="#editshipping" data-toggle="modal" >修改邮寄</a>
-									</div>
-								</div>
-							</li>
-						</ul>
+				<div class="borad-news">
+					<div class="saeaList">
+						<div class="clearfix">
+							<legend><div class="fR"></div>待邮寄</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">打印发票</th><th class="taC" width="120">操作</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+									<td><a class="button btn-block"  href="#addshipping" data-toggle="modal">邮寄发票</a></td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+									<td><a class="button btn-block"  href="#addshipping" data-toggle="modal">邮寄发票</a></td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有需要邮寄的发票</p></blockquote>
+						</div>
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-shipping-all.html">查看更多</a></div>最近邮寄发票</legend>
+							<table class="table table-bordered table-condensed">
+								<tbody>
+								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">快递信息</th><th class="taC">邮寄发票</th></tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								<tr>
+									<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+									<td>珠海XXXX公司</td>
+									<td><b>￥3000.00</b><sup>专</sup></td>
+									<td>广东办刘飞 2016-03-03 12:20:20</td>
+									<td>顺丰速运：<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+									<td>赵淑燕 2016-03-03 12:20:20</td>
+								</tr>
+								</tbody>
+							</table>
+							<blockquote><p class="colGray">暂时没有已邮寄的发票</p></blockquote>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="print">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td colspan="4" class="colRed">输入发票代码（纸质发票左上角）以及发票号（纸质发票右上角），完成发票打印操作。</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td><input type="text" class="span2" placeholder="输入发票代码"></td>
-    			<th width="50">发票号</th><td>No.<input type="text" class="span2" placeholder="输入发票号"></td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">打印</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出发票详情-->
 
 	<!--弹出邮寄-->
 <div class="modal hide fade" id="addshipping">
+	<div class="modal-dialog">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>邮寄物品</h3>
     </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">除了锁,要发个袋子</td>
-    		</tr>
-    	</table>
-        <form class="form-horizontal">
-			<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>快递公司</label>
-              <div class="controls">
-                <select><option>顺丰速运</option><option>圆通速运</option></select>
-              </div>
-            </div>
-			<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>快递单号</label>
-              <div class="controls">
-                <input type="text">
-              </div>
-            </div>
-			<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>邮寄物品</label>
-              <div class="controls">
-                <textarea class="span4"></textarea>
-              </div>
-            </div>
-    	</form>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button" data-dismiss="modal">确定</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--邮寄--> 
-    <!--弹出修改邮寄-->
-<div class="modal hide fade" id="editshipping">
-    <div class="modal-header">
-    <h3>邮寄物品</h3>
-    </div>
-    <div class="modal-body">
-        <div class="alert">
-            已邮寄发票，3天内可修改邮寄信息。
-        </div>
-        <table class="table">
-            <thead><tr><th width="50">邮寄信息</th><td></td>
-                <th width="60"></th><td></td></tr></thead>
-            <tr>
-            </tr>
-            <tr>
-                <th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-            </tr>
-            <tr>
-                <th>收件人</th><td>陈工</td>
-                <th>手机/电话</th><td>12345678901</td>
-            </tr>
-            <tr>
-                <th>备注</th><td colspan="3">除了锁,要发个袋子</td>
-            </tr>
-        </table>
-        <form class="form-horizontal">
-            <div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>快递公司</label>
-              <div class="controls">
-                <select><option>顺丰速运</option><option>圆通速运</option></select>
-              </div>
-            </div>
-            <div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>快递单号</label>
-              <div class="controls">
-                <input type="text" value="01239812382398">
-              </div>
-            </div>
-            <div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>邮寄物品</label>
-              <div class="controls">
-                <textarea class="span4">发票×1、软件锁套装x1</textarea>
-              </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="button" data-dismiss="modal">确定</a>
-        <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-    </div>
-</div>
-    <!--编辑-->   
-	<!--弹出（发票详情）-->
-<div class="modal hide fade" id="invdetail">
-    <div class="modal-header">
-    <h3>发票单详情</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead>
-    			<tr><td><span class="contactsTag tagCol-01">已打印</span></td><td colspan="3">黄爱玲 邮寄 2016-11-01 11:03:03<br>圆通速运：1231243255232323</td></tr>
-    		</thead>
-    		<tr><th width="50">发票代码</th><td class="colGreen">4400152320</td>
-    			<th width="50">发票号</th><td class="colGreen">No.07957263</td>
-    		</tr>
-    		<tr><th width="50">金额</th><td colspan="3"><b class="colOrange">￥3000.00</b></td>
-    		</tr>
-    		<tr><th width="50">发票类型</th><td>普通发票</td>
-    			<th width="50">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
-    		</tr>
-    		<!--普通发票-->
-    		<tr><th width="50">发票抬头</th><td colspan="3">珠海纵横创建软件有限公司</td>
-    		</tr>
-    		<!--增值税发票-->
-    		<tr><th width="50">单位名称</th><td>珠海纵横创建软件有限公司</td>
-    			<th width="60" title="纳税人识别码">识别码</th><td>1212123123123</td>
-    		</tr>
-    		<tr>
-    			<th width="50">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
-    			<th width="50">注册电话</th><td>0756-34324</td>
-    		</tr>
-    		<tr>
-    			<th width="50">开户银行</th><td>广发银行</td>
-    			<th width="50">银行账号</th><td>234324234</td>
-    		</tr>
-
-    		<tr>
-    			<th>单号</th><td>#F20160316001</td>
-    			<th>提交时间</th><td>2016-03-01 12:30:01</td>
-    		</tr>
-    		<tr>
-    			<th>备注</th><td colspan="3">备注内容</td>
-    		</tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">邮寄信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
-    		</tr>
-    		<tr>
-    			<th>收件人</th><td>陈工</td>
-    			<th>手机/电话</th><td>12345678901</td>
-    		</tr>
-            <tr>
-                <th>申请物品</th><td colspan="3">合同x1、锁套装x1</td>
-            </tr>
-    	</table>
-    	<table class="table">
-    		<thead><tr><th width="50">收款信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>收款金额</th><td>￥200000.00</td>
-    			<th>收款信息</th><td>陈宇</td>
-    		</tr>
-    		<tr>
-    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
-    			<th>银行到帐</th><td>2016-04-11</td>
-    		</tr>
-    		<tr>
-    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
-    			<th>认领收款</th><td>张少珊 转入 陈特<br>2015-04-12 11:30:02</td>
-    		</tr>
-    	</table>
+    <div class="modal-body saeaList">
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th colspan="4" class="taC">申请邮寄信息</th>
+			</tr>
+			<tr>
+				<th class="taC" width="100">收件人</th><td>陈工</td>
+				<th class="taC" width="100">收件人手机/电话</th><td>12345678901</td>
+			</tr>
+			<tr>
+				<th class="taC" width="100">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+			</tr>
+			<tr>
+				<th class="taC" width="100">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+			</tr>
+			</tbody>
+		</table>
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th colspan="2" class="taC">实际邮寄信息</th>
+			</tr>
+			<tr>
+				<th class="taC" width="100"><span class="colRed">*</span>快递公司</th><td>
+				<select><option>顺丰速运</option><option>圆通速运</option></select></td>
+			</tr>
+			<tr>
+				<th class="taC" width="100"><span class="colRed">*</span>快递单号</th><td><input type="text" placeholder="请正确填写单号，方便跟踪查询。"></td></tr>
+			<tr>
+				<th class="taC" width="100"><span class="colRed">*</span>邮寄物品</th><td><textarea class="span4" placeholder="请详细填写邮寄的快递包含什么物件。"></textarea></td>
+			</tr>
+			</tbody>
+		</table>
     </div>
 	<div class="modal-footer">
+	    <a href="#" class="button" data-dismiss="modal">确定邮寄</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--弹出内容-->   
-	<!--弹出作废-->
+    <!--邮寄-->
+	<!--弹出快递跟踪-->
 <div class="modal hide fade" id="shipping">
+	<div class="modal-dialog">
+		<div class="modal-content">
     <div class="modal-header">
     <h3>邮寄物品</h3>
     </div>
-    <div class="modal-body">
-        <p>申请物品：发票×1、软件锁套装x1</p>
-        <p>邮寄物品：<b>发票×1、软件锁套装x1</b></p>
-    	<br>
-    	<ul>
-    		<li>• 2016-04-09 20:16:17【珠海市】圆通速递 广东省珠海市收件员 已揽件</li>
-    		<li>• 2016-04-09 20:16:17【珠海市】广东省珠海市香洲区2派件员：陈华辉 13676058042正在为您派件</li>
-    	</ul>
+    <div class="modal-body saeaList">
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th colspan="4" class="taC">申请邮寄信息</th>
+			</tr>
+			<tr>
+				<th class="taC" width="100">收件人</th><td>陈工</td>
+				<th class="taC" width="100">收件人手机/电话</th><td>12345678901</td>
+			</tr>
+			<tr>
+				<th class="taC" width="100">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+			</tr>
+			<tr>
+				<th class="taC" width="100">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+			</tr>
+			</tbody>
+		</table>
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th colspan="4" class="taC">实际邮寄信息</th>
+			</tr>
+			<tr>
+				<th class="taC" width="100">快递公司</th><td>顺丰速运</td><th class="taC" width="100">快递单号</th><td>01239812382398</td></tr>
+			</tr>
+			<tr>
+
+			<tr>
+				<th class="taC" width="100">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+			</tr>
+			</tbody>
+		</table>
+		<table class="table table-bordered table-condensed">
+			<tbody>
+			<tr>
+				<th class="taC">快递跟踪</th>
+			</tr>
+			<tr>
+				<td class="taC">
+					<blockquote>
+						<p><span class="colGray">2016-11-22 周二 15:40:53</span>&nbsp;您的包裹已出库</p>
+					</blockquote>
+					<blockquote>
+						<p><span class="colGray">2016-11-22 周二 15:40:53</span>&nbsp;包裹正在等待揽收</p>
+					</blockquote>
+					<blockquote>
+						<p><span class="colGray">2016-11-21 周一 18:04:23</span>&nbsp;[泰州市]申通快递 兴化恒通婴儿用品公司收件员 已揽件</p>
+					</blockquote>
+
+				</td>
+			</tr>
+			</tbody>
+		</table>
     </div>
 	<div class="modal-footer">
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
+			</div></div>
 </div>
-    <!--作废-->                      	
+    <!--邮寄-->
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>