cld1.0

global/css/ZHcldSystem/demo-files/demo.css

@@ -1,164 +1,164 @@
 body {
-    padding: 0;
-    margin: 0;
-    font-family: sans-serif;
-    font-size: 1em;
-    line-height: 1.5;
-    color: #555;
-    background: #fff;
+  padding: 0;
+  margin: 0;
+  font-family: sans-serif;
+  font-size: 1em;
+  line-height: 1.5;
+  color: #555;
+  background: #fff;
 }
 h1 {
-    font-size: 1.5em;
-    font-weight: normal;
+  font-size: 1.5em;
+  font-weight: normal;
 }
 small {
-    font-size: .66666667em;
+  font-size: .66666667em;
 }
 a {
-    color: #e74c3c;
-    text-decoration: none;
+  color: #e74c3c;
+  text-decoration: none;
 }
 a:hover, a:focus {
-    box-shadow: 0 1px #e74c3c;
+  box-shadow: 0 1px #e74c3c;
 }
 .bshadow0, input {
-    box-shadow: inset 0 -2px #e7e7e7;
+  box-shadow: inset 0 -2px #e7e7e7;
 }
 input:hover {
-    box-shadow: inset 0 -2px #ccc;
+  box-shadow: inset 0 -2px #ccc;
 }
 input, fieldset {
-    font-family: sans-serif;
-    font-size: 1em;
-    margin: 0;
-    padding: 0;
-    border: 0;
+  font-family: sans-serif;
+  font-size: 1em;
+  margin: 0;
+  padding: 0;
+  border: 0;
 }
 input {
-    color: inherit;
-    line-height: 1.5;
-    height: 1.5em;
-    padding: .25em 0;
+  color: inherit;
+  line-height: 1.5;
+  height: 1.5em;
+  padding: .25em 0;
 }
 input:focus {
-    outline: none;
-    box-shadow: inset 0 -2px #449fdb;
+  outline: none;
+  box-shadow: inset 0 -2px #449fdb;
 }
 .glyph {
-    font-size: 16px;
-    width: 15em;
-    padding-bottom: 1em;
-    margin-right: 4em;
-    margin-bottom: 1em;
-    float: left;
-    overflow: hidden;
+  font-size: 16px;
+  width: 15em;
+  padding-bottom: 1em;
+  margin-right: 4em;
+  margin-bottom: 1em;
+  float: left;
+  overflow: hidden;
 }
 .liga {
-    width: 80%;
-    width: calc(100% - 2.5em);
+  width: 80%;
+  width: calc(100% - 2.5em);
 }
 .talign-right {
-    text-align: right;
+  text-align: right;
 }
 .talign-center {
-    text-align: center;
+  text-align: center;
 }
 .bgc1 {
-    background: #f1f1f1;
+  background: #f1f1f1;
 }
 .fgc1 {
-    color: #999;
+  color: #999;
 }
 .fgc0 {
-    color: #000;
+  color: #000;
 }
 p {
-    margin-top: 1em;
-    margin-bottom: 1em;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 .mvm {
-    margin-top: .75em;
-    margin-bottom: .75em;
+  margin-top: .75em;
+  margin-bottom: .75em;
 }
 .mtn {
-    margin-top: 0;
+  margin-top: 0;
 }
 .mtl, .mal {
-    margin-top: 1.5em;
+  margin-top: 1.5em;
 }
 .mbl, .mal {
-    margin-bottom: 1.5em;
+  margin-bottom: 1.5em;
 }
 .mal, .mhl {
-    margin-left: 1.5em;
-    margin-right: 1.5em;
+  margin-left: 1.5em;
+  margin-right: 1.5em;
 }
 .mhmm {
-    margin-left: 1em;
-    margin-right: 1em;
+  margin-left: 1em;
+  margin-right: 1em;
 }
 .mls {
-    margin-left: .25em;
+  margin-left: .25em;
 }
 .ptl {
-    padding-top: 1.5em;
+  padding-top: 1.5em;
 }
 .pbs, .pvs {
-    padding-bottom: .25em;
+  padding-bottom: .25em;
 }
 .pvs, .pts {
-    padding-top: .25em;
+  padding-top: .25em;
 }
 .unit {
-    float: left;
+  float: left;
 }
 .unitRight {
-    float: right;
+  float: right;
 }
 .size1of2 {
-    width: 50%;
+  width: 50%;
 }
 .size1of1 {
-    width: 100%;
+  width: 100%;
 }
 .clearfix:before, .clearfix:after {
-    content: " ";
-    display: table;
+  content: " ";
+  display: table;
 }
 .clearfix:after {
-    clear: both;
+  clear: both;
 }
 .hidden-true {
-    display: none;
+  display: none;
 }
 .textbox0 {
-    width: 3em;
-    background: #f1f1f1;
-    padding: .25em .5em;
-    line-height: 1.5;
-    height: 1.5em;
+  width: 3em;
+  background: #f1f1f1;
+  padding: .25em .5em;
+  line-height: 1.5;
+  height: 1.5em;
 }
 #testDrive {
-    display: block;
-    padding-top: 24px;
-    line-height: 1.5;
+  display: block;
+  padding-top: 24px;
+  line-height: 1.5;
 }
 .fs0 {
-    font-size: 16px;
+  font-size: 16px;
 }
 .fs1 {
-    font-size: 32px;
+  font-size: 32px;
 }
 .fs2 {
-    font-size: 32px;
+  font-size: 32px;
 }
 .fs3 {
-    font-size: 24px;
+  font-size: 24px;
 }
 .fs4 {
-    font-size: 20px;
+  font-size: 20px;
 }
 .fs5 {
-    font-size: 28px;
+  font-size: 28px;
 }
 

global/css/ZHcldSystem/demo.html

@@ -9,20 +9,18 @@
     <link rel="stylesheet" href="style.css"></head>
 <body>
     <div class="bgc1 clearfix">
-        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> ZHcldSystem <small class="fgc1">(Glyphs:&nbsp;42)</small></h1>
+        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> ZHcldSystem <small class="fgc1">(Glyphs:&nbsp;45)</small></h1>
     </div>
     <div class="clearfix mhl ptl">
-        <h1 class="mvm mtn fgc1">Grid Size: 32</h1>
+        <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-mail-envelope-closed">
-                
-                </span>
-                <span class="mls"> icon-mail-envelope-closed</span>
+                <span class="icon-uni31"></span>
+                <span class="mls"> icon-uni31</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="5a" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x5a;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="31" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x31;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -31,14 +29,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-book-bookmark">
-                
-                </span>
-                <span class="mls"> icon-book-bookmark</span>
+                <span class="icon-uni32"></span>
+                <span class="mls"> icon-uni32</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="41" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x41;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="32" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x32;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -47,14 +43,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-note-text">
-                
-                </span>
-                <span class="mls"> icon-note-text</span>
+                <span class="icon-uni33"></span>
+                <span class="mls"> icon-uni33</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="44" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x44;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="33" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x33;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -63,14 +57,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-note-checked">
-                
-                </span>
-                <span class="mls"> icon-note-checked</span>
+                <span class="icon-uni34"></span>
+                <span class="mls"> icon-uni34</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="55" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x55;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="34" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x34;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -79,14 +71,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-inboxes">
-                
-                </span>
-                <span class="mls"> icon-inboxes</span>
+                <span class="icon-uni35"></span>
+                <span class="mls"> icon-uni35</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="43" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x43;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="35" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x35;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -95,14 +85,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-folder-search">
-                
-                </span>
-                <span class="mls"> icon-folder-search</span>
+                <span class="icon-uni45"></span>
+                <span class="mls"> icon-uni45</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="56" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x56;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="45" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x45;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -111,14 +99,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-package">
-                
-                </span>
-                <span class="mls"> icon-package</span>
+                <span class="icon-uni48"></span>
+                <span class="mls"> icon-uni48</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="57" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x57;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="48" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x48;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -127,14 +113,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-barometer">
-                
-                </span>
-                <span class="mls"> icon-barometer</span>
+                <span class="icon-uni49"></span>
+                <span class="mls"> icon-uni49</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="42" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x42;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="49" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x49;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -143,14 +127,12 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-compass">
-                
-                </span>
-                <span class="mls"> icon-compass</span>
+                <span class="icon-uni4A"></span>
+                <span class="mls"> icon-uni4A</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="58" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x58;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="4a" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x4a;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -159,65 +141,141 @@
         </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-usb">
-                
-                </span>
-                <span class="mls"> icon-usb</span>
+                <span class="icon-uni4C"></span>
+                <span class="mls"> icon-uni4C</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="4d" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x4d;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="4e" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x4e;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-  </div>
-    <div class="clearfix mhl ptl">
-        <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
-        <div class="glyph fs2">
+        <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni31">
-                
-                </span>
-                <span class="mls"> icon-uni31</span>
+                <span class="icon-uni4E"></span>
+                <span class="mls"> icon-uni4E</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="31" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x31;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="4f" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x4f;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni32">
-                
-                </span>
-                <span class="mls"> icon-uni32</span>
+                <span class="icon-uni4F"></span>
+                <span class="mls"> icon-uni4F</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="32" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x32;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="50" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x50;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni51"></span>
+                <span class="mls"> icon-uni51</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="51" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x51;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni52"></span>
+                <span class="mls"> icon-uni52</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="52" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x52;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni66"></span>
+                <span class="mls"> icon-uni66</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="66" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x66;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni67"></span>
+                <span class="mls"> icon-uni67</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="67" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x67;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni68"></span>
+                <span class="mls"> icon-uni68</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="68" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x68;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-uni69"></span>
+                <span class="mls"> icon-uni69</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="69" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x69;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
+    </div>
+    <div class="clearfix mhl ptl">
+        <h1 class="mvm mtn fgc1">Grid Size: 32</h1>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni33">
-                
-                </span>
-                <span class="mls"> icon-uni33</span>
+                <span class="icon-key"></span>
+                <span class="mls"> icon-key</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="33" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x33;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="65" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x65;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -226,14 +284,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni34">
-                
-                </span>
-                <span class="mls"> icon-uni34</span>
+                <span class="icon-phone2"></span>
+                <span class="mls"> icon-phone2</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="34" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x34;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="59" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x59;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -242,14 +298,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni35">
-                
-                </span>
-                <span class="mls"> icon-uni35</span>
+                <span class="icon-switch"></span>
+                <span class="mls"> icon-switch</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="35" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x35;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="47" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x47;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -258,14 +312,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni45">
-                
-                </span>
-                <span class="mls"> icon-uni45</span>
+                <span class="icon-calendar"></span>
+                <span class="mls"> icon-calendar</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="45" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x45;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="58" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x58;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -274,14 +326,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni48">
-                
-                </span>
-                <span class="mls"> icon-uni48</span>
+                <span class="icon-gears"></span>
+                <span class="mls"> icon-gears</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="48" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x48;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="46" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x46;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -290,14 +340,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni49">
-                
-                </span>
-                <span class="mls"> icon-uni49</span>
+                <span class="icon-mail-envelope-closed"></span>
+                <span class="mls"> icon-mail-envelope-closed</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="49" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x49;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="5a" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x5a;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -306,14 +354,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni4A">
-                
-                </span>
-                <span class="mls"> icon-uni4A</span>
+                <span class="icon-book-bookmark"></span>
+                <span class="mls"> icon-book-bookmark</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="4a" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x4a;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="41" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x41;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -322,14 +368,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni4C">
-                
-                </span>
-                <span class="mls"> icon-uni4C</span>
+                <span class="icon-note-text"></span>
+                <span class="mls"> icon-note-text</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="4e" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x4e;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="44" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x44;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -338,14 +382,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni4E">
-                
-                </span>
-                <span class="mls"> icon-uni4E</span>
+                <span class="icon-note-checked"></span>
+                <span class="mls"> icon-note-checked</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="4f" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x4f;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="55" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x55;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -354,14 +396,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni4F">
-                
-                </span>
-                <span class="mls"> icon-uni4F</span>
+                <span class="icon-inboxes"></span>
+                <span class="mls"> icon-inboxes</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="50" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x50;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="43" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x43;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -370,14 +410,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni51">
-                
-                </span>
-                <span class="mls"> icon-uni51</span>
+                <span class="icon-folder-search"></span>
+                <span class="mls"> icon-folder-search</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="51" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x51;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="56" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x56;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -386,14 +424,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni52">
-                
-                </span>
-                <span class="mls"> icon-uni52</span>
+                <span class="icon-package"></span>
+                <span class="mls"> icon-package</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="52" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x52;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="57" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x57;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -402,14 +438,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni66">
-                
-                </span>
-                <span class="mls"> icon-uni66</span>
+                <span class="icon-barometer"></span>
+                <span class="mls"> icon-barometer</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="66" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x66;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="42" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x42;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -418,14 +452,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni67">
-                
-                </span>
-                <span class="mls"> icon-uni67</span>
+                <span class="icon-usb"></span>
+                <span class="mls"> icon-usb</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="67" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x67;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="4d" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x4d;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -434,14 +466,12 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni68">
-                
-                </span>
-                <span class="mls"> icon-uni68</span>
+                <span class="icon-certificate"></span>
+                <span class="mls"> icon-certificate</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="68" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x68;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="6d" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x6d;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
@@ -450,28 +480,24 @@
         </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-uni69">
-                
-                </span>
-                <span class="mls"> icon-uni69</span>
+                <span class="icon-shop"></span>
+                <span class="mls"> icon-shop</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="69" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x69;" class="unitRight size1of2 talign-right" />
+                <input type="text" readonly value="73" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#x73;" class="unitRight size1of2 talign-right" />
             </fieldset>
             <div class="fs0 bshadow0 clearfix hidden-true">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-  </div>
+    </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 24</h1>
         <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-check">
-                
-                </span>
+                <span class="icon-check"></span>
                 <span class="mls"> icon-check</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -485,9 +511,7 @@
         </div>
         <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-cross">
-                
-                </span>
+                <span class="icon-cross"></span>
                 <span class="mls"> icon-cross</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -499,14 +523,12 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-  </div>
+    </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 20</h1>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-chevron-down">
-                
-                </span>
+                <span class="icon-chevron-down"></span>
                 <span class="mls"> icon-chevron-down</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -520,9 +542,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-chevron-left">
-                
-                </span>
+                <span class="icon-chevron-left"></span>
                 <span class="mls"> icon-chevron-left</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -536,9 +556,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-chevron-right">
-                
-                </span>
+                <span class="icon-chevron-right"></span>
                 <span class="mls"> icon-chevron-right</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -552,9 +570,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-chevron-up">
-                
-                </span>
+                <span class="icon-chevron-up"></span>
                 <span class="mls"> icon-chevron-up</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -568,9 +584,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-bell">
-                
-                </span>
+                <span class="icon-bell"></span>
                 <span class="mls"> icon-bell</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -584,9 +598,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-book">
-                
-                </span>
+                <span class="icon-book"></span>
                 <span class="mls"> icon-book</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -600,9 +612,7 @@
         </div>
         <div class="glyph fs4">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-lab-flask">
-                
-                </span>
+                <span class="icon-lab-flask"></span>
                 <span class="mls"> icon-lab-flask</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -614,62 +624,12 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs4">
-            <div class="clearfix bshadow0 pbs">
-                <span class="icon-cog">
-                
-                </span>
-                <span class="mls"> icon-cog</span>
-            </div>
-            <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="46" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x46;" class="unitRight size1of2 talign-right" />
-            </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
-                <span class="unit pvs fgc1">liga: </span>
-                <input type="text" readonly value="" class="liga unitRight" />
-            </div>
-        </div>
-        <div class="glyph fs4">
-            <div class="clearfix bshadow0 pbs">
-                <span class="icon-log-out">
-                
-                </span>
-                <span class="mls"> icon-log-out</span>
-            </div>
-            <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="47" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x47;" class="unitRight size1of2 talign-right" />
-            </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
-                <span class="unit pvs fgc1">liga: </span>
-                <input type="text" readonly value="" class="liga unitRight" />
-            </div>
-        </div>
-        <div class="glyph fs4">
-            <div class="clearfix bshadow0 pbs">
-                <span class="icon-tablet">
-                
-                </span>
-                <span class="mls"> icon-tablet</span>
-            </div>
-            <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="59" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#x59;" class="unitRight size1of2 talign-right" />
-            </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
-                <span class="unit pvs fgc1">liga: </span>
-                <input type="text" readonly value="" class="liga unitRight" />
-            </div>
-        </div>
-  </div>
+    </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
         <div class="glyph fs5">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-cny">
-                
-                </span>
+                <span class="icon-cny"></span>
                 <span class="mls"> icon-cny</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -683,9 +643,7 @@
         </div>
         <div class="glyph fs5">
             <div class="clearfix bshadow0 pbs">
-                <span class="icon-th-large">
-                
-                </span>
+                <span class="icon-th-large"></span>
                 <span class="mls"> icon-th-large</span>
             </div>
             <fieldset class="fs0 size1of1 clearfix hidden-false">
@@ -697,7 +655,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-  </div>
+    </div>
 
     <!--[if gt IE 8]><!-->
     <div class="mhl clearfix mbl">
@@ -709,8 +667,7 @@
         </label>
         <input id="testText" type="text" class="phl size1of1 mvl"
         placeholder="Type some text to test..." value=""/>
-        </label>
-        <div id="testDrive" class="icon-">&nbsp;
+        <div id="testDrive" class="icon-" style="font-family: ZHcldSystem">&nbsp;
         </div>
     </div>
     <!--<![endif]-->

global/css/ZHcldSystem/style.css

@@ -1,153 +1,162 @@
 @font-face {
-    font-family: 'ZHcldSystem';
-    src:    url('fonts/ZHcldSystem.eot?c75dav');
-    src:    url('fonts/ZHcldSystem.eot?c75dav#iefix') format('embedded-opentype'),
-        url('fonts/ZHcldSystem.ttf?c75dav') format('truetype'),
-        url('fonts/ZHcldSystem.woff?c75dav') format('woff'),
-        url('fonts/ZHcldSystem.svg?c75dav#ZHcldSystem') format('svg');
-    font-weight: normal;
-    font-style: normal;
+  font-family: 'ZHcldSystem';
+  src:  url('fonts/ZHcldSystem.eot?wjafxl');
+  src:  url('fonts/ZHcldSystem.eot?wjafxl#iefix') format('embedded-opentype'),
+    url('fonts/ZHcldSystem.ttf?wjafxl') format('truetype'),
+    url('fonts/ZHcldSystem.woff?wjafxl') format('woff'),
+    url('fonts/ZHcldSystem.svg?wjafxl#ZHcldSystem') format('svg');
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
 }
 
 [class^="icon-"], [class*=" icon-"] {
-    /* use !important to prevent issues with browser extensions that change fonts */
-    font-family: 'ZHcldSystem' !important;
-    speak: none;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'ZHcldSystem' !important;
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
 
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-mail-envelope-closed:before {
-    content: "\5a";
-}
-.icon-book-bookmark:before {
-    content: "\41";
-}
-.icon-note-text:before {
-    content: "\44";
-}
-.icon-note-checked:before {
-    content: "\55";
-}
-.icon-inboxes:before {
-    content: "\43";
-}
-.icon-folder-search:before {
-    content: "\56";
-}
-.icon-package:before {
-    content: "\57";
-}
-.icon-barometer:before {
-    content: "\42";
-}
-.icon-compass:before {
-    content: "\58";
-}
-.icon-usb:before {
-    content: "\4d";
-}
 .icon-uni31:before {
-    content: "\31";
+  content: "\31";
 }
 .icon-uni32:before {
-    content: "\32";
+  content: "\32";
 }
 .icon-uni33:before {
-    content: "\33";
+  content: "\33";
 }
 .icon-uni34:before {
-    content: "\34";
+  content: "\34";
 }
 .icon-uni35:before {
-    content: "\35";
+  content: "\35";
 }
 .icon-uni45:before {
-    content: "\45";
+  content: "\45";
 }
 .icon-uni48:before {
-    content: "\48";
+  content: "\48";
 }
 .icon-uni49:before {
-    content: "\49";
+  content: "\49";
 }
 .icon-uni4A:before {
-    content: "\4a";
+  content: "\4a";
 }
 .icon-uni4C:before {
-    content: "\4e";
+  content: "\4e";
 }
 .icon-uni4E:before {
-    content: "\4f";
+  content: "\4f";
 }
 .icon-uni4F:before {
-    content: "\50";
+  content: "\50";
 }
 .icon-uni51:before {
-    content: "\51";
+  content: "\51";
 }
 .icon-uni52:before {
-    content: "\52";
+  content: "\52";
 }
 .icon-uni66:before {
-    content: "\66";
+  content: "\66";
 }
 .icon-uni67:before {
-    content: "\67";
+  content: "\67";
 }
 .icon-uni68:before {
-    content: "\68";
+  content: "\68";
 }
 .icon-uni69:before {
-    content: "\69";
+  content: "\69";
+}
+.icon-key:before {
+  content: "\65";
+}
+.icon-phone2:before {
+  content: "\59";
+}
+.icon-switch:before {
+  content: "\47";
+}
+.icon-calendar:before {
+  content: "\58";
+}
+.icon-gears:before {
+  content: "\46";
+}
+.icon-mail-envelope-closed:before {
+  content: "\5a";
+}
+.icon-book-bookmark:before {
+  content: "\41";
+}
+.icon-note-text:before {
+  content: "\44";
+}
+.icon-note-checked:before {
+  content: "\55";
+}
+.icon-inboxes:before {
+  content: "\43";
+}
+.icon-folder-search:before {
+  content: "\56";
+}
+.icon-package:before {
+  content: "\57";
+}
+.icon-barometer:before {
+  content: "\42";
+}
+.icon-usb:before {
+  content: "\4d";
+}
+.icon-certificate:before {
+  content: "\6d";
+}
+.icon-shop:before {
+  content: "\73";
 }
 .icon-check:before {
-    content: "\6a";
+  content: "\6a";
 }
 .icon-cross:before {
-    content: "\6b";
+  content: "\6b";
 }
 .icon-chevron-down:before {
-    content: "\63";
+  content: "\63";
 }
 .icon-chevron-left:before {
-    content: "\62";
+  content: "\62";
 }
 .icon-chevron-right:before {
-    content: "\61";
+  content: "\61";
 }
 .icon-chevron-up:before {
-    content: "\64";
+  content: "\64";
 }
 .icon-bell:before {
-    content: "\4b";
+  content: "\4b";
 }
 .icon-book:before {
-    content: "\53";
+  content: "\53";
 }
 .icon-lab-flask:before {
-    content: "\54";
-}
-.icon-cog:before {
-    content: "\46";
-}
-.icon-log-out:before {
-    content: "\47";
-}
-.icon-tablet:before {
-    content: "\59";
+  content: "\54";
 }
 .icon-cny:before {
-    content: "\4c";
+  content: "\4c";
 }
 .icon-th-large:before {
-    content: "\6c";
+  content: "\6c";
 }
-

global/css/global.css

@@ -119,18 +119,23 @@ a.disenable{color:#ccc}
 .colGray{color:#999}
 .colBlue{color:#3172d9}
 .hide {display:none}
+.bgGreen{background: #f2faf3; color: #17ab0c;}
+.bgRed{background: #f2dede; color: #b94a48;}
 .autoHeight,.autoHeightL1,.autoHeightL2,.autoHeightR1,.autoHeightR2,.autoHeightR3,.autoHeightR4{
   overflow-y: auto
 }
 .height100{height:100%}
 .taC{text-align:center}
 .taL{text-align:left}
-.taR{text-align:right}
+.taR{text-align:right !important}
 .colTip{
   margin-left: 2px;
   display:inline-block;
   line-height: 19px;
 }
+table.mb-0{
+  margin-bottom:0;
+}
 @font-face {
   font-family: 'ZHcldSystem';
   src:  url('fonts/ZHcldSystem.eot?ox6e11');
@@ -222,7 +227,7 @@ input.span5,textarea.span5,.uneditable-input.span5{width:366px;}
 input.span4,textarea.span4,.uneditable-input.span4{width:286px;}
 input.span3,textarea.span3,.uneditable-input.span3{width:206px;}
 input.span2,textarea.span2,.uneditable-input.span2{width:126px;}
-input.span1,textarea.span1,.uneditable-input.span1{width:46px;}
+input.span1,textarea.span1,.uneditable-input.span1{width:80px;}
 .controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;}
 .controls-row:after{clear:both;}
 .controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left;}
@@ -1953,7 +1958,7 @@ a.new-ribbon:before{
 }
 .borad-news {
   width:960px;
-  margin:0 auto
+  margin:0 auto;
 }
 .saeaList {
   margin:0 0 20px 0;
@@ -1962,8 +1967,8 @@ a.new-ribbon:before{
   background:#fff;
   padding:2px;
   position: relative;
-  margin-bottom:100px;
-  min-height:400px
+  margin-bottom:50px;
+  min-height:380px
 }
 .saeaList .seTable{
   margin:0 0 0 30.1%;
@@ -1979,13 +1984,14 @@ a.new-ribbon:before{
 .seTable div.area p{
 
 }
-.saeaList .entry table{
-  margin:0;
-}
-.saeaList  table th.taC{
+.saeaList  table th.taC,.saeaList  table th.taL{
   text-align:center;
   background: #f6f6f6
 }
+.saeaList  table th.taL{
+  text-align:left;
+  background: #f6f6f6;
+}
 .saeaList  table .thead th{
   background: #f6f6f6
 }
@@ -2224,6 +2230,14 @@ table .taC{
 .receipt-censor .title  {
   background:#084F8E
 }
+.receipt-censor .sub-title  {
+  color:#084F8E;
+  border-left:5px solid #084F8E;
+  padding-left:5px;
+  margin-bottom:10px;
+  margin-top:10px;
+  font-weight: 600
+}
 .public-censor .title  {
   background:#008659
 }
@@ -2251,16 +2265,16 @@ table .taC{
   color:#2daebf
 }
 .loan-list.entry  {
-  border-top:2px solid #5C0793
+  border:1px solid #5C0793
 }
 .receipt-list.entry  {
-  border-top:2px solid #084F8E
+  border:1px solid #084F8E
 }
 .public-list.entry  {
-  border-top:2px solid #008659
+  border:1px solid #008659
 }
 .train-list.entry  {
-  border-top:2px solid #2daebf
+  border:1px solid #2daebf
 }
 .loan-list table .taC{
   color:#5C0793
@@ -4011,11 +4025,16 @@ td div.dlLev3{
   background: #ff8130;
   color:#fff;
 }
-
-
-
 .itineraryCon{
-  margin:20px 10px;
+  margin:10px 10px 10px 10px;
+}
+.itineraryCon ul{
+  border-bottom:1px solid #084F8E;
+  padding-bottom:20px;
+  margin-top: 20px;
+}
+.itineraryCon ul:last-child{
+  border-bottom:none;
 }
 .itineraryTitle{
   margin-top: 30px;
@@ -4051,6 +4070,90 @@ td div.dlLev3{
   margin-left: 5px;
 }
 .route p{
-  width: 570px;
+  width: 560px;
   margin-bottom: 5px;
+}
+.totalB{
+  background: #faf2cc;
+  font-weight: bold;
+  font-size: 16px;
+  color: #333;
+}
+.saeaTip{
+  font-size: 16px;
+  padding-bottom: 20px;
+}
+.saeaType{
+  margin-bottom: 20px;
+}
+.saeaType li{
+  float: left;
+  width: 30%;
+  text-align: center;
+  margin:0 10px;
+  padding:20px 0;
+  background:#f2f2f2;
+  font-size:16px;
+}
+.saeaType li .icon- {
+  display: none
+}
+.saeaType li.active{
+  background: #084F8E;
+  color: #fff;
+}
+.saeaType li:hover{
+  background: #2677be;
+  color: #fff;
+  cursor: pointer
+}
+.saeaType li.active:hover{
+  background: #084F8E;
+  cursor: default;
+}
+.saeaType li.active .icon-{
+  display: inline-block;
+  font-weight: bold;
+}
+.saeaCheckbox{
+  float: left;
+}
+.saeaType li label{
+  font-size: 16px;
+  font-weight: bold;
+  margin-top: 7px;
+  margin-left: 30px;
+}
+.btn-display .button{
+  display: block !important;
+}
+.fixedSide{
+  position: sticky;
+  top: 100px;
+  left: 0px;
+  width: 22px;
+}
+.fixedSide ul li{
+  float: left;
+  /*display: block;*/
+  font-size: 12px;
+  color: #fff;
+  background: #666;
+  margin: 1px 0;
+}
+.fixedSide ul li a{
+  display: block;
+  color: #fff;
+  padding: 15px 0;
+  text-align: center;
+}
+.fixedSide ul li.active{
+  background: #222 !important;
+  color: #fff !important;
+}
+.show{
+  display: block !important;
+}
+.hidden{
+  display: none !important;
 }

global/css/jquery-labelauty.css

@@ -0,0 +1,146 @@
+/*!
+ * LABELAUTY jQuery Plugin Styles
+ *
+ * @file: jquery-labelauty.css
+ * @author: Francisco Neves (@fntneves)
+ * @site: www.francisconeves.com
+ * @license: MIT License
+ */
+
+/* Prevent text and blocks selection */
+input.labelauty + label ::selection { background-color: rgba(255, 255, 255, 0); }
+input.labelauty + label ::-moz-selection { background-color: rgba(255, 255, 255, 0); }
+
+/* Hide original checkboxes. They are ugly! */
+input.labelauty { display: none !important; }
+
+/*
+ * Let's style the input
+ * Feel free to work with it as you wish!
+ */
+input.labelauty + label
+{
+	display: inline-block;
+	/*display: table;*/
+	font-size: 14px;
+	padding:20px 0;
+	width: 100%;
+  	text-align: center;
+	background-color: #efefef;
+	color: #b3b3b3;
+	cursor: pointer;
+
+	border-radius: 3px 3px 3px 3px;
+	-moz-border-radius: 3px 3px 3px 3px;
+	-webkit-border-radius: 3px 3px 3px 3px;
+
+
+	transition: background-color 0.25s;
+	-moz-transition: background-color 0.25s;
+	-webkit-transition: background-color 0.25s;
+	-o-transition: background-color 0.25s;
+
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+	-o-user-select: none;
+}
+
+/* Stylish text inside label */
+
+input.labelauty + label > span.labelauty-unchecked,
+input.labelauty + label > span.labelauty-checked
+{
+	display: inline-block;
+	line-height: 16px;
+	vertical-align: bottom;
+}
+
+/* Stylish icons inside label */
+
+input.labelauty + label > span.labelauty-unchecked-image,
+input.labelauty + label > span.labelauty-checked-image
+{
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: bottom;
+	background-repeat: no-repeat;
+	background-position: left center;
+
+	transition: background-image 0.5s linear;
+	-moz-transition: background-image 0.5s linear;
+	-webkit-transition: background-image 0.5s linear;
+	-o-transition: background-image 0.5s linear;
+}
+
+/* When there's a label, add a little margin to the left */
+input.labelauty + label > span.labelauty-unchecked-image + span.labelauty-unchecked,
+input.labelauty + label > span.labelauty-checked-image + span.labelauty-checked
+{
+	margin-left: 7px;
+}
+
+/* When not Checked */
+input.labelauty:not(:checked):not([disabled]) + label:hover
+{
+	background-color: #9e9e9e;
+	color: #fff;
+}
+input.labelauty:not(:checked) + label > span.labelauty-checked-image
+{
+	display: none;
+}
+
+input.labelauty:not(:checked) + label > span.labelauty-checked
+{
+	display: none;
+}
+
+/* When Checked */
+input.labelauty:checked + label
+{
+	background-color: #084F8E;
+	color: #ffffff;
+}
+
+input.labelauty:checked:not([disabled]) + label:hover
+{
+	background-color: #2677be;
+}
+input.labelauty:checked + label > span.labelauty-unchecked-image
+{
+	display: none;
+}
+
+input.labelauty:checked + label > span.labelauty-unchecked
+{
+	display: none;
+}
+
+input.labelauty:checked + label > span.labelauty-checked
+{
+	display: inline-block;
+}
+
+input.labelauty.no-label:checked + label > span.labelauty-checked
+{
+	display: block;
+}
+
+/* When Disabled */
+input.labelauty[disabled] + label
+{
+	opacity: 0.5;
+}
+
+/* Add a background to (un)checked images */
+input.labelauty + label > span.labelauty-unchecked-image
+{
+	background-image: url( ../images/input-unchecked.png );
+}
+
+input.labelauty + label > span.labelauty-checked-image
+{
+	background-image: url( ../images/input-checked.png );
+}

global/css/zTreeStyle/zTreeStyle.css

@@ -0,0 +1,97 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.5.19
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+	text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
+	opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right:2px}
+.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;outline:none;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
+.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
+.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
+.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
+.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
+.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
+.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
+.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
+.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
+.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
+.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
+.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
+.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
+.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
+.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
+.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
+.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
+
+.ztree li span.button.switch {width:18px; height:18px}
+.ztree li span.button.root_open{background-position:-92px -54px}
+.ztree li span.button.root_close{background-position:-74px -54px}
+.ztree li span.button.roots_open{background-position:-92px 0}
+.ztree li span.button.roots_close{background-position:-74px 0}
+.ztree li span.button.center_open{background-position:-92px -18px}
+.ztree li span.button.center_close{background-position:-74px -18px}
+.ztree li span.button.bottom_open{background-position:-92px -36px}
+.ztree li span.button.bottom_close{background-position:-74px -36px}
+.ztree li span.button.noline_open{background-position:-92px -72px}
+.ztree li span.button.noline_close{background-position:-74px -72px}
+.ztree li span.button.root_docu{ background:none;}
+.ztree li span.button.roots_docu{background-position:-56px 0}
+.ztree li span.button.center_docu{background-position:-56px -18px}
+.ztree li span.button.bottom_docu{background-position:-56px -36px}
+.ztree li span.button.noline_docu{ background:none;}
+
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
+
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
+ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+
+span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level style*/
+/*.ztree li span.button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/

global/js/global.js

@@ -1,15 +1,3 @@
-function setSearchLo(className,left){
-	$('#example_filter').addClass("search-dataTables"+className);
-	
-	$('#example_filter').css({'left':left});
-	
-	$('#example_filter label').addClass("dataTables-label");
-	$('#example_filter input').addClass("dataTables-input");
-}
-
-
-
-
 function autoFlashHeight(){
   var infoHeight = $(".contactInfo").height();
   var headerHeight = $(".header").height();
@@ -29,12 +17,11 @@ function autoFlashHeight(){
     $(".autoHeightR4").height($(window).height()-infoHeight-48);
     $(".autoHeightR5").height($(window).height()-48);
     $(".autoHeightI1").height($(window).height()-144);
-    $(".autoHeightI2").height($(window).height()-132);
+    $(".autoHeightI2").height($(window).height()-80);
+    // $(".autoHeightI2").height($(window).height()-132);
     $(".mailAutoHeigh").height($(window).height()-75);
-    $(".censorHeight").height(seCensor-btnList-27);
 };
 $(window).resize(autoFlashHeight);
-
 $(function(){
   var infoHeight = $(".contactInfo").height();
 $(".zhzdFir").click(function () {
@@ -45,15 +32,14 @@ $(".amInput").children("label").children("input:checkbox").click(function(){
         // 当前未选中
         $(".amInput").find("input:checked").removeAttr("checked");
         $(this).attr("checked", "checked");
-      }                      
+      }
     });
-    
     $(".pmInput").children("label").children("input:checkbox").click(function(){
       if($(this).is(":checked")) {
         // 当前未选中
         $(".pmInput").find("input:checked").removeAttr("checked");
         $(this).attr("checked", "checked");
-      }                      
+      }
     });
 $('*[data-toggle=ctooltip]').mouseover(function() { 
  $(this).ctooltip('show'); 
@@ -75,8 +61,7 @@ $("#closeST").click(function(){
   $(".searchTips").hide();
 });
 
-
-// $('.tipFather').hover(function() {
+// $('.tipGray').hover(function() {
 //     $(".tipContent").removeClass('tipConactive');
 //     }, function() {
 //     $(".tipContent").addClass('tipConactive');
@@ -91,6 +76,42 @@ $(".sortAddup").hover(function () {
     $(this).removeClass("focus").find("dl").hide();
     }
 );
+
+
+//模拟点击
+// $('.chalvCheck').click(function(){
+//     if($(".chalv").css("display")=="none"){
+//         $(".chalv").show();
+//         $("#chalv").show();
+//     }else{
+//         $(".chalv").hide();
+//         $("#chalv").hide();
+//     }
+// });
+
+$('.banshiCheck').click(function(){
+    $(".banshi").toggle();
+    $("#banshi").toggle();
+});
+
+$('.chalvCheck').click(function(){
+    $(".chalv").toggle();
+    $("#chalv").toggle();
+});
+
+$('.neibupeixunCheck').click(function(){
+    $(".neibupeixun").toggle();
+    $("#neibupeixun").toggle();
+});
+
+// $('.da').click(function(){
+//     if($(".fsfs").css("display")=="none"){
+//         $(".fsfs").show();
+//     }else{
+//         $(".fsfs").hide();
+//     }
+// })
+
 $(".rmDone").click(function(){
   $(this).parent().parent("th").removeClass().toggleClass("grM");
 });
@@ -112,7 +133,7 @@ $(".snavLeve0 li").click(function(){
     $(this).children(".snavLeve1").slideDown();
     $(this).siblings("li").children("h4").removeClass("focus");
     $(this).siblings("li").children(".snavLeve1").slideUp();
-});    
+});
 /*侧滑窗口*/
 $(".opensidebar").click(function(){
     $(".wrapDetil").animate({width:"702"}).addClass("open");

global/js/invoice.js

@@ -340,10 +340,11 @@ $(function() {
 					$("div[node-receivablesHtml='true']").html(data.receivablesHtml);
 					$("div[node-invoiceHtml='true']").html(data.invoiceHtml);
 					$("input[name='key']").val(data.irkey);
-					if(data.isInvoice)
-						$("blockquote[node-search='invoice']").show();
-					else
-						$("blockquote[node-search='invoice']").hide();
+					$("blockquote[node-search='invoice']").show();
+//					if(data.isInvoice)
+//						$("blockquote[node-search='invoice']").show();
+//					else
+//						$("blockquote[node-search='invoice']").hide();
 				} else{
 					$("input[name='key']").val('');
 					$("div[node-receivablesHtml='true']").html('');

global/js/itineraryView2.0.js

@@ -0,0 +1,101 @@
+$(function() {
+				
+				var sessionStorage= window.sessionStorage;
+				//sessionStorage.setItem("itineraryListApproval",'{{receiptList.0.itinerary}}');
+				var sessionItinerary= sessionStorage.getItem(sessionStorageList);
+				if(typeof sessionItinerary!=='object'){
+					sessionItinerary=JSON.parse(sessionItinerary);
+					buildItineraryProcess(sessionItinerary);
+				}
+	})
+
+function buildItinerary(feeTraveItem){
+				var html='';
+				
+				
+				for(let k=0;k<feeTraveItem.length;k++){
+					html+=`<p class="routeW">
+					<b class="fR">￥${feeTraveItem[k].price}</b>
+					<b>${feeTraveItem[k].name}</b>
+					</p><p class="colGray">#${feeTraveItem[k].detail}</p>
+				<p></p>`;
+				}
+				return html;
+				
+			}
+//构建总行程单
+function buildItineraryProcess(data){
+	let html='';
+	let strokeJson=data;
+	if(typeof data==='string'){
+		strokeJson=JSON.parse(data);
+	}
+	
+	
+	let dataJson;
+	strokeJson.forEach(function(value,index){
+		dataId=Object.keys(value)[0];
+		dataJson=value[dataId];
+		let last=dataJson.length-1;
+		let n=0;var ln=index+1;
+		html+=`<li>行程${ln}#</li>`;
+		for(let i=0;i<dataJson.length;i++){
+			let price=0;
+			for(let p=0;p<dataJson[i].feeTraveItem.length;p++){
+				price+=parseFloat(dataJson[i].feeTraveItem[p].price);
+			}
+			price=price.toFixed(2);
+			
+			let city='';
+			if(i==0){
+				city=dataJson[i].departurecity;
+			}else{
+				n=i-1;
+				city=dataJson[n].arrivalscity.substring(1);
+			}
+			
+			let feeTraveItem=dataJson[i].feeTraveItem;
+			let itemHtml=buildItinerary(feeTraveItem);
+			
+			html+=`<li>
+			<div class="itineraryList">
+				<div class="addressName"><i class="contactsMark icon-">P</i> <b>${city}</b></div>
+				<div class="pointLine">
+					<div class="priceList">
+						<span class="priceTitle">金额</span>
+						<span class="price colGreen">￥${price}</span>
+					</div>
+					<div class="timeList">
+						<span class="timeTitle">时间</span>
+						<span class="time">${dataJson[i].departuredate}${dataJson[i].arrivalsdate}</span>
+					</div>
+					<div class="routeList clearfix">
+					<span class="routeTitle fL">详情</span>
+					<span class="route fL">
+					${itemHtml}
+					</span>
+				</div>
+				</div>
+			</div>
+		</li>`;
+			
+			if(i===last){
+				let arrivalscity=dataJson[i].arrivalscity.substring(1);
+				
+				html+=`<li>
+				<div class="itineraryList">
+					<div class="addressName"><i class="contactsMark icon-">P</i> <b>${arrivalscity}</b></div>
+					
+				</div>
+			</li>`;
+				
+				//html+=`<div class="addressName fL"><i class="contactsMark icon-">P</i><b>${arrivalscity}</b></div>`;
+			}
+		}
+		
+		html+=`<li><br/></li>`;
+		
+	})
+	
+	$("ul[itineraryinfo]").html(html);
+}

global/js/jquery-labelauty.js

@@ -0,0 +1,28 @@
+$(function(){
+	$("#banshi-sw").click(function(){
+	    $(this).toggleClass("active");$("#banshi").toggle();$(".banshi").toggle();
+	});
+	$("#chalv-sw").click(function(){
+	    $(this).toggleClass("active");$("#chalv").toggle();$(".chalv").toggle();
+	});
+	$("#neibupeixun-sw").click(function(){
+	    $(this).toggleClass("active");$("#neibupeixun").toggle();$(".neibupeixun").toggle();
+	});
+
+	$(".close-detail").click(function(){
+	    $(this).hide().siblings(".table").hide().siblings(".open-detail").show();
+	});
+	$(".open-detail").click(function(){
+	    $(this).hide().siblings(".table").show().siblings(".close-detail").show();
+	});
+	$("#open-jie").click(function(){
+	    $(this).parent("p").hide();
+	    $(this).parent("p").siblings("#jie-con").show();
+	    $(this).parent("p").siblings("#close").show();
+	});
+	$("#close-jie").click(function(){
+	    $(this).parent("#close").hide();
+	    $(this).parent("p").siblings("#jie-con").hide();
+	    $(this).parent("p").siblings("#open").show();
+	});
+});

global/js/receipt.js

@@ -609,47 +609,9 @@ $(function() {
 	    }
 	});
 	
-	$("a[getReceiptLoan]").click(function() {
-		$.ajax({
-			url:"/ajaxGetReceiptTrainLoan",
-			type: "post",
-			cache: false,
-			dataType: "json",
-			data: {
-				
-			},
-			global: true,
-			success: function(data){
-				var html='';
-				for(var i=0;i<data.receiptLoanList.length;i++){
-					html +='<option value="'+data.receiptLoanList[i].ridKey+'">'+data.receiptLoanList[i].receiptOrder+' ￥'+data.receiptLoanList[i].sum+'</option>';
-				}
-				$("select[receiptLoanSelect]").html(html);
-			},
-			error:function(err){}
-			});
-	});
 	
-	$("a[getReceiptInvoice]").click(function() {
-		$.ajax({
-			url:"/ajaxGetInvoiceTrainByEnd",
-			type: "post",
-			cache: false,
-			dataType: "json",
-			data: {
-				
-			},
-			global: true,
-			success: function(data){
-				var html='';
-				for(var i=0;i<data.invoiceTrainingList.length;i++){
-					html +='<option value="'+data.invoiceTrainingList[i].itidKey+'">'+data.invoiceTrainingList[i].trainDate+'&nbsp;'+data.invoiceTrainingList[i].trainName+'</option>';
-				}
-				$("select[receiptInvoieSelect]").html(html);
-			},
-			error:function(err){}
-			});
-	});
+	
+	
 	
 	//h5文件上传
 	var numFilesUploaded=0;

protected/cache/categoryCollect/categoryCollectDetail_2016_0.htmls

@@ -0,0 +1,284 @@
+<br />
+<b>Warning</b>:  filemtime(): stat failed for F:\smartcost/cldgh/protected/view//admin/saeaCategoryCollectDetail.html in <b>F:\smartcost\dooframework\view\DooView.php</b> on line <b>292</b><br />
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.07"></script></head>
+
+<script src="http://cld.com/global/js/receipt.js"></script>
+<body>
+<div class="mainLayout">
+<div class="mainMenu">
+<div class="menuItem"><a href="#" class="mLogo">CLD</a>
+<ul>
+	
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+									</ul>
+</div>
+</div>
+<div class="warpContent">
+<div class="subMenu fL">
+<div class="menuItem">
+<ul>
+	<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+							
+	<li  class="  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement/receipts">费用执行</a></li>			
+		
+	
+	
+
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>	
+	
+	<li><a href="/wasteBook"  >公司流水</a></li>		
+	
+	
+
+	</ul>
+						
+						</ul>
+</div>
+</div>
+<div class="adminContent autoHeight" style="height: 821px;"><legend>
+<div class="fL"><a class="icon- crumb"
+	href="saea-dlist-year-dm.html" title="返回上级">b</a></div>
+ 
+ 
+ 
+ 
+ 
+ 
+ 全年报销单汇总</legend>
+<div class="demandCate">
+<form action="/categoryCollectDetail" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect" class="now">按办事处</a><a
+		href="/staffCollect">按员工</a></li>
+	<li><select name="cid" onchange="receiptYear();">
+				<option value="2"
+		>安徽办</option>
+				<option value="4"
+		>广东办</option>
+				<option value="12"
+		>总部1</option>
+			</select></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+		<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  selected  value="2016">2016</option>
+<option  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  value="2019">2019</option>	</select></li>
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+</div>
+<div class="saeaList">
+<div class="entry">
+<table class="table table-bordered table-condensed table-hover">
+	<tbody>
+		<tr>
+			<th width="110" class="taC">日常相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC" width="110">总计</th>
+		</tr>
+					<tr>
+			<th>团队建设费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>教育经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>体育经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>体检费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">差旅相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 差旅相关费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>93</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>93</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+		<tr>
+			<th width="120" class="taC">内部培训费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 内部培训费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>120</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>120</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+
+		<tr>
+			<th width="120" class="taC">培训班费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 培训班费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>148</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>148</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">其他</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 其他 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>174</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>174</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">报销金额调整</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr class="warning">
+			<td class="taR"><b>全年费用合计</b></td>
+			<td class="colGreed taR" colspan="13"><b style="font-size: 24px">￥0</b></td>
+		</tr>
+	</tbody>
+</table>
+</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+<div class="modal-header">
+<h3>添加批注</h3>
+</div>
+<div class="modal-body">
+<form class="">
+<div class="control-group">
+<div class="controls clearfix"><label> 批注内容 </label> <textarea
+	rows="8" class="span6"></textarea></div>
+</div>
+</form>
+</div>
+<div class="modal-footer"><a href="#" class="button btn-gray"
+	data-dismiss="modal" aria-hidden="true">取消</a> <a href="#"
+	class="button">确定</a></div>
+</div>
+<!--弹出内容--> <script type="text/javascript">
+	autoFlashHeight();
+</script>
+</body>

protected/cache/categoryCollect/categoryCollectDetail_2017_0.htmls

@@ -0,0 +1,497 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.02"></script></head>
+
+<script src="http://cld.com/global/js/receipt.js"></script>
+<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="/contacts" class="icon- ">A</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+<a href="/keyonline" class="icon- ">C</a>
+</li>
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="发票申请">
+<a href="/invoice" class="icon- ">D</a>
+</li>
+
+
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="人资管理">
+<a href="/hr" class="icon- ">m</a>
+</li>
+
+
+
+
+
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- ">X</a>
+</li>
+    
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>    
+    
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+<a href="/app" class="icon- ">Y</a>
+</li>
+
+
+<li data-placement="right" style="display:none" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- " >F</a>
+</li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+					
+					
+										</ul>
+</div>
+</div>
+<div class="warpContent">
+<div class="subMenu fL">
+<div class="menuItem">
+<ul>
+	<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+						
+<li><a href="/payments"   >日常收支</a></li>
+						
+						
+							
+	<li  class="topLine  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li><a  href="/remittanceHky">费用汇款</a></li>			
+						
+	
+			
+						
+			<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
+		
+		
+	<li><a href="/paymentsCollect"  >日常收支汇总</a></li>
+	<li><a href="/wasteBook"  >公司流水</a></li>
+		
+	
+	<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+	</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></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>
+    <!--邮寄-->	
+						</ul>
+</div>
+</div>
+<div class="adminContent autoHeight" style="height: 821px;"><legend>
+<div class="fL"><a class="icon- crumb"
+	href="saea-dlist-year-dm.html" title="返回上级">b</a></div>
+ 
+ 
+ 
+ 广东办  
+ 
+ 
+ 全年报销单汇总</legend>
+<div class="demandCate">
+<form action="/categoryCollectDetail" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect" class="now">按办事处</a><a
+		href="/staffCollect">按员工</a></li>
+	<li><select name="cid" onchange="receiptYear();">
+				<option value="2"
+		>安徽办</option>
+				<option		selected  value="4"
+		>广东办</option>
+				<option value="12"
+		>总部1</option>
+			</select></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+		<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  selected  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  value="2019">2019</option>	</select></li>
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+</div>
+<div class="saeaList">
+<div class="entry">
+<table class="table table-bordered table-condensed table-hover">
+	<tbody>
+		<tr>
+			<th width="110" class="taC">日常相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC" width="110">总计</th>
+		</tr>
+					<tr>
+			<th>市内交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>市内出租费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办事处房租</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电话费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>水费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办公费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>邮寄费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>车辆费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>广告费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>团队建设费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>物业管理费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>宽带费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>社保费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>人员薪酬</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>公积金</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>社保</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">差旅相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>往来交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>市内交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>出差住宿费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>出差补助</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+		<tr>
+			<th width="120" class="taC">内部培训费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+				<tr>
+			<th>场租费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>薪酬</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>住宿费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>餐饮费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>公关费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>餐费补助</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th>其他</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>		</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+
+		<tr>
+			<th width="120" class="taC">培训班费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>场租费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>住宿费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>餐饮费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办公费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>公关费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电话费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>讲课费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>邮寄费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>研究中心经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>税款</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">其他</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>公关费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>可自加费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">报销金额调整</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr class="warning">
+			<td class="taR"><b>全年费用合计</b></td>
+			<td class="colGreed taR" colspan="13"><b style="font-size: 24px">￥0</b></td>
+		</tr>
+	</tbody>
+</table>
+</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+<div class="modal-header">
+<h3>添加批注</h3>
+</div>
+<div class="modal-body">
+<form class="">
+<div class="control-group">
+<div class="controls clearfix"><label> 批注内容 </label> <textarea
+	rows="8" class="span6"></textarea></div>
+</div>
+</form>
+</div>
+<div class="modal-footer"><a href="#" class="button btn-gray"
+	data-dismiss="modal" aria-hidden="true">取消</a> <a href="#"
+	class="button">确定</a></div>
+</div>
+<!--弹出内容--> <script type="text/javascript">
+	autoFlashHeight();
+</script>
+</body>

protected/cache/categoryCollect/categoryCollectDetail_2018_0.htmls

@@ -0,0 +1,451 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1"></script></head>
+
+<script src="http://cld.com/global/js/receipt.js"></script>
+<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="/contacts" class="icon- ">A</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+<a href="/keyonline" class="icon- ">C</a>
+</li>
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="发票申请">
+<a href="/invoice" class="icon- ">D</a>
+</li>
+
+
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="人资管理">
+<a href="/hr" class="icon- ">m</a>
+</li>
+
+
+
+
+
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- ">X</a>
+</li>
+    
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>    
+    
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+<a href="/app" class="icon- ">Y</a>
+</li>
+
+
+<li data-placement="right" style="display:none" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- " >F</a>
+</li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+					
+					
+										</ul>
+</div>
+</div>
+<div class="warpContent">
+<div class="subMenu fL">
+<div class="menuItem">
+<ul>
+	<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+						
+<li><a href="/payments"   >日常收支</a></li>
+						
+						
+							
+	<li  class="topLine  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li><a  href="/remittanceHky">费用汇款</a></li>			
+						
+	
+			
+						
+			<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
+		
+		
+	<li><a href="/paymentsCollect"  >日常收支汇总</a></li>
+	<li><a href="/wasteBook"  >公司流水</a></li>
+		
+	
+	<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+	</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></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>
+    <!--邮寄-->	
+						</ul>
+</div>
+</div>
+<div class="adminContent autoHeight" style="height: 821px;"><legend>
+<div class="fL"><a class="icon- crumb"
+	href="saea-dlist-year-dm.html" title="返回上级">b</a></div>
+ 
+ 
+ 
+ 广东办  
+ 
+ 
+ 全年报销单汇总</legend>
+<div class="demandCate">
+<form action="/categoryCollectDetail" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect" class="now">按办事处</a><a
+		href="/staffCollect">按员工</a></li>
+	<li><select name="cid" onchange="receiptYear();">
+				<option value="2"
+		>安徽办</option>
+				<option		selected  value="4"
+		>广东办</option>
+				<option value="12"
+		>总部1</option>
+			</select></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+		<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  value="2017">2017</option>
+<option  selected  value="2018">2018</option>
+<option  value="2019">2019</option>	</select></li>
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+</div>
+<div class="saeaList">
+<div class="entry">
+<table class="table table-bordered table-condensed table-hover">
+	<tbody>
+		<tr>
+			<th width="110" class="taC">日常相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC" width="110">总计</th>
+		</tr>
+					<tr>
+			<th>市内交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>市内出租费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办事处房租</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电话费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>水费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办公费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>邮寄费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>车辆费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>广告费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>团队建设费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>物业管理费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>宽带费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>社保费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>人员薪酬</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>公积金</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>社保</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">差旅相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>往来交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>市内交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>出差住宿费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>出差补助</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">培训班费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>场租费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>住宿费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>交通费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>餐饮费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>办公费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>公关费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>电话费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>讲课费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>邮寄费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>研究中心经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>税款</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">其他</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+					<tr>
+			<th>公关费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>可自加费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">报销金额调整</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr class="warning">
+			<td class="taR"><b>全年费用合计</b></td>
+			<td class="colGreed taR" colspan="13"><b style="font-size: 24px">￥0</b></td>
+		</tr>
+	</tbody>
+</table>
+</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+<div class="modal-header">
+<h3>添加批注</h3>
+</div>
+<div class="modal-body">
+<form class="">
+<div class="control-group">
+<div class="controls clearfix"><label> 批注内容 </label> <textarea
+	rows="8" class="span6"></textarea></div>
+</div>
+</form>
+</div>
+<div class="modal-footer"><a href="#" class="button btn-gray"
+	data-dismiss="modal" aria-hidden="true">取消</a> <a href="#"
+	class="button">确定</a></div>
+</div>
+<!--弹出内容--> <script type="text/javascript">
+	autoFlashHeight();
+</script>
+</body>

protected/cache/categoryCollect/categoryCollectDetail_2019_0.htmls

@@ -0,0 +1,284 @@
+<br />
+<b>Warning</b>:  filemtime(): stat failed for F:\smartcost/cldgh/protected/view//admin/saeaCategoryCollectDetail.html in <b>F:\smartcost\dooframework\view\DooView.php</b> on line <b>292</b><br />
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.07"></script></head>
+
+<script src="http://cld.com/global/js/receipt.js"></script>
+<body>
+<div class="mainLayout">
+<div class="mainMenu">
+<div class="menuItem"><a href="#" class="mLogo">CLD</a>
+<ul>
+	
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+									</ul>
+</div>
+</div>
+<div class="warpContent">
+<div class="subMenu fL">
+<div class="menuItem">
+<ul>
+	<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+							
+	<li  class="  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement/receipts">费用执行</a></li>			
+		
+	
+	
+
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>	
+	
+	<li><a href="/wasteBook"  >公司流水</a></li>		
+	
+	
+
+	</ul>
+						
+						</ul>
+</div>
+</div>
+<div class="adminContent autoHeight" style="height: 821px;"><legend>
+<div class="fL"><a class="icon- crumb"
+	href="saea-dlist-year-dm.html" title="返回上级">b</a></div>
+ 
+ 
+ 
+ 广东办  
+ 
+ 
+ 全年报销单汇总</legend>
+<div class="demandCate">
+<form action="/categoryCollectDetail" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect" class="now">按办事处</a><a
+		href="/staffCollect">按员工</a></li>
+	<li><select name="cid" onchange="receiptYear();">
+				<option value="2"
+		>安徽办</option>
+				<option		selected  value="4"
+		>广东办</option>
+				<option value="12"
+		>总部1</option>
+			</select></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+		<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  selected  value="2019">2019</option>	</select></li>
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+</div>
+<div class="saeaList">
+<div class="entry">
+<table class="table table-bordered table-condensed table-hover">
+	<tbody>
+		<tr>
+			<th width="110" class="taC">日常相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC" width="110">总计</th>
+		</tr>
+					<tr>
+			<th>团队建设费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>教育经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>体育经费</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>体检费用</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+					<tr>
+			<th>其他</th>
+			<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">-</td><td class="taR colGreen"><b>￥0</b></td>			</tr>
+				<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">差旅相关费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 差旅相关费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>93</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>93</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+		<tr>
+			<th width="120" class="taC">内部培训费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 内部培训费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>120</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>120</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+
+
+		<tr>
+			<th width="120" class="taC">培训班费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 培训班费用 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>148</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>148</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">其他</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<br />
+<b>Notice</b>:  Undefined index: 其他 in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>174</b><br />
+<br />
+<b>Warning</b>:  Invalid argument supplied for foreach() in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaCategoryCollectDetail.php</b> on line <b>174</b><br />
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr>
+			<th width="120" class="taC">报销金额调整</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<tr>
+			<th class="taR">合计</th>
+			<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">-</td><td class="taR colGreen">￥0</td>		</tr>
+		<tr class="warning">
+			<td class="taR"><b>全年费用合计</b></td>
+			<td class="colGreed taR" colspan="13"><b style="font-size: 24px">￥0</b></td>
+		</tr>
+	</tbody>
+</table>
+</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+<div class="modal-header">
+<h3>添加批注</h3>
+</div>
+<div class="modal-body">
+<form class="">
+<div class="control-group">
+<div class="controls clearfix"><label> 批注内容 </label> <textarea
+	rows="8" class="span6"></textarea></div>
+</div>
+</form>
+</div>
+<div class="modal-footer"><a href="#" class="button btn-gray"
+	data-dismiss="modal" aria-hidden="true">取消</a> <a href="#"
+	class="button">确定</a></div>
+</div>
+<!--弹出内容--> <script type="text/javascript">
+	autoFlashHeight();
+</script>
+</body>

protected/cache/staffCollect/staffCollect_2017_.htmls

@@ -0,0 +1,329 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1"></script></head>
+
+<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1"></script>
+<script type="text/javascript" >
+</script>
+<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="/contacts" class="icon- ">A</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+<a href="/keyonline" class="icon- ">C</a>
+</li>
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="发票申请">
+<a href="/invoice" class="icon- ">D</a>
+</li>
+
+
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="人资管理">
+<a href="/hr" class="icon- ">m</a>
+</li>
+
+
+
+
+
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- ">X</a>
+</li>
+    
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>    
+    
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+<a href="/app" class="icon- ">Y</a>
+</li>
+
+
+<li data-placement="right" style="display:none" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- " >F</a>
+</li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+					
+					
+														</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+						
+<li><a href="/payments"   >日常收支</a></li>
+						
+						
+							
+	<li  class="topLine  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li><a  href="/remittanceHky">费用汇款</a></li>			
+						
+	
+			
+						
+			<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
+		
+		
+	<li><a href="/paymentsCollect"  >日常收支汇总</a></li>
+	<li><a href="/wasteBook"  >公司流水</a></li>
+		
+	
+	<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+	</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></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>
+    <!--邮寄-->	
+											</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>员工 全年报销单汇总</legend>
+				<div class="demandCate">
+					<form action="/staffCollect" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect">按办事处</a><a href="/staffCollect"
+		class="now">按员工</a></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+	  					<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  selected  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  value="2019">2019</option>	  					</select> 
+	  					
+	  					
+	  					<select onchange="javascript:location.href=this.value;">
+	<option value="/staffCollect">全年</option>
+	<option value="/staffCollectMonthDetail/2017/1">1月</option>
+	<option value="/staffCollectMonthDetail/2017/2">2月</option>
+	<option value="/staffCollectMonthDetail/2017/3">3月</option>
+	<option value="/staffCollectMonthDetail/2017/4">4月</option>
+	<option value="/staffCollectMonthDetail/2017/5">5月</option>
+	<option value="/staffCollectMonthDetail/2017/6">6月</option>
+	<option value="/staffCollectMonthDetail/2017/7">7月</option>
+	<option value="/staffCollectMonthDetail/2017/8">8月</option>
+	<option value="/staffCollectMonthDetail/2017/9">9月</option>
+	<option value="/staffCollectMonthDetail/2017/10">10月</option>
+	<option value="/staffCollectMonthDetail/2017/11">11月</option>
+	<option value="/staffCollectMonthDetail/2017/12">12月</option>
+	</select>
+	  					
+	  					
+	  </li>
+
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">	  			    
+	  				<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						<tr>
+	  						<th  class="taC"></th>
+	  						<th width="110" class="taC">员工/月</th>
+	  						<th class="taC" width="80">1月</th>
+	  						<th class="taC" width="80">2月</th>
+	  						<th class="taC" width="80">3月</th>
+	  						<th class="taC" width="80">4月</th>
+	  						<th class="taC" width="80">5月</th>
+	  						<th class="taC" width="80">6月</th>
+	  						<th class="taC" width="80">7月</th>
+	  						<th class="taC" width="80">8月</th>
+	  						<th class="taC" width="80">9月</th>
+	  						<th class="taC" width="80">10月</th>
+	  						<th class="taC" width="80">11月</th>
+	  						<th class="taC" width="80">12月</th>
+	  						<th class="taC" width="110">总计</th>
+	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/范月光">范月光</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/林森">林森</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王洪生">王洪生</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/姜栋">姜栋</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/刘庆">刘庆</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/封冬梅">封冬梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/李四测试1">李四测试1</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横SC">纵横SC</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="23">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/何银龄">何银龄</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张引">张引</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/杨福芳">杨福芳</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/赵淑燕">赵淑燕</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈世龙">陈世龙</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/冷淑梅">冷淑梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/麦心蓉">麦心蓉</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈特">陈特</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/任杰">任杰</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王晶">王晶</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张少珊">张少珊</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄爱玲">黄爱玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧汝">欧汝</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/付青青">付青青</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/温秀娟">温秀娟</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横知道">纵横知道</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/sha">sha</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/操作日志">操作日志</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						
+	  						<tr><th></th>
+	  						<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">-</td><td class="taR">-</td><td class="taR colGreen">￥0</td>							</tr>
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥0</b></td></tr>
+	  						</tbody>
+	  					</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/cache/staffCollect/staffCollect_2018_.htmls

@@ -0,0 +1,222 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.07"></script></head>
+
+<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1.09"></script>
+<script type="text/javascript" >
+</script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+													</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+							
+	<li  class="  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement/receipts">费用执行</a></li>			
+		
+	
+	
+
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>	
+	
+	<li><a href="/wasteBook"  >公司流水</a></li>		
+	
+	
+
+	</ul>
+						
+											</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>员工 全年报销单汇总</legend>
+				<div class="demandCate">
+					<form action="/staffCollect" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect">按办事处</a><a href="/staffCollect"
+		class="now">按员工</a></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+	  					<br />
+<b>Notice</b>:  Undefined index: dateHtml in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaStaffCollectB.php</b> on line <b>31</b><br />
+	  					</select> 
+	  					
+	  					
+	  					<select onchange="javascript:location.href=this.value;">
+	<option value="/staffCollect">全年</option>
+	<option value="/staffCollectMonthDetail/2018/1/ONJOB">1月</option>
+	<option value="/staffCollectMonthDetail/2018/2/ONJOB">2月</option>
+	<option value="/staffCollectMonthDetail/2018/3/ONJOB">3月</option>
+	<option value="/staffCollectMonthDetail/2018/4/ONJOB">4月</option>
+	<option value="/staffCollectMonthDetail/2018/5/ONJOB">5月</option>
+	<option value="/staffCollectMonthDetail/2018/6/ONJOB">6月</option>
+	<option value="/staffCollectMonthDetail/2018/7/ONJOB">7月</option>
+	<option value="/staffCollectMonthDetail/2018/8/ONJOB">8月</option>
+	<option value="/staffCollectMonthDetail/2018/9/ONJOB">9月</option>
+	<option value="/staffCollectMonthDetail/2018/10/ONJOB">10月</option>
+	<option value="/staffCollectMonthDetail/2018/11/ONJOB">11月</option>
+	<option value="/staffCollectMonthDetail/2018/12/ONJOB">12月</option>
+	</select>
+	  					
+	  					
+	  </li>
+
+	  			<li><select name="nature" id="Y" onchange="receiptYear();">
+	  					<option  selected  value="ONJOB" >在职</option>
+	<option  value="LEAVEJOB">离职</option>
+	  					</select> 		
+	  					
+	  </li>
+
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">	  			    
+	  				<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						<tr>
+	  						<th  class="taC"></th>
+	  						<th width="110" class="taC">员工/月</th>
+	  						<th class="taC" width="80">1月</th>
+	  						<th class="taC" width="80">2月</th>
+	  						<th class="taC" width="80">3月</th>
+	  						<th class="taC" width="80">4月</th>
+	  						<th class="taC" width="80">5月</th>
+	  						<th class="taC" width="80">6月</th>
+	  						<th class="taC" width="80">7月</th>
+	  						<th class="taC" width="80">8月</th>
+	  						<th class="taC" width="80">9月</th>
+	  						<th class="taC" width="80">10月</th>
+	  						<th class="taC" width="80">11月</th>
+	  						<th class="taC" width="80">12月</th>
+	  						<th class="taC" width="110">总计</th>
+	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/范月光">范月光</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/林森">林森</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王洪生">王洪生</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/姜栋">姜栋</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/刘庆">刘庆</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/封冬梅">封冬梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/李四测试1">李四测试1</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横SC">纵横SC</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="23">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/何银龄">何银龄</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张引">张引</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/杨福芳">杨福芳</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/赵淑燕">赵淑燕</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈世龙">陈世龙</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/冷淑梅">冷淑梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/麦心蓉">麦心蓉</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈特">陈特</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/任杰">任杰</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王晶">王晶</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张少珊">张少珊</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄爱玲">黄爱玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧汝">欧汝</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/付青青">付青青</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/温秀娟">温秀娟</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横知道">纵横知道</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/sha">sha</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/操作日志">操作日志</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						
+	  						<tr><th></th>
+	  						<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">-</td><td class="taR">-</td><td class="taR colGreen">￥0</td>							</tr>
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥0</b></td></tr>
+	  						</tbody>
+	  					</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/cache/staffCollect/staffCollect_2019_.htmls

@@ -0,0 +1,222 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.07"></script></head>
+
+<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1.09"></script>
+<script type="text/javascript" >
+</script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+													</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+							
+	<li  class="  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement/receipts">费用执行</a></li>			
+		
+	
+	
+
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>	
+	
+	<li><a href="/wasteBook"  >公司流水</a></li>		
+	
+	
+
+	</ul>
+						
+											</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>员工 全年报销单汇总</legend>
+				<div class="demandCate">
+					<form action="/staffCollect" id="up" method="post">
+<ul class="cateList">
+	<li><a href="/companyCategoryCollect">按办事处</a><a href="/staffCollect"
+		class="now">按员工</a></li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+	  					<br />
+<b>Notice</b>:  Undefined index: dateHtml in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaStaffCollectB.php</b> on line <b>31</b><br />
+	  					</select> 
+	  					
+	  					
+	  					<select onchange="javascript:location.href=this.value;">
+	<option value="/staffCollect">全年</option>
+	<option value="/staffCollectMonthDetail/2019/1/ONJOB">1月</option>
+	<option value="/staffCollectMonthDetail/2019/2/ONJOB">2月</option>
+	<option value="/staffCollectMonthDetail/2019/3/ONJOB">3月</option>
+	<option value="/staffCollectMonthDetail/2019/4/ONJOB">4月</option>
+	<option value="/staffCollectMonthDetail/2019/5/ONJOB">5月</option>
+	<option value="/staffCollectMonthDetail/2019/6/ONJOB">6月</option>
+	<option value="/staffCollectMonthDetail/2019/7/ONJOB">7月</option>
+	<option value="/staffCollectMonthDetail/2019/8/ONJOB">8月</option>
+	<option value="/staffCollectMonthDetail/2019/9/ONJOB">9月</option>
+	<option value="/staffCollectMonthDetail/2019/10/ONJOB">10月</option>
+	<option value="/staffCollectMonthDetail/2019/11/ONJOB">11月</option>
+	<option value="/staffCollectMonthDetail/2019/12/ONJOB">12月</option>
+	</select>
+	  					
+	  					
+	  </li>
+
+	  			<li><select name="nature" id="Y" onchange="receiptYear();">
+	  					<option  selected  value="ONJOB" >在职</option>
+	<option  value="LEAVEJOB">离职</option>
+	  					</select> 		
+	  					
+	  </li>
+
+	<li>报销总计：￥0</li>
+	<li>同意支付：<span class="colGreen">￥0</span></li>
+	<li>审批中：￥0</li>
+</ul>
+</form>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">	  			    
+	  				<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						<tr>
+	  						<th  class="taC"></th>
+	  						<th width="110" class="taC">员工/月</th>
+	  						<th class="taC" width="80">1月</th>
+	  						<th class="taC" width="80">2月</th>
+	  						<th class="taC" width="80">3月</th>
+	  						<th class="taC" width="80">4月</th>
+	  						<th class="taC" width="80">5月</th>
+	  						<th class="taC" width="80">6月</th>
+	  						<th class="taC" width="80">7月</th>
+	  						<th class="taC" width="80">8月</th>
+	  						<th class="taC" width="80">9月</th>
+	  						<th class="taC" width="80">10月</th>
+	  						<th class="taC" width="80">11月</th>
+	  						<th class="taC" width="80">12月</th>
+	  						<th class="taC" width="110">总计</th>
+	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/范月光">范月光</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/林森">林森</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王洪生">王洪生</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/姜栋">姜栋</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/刘庆">刘庆</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/封冬梅">封冬梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/李四测试1">李四测试1</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横SC">纵横SC</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="23">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/何银龄">何银龄</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张引">张引</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/杨福芳">杨福芳</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/赵淑燕">赵淑燕</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈世龙">陈世龙</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/冷淑梅">冷淑梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/麦心蓉">麦心蓉</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈特">陈特</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/任杰">任杰</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王晶">王晶</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张少珊">张少珊</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄爱玲">黄爱玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧汝">欧汝</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/付青青">付青青</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/温秀娟">温秀娟</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横知道">纵横知道</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/sha">sha</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/操作日志">操作日志</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						
+	  						<tr><th></th>
+	  						<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">-</td><td class="taR">-</td><td class="taR colGreen">￥0</td>							</tr>
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥0</b></td></tr>
+	  						</tbody>
+	  					</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/cache/staffCollect/staffCollect_2020_.htmls

@@ -0,0 +1,353 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
+	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
+	<script src="http://cld.com/global/js/global.js"></script>
+	<script src="http://cld.com/global/js/index.js?1.09"></script></head>
+
+<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1.10"></script>
+<script type="text/javascript" >
+</script>
+<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="/contacts" class="icon- ">A</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+<a href="/keyonline" class="icon- ">C</a>
+</li>
+
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="云版管理">
+<a href="/cloud/curing/edition" target="_blank" class="icon- ">e</a>
+</li>
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon-  selected " >U</a>
+</li>  
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="发票申请">
+<a href="/invoice" class="icon- ">D</a>
+</li>
+
+
+
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="人资管理">
+<a href="/hr" class="icon- ">m</a>
+</li>
+
+
+
+
+
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- ">X</a>
+</li>
+    
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>    
+    
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+<a href="/app" class="icon- ">Y</a>
+</li>
+
+
+<li data-placement="right" style="display:none" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- " >F</a>
+</li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+									</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<ul>
+<li class="saeaTitle">费用管理</li>
+	<li><a   href="/saeaBorad" >公布板</a></li>
+	<li><a  href="/expenses">我的费用</a></li>
+	<li><a href="/personalCollect"  >费用汇总</a></li>
+						
+						
+						
+<li><a href="/payments"   >日常收支</a></li>
+						
+						
+							
+	<li  class="topLine  ">
+	<a  href="/approvalExpenses/pendApproval">费用审批</a>
+	</li>
+						
+
+<li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
+						
+						
+		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li class="hide"><a  href="/remittanceHky">费用汇款</a></li>			
+
+	
+		<li><a href="/receiptTrainRevenue"  >培训班营收</a></li>
+	
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
+	
+
+	
+		
+	<li><a href="/paymentsCollect"  >日常收支汇总</a></li>
+	<li><a href="/wasteBook"  >公司流水</a></li>
+		
+	
+	
+	<li  >
+	<a ghToken  href="javascript:void(0)" data-toggle="modal">工会</a>
+	</li>
+	
+	<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+	</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></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>
+    <!--邮寄-->	
+											</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fL"></div>员工 全年报销单汇总</legend>
+				<div class="demandCate">
+					<form action="/staffCollect" id="up" method="post">
+<ul class="cateList">
+	<li>
+	<a href="/companyCategoryCollect">按办事处</a>
+	<a href="/receiptSummaryStatisticsByAgency" >办事处明细</a>
+	<a href="/staffCollect" class="now">按员工</a>
+	</li>
+	<li><select name="year" id="Y" onchange="receiptYear();">
+	  					<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  value="2019">2019</option>
+<option  selected  value="2020">2020</option>	  					</select> 
+	  					
+	  					
+	  					<select onchange="javascript:location.href=this.value;">
+	<option value="/staffCollect">全年</option>
+	<option value="/staffCollectMonthDetail/2020/1/ONJOB">1月</option>
+	<option value="/staffCollectMonthDetail/2020/2/ONJOB">2月</option>
+	<option value="/staffCollectMonthDetail/2020/3/ONJOB">3月</option>
+	<option value="/staffCollectMonthDetail/2020/4/ONJOB">4月</option>
+	<option value="/staffCollectMonthDetail/2020/5/ONJOB">5月</option>
+	<option value="/staffCollectMonthDetail/2020/6/ONJOB">6月</option>
+	<option value="/staffCollectMonthDetail/2020/7/ONJOB">7月</option>
+	<option value="/staffCollectMonthDetail/2020/8/ONJOB">8月</option>
+	<option value="/staffCollectMonthDetail/2020/9/ONJOB">9月</option>
+	<option value="/staffCollectMonthDetail/2020/10/ONJOB">10月</option>
+	<option value="/staffCollectMonthDetail/2020/11/ONJOB">11月</option>
+	<option value="/staffCollectMonthDetail/2020/12/ONJOB">12月</option>
+	</select>
+	  					
+	  					
+	  </li>
+
+	  			<li><select name="nature" id="Y" onchange="receiptYear();">
+	  					<option  selected  value="ONJOB" >在职</option>
+	<option  value="LEAVEJOB">离职</option>
+	  					</select> 		
+	  					
+	  </li>
+
+	<li>报销总计：￥40544.80</li>
+	<li>同意支付：<span class="colGreen">￥37580.80</span></li>
+	<li>审批中：￥2964</li>
+</ul>
+</form>
+	  		</div>
+	  		<div class="saeaList">
+	  			<div class="entry">	  			    
+	  				<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						<tr>
+	  						<th  class="taC"></th>
+	  						<th width="110" class="taC">员工/月</th>
+	  						<th class="taC" width="80">1月</th>
+	  						<th class="taC" width="80">2月</th>
+	  						<th class="taC" width="80">3月</th>
+	  						<th class="taC" width="80">4月</th>
+	  						<th class="taC" width="80">5月</th>
+	  						<th class="taC" width="80">6月</th>
+	  						<th class="taC" width="80">7月</th>
+	  						<th class="taC" width="80">8月</th>
+	  						<th class="taC" width="80">9月</th>
+	  						<th class="taC" width="80">10月</th>
+	  						<th class="taC" width="80">11月</th>
+	  						<th class="taC" width="80">12月</th>
+	  						<th class="taC" width="110">总计</th>
+	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/范月光">范月光</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/林森">林森</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王洪生">王洪生</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/姜栋">姜栋</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/刘庆">刘庆</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/封冬梅">封冬梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/李四测试1">李四测试1</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横SC">纵横SC</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+	  							  						<tr>
+	  						<th rowspan="23">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/何银龄">何银龄</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张引">张引</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/杨福芳">杨福芳</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/赵淑燕">赵淑燕</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈世龙">陈世龙</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/冷淑梅">冷淑梅</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/麦心蓉">麦心蓉</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/陈特">陈特</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/任杰">任杰</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></td><td class="taR">￥0.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥17301.80</td><td class="taR">￥5675.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 colGreen"><b>￥22976.8</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/王晶">王晶</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/张少珊">张少珊</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄爱玲">黄爱玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧汝">欧汝</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/付青青">付青青</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></td><td class="taR">￥300.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥1400.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 colGreen"><b>￥1700</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/温秀娟">温秀娟</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/纵横知道">纵横知道</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/sha">sha</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/操作日志">操作日志</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></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">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  							  						<tr>
+	  						<th class="taR">小计</th><td class="taR">￥300</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥18701.8</td><td class="taR">￥5675</td>
+				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥24676.8</td>	  						</tr>
+	  							  						
+	  						<tr><th></th>
+	  						<td class="taR">合计</td>
+	  						<td class="taR">￥300</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥18701.8</td><td class="taR">￥5675</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">￥24676.8</td>							</tr>
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥24676.8</b></td></tr>
+	  						</tbody>
+	  					</table>
+	  			</div>
+			</div>
+		</div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/class/XDeode.php

@@ -3,9 +3,6 @@
 /**
  * 加密解密类
  * 该算法仅支持加密数字。比较适用于数据库中id字段的加密解密，以及根据数字显示url的加密。
- * @author 深秋的竹子
- * @email  81254648@qq.com
- * @version alpha
  * @加密原则 标记长度 + 补位 + 数字替换
  * @加密步骤：
  * 将a-z,A-Z,0-9 62个字符打乱，取前M(数字最大的位数)位作为 标记长度字符串，取第M+1 到第M+10位为数字替换字符串，剩余的为补位字符串

protected/class/invoice.func.php

@@ -1,4 +1,5 @@
 <?php
+
 function formatExcelToArrayBank($file_url = ""){
 	if (! file_exists ( $file_url )) {
 		return array ();

protected/class/middleware/access_auth.php

@@ -0,0 +1,5 @@
+<?php
+
+
+
+?>

protected/class/receipt.finances.func.php

@@ -0,0 +1,239 @@
+<?php
+
+/**
+ * 生成一个日常支出
+ *
+ * @param [type] $accountBook
+ * @param [type] $expensesType
+ * @param [type] $outlayAccountType
+ * @param [type] $outlayAccountMsg
+ * @param [type] $outlayPrice
+ * @param [type] $outlayBank
+ * @param [type] $outlayDate
+ * @param [type] $outlayRemarks
+ * @return void
+ */
+function _saveOutlayAB($accountBook, $expensesType, $outlayAccountType, $operatingBankType, $depositMethod, $outlayMsg, $outlayPrice, $outlayBank, $outlayDate, $outlayRemarks, $staff) {
+	$accountBook->expensesType = $expensesType;
+	$accountBook->expenditureType = $outlayAccountType;
+	$accountBook->operatingBankType = $operatingBankType;
+	$accountBook->depositMethod = $depositMethod;
+	$accountBook->expenditureMsg = $outlayMsg;
+	$accountBook->expenditurePrice = $outlayPrice;
+	$accountBook->expenditureBank = $outlayBank;
+	$accountBook->expenditureDate = $outlayDate;
+	$accountBook->remarks = $outlayRemarks;
+	$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+	$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+	$accountBook->inputStaff = $staff [0] ['sid'];
+	$id = $accountBook->insert ();
+	return $id;
+}
+
+/**
+ * 生成一条理财流水
+ *
+ * @return void
+ */
+function _saveFWB($wasteBook, $expensesType, $accountType, $dailyType, $operatingBankType, $depositMethod, $outlayPrice, $outlayId, $accountBank, $outlayDate, $staff) {
+	$itemWaste = array (
+			'expensesType' => $expensesType,
+			'accountType' => $accountType,
+			
+			'dailyType' => $dailyType,
+			'operatingBankType' => $operatingBankType,
+			'depositMethod' => $depositMethod,
+			'accountPriceShow' => abs ( $outlayPrice ),
+			'accountPrice' => $outlayPrice,
+			'dataID' => $outlayId,
+			'accountBank' => $accountBank,
+			'category' => $staff [0] ['category'],
+			'cid' => $staff [0] ['cid'],
+			'name' => $staff [0] ['username'],
+			'sid' => $staff [0] ['sid'],
+			'inputDate' => $outlayDate,
+			'createAt' => date ( "Y-m-d H:i:s" ),
+			'synPaymentDate' => 1 
+	);
+	$wasteBook->setAccountBookStatistics ( $itemWaste );
+}
+
+/**
+ * 生成日常收入-理财
+ *
+ * @param [type] $accountBook
+ * @param [type] $expensesType
+ * @param [type] $accountType
+ * @param [type] $operatingBankType
+ * @param [type] $depositMethod
+ * @param [type] $outlayBank
+ * @param [type] $revenuePrice
+ * @param [type] $revenueMsg
+ * @param [type] $revenueDate
+ * @param [type] $revenueRemarks
+ * @param [type] $staff
+ * @return void
+ */
+function _saveRevenueAB($accountBook, $expensesType, $accountType, $operatingBankType, $depositMethod, $outlayBank, $revenuePrice, $revenueMsg, $revenueDate, $revenueRemarks, $staff) {
+	$accountBook->expensesType = $expensesType;
+	$accountBook->accountType = $accountType;
+	
+	$accountBook->operatingBankType = $operatingBankType;
+	$accountBook->depositMethod = $depositMethod;
+	
+	$accountBook->receivedBank = $outlayBank;
+	
+	$accountBook->receivedPrice = $revenuePrice;
+	$accountBook->receivedMsg = $revenueMsg;
+	$accountBook->receivedDate = $revenueDate;
+	$accountBook->remarks = $revenueRemarks;
+	
+	$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+	$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+	$accountBook->inputStaff = $staff [0] ['sid'];
+	$inComeId = $accountBook->insert ();
+	return $inComeId;
+}
+
+/**
+ * 产生一条汇总信息
+ *
+ * @param [type] $abDetail
+ * @param [type] $accountBookStatistics
+ * @return void
+ */
+function _saveAccountBookStatistics($abDetail, $accountBookStatistics) {
+	$item = array (
+			'date' => date ( "Y-m-d" ),
+			'expenditureType' => $abDetail ['expenditureType'],
+			'expenditureMsg' => $abDetail ['expenditureMsg'],
+			'aid' => $abDetail ['aid'],
+			'payPrice' => $abDetail ['expenditurePrice'],
+			'expensesType' => $abDetail ['expensesType'] 
+	);
+	$accountBookStatistics->setAccountBookStatistics ( $item );
+}
+
+/**
+ * 产生一条收入汇总信息
+ *
+ * @param [type] $abDetail
+ * @param [type] $accountBookStatistics
+ * @return void
+ */
+function _saveRevenueAccountBookStatistics($abDetail, $accountBookStatistics) {
+	$item = array (
+			'date' => date ( "Y-m-d" ),
+			'accountType' => $abDetail ['accountType'],
+			'accountMsg' => $abDetail ['accountMsg'],
+			'aid' => $abDetail ['aid'],
+			'inComePrice' => $abDetail ['receivedPrice'],
+			'expensesType' => $abDetail ['expensesType'] 
+	);
+	$accountBookStatistics->setAccountBookStatistics ( $item );
+}
+
+/**
+ * 转换公司账号银行名称
+ *
+ * @param [type] $bank
+ * @return void
+ */
+function _getCompanyBankEN($bank) {
+	$accountBank = '';
+	if ($bank == '纵横广发' || $bank == '(纵横广发)广发存款') {
+		$accountBank = 'CGBDeposit';
+	} elseif ($bank == '纵横工行') {
+		$accountBank = 'ICBCDeposit';
+	} elseif ($bank == '个人存款') {
+		$accountBank = 'PersonalDeposit';
+	}
+	return $accountBank;
+}
+
+/**
+ * 理财银行转换名称的转换
+ *
+ * @param [type] $bank
+ * @return void
+ */
+function _getFinancesBankEN($bank) {
+	$accountBank = '';
+	if ($bank == '广发理财') {
+		$accountBank = 'CGBDeposit';
+	} elseif ($bank == '工行理财') {
+		$accountBank = 'ICBCDeposit';
+	} elseif ($bank == '个人理财(广发)') {
+		$accountBank = 'CGBPersonalDeposit';
+	}
+	return $accountBank;
+}
+function _checkDepositMethod($revenueAccountMsg) {
+	$depositMethod = '';
+	if ($revenueAccountMsg == '固定') {
+		$depositMethod = '固定';
+	} elseif ($revenueAccountMsg == '活期') {
+		$depositMethod = '活期';
+	}
+	return $depositMethod;
+}
+function _getRevenueTypeCN($value) {
+	$revenueType = '';
+	if ($value ['accountType'] == 6 || $value ['accountType'] == 9 || $value ['accountType'] == 10) {
+		$revenueType = '日常收入-' . $value ['data'] ['incomeTypeMsg'];
+	} elseif ($value ['accountType'] == 7 || $value ['accountType'] == 8) {
+		$revenueType = '发票收款';
+	} elseif ($value ['accountType'] == 1) {
+		$revenueType = '费用收入（借款）';
+	} elseif ($value ['accountType'] == 2) {
+		$revenueType = '费用收入（借款报销）';
+	} elseif ($value ['accountType'] == 3) {
+		$revenueType = '费用收入（报销）';
+	} elseif ($value ['accountType'] == 4) {
+		$revenueType = '费用收入（对公汇款）';
+	} elseif ($value ['accountType'] == 12) {
+		$revenueType = '费用收入（ 培训班结算）';
+	}
+	return $revenueType;
+}
+function _getOutlayTypeCN($value) {
+	$outlayType = '';
+	if ($value ['accountType'] == 5 || $value ['accountType'] == 9 || $value ['accountType'] == 10) {
+		$outlayType = '日常支出-' . $value ['data'] ['expenditureTypeMsg'];
+	} elseif ($value ['accountType'] == 1) {
+		$outlayType = '费用管理（借款）';
+	} elseif ($value ['accountType'] == 2) {
+		$outlayType = '费用管理（借款报销）';
+	} elseif ($value ['accountType'] == 3) {
+		$outlayType = '费用管理（报销）';
+	} elseif ($value ['accountType'] == 4) {
+		$outlayType = '费用管理（对公汇款）';
+	} elseif ($value ['accountType'] == 12) {
+		$outlayType = '费用管理（ 培训班结算）';
+	} elseif ($value ['accountType'] == 11) {
+		$outlayType = '收款退款';
+	}
+	return $outlayType;
+}
+
+function _structureReportItem($inputDate,$receivablesMessage,$revenueType,$category,$settlementType,$revenueBankMsg,$revenuePriceShow,$revenueTotalDay
+		,$outlayType,$outlayMsg,$outlayBankMsg,$outlayPriceShow,$outlayTotalDay){
+	$item['inputDate']=$inputDate;
+	$item['receivablesMessage']=$receivablesMessage;
+	$item['revenueType']=$revenueType;
+	$item['category']=$category;
+	$item['settlementType']=$settlementType;
+	$item['revenueBankMsg']=$revenueBankMsg;
+	$item['revenuePriceShow']=$revenuePriceShow;
+	$item['revenueTotalDay']=$revenueTotalDay;
+	
+	$item['outlayType']=$outlayType;
+	$item['outlayMsg']=$outlayMsg;
+	$item['outlayBankMsg']=$outlayBankMsg;
+	$item['outlayPriceShow']=$outlayPriceShow;
+	$item['outlayTotalDay']=$outlayTotalDay;
+	$item['balance']=0;
+	return $item;
+}
+
+?>

protected/class/receipt.func.php

@@ -642,7 +642,54 @@ function _getPaymentsCollectPayByYearHtml($statisticsPay = array()) {
 			else
 				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
 			$html .= '</tr>';
+		}elseif ($i == 13) {
+			$html .= '<tr><th colspan="2" >纵横文库提现</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . abs ( $value ['payPrice'] ) . '</td>';
+						$sum += abs ( $value ['payPrice'] );
+						$subtotalSum [$month] += abs ( $value ['payPrice'] );
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+		}elseif ($i == 14) {
+			$html .= '<tr><th colspan="2" >其他</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . abs ( $value ['payPrice'] ) . '</td>';
+						$sum += abs ( $value ['payPrice'] );
+						$subtotalSum [$month] += abs ( $value ['payPrice'] );
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
 		}
+		
 	}
 	
 	$html .= '<tr><th class="taR" colspan="2">合计</th>';
@@ -703,7 +750,7 @@ function _getPaymentsCollectByYearHtml($statisticsIncome = array()) {
 					11 => 0,
 					12 => 0 
 			);
-			$html .= '<tr><th rowspan="4" width="90">利息收入</th>';
+			$html .= '<tr><th rowspan="5" width="90">利息收入</th>';
 			$html .= '<th width="90">银行存款</th>';
 			$sum = 0;
 			for($month = 1; $month <= 12; $month ++) {
@@ -1708,12 +1755,61 @@ function _getPaymentsCollectPayByDayHtml($statisticsPay = array(), $day = 0) {
 				if ($falg)
 					$html .= '<td class="taR">-</td>';
 			}
-			if ($sum == 0)
+			if ($sum == 0){
 				$html .= '<td class="taR">-</td>';
-			else
+			}else{
+				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+		}elseif ($i == 13) {
+			$html .= '<tr><th colspan="2" >纵横文库提现</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . abs ( $value ['payPrice'] ) . '</td>';
+						$sum += abs ( $value ['payPrice'] );
+						$subtotalSum [$month] += abs ( $value ['payPrice'] );
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
 				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+		}elseif ($i == 14) {
+			$html .= '<tr><th colspan="2" >其他</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . abs ( $value ['payPrice'] ) . '</td>';
+						$sum += abs ( $value ['payPrice'] );
+						$subtotalSum [$month] += abs ( $value ['payPrice'] );
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR colRed">￥' . $sum . '</td>';
+			}
 			$html .= '</tr>';
 		}
+		
+		
 	}
 	
 	$html .= '<tr><th class="taR" colspan="2">合计</th>';

protected/class/wasteBook.finances.func.php

@@ -0,0 +1,63 @@
+<?php
+
+	function _getBankSavingsWBS($waste, $statistics){
+		
+		foreach($statistics as $key=>$value){
+			//（纵横广发）广发存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
+				$waste['bank']['CGBDeposit'] += $value['accountPrice'];
+			}
+			//工行存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
+				$waste['bank']['ICBCDeposit'] += $value['accountPrice'];
+			}
+			//个人存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
+				$waste['bank']['PersonalDeposit'] += $value['accountPrice'];
+			}
+		}
+		return $waste;
+	}
+
+	function _getFinancesWBS($waste, $financesStatistics){
+	//理财账号
+		foreach ($financesStatistics['financesAccount'] as $key => $value) {
+			//广发理财-固定
+			if ($value['depositMethod'] == '固定' && $value['accountBank'] == 'CGBDeposit') {
+				$waste['financial']['fixed']['CGBDeposit'] += $value['accountPrice'];
+			}
+			//个人理财固定（广发）
+			if ($value['depositMethod'] == '固定' && $value['accountBank'] == 'CGBPersonalDeposit') {
+				$waste['financial']['fixed']['ICBCDeposit'] += $value['accountPrice'];
+			}
+			//广发理财活期
+			if ($value['depositMethod'] == '活期' && $value['accountBank'] == 'CGBDeposit') {
+				$waste['financial']['current']['CGBDeposit'] += $value['accountPrice'];
+			}
+			//工行理财活期
+			if ($value['depositMethod'] == '活期' && $value['accountBank'] == 'ICBCDeposit') {
+				$waste['financial']['current']['ICBCDeposit'] += $value['accountPrice'];
+			}
+		}
+		//公司账号
+		foreach($financesStatistics['companyAccount'] as $key=>$value){
+			//print_r($value);
+			//（纵横广发）广发存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
+				$waste['bank']['CGBDeposit'] += $value['accountPrice'];
+			}
+			//工行存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
+				$waste['bank']['ICBCDeposit'] += $value['accountPrice'];
+			}
+			//个人存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
+				$waste['bank']['PersonalDeposit'] += $value['accountPrice'];
+			}
+		}
+		return $waste;
+		//print_r($waste);
+		//die;
+	}
+
+?>

protected/config/acl.conf.php

@@ -383,6 +383,9 @@ $acl ['EMAIL'] ['allow'] = array (
 
 //费用
 $acl ['RECEIPTS'] ['allow'] = array (
+		'fee_controller' => array (
+				'GetViewReceiptCreate',
+		),
 		'ReceiptController' => array (
 				'saeaBorad',
 				'saeaLoanAdd',
@@ -518,6 +521,11 @@ $acl ['RECEIPTSEXTEND'] ['allow'] = array (
 				'receiptSummaryStatisticsByAgency',
 				'setSummaryCategory',
 				'exportReceiptSummaryExcel',
+				'paymentsFinancesDo',
+				'paymentsBankDo',
+				'paymentsDelete',
+				'wasteBookReport',
+				'frame_wasteBookReport',
 		)
 );
 $acl ['RECEIPTSAJAX'] ['allow'] = array (
@@ -526,6 +534,7 @@ $acl ['RECEIPTSAJAX'] ['allow'] = array (
 				'ajaxSetRceiptAmountByRid',
 				'ajaxGetReceiptDetailByJson',
 				'ajaxItineraryDate',
+				'ajaxWasteBookReportData',
 		)
 );
 //人资
@@ -596,4 +605,6 @@ $acl ['BUILD'] ['allow'] = array (
 		)
 );
 
+
+
 ?>

protected/config/js.edition.conf.php

@@ -3,7 +3,7 @@
 define ( "index", WEB_SITE_GLOBAL.'js/index.js?1.09' );
 define ( "receiptExtend", WEB_SITE_GLOBAL.'js/receiptExtend.js?1.05' );
 
-define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.10' );
+define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.11' );
 define ( "itinerary", WEB_SITE_GLOBAL.'js/itinerary.js?1.27' );
 define ( "itineraryView", WEB_SITE_GLOBAL.'js/itineraryView.js?1.12' );
 
@@ -12,8 +12,8 @@ define ( "itinerary2", WEB_SITE_GLOBAL.'js/itinerary2.0.js?1.00' );
 define ( "itinerary2func", WEB_SITE_GLOBAL.'js/itinerary2func.js?1.01' );
 define ( "itineraryView2", WEB_SITE_GLOBAL.'js/itineraryView2.0.js?1.12' );
 
-define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.02' );
-define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.03' );
+define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.03' );
+define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.04' );
 define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.02' );
 
 define ( "autoTag", WEB_SITE_GLOBAL.'js/autoTag.js?1' );

protected/config/longle2.bak

@@ -0,0 +1 @@
+[{"key_num":"ZH-04405","serialnumber":"273800F8076B804C","product":"全国专业+固化清单全功能+广东专业","make_day":"2020/1/2 19:15:58","alloted_time":"2021/1/1","version":"年限","cid":"11","title":"山东办","licences":"0"}]

protected/config/routes.conf.php

@@ -1,5 +1,5 @@
 <?php
-
+require "routes_receipt.php";
 
 $route['post']['/auth/token'] = array('ghController', 'authToken');
 
@@ -257,6 +257,13 @@ $route['*']['/paymentsAchieve'] = array('ReceiptController', 'paymentsAchieve');
 $route['*']['/paymentsAchieve/:page/:expensesType'] = array('ReceiptController', 'paymentsAchieve');
 $route['*']['/ajaxGetPaymentsByAid'] = array('ReceiptController', 'ajaxGetPaymentsByAid');
 
+//理财部分
+$route['post']['/paymentsFinancesDo'] = array('ReceiptExtendController', 'paymentsFinancesDo');
+//银行互转部分
+$route['post']['/paymentsBankDo'] = array('ReceiptExtendController', 'paymentsBankDo');
+$route['post']['/paymentsDelete'] = array('ReceiptExtendController', 'paymentsDelete');
+
+
 //$route['post']['/paymentsIncomeUpdateDo'] = array('ReceiptController', 'paymentsIncomeUpdateDo');
 //$route['post']['/paymentsExpenditureEdiDo'] = array('ReceiptController', 'paymentsExpenditureEdiDo');
 
@@ -271,8 +278,12 @@ $route['*']['/ajaxGetWasteinvoiceReceivables'] = array('ReceiptController', 'aja
 $route['*']['/ajaxGetWasteInvoice'] = array('ReceiptController', 'ajaxGetWasteInvoice');
 
 
+$route['*']['/wasteBookReport'] = array('ReceiptExtendController', 'wasteBookReport');
 $route['*']['/wasteBookIncome'] = array('ReceiptController', 'wasteBookIncome');
 $route['*']['/wasteBookExpenditure'] = array('ReceiptController', 'wasteBookExpenditure');
+$route['*']['/ajaxWasteBookReportData'] = array('ReceiptAjaxController', 'ajaxWasteBookReportData');
+$route['*']['/frame/wasteBookReport'] = array('ReceiptExtendController', 'frame_wasteBookReport');
+
 
 //培训班结算
 $route['*']['/receiptTrainAdd'] = array('ReceiptController', 'receiptTrainAdd');

protected/config/routes_receipt.php

@@ -0,0 +1,6 @@
+<?php
+
+//申请报销单相关 
+$route['get']['/view/receipt/create'] = array('fee/fee_controller', 'GetViewReceiptCreate');
+
+?>

protected/config/wasteBook.conf.php

@@ -3,23 +3,24 @@
 $waste['total']=0;
 //存款部分
 $waste ['bank'] = array (
-		'CGBDeposit' => 10000,   //广发存款
-		'ICBCDeposit' => 588829.12,  //工行存款
-		'HUADeposit' => 161441.20,	//纵横广发（其中纵横知道充值金额）
-		'PersonalDeposit' => 93850.16, //个人存款
+		'CGBDeposit' => 0,   //广发存款
+		'ICBCDeposit' => 0,  //工行存款
+		'HUADeposit' => 0,	//纵横广发（其中纵横知道充值金额）
+		'PersonalDeposit' => 0, //个人存款
 );
 //理财部分
 $waste ['financial'] = array (
 		'current' => array(
-				'CGBDeposit' => 0,					//广发活期
-				'ICBCDeposit' => 7000725.18,		//工行活期
+				'CGBDeposit' => 0,		//广发活期
+				'ICBCDeposit' => 0,		//工行活期
 		),
 		'fixed' => array(
-				'CGBDeposit' => 3000000.00,			//广发固定
-				'ICBCDeposit' => 300000.00,					//个人固定
+				'CGBDeposit' => 0,			//广发固定
+				'ICBCDeposit' => 0,			//(原本是工会活期)个人固定
 		),
 		
 );
 
+$wbBalance=0;
 
 ?>

protected/controller/InvoiceAjaxController.php

@@ -88,10 +88,26 @@ class InvoiceAjaxController extends DooController {
 	 * 获得已经结算完成的培训班
 	 */
 	function ajaxGetInvoiceTrainByEnd(){
+		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : "";
+		
 		Doo::loadModel ( 'invoiceTraining' );
 		$invoiceTraining = new invoiceTraining ();
 		
-		$invoiceTrainingList = $invoiceTraining->getInvoiceTrainBySettlementStatus ( 0 ,$this->staff[0]['cid'],0);
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		
+		$cid = $XDeode->decode ( $cidKey );
+		if(!is_numeric($cid)){
+			echo json_encode ( array (
+					'status' => 1,
+					'invoiceTrainingList' => array()
+			) );die;
+		}
+		
+		//$cidCon='cid in ('+$cid+','+$this->staff[0]['cid']+')';
+		$cidCon=' cid = '+$cid;
+		//echo $cidCon;
+		$invoiceTrainingList = $invoiceTraining->getInvoiceTrainBySettlementStatus ( 0 ,$cid,0);
 		
 		echo json_encode ( array (
 				'status' => 1,

protected/controller/InvoiceController.php

@@ -275,7 +275,14 @@ class InvoiceController extends DooController {
 		
 		Doo::loadModel ( 'invoiceTraining' );
 		$invoiceTraining = new invoiceTraining ();
-		$itList = $invoiceTraining->getInvoiceTrainingByCid ( $this->staff [0] ['cid'] );
+		
+		$itList = $invoiceTraining->findAll( array (
+				'where' => " cid=" . $this->staff [0] ['cid'].' or creator ='.$this->staff [0]['sid'],
+				'desc'=>'itid',
+				'asArray' => TRUE 
+		) );
+		
+		//$itList = $invoiceTraining->getInvoiceTrainingByCid ( $this->staff [0] ['cid'] );
 		
 		Doo::loadModel ( 'receipt' );
 		$receipt = new receipt ();
@@ -1093,6 +1100,7 @@ class InvoiceController extends DooController {
 			$cidString .= $cidString . ',' . $this->staff [0] ['cid'];
 		}
 		
+		
 		$itTodoList = $invoiceTraining->getInvoiceTrainingByTodo ( '', $cidString, $this->staff [0] ['sid'] );
 		$itedList = $invoiceTraining->getInvoiceTrainingByStatus ( 2, '', $cidString, $this->staff [0] ['sid'] );
 		$category = $lCategory->getCategory ();
@@ -3035,9 +3043,9 @@ class InvoiceController extends DooController {
 		
 		$get .= "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea ) . "&invoiceType=" . urlencode ( $invoiceType ) . "&invoiceTrain=" . urlencode ( $invoiceTrain ) . "";
 		
-		$sql = " (untreadStatus=0 or untreadStatus=3) and moldManage like '%[\"" . $this->staff [0] ['sid'] . "\",%'" . $con;
+		$sql = " (untreadStatus=0 or untreadStatus=3 or untreadStatus=4) and moldManage like '%[\"" . $this->staff [0] ['sid'] . "\",%'" . $con;
 		$action = "invoicePrintStayAchieve";
-		
+		//echo $sql;
 		$pageinfo = $this->get_page ( "CLD_invoice", $sql, $page, $page_size, $action, $get, "" );
 		$limit = $pageinfo ['lower'] . ',' . $page_size;
 		$list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $sql, 'desc', 5 );
@@ -3314,7 +3322,7 @@ class InvoiceController extends DooController {
 		/*
 		 * $action = "invoiceUntreadIsAchieve"; $pageinfo = $this->get_page ( "CLD_invoice", $sql, $page, $page_size, $action, $get, "" ); $limit = $pageinfo ['lower'] . ',' . $page_size;
 		 */
-		$limit = '0,20';
+		$limit = '0,50';
 		$list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $sql );
 		
 		 //print_r($list);
@@ -3623,7 +3631,12 @@ class InvoiceController extends DooController {
 			// 拷贝插入一条发票数据
 			$iid = $invoice->setInvoiceLoss ( $iidKey );
 			// 更新负票
-			$invoiceSerial = "#F" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+			if($invoiceDetail['invoiceForm']==1){
+				$invoiceSerial = "#FE" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+			}else{
+				$invoiceSerial = "#F" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+			}
+			
 			$invoice = new invoice ();
 			$item = array (
 					'iid' => $iid,
@@ -4105,24 +4118,15 @@ class InvoiceController extends DooController {
 			$bill->trainId=$invoiceDetail['trainId'];
 			$bill->irid=$irid;
 			$bill->create_time=date ( "Y-m-d H:i:s" );
-			$bill->price=$receivablesPrice;
+			$bill->price=$invoiceBalance;
 			$bill->insert ();
 			
 			// 公司流水记录
 			Doo::loadModel ( 'wasteBook' );
 			$wasteBook = new wasteBook ();
 			
-			$abDetail = $wasteBook->getAccountBookByAid ( 2, 7, $irid );
-			$accountBank = '';
-			if ($receivablesBank == '纵横广发') {
-				$accountBank = 'CGBDeposit';
-			} elseif ($receivablesBank == '纵横工行') {
-				$accountBank = 'ICBCDeposit';
-			} elseif ($receivablesBank == '华润银行') {
-				$accountBank = 'HUADeposit';
-			} elseif ($receivablesBank == '个人广发') {
-				$accountBank = 'PersonalDeposit';
-			}
+			$abDetail = $wasteBook->getAccountBookByAid ( 1, 7, $irid );
+			$accountBank=$wasteBook->_getAccountBankEN($receivablesBank);
 			
 			if (empty ( $abDetail )) {
 				$item = array (
@@ -4132,11 +4136,11 @@ class InvoiceController extends DooController {
 						'accountPrice' => $receivablesPrice,
 						'accountPriceShow' => $receivablesPrice,
 						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
+						'cid'=>$invoiceDetail['cid'],
+						'category' => $invoiceDetail ['categoryName'],
 						'name' => $this->staff [0] ['username'],
 						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
+						'inputDate' => $receivablesDate//date ( "Y-m-d H:i:s" ) 
 				);
 				$wasteBook->setAccountBookStatistics ( $item );
 			}
@@ -4248,16 +4252,8 @@ class InvoiceController extends DooController {
 			$wasteBook = new wasteBook ();
 			
 			$abDetail = $wasteBook->getAccountBookByAid ( 1, 7, $irid );
-			$accountBank = '';
-			if ($receivablesBank == '纵横广发') {
-				$accountBank = 'CGBDeposit';
-			} elseif ($receivablesBank == '纵横工行') {
-				$accountBank = 'ICBCDeposit';
-			} elseif ($receivablesBank == '华润银行') {
-				$accountBank = 'HUADeposit';
-			} elseif ($receivablesBank == '个人广发') {
-				$accountBank = 'PersonalDeposit';
-			}
+			$accountBank=$wasteBook->_getAccountBankEN($receivablesBank);
+			
 			
 			$item = array (
 					'dataID' => $irid,
@@ -4417,9 +4413,9 @@ class InvoiceController extends DooController {
 		$skll = $this->get_args ( 'skll' ) ? $this->get_args ( 'skll' ) : "";
 		
 		if ($skll != '删除到款')
-			die ( 'illegal request' );
+			die ( 'illegal request-未填写 删除到款' );
 		if (empty ( $claimKey ))
-			die ( 'illegal request' );
+			die ( 'illegal request-收款key不正确' );
 		
 		Doo::loadModel ( 'invoiceReceivables' );
 		$invoiceReceivables = new invoiceReceivables ();
@@ -4427,7 +4423,7 @@ class InvoiceController extends DooController {
 		$con = '  and bindStatus=0 ';
 		$detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $claimKey, $con );
 		if (empty ( $detail ))
-			die ( 'illegal request' );
+			die ( 'illegal request-未找到该收款或者未解绑' );
 		
 		$invoiceReceivables->delInvoiceReceivablesByIrid ( $detail ['irid'] );
 		
@@ -4512,6 +4508,17 @@ class InvoiceController extends DooController {
 					'staff' => $this->staff [0] ['sid'] 
 			);
 			$invoiceStatistics->updateInvoiceStatisticsByIrid ( $item, $detail ['irid'], 2 );
+			
+			//更新流水的办事处
+			Doo::loadModel ( 'wasteBook' );
+			$wasteBook = new wasteBook ();
+			$abDetail = $wasteBook->getAccountBookByAid ( 1, 7, $detail ['irid'] );
+			
+			$wasteBook->wid = $abDetail ['wid'];
+			$wasteBook->category = $this->staff [0] ['category'];
+			$wasteBook->cid = $this->staff [0] ['cid'];
+			$wasteBook->update ();
+			
 		}
 		
 		return "/invoiceReceivablesClaim";
@@ -5916,9 +5923,20 @@ class InvoiceController extends DooController {
 			$iridString = implode ( ",", $list );
 		}
 		
+		//解绑后余额 加回去
+		
+		$invoiceBalance=$invoiceDetails['invoiceBalance']+$irDetails['receivablesPrice'];
+		if ($invoiceBalance<0){
+			$invoiceBalance=0;
+		}
+		if($invoiceBalance>$invoiceDetails['invoicePrice']){
+			$invoiceBalance=$invoiceDetails['invoicePrice'];
+		}
+		
 		$item = array (
 				'iid' => $invoiceDetails ['iid'],
 				'irid' => $iridString,
+				'invoiceBalance'=>$invoiceBalance,
 				'updateTime' => date ( "Y-m-d H:i:s" ) 
 		);
 		if ($invoiceDetails ['untreadStatus'] == 3)
@@ -6304,6 +6322,7 @@ class InvoiceController extends DooController {
 					'irid' => $irDetail ['irid'],
 					'receivablesPrice' => - $refundPrice 
 			);
+			$receivablesCategory=array(0=>'',1=>'');
 			if ($irDetail ['receivablesCategory'] != 'PUBLIC') {
 				$receivablesCategory = explode ( ":", $irDetail ['receivablesCategory'] );
 				$item += array (
@@ -6322,17 +6341,7 @@ class InvoiceController extends DooController {
 			
 			Doo::loadModel ( 'wasteBook' );
 			$wasteBook = new wasteBook ();
-			
-			$accountBank = '';
-			if ($irDetail ['receivablesBank'] == '纵横广发') {
-				$accountBank = 'CGBDeposit';
-			} elseif ($irDetail ['receivablesBank'] == '纵横工行') {
-				$accountBank = 'ICBCDeposit';
-			} elseif ($irDetail ['receivablesBank'] == '华润银行') {
-				$accountBank = 'HUADeposit';
-			} elseif ($irDetail ['receivablesBank'] == '个人广发') {
-				$accountBank = 'PersonalDeposit';
-			}
+			$accountBank=$wasteBook->_getAccountBankEN($irDetail ['receivablesBank']);
 			
 			$itemWaste = array (
 					'accountPrice' => - $refundPrice,
@@ -6342,8 +6351,8 @@ class InvoiceController extends DooController {
 					'dataID' => $irid,
 					
 					'accountBank' => $accountBank,
-					'category' => $this->staff [0] ['category'],
-					'cid' => $this->staff [0] ['cid'],
+					'category' => $receivablesCategory[1],
+					'cid' => $receivablesCategory[0],
 					'name' => $this->staff [0] ['username'],
 					'sid' => $this->staff [0] ['sid'],
 					'inputDate' => date ( "Y-m-d H:i:s" ) 
@@ -6787,8 +6796,16 @@ class InvoiceController extends DooController {
 			} else {
 				if ($value ['status'] == 2) {
 					array_push ( $irDetail, '<a href="#editPay" class="fnSettlementType" data-iidKey="' . $value ['iidKeyK'] . '" data-toggle="modal">结算方式</a>' );
-				} else
-					array_push ( $irDetail, '' );
+				} else{
+					if ($value ['status'] == 1 && $value ['pendingApprovals'] == $this->staff [0] ['sid']) {
+						array_push ( $irDetail, '<a href="#approvalInvice" onclick="nodeInvoiceApproval(\'' . $value ['iidKeyK'] . '\')" data-toggle="modal">审批发票</a>' );
+					}else{
+						array_push ( $irDetail, '' );
+					}
+						
+					
+				}
+					
 			}
 			
 			array_push ( $irDetail, '<a href="#approvalInvice" onclick="nodeInvoice(\'' . $value ['iidKeyK'] . '\')"  data-toggle="modal">' . $value ['invoiceSerial'] . '</a>' );
@@ -7093,6 +7110,7 @@ class InvoiceController extends DooController {
 		// 应收款合计
 		$ics = $invoice->getInvoiceCompanyStatistics ( $con );
 		
+		//,'desc','desc','printTime'
 		$list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $con );
 		$monthHtml = "";
 		if ($year != "ALL") {
@@ -7427,7 +7445,7 @@ class InvoiceController extends DooController {
 		$type = $this->get_args ( 'type' ) ? $this->get_args ( 'type' ) : "";
 		$serial = $this->get_args ( 'serial' ) ? $this->get_args ( 'serial' ) : "";
 		$loss = $this->get_args ( 'loss' ) ? $this->get_args ( 'loss' ) : false;
-		
+		include Doo::conf()->BASE_PATH.'diagnostic/debug.php';
 		if (empty ( $serial )) {
 			echo json_encode ( array (
 					'status' => 2,
@@ -7512,7 +7530,12 @@ class InvoiceController extends DooController {
 						<tr>
 							<th class="taC">开户银行</th><td>' . $detail ['bank'] . '</td>
 							<th class="taC">银行账号</th><td>' . $detail ['bankAccount'] . '</td>
-						</tr></tbody></table>';
+						</tr>
+						<tr>
+							<th class="taC">发票号</th><td>' . $detail ['invoiceNo'] . '</td>
+							<th class="taC"></th><td></td>
+						</tr>
+						</tbody></table>';
 				
 				if ($detail ['doPost'] == 1) {
 					$html .= '<table class="table table-bordered table-condensed"><tbody><tr><th colspan="4" class="taC">邮寄信息</th></tr><tr>
@@ -7701,14 +7724,23 @@ class InvoiceController extends DooController {
 				
 				if ($detail ['invoiceType'] == 0) {
 					$html .= '<table class="table table-bordered table-condensed"><tbody>
-							<tr><th colspan="4" class="taC">增值税普通发票</th></tr><tr>
+							<tr><th colspan="4" class="taC">增值税普通发票';
+					if($detail ['invoiceForm']==1){
+						$html .= '( <span class="colRed">电子发票</span> )';
+					}
+							
+							$html.='</th></tr><tr>
 							<th class="taC" width="150">发票抬头</th><td >' . $detail ['invoiceTitle'] . '</td>
 							<th class="taC" width="150">纳税人识别码</th><td>' . $detail ['TIN'] . '</td>
 									</tr>';
 					$receivablesMessage = $detail ['invoiceTitle'];
 				} else {
 					$html .= '<table class="table table-bordered table-condensed"><tbody>
-							<tr><th colspan="4" class="taC">增值税专用发票</th></tr><tr>
+							<tr><th colspan="4" class="taC">增值税专用发票';
+					if($detail ['invoiceForm']==1){
+						$html .= '( <span class="colRed">电子发票</span> )';
+					}
+							$html .= '</th></tr><tr>
 							<th class="taC" width="150">单位名称</th><td>' . $detail ['invoiceCompany'] . '</td>
 							<th class="taC" width="150">纳税人识别码</th><td>' . $detail ['TIN'] . '</td></tr>
 			

protected/controller/InvoiceExtendController.php

@@ -672,7 +672,7 @@ class InvoiceExtendController extends DooController {
 			
 			return "/invoiceUntreadAchieve/1/".$date;
 		}else{
-			die ( 'illegal request-status' );
+			die ( 'illegal request-status-发票可能已删除或未退票' );
 		}
 	}
 	

protected/controller/MainController.php

@@ -20,7 +20,10 @@ class MainController extends DooController {
 			'12' => '监理',
 			'13' => '学校',
 			'14' => '个人',
-			'15' => '合作伙伴' 
+			'15' => '合作伙伴' ,
+			'16'=>'建设局',
+			'17'=>'建设造价管理',
+			'18'=>'建筑设计',
 	);
 	public $tooltip = array (
 			'1' => array (
@@ -616,7 +619,7 @@ class MainController extends DooController {
 		// echo $staffCondition;
 		// Doo::db()->beginTransaction();
 		$staffList = $staff->find ( array (
-				'where' => ' username !="admin"' . $staffCondition . ' and nature!=4 and pendStatus!=4 and pendStatus!=1 and pendStatus!=2 ',
+				'where' => ' username !="admin"' . $staffCondition . ' and nature!=4 and pendStatus!=4 and pendStatus!=3 and pendStatus!=1 and pendStatus!=2 ',
 				'asArray' => true 
 		) );
 		
@@ -1699,6 +1702,8 @@ class MainController extends DooController {
 			if (! empty ( $mark ))
 				$client->mark = $mark;
 			
+			$client->createTime = date ( "Y-m-d" );
+				
 			$id = $client->insert ();
 			
 			$client_staff->cid = $id;
@@ -3406,14 +3411,18 @@ class MainController extends DooController {
 		//
 		$sql = "select COUNT(*) as count,responsible
 				from CLD_longle
-				where status!= 1 and make_day >='2019-12-01'
+				where responsible!='' and status!= 1  and make_day >='2019-12-01'
 				GROUP BY responsible";
 		$query = Doo::db ()->query ( $sql );
 		$resultSum = $query->fetchAll ();
 		
+// 		$sql = "select COUNT(*) as count,responsible
+// 				from CLD_longle
+// 				where status!= 2 and status!= 1 and status!=10 and make_day >='2019-12-01'
+// 				GROUP BY responsible";
 		$sql = "select COUNT(*) as count,responsible
 				from CLD_longle
-				where status!= 2 and status!= 1 and make_day >='2019-12-01'
+				where responsible!='' and status!= 1 and clientid!=0 and make_day >='2019-12-01'
 				GROUP BY responsible";
 		$query = Doo::db ()->query ( $sql );
 		$resultA = $query->fetchAll ();
@@ -3440,18 +3449,6 @@ class MainController extends DooController {
 			$staffList [$key] ['b'] = $b;
 		}
 		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
 		/* Doo::db ()->beginTransaction ();
 		foreach ( $staffList as $key => $value ) { // not in(1,2)
 			$sum = $longle->count ( array (
@@ -3496,7 +3493,7 @@ class MainController extends DooController {
 		$company = $this->get_args ( 'company' ) ? $this->get_args ( 'company' ) : '';
 
         $alloted_time = $this->get_args ( 'alloted_time' ) ? $this->get_args ( 'alloted_time' ) : '';
-		
+        
 		if (empty ( $lidKey ))
 			return "/keyonline/";
 
@@ -3506,6 +3503,7 @@ class MainController extends DooController {
 
 		$linfo = $longle->getLongleByLid ( $lid );
 		
+		
 		if ($status == 0)
 			return "/keyonline/" . $lid;
 		elseif ($status == 3) {
@@ -4360,6 +4358,7 @@ class MainController extends DooController {
 		  					<tr><th>单位乘车</th><td colspan="3">' . $companyInfo ['ride'] . '</td></tr>
 		  					<tr><th>单位地标</th><td colspan="3">' . $companyInfo ['landmarks'] . '</td></tr>
 		  					<tr><th>单位住宿</th><td colspan="3">' . $companyInfo ['stay'] . '</td></tr>
+		  					<tr><th>单位主页</th><td colspan="3">' . $companyInfo ['webservice'] . '</td></tr>
 		  					<tr><td colspan="4">
 		  					' . $taghtml . '
 		  					</td></tr>

protected/controller/ReceiptAjaxController.php

@@ -147,12 +147,22 @@ class ReceiptAjaxController extends DooController {
 	 */
 	function ajaxGetReceiptTrainLoan(){
 		$sid = $this->get_args ( 'sid' ) ? $this->get_args ( 'sid' ) : $this->staff['sid'];
-		$cid = $this->get_args ( 'cid' ) ? $this->get_args ( 'cid' ) : $this->staff['cid'];
+		$cid = $this->get_args ( 'cid' ) ? $this->get_args ( 'cid' ) : "";
 		$limit = $this->get_args ( 'limit' ) ? $this->get_args ( 'limit' ) : '30';
 		$status=8;
 		Doo::loadModel ( 'receipt' );
 		$receipt = new receipt ();
 		
+		if(!empty($cid)){
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			$cid = $XDeode->decode ( $cid );
+			if(!is_numeric($cid)){
+				$cid=$this->staff['cid'];
+			}
+		}
+		
+		
 		$list=$receipt->getReceiptLoanByStatus($sid,$cid,$status,$limit);
 		
 		echo json_encode ( array (
@@ -286,6 +296,246 @@ class ReceiptAjaxController extends DooController {
 		) );
 	}
 	
+	/*
+	 * 流水报表数据
+	 */
+	function ajaxWasteBookReportData(){
+		Doo::loadModel ( 'wasteBook' );
+		$wasteBook = new wasteBook ();
+		
+		$date = $this->get_args ( 'month' )  ? $this->get_args ( 'month' ) : '';
+		
+		if($date=='undefined'||empty($date)){
+			$year=date('Y', strtotime(date("Y-m-d")));
+			$month=date('m', strtotime(date("Y-m-d")));
+		}else{
+			$date=explode('-', $date);
+			if(isset($date[1])){
+				if(is_numeric ( $date[0] )&&is_numeric ( $date[1] )){
+					$year=(int)$date[0];
+					$month=(int)$date[1];
+				}else{
+					echo json_encode ( array ('msg' => 'is_numeric is error') );die;
+				}
+			}else{
+				echo json_encode ( array ('msg' => 'date is error') );die;
+			}
+		}
+		
+		$con = ' and year(inputDate) = "'.$year.'" and month(inputDate)="'.$month.'"';
+		
+		//收入
+		$incomeList = $wasteBook->getAccountBookByExpensesType ( 0, 1, $con );
+		//支出
+		$expenditureList = $wasteBook->getAccountBookByExpensesType ( 0, 2, $con );
+		
+		$firstday = date('Y-m-01', strtotime(date("Y-m-d")));
+		$lastday = date('d', strtotime("$firstday +1 month -1 day"));
+		
+		//print_r($incomeList);
+		//导入流水func
+		Doo::loadClass ( 'receipt.finances.func' );
+		
+		//1-0获得这月之前的所有金额合计
+		include './protected/config/wasteBook.conf.php';
+		$balance=$wbBalance;
+		$balanceSum=$wasteBook->getStatisticsByMonthAll($year,$month);
+		if(!empty($balanceSum[0]['accountPrice'])){
+			$balance+=$balanceSum[0]['accountPrice'];
+		}
+		
+		$data=array();
+		//1-1 日排序
+		for($day=$lastday;$day>0;$day--){
+			$data[$year.'-'.str_pad($month,2,'0',STR_PAD_LEFT).'-'.str_pad($day,2,'0',STR_PAD_LEFT)]=array();
+		}
+		
+		//1-2 设置流水收入
+		foreach ($incomeList as $key=>$value){
+			
+			$inputDate=date('Y-m-d', strtotime($value['inputDate']));
+			$item['inputDate']=$inputDate;
+			
+			//TODO-收款和日常收入-付款单位
+			$item['receivablesMessage']='';
+			if($value['accountType']==5||$value['accountType']==6){
+				$item['receivablesMessage']=$value['data']['remarks'];
+			}elseif($value['accountType']==7){
+				$item['receivablesMessage']=$value['data']['receivablesMessage'];
+			}
+			
+			//类型
+			$item['revenueType']='';
+			if($value['expensesType']==1){
+				$item['revenueType']=_getRevenueTypeCN($value);
+			}
+			
+			$item['category']=$value['category'];
+			
+			//结算方式--只有发票和收款才有
+			$item['settlementType']='';
+			if($value['accountType']==8||$value['accountType']==7){
+				if(isset($value['data']['settlementType'])){
+					$item['settlementType']='软件销售';
+					if($value['data']['settlementType']==1){
+						$item['settlementType']='培训班';
+					}
+				}
+				
+			}
+			
+			$item['revenueBankMsg']=$value['accountBankMsg'];
+			$item['revenuePriceShow']=$value['accountPriceShow'];
+			$item['revenueTotalDay']='';
+			//echo $inputDate.'</br>';
+ 			array_push($data[$inputDate], $item);
+		}
+		//print_r($incomeList);
+		//组合支出
+		//1-3设置支出
+		$bakDate=0;
+		foreach ($expenditureList as $key=>$value){
+			$inputDate=date('Y-m-d', strtotime($value['inputDate']));
+			
+			if($bakDate!=$inputDate){
+				$bakDate=$inputDate;
+				$index=0;
+			}
+			
+			if(isset($data[$inputDate][$index])){
+				
+				//费用类别
+				$item['outlayType']=_getOutlayTypeCN($value);
+
+				//支出内容
+				$item['outlayMsg']='';
+				if($value['accountType']==5||$value['accountType']==9||$value['accountType']==10){
+					$item['outlayMsg']=$value['data']['remarks'];
+				}
+				
+				$item['outlayBankMsg']=$value['accountBankMsg'];
+				$item['outlayPriceShow']=$value['accountPriceShow'];
+				
+				$data[$inputDate][$index]+=$item;
+				
+			}else{
+				$item['inputDate']=$inputDate;
+				$item['receivablesMessage']='';
+				$item['revenueType']='';
+				$item['category']='';
+				$item['settlementType']='';
+				$item['revenueBankMsg']='';
+				$item['revenuePriceShow']='';
+				
+				//支出项
+				//费用类别
+				$item['outlayType']=_getOutlayTypeCN($value);
+				//支出内容
+				$item['outlayMsg']='';
+				$item['outlayBankMsg']=$value['accountBankMsg'];
+				$item['outlayPriceShow']=$value['accountPriceShow'];
+				$item['outlayTotalDay']='';
+				array_push($data[$inputDate], $item);
+			}
+			$index++;
+		}
+		
+		//TODO 1-4 计算每日合计
+		$revenueTotalMonthPrice=$outlayTotalMonthPrice=0;
+		foreach ($data as $key=>$value){
+			if(!empty($value)){
+				$revenueTotalDayPrice=$outlayTotalDayPrice=0;
+				foreach ($value as $v){
+					if(isset($v['revenuePriceShow'])){
+						$revenueTotalDayPrice+=$v['revenuePriceShow'];
+						$revenueTotalMonthPrice+=$v['revenuePriceShow'];
+					}
+					if(isset($v['outlayPriceShow'])){
+						$outlayTotalDayPrice+=$v['outlayPriceShow'];
+						$outlayTotalMonthPrice+=$v['outlayPriceShow'];
+					}
+				}
+				$item=_structureReportItem('','','','','','','今日总收入',number_format($revenueTotalDayPrice,2)
+						,'','','','今日总支出',number_format($outlayTotalDayPrice,2));
+				$item['balance']=$balance+$revenueTotalDayPrice-$outlayTotalDayPrice;
+				array_push($data[$key], $item);
+			}
+		}
+		
+		
+		$pieDetailData=array();
+		foreach ($data as $key=>$value){
+			//$pieDetailData[$key]=array();
+			$revenueTotalDay=$outlayTotalDay=0;
+			if(!empty($value)){
+				$item=end($value);
+				if (isset($item['revenueTotalDay'])){
+					$revenueTotalDay=str_replace(',','',$item['revenueTotalDay']);
+				}
+				if(isset($item['revenueTotalDay'])){
+					$outlayTotalDay=str_replace(',','',$item['outlayTotalDay']);
+				}
+			}
+			if($revenueTotalDay!=0&&$outlayTotalDay!=0){
+				$pieDetailData[$key]=array($revenueTotalDay,$outlayTotalDay);
+			}
+			
+			//array_push($pieDetailData[$key], array($revenueTotalDay,$outlayTotalDay));
+		}
+		//print_r($pieDetailData);
+		
+		//格式化数据
+		
+		$item=_structureReportItem('月初金额','','','','','','',0
+				,'','','','',0);
+		$item['key']='balance';
+		$item['balance']=$balance;
+		$jsonList[0]= $item;
+		
+		$item=_structureReportItem('','','','','','','总收入',number_format($revenueTotalMonthPrice,2)
+				,'','','','总支出',number_format($outlayTotalMonthPrice,2));
+		$item['balance']=$balance+$revenueTotalMonthPrice-$outlayTotalMonthPrice;
+		$item['key']='summary';
+		$jsonList[1]= $item;
+		
+		//$jsonList=array();
+		$dayList=array();
+		foreach ($data as $key=>$value){
+			foreach ($value as $k=>$v){
+				$v['key']=$k;
+				array_push($jsonList, $v);
+				array_push($dayList, $key);
+			}
+		}
+		//echo $firstday;
+		//print_r($incomeList);
+		
+// 		$item=_structureReportItem('','','','','','','总收入',number_format($revenueTotalMonthPrice,2)
+// 				,'','','','总支出',number_format($outlayTotalMonthPrice,2));
+// 		$item['balance']=$balance+$revenueTotalMonthPrice-$outlayTotalMonthPrice;
+// 		$item['key']='summary';
+// 		array_push($jsonList, $item);
+ 		
+		//日期筛选数据
+		$dayList=array_unique($dayList);
+		$list=array();
+		foreach ($dayList as $value){
+			array_push($list, array('text'=>$value,'value'=>$value));
+		}
+		//print_r(array_values($dayList));
+	
+		echo json_encode ( array (
+				'reportData' => $jsonList,
+				'reportDay'=>$list,
+				'reportDateStart'=>$year.'-'.str_pad(($month),2,"0",STR_PAD_LEFT),
+				'reportDateEnd'=>$year.'-'.str_pad(($month+1),2,"0",STR_PAD_LEFT),
+				'pieDetailData'=>$pieDetailData,
+		) );
+		
+		//echo json_encode($jsonList);
+		
+	}
+	
 	function setWXMsg($rid, $type) {
 		Doo::loadModel ( "receipt" );
 		$receipt = new receipt ();

protected/controller/ReceiptController.php

@@ -2764,7 +2764,7 @@ class ReceiptController extends DooController {
 			
 			$receipt->receiptClass=$receiptClass;
 			if($receiptClass==2){
-				$receipt->itinerary=$itinerary;
+				$receipt->itinerary2=$itinerary;
 				
 				$this->_storageItinerary($itinerary, $rid);
 				
@@ -3146,6 +3146,9 @@ class ReceiptController extends DooController {
 			}
 		}
 		
+		
+		
+		
 		$data ['category'] = $Lcategory->find ( array (
 				'asArray' => true 
 		) );
@@ -3167,6 +3170,9 @@ class ReceiptController extends DooController {
 		if($receiptDetail['receiptClass']==1){ 
 			$this->render ( "/receipt/feeLoanReceiptAgencyEdi", $data );
 		}elseif($receiptDetail['receiptClass']==2){
+			Doo::loadModel ( 'itinerary' );
+			$itinerary = new itinerary ();
+			$itinerary->delete(array('where' => 'rid=' . $receiptDetail['rid'] ));
 			$this->render ( "/receipt/feeLoanReceiptTraveEdi", $data );
 		}elseif($receiptDetail['receiptClass']==3){
 			$this->render ( "/receipt/feeLoanReceiptITEdi", $data );
@@ -3322,6 +3328,8 @@ class ReceiptController extends DooController {
 			die ('illegal request--status');
 		}
 		
+		
+		
 		//如有已入账已收款的发票，自动取消办事处已收款
 // 		Doo::loadModel ( 'RIExtend' );
 // 		$RIExtend = new RIExtend ();
@@ -3574,6 +3582,8 @@ class ReceiptController extends DooController {
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
 		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		
+		
+		
 		//&& ! empty ( $participants )
 		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber ) && ! empty ( $trainName ) && ! empty ( $trainStartDate ) && ! empty ( $trainEndDate )  && ! empty ( $trainAddress )) {
 			
@@ -5173,13 +5183,10 @@ class ReceiptController extends DooController {
 			array_push ( $vidList, $value ['vid'] );
 		}
 		$vid = implode ( ",", $vidList );
-		if (empty ( $verifyDetail ))
+		if (empty ( $verifyDetail )){
 			$vid = 0;
-			
-			// if ($status==0)
-			// $dateCondition="";
-			// else
-		
+		}
+
 		$dateCondition = " ";
 		
 		// if (! empty ( $month ))
@@ -5238,6 +5245,9 @@ class ReceiptController extends DooController {
 		if ($status == 'finish') {
 			$approvalCondition = " and (status=1 or status=8 or status=9 or status=10)";
 		}
+		if($status == 'loan'){
+			$approvalCondition = " and (status=8 or status=7) and Rtype=1";
+		}
 		
 		$pageinfo ['page'] = array (
 				'previous' => '' 
@@ -12311,123 +12321,126 @@ class ReceiptController extends DooController {
                 );
                 $wasteBook->setAccountBookStatistics ( $itemWaste );
 
-			//TODO --移除理财相关
-            }elseif($accountType == 7 || $accountType == 9) { // 收入为理财时特殊处理
+			
+            }
+            //TODO --移除理财相关
+//             elseif($accountType == 7 || $accountType == 9) { // 收入为理财时特殊处理
 				
-				// if ($receivedBank == '个人广发') {
-				// 	die ( '个人广发  illegal request' );
-				// }
+// 				// if ($receivedBank == '个人广发') {
+// 				// 	die ( '个人广发  illegal request' );
+// 				// }
 				
-				// echo $receivedBank;
-				// die;
+// 				// echo $receivedBank;
+// 				 die;
 
-				// 添加一条收入
-				$accountBook = new accountBook ();
-				$accountBook->accountType = 10;
-				$accountBook->accountMsg = $accountMsg;
-				$accountBook->receivedPrice = $receivedPrice;
-				$accountBook->receivedMsg = $receivedMsg;
-				$accountBook->receivedBank = $receivedBank;
-				$accountBook->receivedDate = $receivedDate;
-				$accountBook->remarks = $remarks;
-				$accountBook->expensesType = 1;
-				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
-				$accountBook->inputStaff = $this->staff [0] ['sid'];
-				$inComeId = $accountBook->insert ();
-				// 收支汇总-添加一条收入日常汇总
-				$abDetail = $accountBook->getAccountBookByAid ( $inComeId );
-				$accountBookStatistics = new accountBookStatistics ();
-				$item = array (
-						'date' => date ( "Y-m-d" ),
-						'accountType' => $abDetail ['accountType'],
-						'accountMsg' => $abDetail ['accountMsg'],
-						'aid' => $abDetail ['aid'],
-						'inComePrice' => $abDetail ['receivedPrice'],
-						'expensesType' => $abDetail ['expensesType'] 
-				);
-				$accountBookStatistics->setAccountBookStatistics ( $item );
+// 				// 添加一条收入
+// 				$accountBook = new accountBook ();
+// 				$accountBook->accountType = 10;
+// 				$accountBook->accountMsg = $accountMsg;
+// 				$accountBook->receivedPrice = $receivedPrice;
+// 				$accountBook->receivedMsg = $receivedMsg;
+// 				$accountBook->receivedBank = $receivedBank;
+// 				$accountBook->receivedDate = $receivedDate;
+// 				$accountBook->remarks = $remarks;
+// 				$accountBook->expensesType = 1;
+// 				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+// 				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+// 				$accountBook->inputStaff = $this->staff [0] ['sid'];
+// 				$inComeId = $accountBook->insert ();
+// 				// 收支汇总-添加一条收入日常汇总
+// 				$abDetail = $accountBook->getAccountBookByAid ( $inComeId );
+// 				$accountBookStatistics = new accountBookStatistics ();
+// 				$item = array (
+// 						'date' => date ( "Y-m-d" ),
+// 						'accountType' => $abDetail ['accountType'],
+// 						'accountMsg' => $abDetail ['accountMsg'],
+// 						'aid' => $abDetail ['aid'],
+// 						'inComePrice' => $abDetail ['receivedPrice'],
+// 						'expensesType' => $abDetail ['expensesType'] 
+// 				);
+// 				$accountBookStatistics->setAccountBookStatistics ( $item );
 				
-				// 添加收入流水
-				$wasteBook = new wasteBook ();
-				$itemWaste = array (
-						'accountPriceShow' => $receivedPrice,
-						'accountPrice' => $receivedPrice,
-						'expensesType' => 1,
-						'accountType' => 6, // 流水类型
-						'dataID' => $inComeId,
-						'dailyIncomeType' => $accountType, // $dailyIncomeType,
-						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
-						'name' => $this->staff [0] ['username'],
-						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
-				);
-				$wasteBook->setAccountBookStatistics ( $itemWaste );
-				// 添加一条理财支出
-				$accountBank = 'CGBDeposit';
-				$expenditureBank = '纵横广发';
-				if($accountMsg=='个人（GR）'){
-					$expenditureBank = '个人广发';
-				}
-				$dailyExpenditureType = 4;
-				if ($accountType == 9) {
-					$accountBank = 'ICBCDeposit';
-					$expenditureBank = '纵横工行';
-					$dailyExpenditureType = 6;
-				}
-				$accountBook = new accountBook ();
-				$accountBook->expensesType = 2;
-				$accountBook->expenditureType = $dailyExpenditureType;
-				$accountBook->expenditureMsg = $accountMsg;
-				$accountBook->expenditurePrice = $receivedPrice;
-				$accountBook->expenditureBank = $expenditureBank;
-				$accountBook->expenditureDate = $receivedDate;
-				$accountBook->remarks = $remarks;
-				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
-				$accountBook->inputStaff = $this->staff [0] ['sid'];
-				$id = $accountBook->insert ();
-				// 收支汇总-添加一条理财支出汇总
-				$abDetail = $accountBook->getAccountBookByAid ( $id );
-				$accountBookStatistics = new accountBookStatistics ();
-				$item = array (
-						'date' => date ( "Y-m-d" ),
-						'accountType' => $abDetail ['accountType'],
-						'accountMsg' => $abDetail ['accountMsg'],
-						'aid' => $abDetail ['aid'],
-						'financingPrice' => - $receivedPrice,
-						'expensesType' => 3 
-				);
-				$accountBookStatistics->setAccountBookStatistics ( $item );
+// 				// 添加收入流水
+// 				$wasteBook = new wasteBook ();
+// 				$itemWaste = array (
+// 						'accountPriceShow' => $receivedPrice,
+// 						'accountPrice' => $receivedPrice,
+// 						'expensesType' => 1,
+// 						'accountType' => 6, // 流水类型
+// 						'dataID' => $inComeId,
+// 						'dailyIncomeType' => $accountType, // $dailyIncomeType,
+// 						'accountBank' => $accountBank,
+// 						'category' => $this->staff [0] ['category'],
+// 						'cid' => $this->staff [0] ['cid'],
+// 						'name' => $this->staff [0] ['username'],
+// 						'sid' => $this->staff [0] ['sid'],
+// 						'inputDate' => date ( "Y-m-d H:i:s" ) 
+// 				);
+// 				$wasteBook->setAccountBookStatistics ( $itemWaste );
+// 				// 添加一条理财支出
+// 				$accountBank = 'CGBDeposit';
+// 				$expenditureBank = '纵横广发';
+// 				if($accountMsg=='个人（GR）'){
+// 					$expenditureBank = '个人广发';
+// 				}
+// 				$dailyExpenditureType = 4;
+// 				if ($accountType == 9) {
+// 					$accountBank = 'ICBCDeposit';
+// 					$expenditureBank = '纵横工行';
+// 					$dailyExpenditureType = 6;
+// 				}
+// 				$accountBook = new accountBook ();
+// 				$accountBook->expensesType = 2;
+// 				$accountBook->expenditureType = $dailyExpenditureType;
+// 				$accountBook->expenditureMsg = $accountMsg;
+// 				$accountBook->expenditurePrice = $receivedPrice;
+// 				$accountBook->expenditureBank = $expenditureBank;
+// 				$accountBook->expenditureDate = $receivedDate;
+// 				$accountBook->remarks = $remarks;
+// 				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+// 				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+// 				$accountBook->inputStaff = $this->staff [0] ['sid'];
+// 				$id = $accountBook->insert ();
+// 				// 收支汇总-添加一条理财支出汇总
+// 				$abDetail = $accountBook->getAccountBookByAid ( $id );
+// 				$accountBookStatistics = new accountBookStatistics ();
+// 				$item = array (
+// 						'date' => date ( "Y-m-d" ),
+// 						'accountType' => $abDetail ['accountType'],
+// 						'accountMsg' => $abDetail ['accountMsg'],
+// 						'aid' => $abDetail ['aid'],
+// 						'financingPrice' => - $receivedPrice,
+// 						'expensesType' => 3 
+// 				);
+// 				$accountBookStatistics->setAccountBookStatistics ( $item );
 				
-				//TODO -新增理财为个人时的情况 添加一条支出理财流水
-				$accountTypeWaste = 5;
-				if ($accountMsg == '公司固定') {
-					$accountTypeWaste = 9;
-				} elseif ($accountMsg == '公司活期') {
-					$accountTypeWaste = 10;
-				} elseif ($receivedBank == '个人广发') {
-					$accountTypeWaste = 9;
-					$accountBank = 'ICBCDeposit';
-				}
-				$itemWaste = array (
-						'expensesType' => 2,
-						'accountType' => $accountTypeWaste,
-						'accountPriceShow' => $receivedPrice,
-						'accountPrice' => - $receivedPrice,
-						'dataID' => $id,
-						'dailyExpenditureType' => $dailyExpenditureType,
-						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
-						'name' => $this->staff [0] ['username'],
-						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
-				);
-				$wasteBook->setAccountBookStatistics ( $itemWaste );
-			} elseif ($accountType == 1) {
+// 				//TODO -新增理财为个人时的情况 添加一条支出理财流水
+// 				$accountTypeWaste = 5;
+// 				if ($accountMsg == '公司固定') {
+// 					$accountTypeWaste = 9;
+// 				} elseif ($accountMsg == '公司活期') {
+// 					$accountTypeWaste = 10;
+// 				} elseif ($receivedBank == '个人广发') {
+// 					$accountTypeWaste = 9;
+// 					$accountBank = 'ICBCDeposit';
+// 				}
+// 				$itemWaste = array (
+// 						'expensesType' => 2,
+// 						'accountType' => $accountTypeWaste,
+// 						'accountPriceShow' => $receivedPrice,
+// 						'accountPrice' => - $receivedPrice,
+// 						'dataID' => $id,
+// 						'dailyExpenditureType' => $dailyExpenditureType,
+// 						'accountBank' => $accountBank,
+// 						'category' => $this->staff [0] ['category'],
+// 						'cid' => $this->staff [0] ['cid'],
+// 						'name' => $this->staff [0] ['username'],
+// 						'sid' => $this->staff [0] ['sid'],
+// 						'inputDate' => date ( "Y-m-d H:i:s" ) 
+// 				);
+// 				$wasteBook->setAccountBookStatistics ( $itemWaste );
+// 			}
+			elseif ($accountType == 1) {
 // 				if ($receivedBank == '个人广发')
 // 					die ( 'illegal request--no man' );
 					// 添加一条收入
@@ -12537,17 +12550,18 @@ class ReceiptController extends DooController {
 				$accountBookStatistics->setAccountBookStatistics ( $item );
 				
 				// 添加收入流水
-				$itemWaste = array (
-						'accountPrice' => $receivedPrice 
-				);
-				if ($receivedBank == '个人广发') {
-					$itemWaste = array (
-							'accountPrice' => - $receivedPrice 
-					);
-				}
+// 				$itemWaste = array (
+// 						'accountPrice' => $receivedPrice 
+// 				);
+// 				if ($receivedBank == '个人广发') {
+// 					$itemWaste = array (
+// 							'accountPrice' => - $receivedPrice 
+// 					);
+// 				}
 				$wasteBook = new wasteBook ();
-				$itemWaste += array (
+				$itemWaste = array (
 						'accountPriceShow' => $receivedPrice,
+						'accountPrice' => $receivedPrice,
 						'expensesType' => 1,
 						'accountType' => 6, // 流水类型
 						'dailyIncomeType' => $accountType, // $dailyIncomeType,
@@ -12596,74 +12610,74 @@ class ReceiptController extends DooController {
 
 			if($expenditureType == 8 || $expenditureType == 9){
 
-                if($expenditureType == 8 ){
-                    $expenditureBank='纵横广发';
-                }elseif($expenditureType == 9){
-                    $expenditureBank='纵横工行';
-                }
+//                 if($expenditureType == 8 ){
+//                     $expenditureBank='纵横广发';
+//                 }elseif($expenditureType == 9){
+//                     $expenditureBank='纵横工行';
+//                 }
 
-                // 添加一笔日常支出
-                $accountBook = new accountBook ();
-                $accountBook->expensesType = 2;
-                $accountBook->expenditureType = $expenditureType;
-                $accountBook->expenditureMsg = $expenditureMsg;
-                $accountBook->expenditurePrice = $expenditurePrice;
-                $accountBook->expenditureBank = $expenditureBank;
-                $accountBook->expenditureDate = $expenditureDate;
-                $accountBook->remarks = $remarks;
-                $accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-                $accountBook->inputDate = date ( "Y-m-d H:i:s" );
-                $accountBook->inputStaff = $this->staff [0] ['sid'];
-                $expenditureId = $accountBook->insert ();
+//                 // 添加一笔日常支出
+//                 $accountBook = new accountBook ();
+//                 $accountBook->expensesType = 2;
+//                 $accountBook->expenditureType = $expenditureType;
+//                 $accountBook->expenditureMsg = $expenditureMsg;
+//                 $accountBook->expenditurePrice = $expenditurePrice;
+//                 $accountBook->expenditureBank = $expenditureBank;
+//                 $accountBook->expenditureDate = $expenditureDate;
+//                 $accountBook->remarks = $remarks;
+//                 $accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+//                 $accountBook->inputDate = date ( "Y-m-d H:i:s" );
+//                 $accountBook->inputStaff = $this->staff [0] ['sid'];
+//                 $expenditureId = $accountBook->insert ();
 
-                // 添加日常支出汇总
-                $abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
-                $accountBookStatistics = new accountBookStatistics ();
-                $item = array (
-                    'date' => date ( "Y-m-d" ),
-                    'expenditureType' => $abDetail ['expenditureType'],
-                    'expenditureMsg' => $abDetail ['expenditureMsg'],
-                    'aid' => $abDetail ['aid'],
-                    'payPrice' => $abDetail ['expenditurePrice'],
-                    'expensesType' => $abDetail ['expensesType']
-                );
-                $accountBookStatistics->setAccountBookStatistics ( $item );
+//                 // 添加日常支出汇总
+//                 $abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
+//                 $accountBookStatistics = new accountBookStatistics ();
+//                 $item = array (
+//                     'date' => date ( "Y-m-d" ),
+//                     'expenditureType' => $abDetail ['expenditureType'],
+//                     'expenditureMsg' => $abDetail ['expenditureMsg'],
+//                     'aid' => $abDetail ['aid'],
+//                     'payPrice' => $abDetail ['expenditurePrice'],
+//                     'expensesType' => $abDetail ['expensesType']
+//                 );
+//                 $accountBookStatistics->setAccountBookStatistics ( $item );
 
-                // 公司日常支出流水
-                if($expenditureType == 8 ){
-                    $accountBank = 'CGBDeposit';
-                }elseif($expenditureType == 9){
-                    $accountBank = 'ICBCDeposit';
-                }
+//                 // 公司日常支出流水
+//                 if($expenditureType == 8 ){
+//                     $accountBank = 'CGBDeposit';
+//                 }elseif($expenditureType == 9){
+//                     $accountBank = 'ICBCDeposit';
+//                 }
 
-                if($accountBank=='CGBDeposit'){
-                    $dailyExpenditureType='8';
-                }elseif($accountBank=='ICBCDeposit'){
-                    $dailyExpenditureType='9';
-                }elseif($accountBank=='PersonalDeposit'){
-                    $dailyExpenditureType='10';
-                }elseif($accountBank=='HUADeposit'){
-                    $dailyExpenditureType='11';
-                }
+//                 if($accountBank=='CGBDeposit'){
+//                     $dailyExpenditureType='8';
+//                 }elseif($accountBank=='ICBCDeposit'){
+//                     $dailyExpenditureType='9';
+//                 }elseif($accountBank=='PersonalDeposit'){
+//                     $dailyExpenditureType='10';
+//                 }elseif($accountBank=='HUADeposit'){
+//                     $dailyExpenditureType='11';
+//                 }
 
 
-                $wasteBook = new wasteBook ();
-                $itemWaste = array (
-                    'expensesType' => 2,
-                    'accountType' => 5,
-                    'dailyExpenditureType' => $dailyExpenditureType,
+//                 $wasteBook = new wasteBook ();
+//                 $itemWaste = array (
+//                     'expensesType' => 2,
+//                     'accountType' => 5,
+//                     'dailyExpenditureType' => $dailyExpenditureType,
 
-                    'accountPriceShow' => $expenditurePrice,
-                    'accountPrice' => - $expenditurePrice,
-                    'dataID' => $expenditureId,
-                    'accountBank' => $accountBank,
-                    'category' => $this->staff [0] ['category'],
-                    'cid' => $this->staff [0] ['cid'],
-                    'name' => $this->staff [0] ['username'],
-                    'sid' => $this->staff [0] ['sid'],
-                    'inputDate' => date ( "Y-m-d H:i:s" )
-                );
-                $wasteBook->setAccountBookStatistics ( $itemWaste );
+//                     'accountPriceShow' => $expenditurePrice,
+//                     'accountPrice' => - $expenditurePrice,
+//                     'dataID' => $expenditureId,
+//                     'accountBank' => $accountBank,
+//                     'category' => $this->staff [0] ['category'],
+//                     'cid' => $this->staff [0] ['cid'],
+//                     'name' => $this->staff [0] ['username'],
+//                     'sid' => $this->staff [0] ['sid'],
+//                     'inputDate' => date ( "Y-m-d H:i:s" )
+//                 );
+//                 $wasteBook->setAccountBookStatistics ( $itemWaste );
 
 			//TODO 日常支出 个人理财情况的相关修改
             }elseif ($expenditureType == 4 || $expenditureType == 6) {
@@ -12673,123 +12687,123 @@ class ReceiptController extends DooController {
 				// }
 				
 				// echo $expenditureMsg;
-				// die;
+				 die;
 
-				// 添加一笔日常支出
-				$accountBook = new accountBook ();
-				$accountBook->expensesType = 2;
-				$accountBook->expenditureType = 7;
-				$accountBook->expenditureMsg = $expenditureMsg;
-				$accountBook->expenditurePrice = $expenditurePrice;
-				$accountBook->expenditureBank = $expenditureBank;
-				$accountBook->expenditureDate = $expenditureDate;
-				$accountBook->remarks = $remarks;
-				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
-				$accountBook->inputStaff = $this->staff [0] ['sid'];
-				$expenditureId = $accountBook->insert ();
+// 				// 添加一笔日常支出
+// 				$accountBook = new accountBook ();
+// 				$accountBook->expensesType = 2;
+// 				$accountBook->expenditureType = 7;
+// 				$accountBook->expenditureMsg = $expenditureMsg;
+// 				$accountBook->expenditurePrice = $expenditurePrice;
+// 				$accountBook->expenditureBank = $expenditureBank;
+// 				$accountBook->expenditureDate = $expenditureDate;
+// 				$accountBook->remarks = $remarks;
+// 				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+// 				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+// 				$accountBook->inputStaff = $this->staff [0] ['sid'];
+// 				$expenditureId = $accountBook->insert ();
 				
-				// 添加日常支出汇总
-				$abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
-				$accountBookStatistics = new accountBookStatistics ();
-				$item = array (
-						'date' => date ( "Y-m-d" ),
-						'expenditureType' => $abDetail ['expenditureType'],
-						'expenditureMsg' => $abDetail ['expenditureMsg'],
-						'aid' => $abDetail ['aid'],
-						'payPrice' => $abDetail ['expenditurePrice'],
-						'expensesType' => $abDetail ['expensesType'] 
-				);
-				$accountBookStatistics->setAccountBookStatistics ( $item );
+// 				// 添加日常支出汇总
+// 				$abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
+// 				$accountBookStatistics = new accountBookStatistics ();
+// 				$item = array (
+// 						'date' => date ( "Y-m-d" ),
+// 						'expenditureType' => $abDetail ['expenditureType'],
+// 						'expenditureMsg' => $abDetail ['expenditureMsg'],
+// 						'aid' => $abDetail ['aid'],
+// 						'payPrice' => $abDetail ['expenditurePrice'],
+// 						'expensesType' => $abDetail ['expensesType'] 
+// 				);
+// 				$accountBookStatistics->setAccountBookStatistics ( $item );
 				
-				// 公司日常支出流水
-				$wasteBook = new wasteBook ();
-				$itemWaste = array (
-						'accountPrice' => - $expenditurePrice 
-				);
-				if($expenditureMsg!='个人（GR）'){
-					if ($expenditureBank == '个人广发') {
-						$itemWaste = array (
-								'accountPrice' => $expenditurePrice 
-						);
-					}
-				}
+// 				// 公司日常支出流水
+// 				$wasteBook = new wasteBook ();
+// 				$itemWaste = array (
+// 						'accountPrice' => - $expenditurePrice 
+// 				);
+// 				if($expenditureMsg!='个人（GR）'){
+// 					if ($expenditureBank == '个人广发') {
+// 						$itemWaste = array (
+// 								'accountPrice' => $expenditurePrice 
+// 						);
+// 					}
+// 				}
 				
-				$itemWaste += array (
-						'expensesType' => 2,
-						'accountType' => 5,
-						'dailyExpenditureType' => $expenditureType,
-						'accountPriceShow' => $expenditurePrice,
-						'accountPrice' => - $expenditurePrice,
-						'dataID' => $expenditureId,
-						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
-						'name' => $this->staff [0] ['username'],
-						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
-				);
-				$wasteBook->setAccountBookStatistics ( $itemWaste );
-				// 添加一笔理财收入
-				$accountBank = 'CGBDeposit';
-				$dailyIncomeType = 7;
-				$receivedBank = '纵横广发';
-				if ($expenditureType == 6) {
-					$accountBank = 'ICBCDeposit';
-					$receivedBank = '纵横工行';
-					$dailyIncomeType = 9;
-				}elseif($expenditureMsg=='个人（GR）'){
-					$receivedBank = '个人广发';
-				}
-				$accountBook = new accountBook ();
-				$accountBook->expensesType = 1;
-				$accountBook->accountType = $dailyIncomeType;
-				$accountBook->accountMsg = $expenditureMsg;
-				$accountBook->receivedPrice = $expenditurePrice;
-				$accountBook->receivedBank = $receivedBank;
-				$accountBook->receivedDate = $expenditureDate;
-				$accountBook->remarks = $remarks;
-				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
-				$accountBook->inputStaff = $this->staff [0] ['sid'];
-				$id = $accountBook->insert ();
-				// 添加日常理财收入汇总
-				$abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
-				$accountBookStatistics = new accountBookStatistics ();
-				$item = array (
-						'date' => date ( "Y-m-d" ),
-						'expenditureType' => $abDetail ['expenditureType'],
-						'expenditureMsg' => $abDetail ['expenditureMsg'],
-						'aid' => $abDetail ['aid'],
-						'financingPrice' => $expenditurePrice,
-						'expensesType' => 3 
-				);
-				$accountBookStatistics->setAccountBookStatistics ( $item );
-				//TODO 修改理财收入 添加一笔收入流水
-				if ($expenditureMsg == '公司固定') {
-					$accountTypeWaste = 9;
-				} elseif ($expenditureMsg == '公司活期') {
-					$accountTypeWaste = 10;
-				} elseif ($expenditureMsg == '个人（GR）') {
-					$accountTypeWaste = 9;
-					$accountBank = 'ICBCDeposit';
-				}
-				$itemWaste = array (
-						'expensesType' => 1,
-						'accountType' => $accountTypeWaste,
-						'accountPriceShow' => $expenditurePrice,
-						'accountPrice' => $expenditurePrice,
-						'dataID' => $id,
+// 				$itemWaste += array (
+// 						'expensesType' => 2,
+// 						'accountType' => 5,
+// 						'dailyExpenditureType' => $expenditureType,
+// 						'accountPriceShow' => $expenditurePrice,
+// 						'accountPrice' => - $expenditurePrice,
+// 						'dataID' => $expenditureId,
+// 						'accountBank' => $accountBank,
+// 						'category' => $this->staff [0] ['category'],
+// 						'cid' => $this->staff [0] ['cid'],
+// 						'name' => $this->staff [0] ['username'],
+// 						'sid' => $this->staff [0] ['sid'],
+// 						'inputDate' => date ( "Y-m-d H:i:s" ) 
+// 				);
+// 				$wasteBook->setAccountBookStatistics ( $itemWaste );
+// 				// 添加一笔理财收入
+// 				$accountBank = 'CGBDeposit';
+// 				$dailyIncomeType = 7;
+// 				$receivedBank = '纵横广发';
+// 				if ($expenditureType == 6) {
+// 					$accountBank = 'ICBCDeposit';
+// 					$receivedBank = '纵横工行';
+// 					$dailyIncomeType = 9;
+// 				}elseif($expenditureMsg=='个人（GR）'){
+// 					$receivedBank = '个人广发';
+// 				}
+// 				$accountBook = new accountBook ();
+// 				$accountBook->expensesType = 1;
+// 				$accountBook->accountType = $dailyIncomeType;
+// 				$accountBook->accountMsg = $expenditureMsg;
+// 				$accountBook->receivedPrice = $expenditurePrice;
+// 				$accountBook->receivedBank = $receivedBank;
+// 				$accountBook->receivedDate = $expenditureDate;
+// 				$accountBook->remarks = $remarks;
+// 				$accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
+// 				$accountBook->inputDate = date ( "Y-m-d H:i:s" );
+// 				$accountBook->inputStaff = $this->staff [0] ['sid'];
+// 				$id = $accountBook->insert ();
+// 				// 添加日常理财收入汇总
+// 				$abDetail = $accountBook->getAccountBookByAid ( $expenditureId );
+// 				$accountBookStatistics = new accountBookStatistics ();
+// 				$item = array (
+// 						'date' => date ( "Y-m-d" ),
+// 						'expenditureType' => $abDetail ['expenditureType'],
+// 						'expenditureMsg' => $abDetail ['expenditureMsg'],
+// 						'aid' => $abDetail ['aid'],
+// 						'financingPrice' => $expenditurePrice,
+// 						'expensesType' => 3 
+// 				);
+// 				$accountBookStatistics->setAccountBookStatistics ( $item );
+// 				//TODO 修改理财收入 添加一笔收入流水
+// 				if ($expenditureMsg == '公司固定') {
+// 					$accountTypeWaste = 9;
+// 				} elseif ($expenditureMsg == '公司活期') {
+// 					$accountTypeWaste = 10;
+// 				} elseif ($expenditureMsg == '个人（GR）') {
+// 					$accountTypeWaste = 9;
+// 					$accountBank = 'ICBCDeposit';
+// 				}
+// 				$itemWaste = array (
+// 						'expensesType' => 1,
+// 						'accountType' => $accountTypeWaste,
+// 						'accountPriceShow' => $expenditurePrice,
+// 						'accountPrice' => $expenditurePrice,
+// 						'dataID' => $id,
 						
-						'dailyIncomeType' => $dailyIncomeType,
-						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
-						'name' => $this->staff [0] ['username'],
-						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
-				);
-				$wasteBook->setAccountBookStatistics ( $itemWaste );
+// 						'dailyIncomeType' => $dailyIncomeType,
+// 						'accountBank' => $accountBank,
+// 						'category' => $this->staff [0] ['category'],
+// 						'cid' => $this->staff [0] ['cid'],
+// 						'name' => $this->staff [0] ['username'],
+// 						'sid' => $this->staff [0] ['sid'],
+// 						'inputDate' => date ( "Y-m-d H:i:s" ) 
+// 				);
+// 				$wasteBook->setAccountBookStatistics ( $itemWaste );
 			} else {
 				// 添加一笔日常支出
 				$accountBook = new accountBook ();
@@ -13291,7 +13305,7 @@ class ReceiptController extends DooController {
 			if (empty ( $abDetail ))
 				die ( 'illegal request' );
 				
-				// 删除收支
+			// 删除收支
 			Doo::loadModel ( "accountBookStatistics" );
 			$accountBookStatistics = new accountBookStatistics ();
 			$item = array (
@@ -13354,6 +13368,7 @@ class ReceiptController extends DooController {
 			) );
 			
 			// 删除收入流水
+			//TODO 2020-07-23 删除新增理财和银行存款流水
 			if (! empty ( $accountType )) {
 				Doo::loadModel ( 'wasteBook' );
 				$wasteBook = new wasteBook ();
@@ -13665,9 +13680,115 @@ class ReceiptController extends DooController {
 		include './protected/config/wasteBook.conf.php';
 		Doo::loadModel ( 'wasteBook' );
 		$wasteBook = new wasteBook ();
-		
+		$data ['store']=$waste;
 		$inComeStatistics = $wasteBook->getWasteBookStatisticsByIncome ();
+		//print_r($waste);
+		//1-收入支出流水金额合计
 		$waste = $this->getWasteBookStatistics ( $waste, $inComeStatistics );
+		//echo $waste['bank']['CGBDeposit'].'</br>';
+		//2020-07-20 -理财相关-面板数据
+		Doo::loadClass ( 'wasteBook.finances.func' );
+		$financesStatistics=$wasteBook->getFinancesStatistics();
+		//print_r($waste);
+		// 展示使用
+		//收入
+		//print_r($inComeStatistics);
+		$wasteStatistics['CGBDeposit']=0;
+		$wasteStatistics['ICBCDeposit']=0;
+		$wasteStatistics['HUADeposit']=0;
+		$wasteStatistics['PersonalDeposit']=0;
+		foreach ($inComeStatistics['incomeStatistics'] as $value ){
+			if($value['accountBank']=='CGBDeposit'){
+				$wasteStatistics['CGBDeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='ICBCDeposit'){
+				$wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='HUADeposit'){
+				$wasteStatistics['HUADeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='PersonalDeposit'){
+				$wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
+			}
+		}
+		$data ['wasteStatistics']=$wasteStatistics;
+		//支出
+		$wasteStatistics['CGBDeposit']=0;
+		$wasteStatistics['ICBCDeposit']=0;
+		$wasteStatistics['HUADeposit']=0;
+		$wasteStatistics['PersonalDeposit']=0;
+		foreach ($inComeStatistics['expenditureStatistics'] as $value ){
+			if($value['accountBank']=='CGBDeposit'){
+				$wasteStatistics['CGBDeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='ICBCDeposit'){
+				$wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='HUADeposit'){
+				$wasteStatistics['HUADeposit']+=$value['accountPrice'];
+			}
+			if($value['accountBank']=='PersonalDeposit'){
+				$wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
+			}
+		}
+		$data ['wastePay']=$wasteStatistics;
+		//理财公司账号部分
+		$wasteStatistics['CGBDeposit']=0;
+		$wasteStatistics['ICBCDeposit']=0;
+		$wasteStatistics['HUADeposit']=0;
+		$wasteStatistics['PersonalDeposit']=0;
+		foreach ($financesStatistics['companyAccount'] as $value ){
+			
+			//（纵横广发）广发存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
+				$wasteStatistics['CGBDeposit']+=$value['accountPrice'];
+			}
+			//工行存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
+				$wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
+			}
+			//个人存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
+				$wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
+			}
+		}
+		$data ['wasteCompanyAccount']=$wasteStatistics;
+		
+		
+		
+		
+
+		//理财部分的金额计算
+		$waste =_getFinancesWBS ( $waste, $financesStatistics );
+		//echo $waste['bank']['CGBDeposit'].'</br>';;
+		//存款面板数据--日常收支改变后的金额汇总
+		$bankSavingsStatistics=$wasteBook->getBankSavingsStatistics();
+		$waste =_getBankSavingsWBS ( $waste, $bankSavingsStatistics );
+		
+		//展示调试BUG-使用
+		//print_r($bankSavingsStatistics);
+		$wasteStatistics['CGBDeposit']=0;
+		$wasteStatistics['ICBCDeposit']=0;
+		$wasteStatistics['PersonalDeposit']=0;
+		foreach ($bankSavingsStatistics as $value ){
+			//（纵横广发）广发存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
+				$wasteStatistics['CGBDeposit']+=$value['accountPrice'];
+			}
+			//工行存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
+				$wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
+			}
+			//个人存款
+			if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
+				$wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
+			}
+		}
+		$data ['wasteNewPay']=$wasteStatistics;
+		
+		
+		//echo $waste['bank']['CGBDeposit'].'</br>';;
+		
 		//
 		$total = $waste ['bank'] ['CGBDeposit'] + $waste ['bank'] ['ICBCDeposit']+ $waste ['bank'] ['HUADeposit']  + $waste ['bank'] ['PersonalDeposit'] + $waste ['financial'] ['current'] ['CGBDeposit'] + $waste ['financial'] ['current'] ['ICBCDeposit'] + $waste ['financial'] ['fixed'] ['CGBDeposit'] + $waste ['financial'] ['fixed'] ['ICBCDeposit'];
 		$CGBDeposit_total =$waste ['bank'] ['CGBDeposit']+$waste ['bank'] ['HUADeposit'];
@@ -13676,12 +13797,15 @@ class ReceiptController extends DooController {
 		
 		// print_r($waste);
 		
-		$data ['waste'] = $waste;
-		$data ['total'] = $total;
-		$data ['CGBDeposit_total'] = $CGBDeposit_total;
-		$data['cashBalance']= $CGBDeposit_total+$waste ['bank'] ['ICBCDeposit']+$waste ['bank'] ['PersonalDeposit']+$waste ['financial'] ['current'] ['CGBDeposit']+$waste ['financial'] ['current'] ['ICBCDeposit'];
 		
+		$data ['total'] = number_format($total,2);
+		$data ['CGBDeposit_total'] =  number_format($CGBDeposit_total,2);
+		$cashBalance=$CGBDeposit_total+$waste ['bank'] ['ICBCDeposit']+$waste ['bank'] ['PersonalDeposit']+$waste ['financial'] ['current'] ['CGBDeposit']+$waste ['financial'] ['current'] ['ICBCDeposit'];
+		$data['cashBalance']= number_format($cashBalance,2);
 		
+		$waste ['bank'] ['CGBDeposit']=sprintf("%.2f", round($waste ['bank'] ['CGBDeposit'], 2));
+		
+		$data ['waste'] = $waste;
 		
 		// 月流水数据结构
 		$monthStatistics = array ();

protected/controller/ReceiptExtendController.php

@@ -127,53 +127,133 @@ class ReceiptExtendController extends DooController {
 			@header ( "Location: /login" );
 		}
 	}
-	
-	/**
-	 * 生成一个日常支出
-	 *
-	 * @param [type] $accountBook
-	 * @param [type] $expensesType
-	 * @param [type] $outlayAccountType
-	 * @param [type] $outlayAccountMsg
-	 * @param [type] $outlayPrice
-	 * @param [type] $outlayBank
-	 * @param [type] $outlayDate
-	 * @param [type] $outlayRemarks
-	 * @return void
-	 */
-	private function _saveOutlayAB($accountBook,$expensesType,$outlayAccountType,$outlayMsg,$outlayPrice,$outlayBank,$outlayDate,$outlayRemarks,$outlayAccountMsg){
-		$accountBook->expensesType = $expensesType;
-		$accountBook->expenditureType = $outlayAccountType;
-		$accountBook->expenditureMsg = $outlayMsg;
-		$accountBook->expenditurePrice = $outlayPrice;
-		$accountBook->expenditureBank = $outlayBank;
-		$accountBook->expenditureDate = $outlayDate;
-		$accountBook->depositMethod=$outlayAccountMsg;
-		$accountBook->remarks = $outlayRemarks;
-		$accountBook->bookSerial = "#IN" . date("Ymd") . mt_rand(1000, 9999);
-		$accountBook->inputDate = date("Y-m-d H:i:s");
-		$accountBook->inputStaff = $this->staff[0]['sid'];
-		$id = $accountBook->insert();
-		return $id;
+
+	function paymentsDelete(){
+		$aidKey = $this->get_args ( 'aidKey' ) ? $this->get_args ( 'aidKey' ) : "";
+		if (! empty ( $aidKey )) {
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			
+			$aid = $XDeode->decode ( $aidKey );
+			
+			Doo::loadModel ( "accountBook" );
+			$accountBook = new accountBook ();
+			
+			$abDetail = $accountBook->getAccountBookByAid ( $aid );
+			
+			if (empty ( $abDetail )){
+				die ( 'illegal request' );
+			}
+			// 删除收支统计
+			Doo::loadModel ( "accountBookStatistics" );
+			$accountBookStatistics = new accountBookStatistics ();
+			$accountBookStatistics->delete ( array (
+				'where' => 'aid=' . $aid,
+				'limit' => 1 
+			) );
+			//删除日常收支
+			$accountBook->delete ( array (
+				'where' => 'aid=' . $aid,
+				'limit' => 1 
+			) );
+			//TODO 2020-07-23 删除新增理财和银行存款流水
+			$accountType = '';
+			if ($abDetail ['expensesType'] == 1) {
+				$accountType = 6;
+			}elseif($abDetail ['expensesType'] == 2){
+				$accountType = 5;
+			}
+
+			Doo::loadModel ( 'wasteBook' );
+			$wasteBook = new wasteBook ();
+			$wasteBook->delete ( array (
+				'where' => 'dataID=' . $aid . ' and accountType=' . $accountType,
+				'limit' => 1 
+			) );
+
+		}
+		return '/paymentsAchieve';
+
 	}
 
 	/**
-	 * 产生一条汇总信息
+	 * 银行存款相关
 	 *
-	 * @param [type] $abDetail
-	 * @param [type] $accountBookStatistics
 	 * @return void
 	 */
-	private function _saveAccountBookStatistics($abDetail,$accountBookStatistics){
-		$item = array(
-			'date' => date("Y-m-d"),
-			'expenditureType' => $abDetail['expenditureType'],
-			'expenditureMsg' => $abDetail['expenditureMsg'],
-			'aid' => $abDetail['aid'],
-			'payPrice' => $abDetail['expenditurePrice'],
-			'expensesType' => $abDetail['expensesType']
-		);
-		$accountBookStatistics->setAccountBookStatistics($item);
+	function paymentsBankDo(){
+		//支出部分
+		$outlayBank = $this->get_args ( 'outlayBank' ) ? $this->get_args ( 'outlayBank' ) : "";
+		$outlayMsg = $this->get_args ( 'outlayMsg' ) ? $this->get_args ( 'outlayMsg' ) : "";
+		$outlayDate = $this->get_args ( 'outlayDate' ) ? $this->get_args ( 'outlayDate' ) : "";
+		$outlayRemarks = $this->get_args ( 'outlayRemarks' ) ? $this->get_args ( 'outlayRemarks' ) : "";
+
+		$outlayPrice = is_numeric ( $this->get_args ( 'outlayPrice' ) ) ? $this->get_args ( 'outlayPrice' ) : 0;
+		//收入部分
+		$revenueBank = $this->get_args ( 'revenueBank' ) ? $this->get_args ( 'revenueBank' ) : "";
+		$revenueMsg = $this->get_args ( 'revenueMsg' ) ? $this->get_args ( 'revenueMsg' ) : "";
+		$revenueDate = $this->get_args ( 'revenueDate' ) ? $this->get_args ( 'revenueDate' ) : "";
+		$revenueRemarks = $this->get_args ( 'revenueRemarks' ) ? $this->get_args ( 'revenueRemarks' ) : "";
+		
+		$revenuePrice = is_numeric ( $this->get_args ( 'revenuePrice' ) ) ? $this->get_args ( 'revenuePrice' ) : 0;
+		if(! empty ( $outlayPrice ) && ! empty ( $outlayMsg ) && ! empty ( $outlayBank ) && ! empty ( $outlayDate ) && 
+		   ! empty ( $revenuePrice ) && ! empty ( $revenueMsg ) && ! empty ( $revenueBank ) && ! empty ( $revenueDate )){
+
+			Doo::loadModel ( "accountBook" );
+			Doo::loadModel ( "accountBookStatistics" );
+			Doo::loadModel ( 'wasteBook' );
+
+			//导入理财func
+			Doo::loadClass ( 'receipt.finances.func' );
+
+			//公司使用
+			$accountBank_companyOut=_getCompanyBankEN($outlayBank);
+			if(empty($accountBank_companyOut)){
+				die ( '支出信息-公司银行  illegal request' );
+			}
+			//公司银行转换
+			$accountBank_companyRevenue=_getCompanyBankEN($revenueBank);
+			if (empty($accountBank_companyRevenue)) {
+				die('收入信息-公司银行 illegal request');
+			}
+
+			//1-1 银行支出
+			$depositMethod = '活期';
+			$accountBook = new accountBook();
+			//expensesType,expenditureType,operatingBankType
+			$outlayId = _saveOutlayAB($accountBook, 2, 12, 2, $depositMethod, $outlayMsg, $outlayPrice, $outlayBank, $outlayDate, $outlayRemarks, $this->staff);
+
+			//1-2 理财支出汇总--存款不需要
+			$abDetail = $accountBook->getAccountBookByAid($outlayId);
+			$accountBookStatistics = new accountBookStatistics();
+			_saveAccountBookStatistics($abDetail, $accountBookStatistics);
+
+			//1-3 理财-流水支出
+			//公司银行转换
+			$accountBank = $accountBank_companyOut;
+			$wasteBook = new wasteBook();
+			//expensesType,accountType,dailyType,operatingBankType
+			_saveFWB($wasteBook, 2, 5, 3, 2, $depositMethod, -$outlayPrice, $outlayId, $accountBank, $outlayDate, $this->staff);
+
+			//2-1银行收入
+			$depositMethod = '活期';
+			$accountBook = new accountBook();
+			//expensesType,accountType,operatingBankType
+			$inComeId = _saveRevenueAB($accountBook, 1, 14, 2, $depositMethod, $revenueBank, $revenuePrice, $revenueMsg, $revenueDate, $revenueRemarks, $this->staff);
+
+			//2-2-2 理财支出汇总
+			$abDetail = $accountBook->getAccountBookByAid($inComeId);
+			$accountBookStatistics = new accountBookStatistics();
+			_saveRevenueAccountBookStatistics($abDetail, $accountBookStatistics);
+
+			//1-2-3 理财-流水收入
+			//公司银行转换
+			$accountBank = $accountBank_companyRevenue;
+			$wasteBook = new wasteBook();
+			//expensesType,accountType,dailyType,operatingBankType
+			_saveFWB($wasteBook, 1, 6, 3, 2, $depositMethod, $revenuePrice, $inComeId, $accountBank, $revenueDate, $this->staff);
+		}
+		return '/payments';
 	}
 
 	/**
@@ -206,116 +286,119 @@ class ReceiptExtendController extends DooController {
 		//信息完整性检查
 		if(!empty ( $outlayOperatingType ) &&!empty ( $outlayAccountType ) && ! empty ( $outlayPrice ) && ! empty ( $outlayMsg ) && ! empty ( $outlayBank ) && ! empty ( $outlayDate ) && !empty($outlayAccountMsg) &&
 		!empty ( $revenueOperatingType ) &&!empty ( $revenueAccountType ) && ! empty ( $revenuePrice ) && ! empty ( $revenueMsg ) && ! empty ( $revenueBank ) && ! empty ( $revenueDate )){
-			Doo::loadClass ( 'XDeode' );
-			$XDeode = new XDeode ( 5 );
+
 			Doo::loadModel ( "accountBook" );
 			Doo::loadModel ( "accountBookStatistics" );
 			Doo::loadModel ( 'wasteBook' );
 
+			//导入理财func
+			Doo::loadClass ( 'receipt.finances.func' );
+
+			//信息判定
+			$depositMethod_out=_checkDepositMethod($outlayAccountMsg);
+			//流水使用
+			$accountBank_out= _getFinancesBankEN($outlayAccountType);
+			//公司使用
+			$accountBank_companyOut=_getCompanyBankEN($outlayBank);
+			if(empty($depositMethod_out)||empty($accountBank_out)||empty($accountBank_companyOut)){
+				die ( '支出信息-理财或者公司银行  illegal request' );
+			}
+			//信息完整性判断
+			$depositMethod_revenue=_checkDepositMethod($revenueAccountMsg);
+			//流水使用
+			$accountBank_revenue= _getFinancesBankEN($revenueAccountType);
+			//公司银行转换
+			$accountBank_companyRevenue=_getCompanyBankEN($revenueBank);
+			if (empty($accountBank_companyRevenue)||empty($depositMethod_revenue)||empty($accountBank_revenue)) {
+				die('收入信息-理财或者公司银行 illegal request');
+			}
+
 			//处理支出信息
 			//1.1-理财支出
 			if($outlayOperatingType=='finances'){
-				//信息完整性判断
-				$accountType='';
-				if ($outlayAccountMsg == '固定') {
-					$accountType = 9;
-				} elseif ($outlayAccountMsg == '活期') {
-					$accountType = 10;
-				}
-				if(empty($accountType)){
-					die ( '固定或活期  illegal request' );
-				}
+				//活或固
+				$depositMethod=$depositMethod_out;
 				
-				//流水使用
-				$accountBank='';
-				if($outlayAccountType=='广发理财'){
-					$accountBank='CGBDeposit';
-				}elseif($outlayAccountType=='工行理财'){
-					$accountBank = 'ICBCDeposit';
-				}elseif($outlayAccountType=='个人理财(广发)'){
-					$accountBank = 'CGBPersonalDeposit';
-				}
-				if(empty($accountBank)){
-					die ( '理财银行  illegal request' );
-				}
-
 				//1-1-1-日常支出
-				 $accountBook = new accountBook ();
-				// $accountBook->expensesType = 2;
-				// $accountBook->expenditureType = $outlayAccountType;
-				// $accountBook->expenditureMsg = $outlayAccountMsg;
-				// $accountBook->expenditurePrice = $outlayPrice;
-				// $accountBook->expenditureBank = $outlayBank;
-				// $accountBook->expenditureDate = $outlayDate;
-				// $accountBook->remarks = $outlayRemarks;
-				// $accountBook->bookSerial = "#IN" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-				// $accountBook->inputDate = date ( "Y-m-d H:i:s" );
-				// $accountBook->inputStaff = $this->staff [0] ['sid'];
-				// $outlayId = $accountBook->insert ();
-				$outlayId =$this->_saveOutlayAB($accountBook,2,11,$outlayMsg,$outlayPrice,$outlayAccountType,$outlayDate,$outlayRemarks,$outlayAccountMsg);
+				$accountBook = new accountBook ();
+				$outlayId =_saveOutlayAB($accountBook,2,11,1,$depositMethod,$outlayMsg,$outlayPrice,$outlayAccountType,$outlayDate,$outlayRemarks,$this->staff);
+				
 				//1-1-2 理财支出汇总
 				$abDetail = $accountBook->getAccountBookByAid ( $outlayId );
 				$accountBookStatistics = new accountBookStatistics ();
-				$this->_saveAccountBookStatistics($abDetail,$accountBookStatistics);
-				// $item = array (
-				// 		'date' => date ( "Y-m-d" ),
-				// 		'expenditureType' => $abDetail ['expenditureType'],
-				// 		'expenditureMsg' => $abDetail ['expenditureMsg'],
-				// 		'aid' => $abDetail ['aid'],
-				// 		'payPrice' => $abDetail ['expenditurePrice'],
-				// 		'expensesType' => $abDetail ['expensesType'] 
-				// );
-				// $accountBookStatistics->setAccountBookStatistics ( $item );
+				_saveAccountBookStatistics($abDetail,$accountBookStatistics);
+				
 				//1-1-3 理财-流水支出
+				//理财银行
+				$accountBank= $accountBank_out;
 				$wasteBook = new wasteBook ();
-				$itemWaste = array (
-						'expensesType' => 2,
-						'accountType' => $accountType,
-						'dailyExpenditureType' => $outlayAccountType,
-						'accountPriceShow' => $outlayPrice,
-						'accountPrice' => - $outlayPrice,
-						'dataID' => $outlayId,
-						'accountBank' => $accountBank,
-						'category' => $this->staff [0] ['category'],
-						'cid' => $this->staff [0] ['cid'],
-						'name' => $this->staff [0] ['username'],
-						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => $outlayDate ,
-						'createAt'=>date ( "Y-m-d H:i:s" ),
-						'synPaymentDate'=>1,
-				);		
-				$wasteBook->setAccountBookStatistics ( $itemWaste );
-
+				_saveFWB($wasteBook,2,5,2,1,$depositMethod,-$outlayPrice,$outlayId,$accountBank,$outlayDate,$this->staff);
 			}
 			//1.2-银行支出
 			if($outlayOperatingType=='bank'){
 				
-				$accountBank = '';
-				if ($outlayBank == '纵横广发') {
-					$accountBank = 'CGBDeposit';
-				} elseif ($outlayBank == '纵横工行') {
-					$accountBank = 'ICBCDeposit';
-				} elseif ($outlayBank == '华润银行') {
-					$accountBank = 'HUADeposit';
-				} elseif ($outlayBank == '个人广发') {
-					$accountBank = 'PersonalDeposit';
-				}
-				if (empty ( $accountBank )){
-					die ( 'illegal request' );
-				}
-
 				//1-2-1-日常支出
+				$depositMethod = '活期';
 				$accountBook = new accountBook ();
-				$outlayId =$this->_saveOutlayAB($accountBook,2,7,$outlayAccountMsg,$outlayPrice,$outlayBank,$outlayDate,$outlayRemarks);
+				$outlayId =_saveOutlayAB($accountBook,2,11,2,$depositMethod,$outlayMsg,$outlayPrice,$outlayBank,$outlayDate,$outlayRemarks,$this->staff);
+				
 				//1-2-2 理财支出汇总
 				$abDetail = $accountBook->getAccountBookByAid ( $outlayId );
 				$accountBookStatistics = new accountBookStatistics ();
-				$this->_saveAccountBookStatistics($abDetail,$accountBookStatistics);
-				//1-1-3 理财-流水支出
+				_saveAccountBookStatistics($abDetail,$accountBookStatistics);
 
+				//1-2-3 理财-流水支出
+				//公司银行转换
+				$accountBank=$accountBank_companyOut;
+				$wasteBook = new wasteBook ();
+				//expensesType,accountType,dailyType,operatingBankType
+				_saveFWB($wasteBook,2,5,2,2,$depositMethod,-$outlayPrice,$outlayId,$accountBank,$outlayDate,$this->staff);
+			}
+		
+			//处理收入信息
+			//2-1 理财收入
+			if($revenueOperatingType=='finances'){
+
+				//信息完整性判断
+				$depositMethod=$depositMethod_revenue;
+				//2-1-1-日常收入
+				$accountBook = new accountBook();
+				$inComeId =_saveRevenueAB($accountBook,1,13,1,$depositMethod,$revenueAccountType,$revenuePrice,$revenueMsg,$revenueDate,$revenueRemarks,$this->staff);
 
+				//2-1-2 理财收入汇总
+				$abDetail = $accountBook->getAccountBookByAid($inComeId);
+				$accountBookStatistics = new accountBookStatistics();
+				_saveRevenueAccountBookStatistics($abDetail,$accountBookStatistics);
+				
+				//2-1-3 理财-流水收入
+				//流水使用
+				$accountBank= $accountBank_revenue;
+				$wasteBook = new wasteBook ();
+				//expensesType,accountType,dailyType,operatingBankType
+				_saveFWB($wasteBook,1,6,2,1,$depositMethod,$revenuePrice,$inComeId,$accountBank,$revenueDate,$this->staff);
 			}
 
+			//2-2银行收入
+			if($revenueOperatingType=='bank'){
+				
+				//2-2-1-日常支出
+				$depositMethod = '活期';
+				$accountBook = new accountBook();
+				//expensesType,accountType,operatingBankType
+				$inComeId =_saveRevenueAB($accountBook,1,13,2,$depositMethod,$revenueBank,$revenuePrice,$revenueMsg,$revenueDate,$revenueRemarks,$this->staff);
+
+				//2-2-2 理财支出汇总
+				$abDetail = $accountBook->getAccountBookByAid($inComeId);
+				$accountBookStatistics = new accountBookStatistics();
+				_saveRevenueAccountBookStatistics($abDetail,$accountBookStatistics);
+
+				//1-2-3 理财-流水收入
+				//公司银行转换
+				$accountBank=$accountBank_companyRevenue;
+				$wasteBook = new wasteBook();
+				//expensesType,accountType,dailyType,operatingBankType
+				_saveFWB($wasteBook, 1, 6, 2, 2, $depositMethod, $revenuePrice, $inComeId, $accountBank, $revenueDate, $this->staff);
+			}	
 
 		}
 		return '/payments';
@@ -1945,6 +2028,21 @@ class ReceiptExtendController extends DooController {
 		
 	}
 	
+	function wasteBookReport(){
+		$data ['memu'] = "receipt";
+		$data ['staff'] = $this->staff;
+		$data ['verifyId'] = $this->verifyId;
+		$data['receiptMemu']='wasteBookReport';
+		$data ['executeId'] = $this->executeId;
+		$this->render ( "/expenses/wasteBookReport", $data );
+	}
+	
+	function frame_wasteBookReport(){
+		$data='';
+		$this->render ( "/wbReport/index", $data );
+	}
+	
+	
 	//移除培训班结算-支出列
 	private function _receiptTrainItemDel($RItem,$rDetail,$riid,$rid,$detail,$receipt){
 		$RItem->delete ( array (
@@ -3005,6 +3103,8 @@ class ReceiptExtendController extends DooController {
     }
     
 	function exportReceiptTrainExcel() {
+		
+		//include Doo::conf()->BASE_PATH.'diagnostic/debug.php';
 		$rtidKey = $this->get_args ( 'rtidKey' ) ? $this->get_args ( 'rtidKey' ) : "";
 		$ridKey = $this->get_args ( 'ridKey' ) ? $this->get_args ( 'ridKey' ) : "";
 		
@@ -3042,8 +3142,13 @@ class ReceiptExtendController extends DooController {
 		$invoice = new invoice ();
 		Doo::loadModel ( 'invoiceTraining' );
 		$invoiceTraining = new invoiceTraining ();
-		$invoiceList = $invoice->getInvoicePrintedByItid ( $receiptDetail ['invoiceTrainId'] );
-		$invoiceTrainingDetail = $invoiceTraining->getInvoiceTrainingByItid ( $receiptDetail ['invoiceTrainId'] );
+		$invoiceList=array();
+		$invoiceTrainingDetail=array();
+		if($receiptDetail ['invoiceTrainId']!=0){
+			$invoiceList = $invoice->getInvoicePrintedByItid ( $receiptDetail ['invoiceTrainId'] );
+			$invoiceTrainingDetail = $invoiceTraining->getInvoiceTrainingByItid ( $receiptDetail ['invoiceTrainId'] );
+		}
+		
 		
 		//支出
 		Doo::loadModel ( 'RItem' );

protected/controller/SoftController.php

@@ -304,7 +304,7 @@ class SoftController extends DooController {
 		
 		
 		
-		//$longleList=isset($_POST['longle'])?$_POST['longle']:'{"serialnumber":"1657000186160000"}';
+		//$longleList=isset($_POST['longle'])?$_POST['longle']:'{"serialnumber":"1B6C000758730019"}';
 		$longleList=isset($_POST['longle'])?$_POST['longle']:'';
 		
 		//file_put_contents ( "protected/config/longle2.bak", $longleList );
@@ -620,9 +620,11 @@ class SoftController extends DooController {
 			$action_log->status = 12;
 				
 			$longle->alloted_time = '';//更新锁延期时间
-			$longle->status = 10;
+// 			$longle->status = 10;
+// 			$longle->statusT='延期';
 				
 			$longle_log->status = 10;
+			
 			$longle_log->mark ='由'.$linfo['alloted_time'].'延期至 '; 
 			
 			
@@ -639,7 +641,8 @@ class SoftController extends DooController {
 				$action_log->status = 12;
 				
 				$longle->alloted_time = '';//更新锁延期时间
-				$longle->status = 10;
+// 				$longle->status = 10;
+// 				$longle->statusT='延期';
 				
 				$longle_log->status = 10;
 				$longle_log->mark ='由'.$linfo['alloted_time'].'延期至 ';
@@ -657,7 +660,7 @@ class SoftController extends DooController {
 				$action_log->status = 12;
 					
 				$longle->alloted_time = $alloted_time;//更新锁延期时间
-				$longle->status = 10;
+				//$longle->status = 10;
 					
 				$longle_log->status = 10;
 				$longle_log->mark ='由'.$linfo['alloted_time'].'延期至'.$alloted_time;

protected/controller/fee/fee_controller.php

@@ -0,0 +1,148 @@
+<?php
+/*
+ * @description: 费用管理控制类
+ * @Author: CP
+ * @Date: 2020-11-11 17:51:05
+ * @FilePath: \cld\protected\controller\fee\fee_controller.php
+ */
+class fee_controller extends DooController {
+	
+	public $staff;
+	
+	public function beforeRun($resource, $action) {
+		
+		$this->accessAuth($resource, $action);
+	}
+	
+	function __construct() {
+		
+		if (isset ( $_COOKIE ["staff"] )) {
+				
+			if (! empty ( $_COOKIE ["staff"] )) {
+		
+				Doo::loadModel ( 'staff' );
+				Doo::loadModel ( 'verify' );
+				$verify = new verify ();
+				$staff = new staff ();
+				Doo::loadModel ( "execute" );
+				$execute = new execute ();
+		
+				$verifyList = $verify->find ( array (
+						'select' => 'staff',
+						'asArray' => true
+				) );
+				$list = array ();
+		
+				// 判断角色的审批权限
+				foreach ( $verifyList as $key => $value ) {
+					$ver = json_decode ( $value ['staff'] );
+						
+					foreach ( $ver as $k => $v ) {
+						if ($v [1] == 'ROLE') {
+							$roleList = json_decode ( $v [3] );
+							foreach ( $roleList as $t => $g ) {
+								$gList = explode ( "_", $g );
+								array_push ( $list, $gList [0] );
+								// print_r($list);
+							}
+						} else
+							array_push ( $list, $v [0] );
+					}
+				}
+		
+				// 判断执行人的审批权限
+				$executeList = $execute->find ( array (
+						'where'=>'mold !="日常收支"',
+						'select' => 'staff',
+						'asArray' => true
+				) );
+				$list2 = array ();
+				foreach ( $executeList as $key => $value ) {
+					$ver = json_decode ( $value ['staff'] );
+						
+					foreach ( $ver as $k => $v ) {
+						array_push ( $list2, $v [0] );
+					}
+				}
+		
+				$eidList = file_get_contents ( "protected/config/execute/execute.ini" );
+				$eidList = array_filter ( explode ( ",", $eidList ) );
+		
+				$this->executeId = array_merge ( $list2, $eidList );
+				//print_r($this->executeId);
+				$this->verifyId = $list;
+				//$this->staff = $staff->getUserByIdList ( $_COOKIE ["staff"] );
+		
+				// 检测用户信息完成
+				$this->data ['isStaffCompleteMsg'] = false;
+				$detail = $staff->checkStaffInfoIsComplete ( $_COOKIE ["staff"] );
+				if (! empty ( $detail ))
+					$this->data ['isStaffCompleteMsg'] = true;
+		
+					return "/";
+			}
+		}
+		
+		Doo::loadCore ( 'uri/DooUriRouter' );
+		$router = new DooUriRouter ();
+		$routeRs = $router->execute ( Doo::app ()->route, Doo::conf ()->SUBFOLDER );
+		
+		if ($routeRs ['1'] != "login") {
+			header ( 'Content-Type:text/html;charset=utf-8' );
+			@header ( "Location: /login" );
+		}
+	}
+	
+	//构建申请报销单页面
+	public function GetViewReceiptCreate(){
+		
+		$data ['memu'] = "receipt";
+		$this->render ( "/fee/create/receipt",$data );
+	}
+	
+	// 访问权限-费用管理
+	private function accessAuth($resource, $action){
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		$sid = $XDeode->decode ( $_COOKIE ["staff"] );
+		// 1.单独判断公司汇总的访问权限
+		if ($action == 'companyCategoryCollect') {
+			Doo::loadModel ( "receiptAuthorityManage" );
+			$invoiceCompanyManage = new receiptAuthorityManage ();
+				
+			$icm = $invoiceCompanyManage->getInvoiceCMByStaff ( $sid );
+			if (empty ( $icm ))
+				die ( 'illegal request-无权访问该页面' );
+		}
+		
+		//2.获得登陆用户信息
+		Doo::loadModel ( 'cld/staff_cld' );
+		$staff = new staff_cld ();
+		$this->staff = $staff->Get($sid);
+		
+		//3.是否有权限访问
+		$accessModular = 'RECEIPTS';
+		if (empty ( $this->staff ['cldAccessArray'] )){
+			die ( 'illegal request-无权访问费用页面，向总部申请权限' );
+		}else {
+				if (in_array ( $accessModular, $this->staff ['cldAccessArray'] )) {
+					if (Doo::acl ()->isAllowed ( $accessModular, $resource, $action )) {
+						$flag = true;
+					} else {
+						$flag = false;
+					}
+				} else {
+					die ( 'illegal request-无权访问费用页面' );
+				}
+			}
+			if (! $flag)
+				die ( 'illegal request-无权访问费用页面' );
+	}
+	
+	private function session(){
+		
+	}
+	
+}
+
+?>

protected/model/accountBook.php

@@ -5,6 +5,7 @@ class accountBook extends DooModel {
 	public $expensesType;
 	public $accountType;
 	public $accountMsg;
+	public $operatingBankType;
 	public $depositMethod;
 	public $receivedPrice;
 	public $receivedMsg;
@@ -28,6 +29,7 @@ class accountBook extends DooModel {
 			'expensesType',
 			'accountType',
 			'accountMsg',
+			'operatingBankType',
 			'depositMethod',
 			'receivedPrice',
 			'receivedMsg',
@@ -149,7 +151,24 @@ class accountBook extends DooModel {
             $Detail['expenditureTypeMsg']='工行存款';
         }elseif($Detail ['expenditureType']==10){
             $Detail['expenditureTypeMsg']='工资';
-        }
+        }elseif($Detail ['expenditureType']==11){
+			$msg='理财';
+			if($Detail ['operatingBankType']==1){
+				$msg.='(理财账号)';
+			}elseif($Detail ['operatingBankType']==2){
+				$msg.='(公司账号)';
+			}
+			$Detail['expenditureTypeMsg']=$msg;
+			if($Detail['operatingBankType']==1){
+				$Detail['expenditureBank']=$Detail['expenditureBank'].'('.$Detail['depositMethod'].')';
+			}
+        }elseif($Detail ['expenditureType']==12){
+			$Detail['expenditureTypeMsg']='存款';
+		}elseif($Detail ['expenditureType']==13){
+			$Detail['expenditureTypeMsg']='纵横文库提现';
+		}elseif($Detail ['expenditureType']==14){
+			$Detail['expenditureTypeMsg']='其他';
+		}
 		
 		$Detail['incomeTypeMsg']='';
 		if($Detail ['accountType']==1){
@@ -176,12 +195,26 @@ class accountBook extends DooModel {
             $Detail['incomeTypeMsg']='广发存款';
         }elseif($Detail ['accountType']==12){
             $Detail['incomeTypeMsg']='工行存款';
-        }
+        }elseif($Detail ['accountType']==13){
+			$msg='理财';
+			if($Detail ['operatingBankType']==1){
+				$msg.='(理财账号)';
+			}elseif($Detail ['operatingBankType']==2){
+				$msg.='(公司账号)';
+			}
+			$Detail['incomeTypeMsg']=$msg;
+			if($Detail['operatingBankType']==1){
+				$Detail['receivedBank']=$Detail['receivedBank'].'('.$Detail['depositMethod'].')';
+			}
+
+        }elseif($Detail ['accountType']==14){
+			$Detail['incomeTypeMsg']='存款';
+		}
 		
         if($Detail['receivedBank']=='华润银行'){
         	$Detail['receivedBank']='广发纵横知道';
         }
-        
+       
 		$Detail['staffDetail']=$staff->getStaffBySid($Detail['inputStaff']);
 		
 		return $Detail;

protected/model/cld/staff_cld.php

@@ -0,0 +1,209 @@
+<?php
+Doo::loadCore ( 'db/DooModel' );
+class staff_cld extends DooModel {
+	
+	
+	// 获得员工信息
+	public  function Get($id=0){
+		$detail =$this->getOne ( array (
+				'where' => "sid= ? ",
+				'param' => array($id),
+				'asArray' => TRUE
+		) );
+		
+		//
+		$detail ['cldAccessArray'] =array();
+		if (!empty($detail['cldAccess'])){
+			$detail ['cldAccessArray'] =json_decode($detail['cldAccess']);
+		}
+			
+		
+		return $detail;
+	}
+	
+	private $sid;
+	private $username;
+	private $passwork;
+	private $staffManage;
+	private $isadmin;
+	private $cid;
+	private $othercid;
+	private $category;
+	private $othercategory;
+	private $gender;
+	private $qq;
+	private $phone;
+	private $telephone;
+	private $email;
+	private $birthday;
+	private $position;
+	private $avatar;
+	private $appDate;
+	private $hiredate;
+	private $hireBiasDate;
+	private $wxid;
+	private $wecat;
+	private $nature;
+	private $remittanceName;
+	private $bankName;
+	private $bankNumber;
+	private $coupletNumber;
+	private $remittanceBankType;
+	
+	private $living;
+	private $nativePlace;
+	private $emergencyContacts;
+	
+	private $did;
+	private $didName;
+	private $jobNumber;
+	private $baseWage;
+	private $postWage;
+	private $achievementBonus;
+	private $pendingApprovals;
+	private $processApprovals;
+	private $processCC;
+	
+	private $InductionDate;
+	private $pendStatus;
+	private $updateDate;
+	
+	private $probationaryDate;
+	private $regularsDate;
+	
+	private $qualifications;
+	private $marriage;
+	
+	private $salaryCard;
+	private $salaryBank;
+	
+	private $pendingApprovalsLeave;
+	private $processApprovalsLeave;
+	private $processLeaveCC;
+	private $staffManageLeave;
+	private $dimissionDate;
+	private $dimissionReason;
+	private $seniorityFormula;
+	
+	private $practiceDate;
+	
+	private $cldAccess;
+	
+	private $IDcards;
+	private $IDcardsImgA;
+	private $certificate;
+	private $diploma;
+	private $professionalTitle;
+	private $IDcardsImgB;
+	
+	private $nation;
+	private $graduateInstitutions;
+	private $major;
+	private $education;
+	private $graduationTime;
+	private $registeredResidence;
+	private $householdRegistrationType;
+	private $IDcardsValidity;
+	private $positionId;
+	
+	private $appliedPromote;
+	private $departmentID;
+	private $applyLeaveDate;
+	
+	public $_table = 'CLD_staff';
+	public $_primarykey = 'sid';
+	public $_fields = array (
+			
+			'nation',
+			'graduateInstitutions',
+			'major',
+			'education',
+			'graduationTime',
+			'registeredResidence',
+			'householdRegistrationType',
+			'IDcardsValidity',
+			
+			'IDcards',
+			'IDcardsImgA',
+			'IDcardsImgB',
+			'certificate',
+			'diploma',
+			'professionalTitle',
+			
+			'sid',
+			'username',
+			'staffManage',
+			'birthday',
+			'position',
+			'passwork',
+			'isadmin',
+			'cid',
+			'othercid',
+			'appDate',
+			'category',
+			'othercategory',
+			'gender',
+			'qq',
+			'phone',
+			'telephone',
+			'email',
+			'avatar',
+			'hiredate',
+			'hireBiasDate',
+			'wxid',
+			'nature',
+			'remittanceName',
+			'bankName',
+			'bankNumber',
+			'remittanceBankType',
+			'coupletNumber',
+			'did',
+			'jobNumber',
+			'baseWage',
+			'postWage',
+			'achievementBonus',
+			'pendingApprovals',
+			'processApprovals',
+			'processCC',
+			
+			'pendingApprovalsLeave',
+			'processApprovalsLeave',
+			'processLeaveCC',
+			'staffManageLeave',
+			
+			'InductionDate',
+			'pendStatus',
+			'wecat',
+			'updateDate',
+			
+			'dimissionReason',
+			
+			'salaryCard',
+			'salaryBank',
+			'qualifications',
+			'marriage',
+			
+			'living',
+			'nativePlace',
+			'emergencyContacts',
+			
+			'practiceDate',
+			'probationaryDate',
+			'regularsDate',
+			'dimissionDate',
+			'seniorityFormula',
+			'cldAccess',
+
+			'departmentID',
+			
+			'didName',
+			'positionId',
+			'appliedPromote',
+			
+			'applyLeaveDate',
+	);
+	
+	
+}
+
+?>

protected/model/client.php

@@ -35,11 +35,12 @@ class client extends DooModel {
     public $priority;
     public $updatetime;
     public $servicetime;
+    public $createTime;
     
     public $_table = 'CLD_client';
     public $_primarykey = 'cid';
     public $_fields = array('cid', 'gender','qq', 'nature','nicename','companyname', 'telephone','phone','qq','email','clientname','keynum','companyid','unit','tooltip','tag'
-    ,'district','fax','webservice','department','position','office','address','ride','stay','landmarks','mark','priority','updatetime','servicetime','local');
+    ,'district','fax','webservice','department','position','office','address','ride','stay','landmarks','mark','priority','updatetime','servicetime','local','createTime');
 
     function getlaborhoutByPid($pid,$date,$uid){
     	
@@ -63,7 +64,9 @@ class client extends DooModel {
     
 	function getClientByName2($name,$company){
 		
-    	return $this->find ( array ('where' => "clientname = '".$name."' and companyname ='".$company."'", 'asArray' => TRUE ) );
+		return $this->find ( array ('where' => "clientname = ? and companyname =?" , 'param' => array($name,$company) , 'asArray' => TRUE ) );
+		
+    	//return $this->find ( array ('where' => "clientname = '".$name."' and companyname ='".$company."'", 'asArray' => TRUE ) );
     }
     
     function getClientByName($name){

protected/model/invoiceReceivables.php

@@ -221,7 +221,7 @@ class invoiceReceivables extends DooModel {
 		
 		if (! empty ( $cid )) {
 			$list ['csClaim'] = $this->find ( array (
-					'where' => "receivablesCategory='public' and receivablesStaff='public'  and bindStatus=0 and bankBatchNumber=''",
+					'where' => "receivablesCategory='PUBLIC' and receivablesStaff='PUBLIC'  and bindStatus=0 and (bankBatchNumber='' or bankBatchNumber is NULL)",
 					'desc' => 'irid',
 					'asArray' => TRUE 
 			) );
@@ -231,7 +231,7 @@ class invoiceReceivables extends DooModel {
 			}
 			
 			$list ['sClaim'] = $this->find ( array (
-					'where' => "receivablesCategory!='public' and receivablesStaff='public' and receivablesCategory like '" . $cid . ":%' and bindStatus=0",
+					'where' => "receivablesCategory!='PUBLIC' and receivablesStaff='PUBLIC' and receivablesCategory like '" . $cid . ":%' and bindStatus=0",
 					'desc' => 'irid',
 					'asArray' => TRUE 
 			) );
@@ -575,7 +575,7 @@ class invoiceReceivables extends DooModel {
 			$query = Doo::db ()->query ( $sql );
 			$invoiceList = $query->fetchAll ();
 		}
-// 		echo $sql;
+ 		//echo $sql;
 
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
@@ -585,10 +585,15 @@ class invoiceReceivables extends DooModel {
 		foreach ( $list as $key => $value ) {
 			$list [$key] ['invoiceList']=$tem=array();
 			foreach ($invoiceList as $ilK=>$ilv){
-				if($value['irid']==$ilv['irid']){
-					$tem[$XDeode->encode ($ilv['iid'])]= $ilv['invoiceSerial'];
-					
+				//发票绑定了多个收款的情况
+				$iridList=explode(",", $ilv['irid']);
+				foreach ($iridList as $irlv){
+					if($value['irid']==$irlv){
+						$tem[$XDeode->encode ($ilv['iid'])]= $ilv['invoiceSerial'];
+						break;
+					}
 				}
+				
 			}
 			
 			$list [$key] ['invoiceList']=$tem;

protected/model/invoiceTraining.php

@@ -127,6 +127,16 @@ class invoiceTraining extends DooModel {
 		return $list;
 	}
 	
+	function findAll($condition=array()){
+		$list = $this->find ( $condition );
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		foreach ( $list as $key => $value ) {
+			$list [$key] ['itidKey'] = $XDeode->encode ( $value ['itid'] );
+		}
+		return $list;
+	}
+	
 	/**
 	 * 获得办事处下的培训班
 	 */
@@ -179,12 +189,36 @@ class invoiceTraining extends DooModel {
 		$invoice = new invoice ();
 		
 		$invoiceList = $invoiceRecelvablesList = array ();
+		$itidSum=array();
 		if (! empty ( $itid )) {
 			$itidSql = implode ( ',', $itid );
 			$invoiceList = $invoice->sumOfinvoiceTrain ( $itidSql );
-			$invoiceRecelvablesList = $invoice->sumOfInvoiceRecelvablesTrain ( $itidSql );
+			
+			
+			// 1.所有培训班发票 收款合计
+			$invoiceRecelvablesList = $invoice->InvoiceTrainIncomesPrice($itid);
+			//$invoiceRecelvablesList = $invoice->sumOfInvoiceRecelvablesTrain ( $itidSql );
+			
+			// 收款有多个发票绑定，导致收款金额没有统计--TODO
+			// 获得收款扩展部分的金额
+			// id
+			$iidList=$invoice->getInvoiceByTrain($itidSql);
+			foreach ($iidList as $key=>$value){
+				$idData=explode(",", $value['iid']);
+				$sum=0;
+				foreach ($idData as $item){
+					
+					$sum+=$invoice->getTrainRP($item);
+					
+				}
+				//
+				$itidSum[$value['trainId']]=$sum;
+			}
+			
 		}
+		//print_r($iidList);
 		// print_r($invoiceRecelvablesList);
+// 		print_r($itidSum);
 		
 		foreach ( $list as $key => $value ) {
 			
@@ -198,11 +232,13 @@ class invoiceTraining extends DooModel {
 					break;
 				}
 			}
+			
 			foreach ( $invoiceRecelvablesList as $i => $o ) {
 				if ($value ['itid'] == $o ['trainId']) {
 					$list [$key] ['invoiceArriveAmount'] = $o ['receivablesPrice'];
 					$list [$key] ['arriveSchedule'] = "0";
 					if ($value ['invoiceTotal'] != 0) {
+						$list [$key] ['invoiceArriveAmount']+=$itidSum[$value ['itid']];
 						$list [$key] ['arriveSchedule'] = round ( $list [$key] ['invoiceArriveAmount'] / $list [$key] ['invoiceTotalAmount'] * 100, 2 );
 						// $list [$key] ['arriveSchedule'] = round ( $o ['count'] / $value ['invoiceTotal'] * 100, 2 );
 					}
@@ -279,12 +315,16 @@ class invoiceTraining extends DooModel {
 		$invoice = new invoice ();
 		
 		$invoiceList = $invoiceRecelvablesList = array ();
+		
 		if (! empty ( $itid )) {
 			$itidSql = implode ( ',', $itid );
 			$invoiceList = $invoice->sumOfinvoiceTrain ( $itidSql );
-			$invoiceRecelvablesList = $invoice->sumOfInvoiceRecelvablesTrain ( $itidSql );
+			$invoiceRecelvablesList =$invoice->InvoiceTrainIncomesPrice($itid);
+			//$invoiceRecelvablesList = $invoice->sumOfInvoiceRecelvablesTrain ( $itidSql );
+			
 		}
 		// print_r($invoiceRecelvablesList);
+		//print_r($itidSum);
 		
 		foreach ( $list as $key => $value ) {
 			
@@ -303,12 +343,9 @@ class invoiceTraining extends DooModel {
 					$list [$key] ['invoiceArriveAmount'] = $o ['receivablesPrice'];
 					$list [$key] ['arriveSchedule'] = "0";
 					if ($value ['invoiceTotal'] != 0) {
-						
-						$list [$key] ['arriveSchedule'] = round ( $list [$key] ['invoiceArriveAmount'] / $list [$key] ['invoiceTotalAmount'] * 100, 2 );
-						
+						$list [$key] ['arriveSchedule'] = round ( ($list [$key] ['invoiceArriveAmount'] )/ $list [$key] ['invoiceTotalAmount'] * 100, 2 );
 						// $list [$key] ['arriveSchedule'] = round ( $o ['count'] / $value ['invoiceTotal'] * 100, 2 );
 					}
-					
 					break;
 				}
 			}
@@ -396,12 +433,12 @@ class invoiceTraining extends DooModel {
 					break;
 				}
 			}
-			
+			//入账金额
 			foreach ( $invoiceRecelvablesList as $i => $o ) {
 				if ($detail['itid'] == $o ['trainId']) {
 					$detail ['invoiceArriveAmount'] = $o ['receivablesPrice'];
 					$detail ['arriveSchedule'] = 0;
-					if ($detail ['invoiceTotal'] != 0) {
+					if ($detail ['invoiceTotal'] != 0&&$detail ['invoiceArriveAmount']!=0) {
 						$detail ['arriveSchedule'] = round ( $detail ['invoiceArriveAmount'] / $detail ['invoiceTotalAmount'] * 100, 2 );
 					}
 					break;

protected/model/longle.php

@@ -62,6 +62,7 @@ class longle extends DooModel {
 				//echo $str.$str2.$str3.$str4;
 				
 //			'select * form CLD_longle as a left join CLD_client as b on (a.clientid =b.cid) where ( status=3 or statuslog like "%3%" ) and make_day like "%2015%" and cid =10';
+		//echo  $str.$str2.$str3.$str4.$str5;
 			return $this->find ( array ('where' => $str.$str2.$str3.$str4.$str5, 'desc'=>'make_day', 'asArray' => TRUE ) );
 		}else{
 			return $this->find ( array ('where' => " key_num like '%".$search."%'",'desc'=>'make_day', 'asArray' => TRUE ) );

protected/model/receipt.php

@@ -374,6 +374,7 @@ class receipt extends DooModel {
 		) );
 		
 		$rinfo ['ridKey'] = $XDeode->encode ( $rinfo ['rid'] );
+		$rinfo ['cidKey'] = $XDeode->encode ( $rinfo ['cid'] );
 		//$rinfo ['trainLoanRidKey'] = $XDeode->encode ( $rinfo ['trainLoanRid'] );
 		$XDeode = new XDeode ( 7 );
 		$rinfo ['ridKey7'] = $XDeode->encode ( $rinfo ['rid'] );

protected/model/staff.php

@@ -241,7 +241,7 @@ class staff extends DooModel {
 		if ($admin)
 			$condition += array (
 
-					'where' => "username != 'admin' and nature !=4",
+					'where' => "username != 'admin' and nature !=4 and (pendStatus!=3 or pendStatus!=4 )",
 			);
 		
 		$list = $this->find ( $condition);

protected/model/wasteBook.php

@@ -4,6 +4,11 @@ class wasteBook extends DooModel {
 	public $wid;
 	public $expensesType;
 	public $accountType;
+	
+	public $dailyType;
+	public $operatingBankType;
+	public $depositMethod;
+
 	public $accountMsg;
 	public $accountPrice;
 	public $accountBank;
@@ -28,6 +33,11 @@ class wasteBook extends DooModel {
 			'wid',
 			'expensesType',
 			'accountType',
+
+			'dailyType',
+			'operatingBankType',
+			'depositMethod',
+
 			'accountMsg',
 			
 			'accountPrice',
@@ -95,6 +105,16 @@ class wasteBook extends DooModel {
 		return $list;
 	}
 	
+	function getStatisticsByMonthAll($year= '',$month=''){
+		$list  = $this->find ( array (
+				'select' => 'sum(accountPrice) as accountPrice,sum(accountPriceShow) as accountPriceShow,date_format(inputDate,"%Y-%m") ,Month(inputDate) as month,expensesType,Year(inputDate),Day(inputDate) as day',
+				'where' => " date_format(inputDate,'%Y-%m')<date_format('".$year."-".$month."-1','%Y-%m') and (expensesType=1 or expensesType=2)",
+				//'groupby' => 'Day(inputDate)',
+				'asArray' => TRUE
+		) );
+		return $list;
+	}
+	
 	public function getStatisticsByDay($expensesType=1,$year= '',$month='') {
 	
 		
@@ -130,8 +150,10 @@ class wasteBook extends DooModel {
 			);
 		}
 		
-		$list = $this->find ( $where );
 		
+		
+		 $list= $this->find ( $where );
+		//print_r($list);
 		Doo::loadModel ( "accountBook" );
 		$accountBook = new accountBook ();
 		Doo::loadModel ( 'receipt' );
@@ -143,6 +165,8 @@ class wasteBook extends DooModel {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
 		
+		//print_r($list);
+
 		foreach ($list as $key=>$value){
 			$list[$key]['widKey']=$XDeode->encode ( $value ['wid'] );
 			$list[$key]['accountTypeKey']=$XDeode->encode ( $value ['accountType'] );
@@ -154,17 +178,24 @@ class wasteBook extends DooModel {
 				$list[$key]['accountBankMsg']='纵横工行';
 			}elseif($value['accountBank']=='HUADeposit'){
 				$list[$key]['accountBankMsg']='广发纵横知道';
-			}elseif($value['accountBank']=='PersonalDeposit'){
+			}elseif($value['accountBank']=='PersonalDeposit'||$value['accountBank']=='CGBPersonalDeposit'){
 				$list[$key]['accountBankMsg']='个人广发';
 			}
 			
-			
 			$list[$key]['data']=array();
 			if ($value['accountType']==5||$value['accountType']==6||$value['accountType']==9||$value['accountType']==10){
 				
 				$list[$key]['data']=$accountBook->getAccountBookByAid($value['dataID']);
 			}elseif($value['accountType']==7||$value['accountType']==11){
-				$list[$key]['data']=$invoiceReceivables->getInvoiceReceivablesByIrid($value['dataID']);
+				
+				$ir=$invoiceReceivables->getInvoiceReceivablesByIrid($value['dataID']);
+				$idetail=$invoice->getInvoiceByIid ( $ir['iid'] );
+				//$ir['settlementType']=0;
+				if(!empty($idetail)){
+					$ir['settlementType']=$idetail['settlementType'];
+				}
+				
+				$list[$key]['data']=$ir;//$invoiceReceivables->getInvoiceReceivablesByIrid($value['dataID']);
 			}elseif($value['accountType']==8){
 				$list[$key]['data']= $invoice->getInvoiceByIid ( $value['dataID'] );
  			
@@ -225,6 +256,20 @@ class wasteBook extends DooModel {
 		return $list;
 	}
 	
+	function _getAccountBankEN($receivablesBank){
+		$accountBank = '';
+		if ($receivablesBank == '纵横广发') {
+			$accountBank = 'CGBDeposit';
+		} elseif ($receivablesBank == '纵横工行') {
+			$accountBank = 'ICBCDeposit';
+		} elseif ($receivablesBank == '华润银行') {
+			$accountBank = 'HUADeposit';
+		} elseif ($receivablesBank == '个人广发') {
+			$accountBank = 'PersonalDeposit';
+		}
+		return $accountBank;
+	}
+	
 	/**
 	 * 
 	 * @param number $expensesType
@@ -264,13 +309,53 @@ class wasteBook extends DooModel {
 		return $Detail;
 	}
 	
+	
+	
+	
+	function getReportData(){
+		$list = $this->find ( array (
+				'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyExpenditureType,depositMethod,operatingBankType',
+				'where' => " dailyType =3 and operatingBankType=2 and (accountType =5 or accountType =6) ",
+				'groupby' => 'accountBank',
+				'asArray' => TRUE
+		) );
+		return $list;
+	}
+	
+	//日常收支改变后的金额汇总
+	function getBankSavingsStatistics(){
+		$list = $this->find ( array (
+			'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyExpenditureType,depositMethod,operatingBankType',
+			'where' => " dailyType =3 and operatingBankType=2 and (accountType =5 or accountType =6) ",
+			'groupby' => 'accountBank',
+			'asArray' => TRUE
+		) );
+		return $list;
+	}
+
 	/**
-	 * 
+	 * 理财部分的面板总计
+	 *
+	 * @return void
 	 */
-	function getAccountBookByWid(){
-		
+	function getFinancesStatistics(){
+		//理财-理财账号
+		$list['financesAccount'] = $this->find ( array (
+			'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyExpenditureType,depositMethod,operatingBankType',
+			'where' => " dailyType =2 and operatingBankType=1 and (accountType =5 or accountType =6) ",
+			'groupby' => 'accountBank,depositMethod',
+			'asArray' => TRUE
+		) );
+		//理财-公司账号
+		$list['companyAccount'] = $this->find ( array (
+				'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyExpenditureType,depositMethod,operatingBankType',
+				'where' => " dailyType =2 and operatingBankType=2 and (accountType =5 or accountType =6) ",
+				'groupby' => 'accountBank',
+				'asArray' => TRUE
+		) );
+		return $list;
 	}
-	
+
 	/**
 	 * 统计存款部分
 	 */
@@ -278,14 +363,14 @@ class wasteBook extends DooModel {
 		//and dailyIncomeType!=7
 		$list['incomeStatistics'] = $this->find ( array (
 				'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyIncomeType',
-				'where' => " expensesType=1  and (accountType =6 or accountType =7 or accountType=8  or accountType =1 or accountType =2 or accountType=3 or accountType=4 or accountType=12 ) ",
+				'where' => " expensesType=1 and dailyType=0 and (accountType =6 or accountType =7 or accountType=8  or accountType =1 or accountType =2 or accountType=3 or accountType=4 or accountType=12 ) ",
 				'groupby' => 'accountBank',
 				'asArray' => TRUE
 		) );
 		
 		$list['expenditureStatistics'] = $this->find ( array (
 				'select' => 'sum(accountPrice) as accountPrice,expensesType,accountType,accountBank,dailyExpenditureType',
-				'where' => " expensesType=2   and (accountType =1 or accountType =2 or accountType=3 or accountType=4 or accountType=5 or accountType=11  or accountType=12) ",
+				'where' => " expensesType=2  and dailyType=0 and (accountType =1 or accountType =2 or accountType=3 or accountType=4 or accountType=5 or accountType=11  or accountType=12) ",
 				'groupby' => 'accountBank',
 				'asArray' => TRUE
 		) );

protected/plugin/TemplateTag.php

@@ -30,9 +30,14 @@ Doo::conf ()->TEMPLATE_GLOBAL_TAGS = array (
 		'isReceiptTrainShow',
 		'isPaymentsShow',
 		'isUrlEncode',
-		'isGHNews'
+		'isGHNews',
+		'numberFormat'
 );
 
+function numberFormat($a,$b){
+	return number_format($a,$b);
+}
+
 function isGHNews($staffGH){
 	
 	$BuildUrl = 'http://gh.cld.smartcost.com.cn';
@@ -110,6 +115,7 @@ function isShowMenu($menu=''){
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		$st = $staff->getStaffBySid( $_COOKIE ["staff"] );
+		
 		$cldAccess=array();
 		if (!empty($st['cldAccess']))
 			$cldAccess=json_decode($st['cldAccess'],true);

protected/view/admin/approvalExpenses.html

@@ -37,6 +37,7 @@
 	  					
 	  					<a <!-- if {{status}}=='finish' --> class="now" <!-- endif --> href="/approvalExpenses/finish" >审批完成</a>
 	  					
+	  					<a <!-- if {{status}}=='loan' --> class="now" <!-- endif --> href="/approvalExpenses/loan" >借款相关</a>
 	  					</li>
 	  					
 	  					<!-- if {{status}}=='pendApproval'|| {{status}}=='ongoing'  -->
@@ -56,7 +57,7 @@
 	  					
 	  					<!-- endif -->
 	  					
-	  					<!-- if {{status}}=='done' || {{status}}=='termination'|| {{status}}=='finish' --> 
+	  					<!-- if {{status}}=='done' || {{status}}=='termination'|| {{status}}=='finish'|| {{status}}=='loan' --> 
 	  					<li style="display:none" >
 	  					<input type="month" name="date" id="date" style="width:120px" onChange="receiptDate();" value="">
 	  					</li>

protected/view/admin/invoiceElement.html

@@ -9,6 +9,7 @@
 <option <!-- if {{invoiceDetail.invoiceElement}}=='纵横公路造价编审软件V9.0' --> selected <!-- endif --> value="纵横公路造价编审软件V9.0">纵横公路造价编审软件V9.0</option>
 <!-- <option <!-- if {{invoiceDetail.invoiceElement}}=='纵横公路养护造价管理软件V10.1' --> selected <!-- endif --> value="纵横公路养护造价管理软件V10.1">纵横公路养护造价管理软件V10.1</option> -->
 <option <!-- if {{invoiceDetail.invoiceElement}}=='纵横公路工程计量支付决算一体化云版软件V3.3' --> selected <!-- endif --> value="纵横公路工程计量支付决算一体化云版软件V3.3">纵横公路工程计量支付决算一体化云版软件V3.3</option>
+<option <!-- if {{invoiceDetail.invoiceElement}}=='纵横公路养护造价管理云版软件V3.0' --> selected <!-- endif --> value="纵横公路养护造价管理云版软件V3.0">纵横公路养护造价管理云版软件V3.0</option>
 <option <!-- if {{invoiceDetail.invoiceElement}}=='培训费' --> selected <!-- endif --> value="培训费">培训费</option>
 <option <!-- if {{invoiceDetail.invoiceElement}}=='服务费' --> selected <!-- endif --> value="服务费">服务费</option>
 <option <!-- if {{invoiceDetail.invoiceElement}}=='软件培训费' --> selected <!-- endif --> value="软件培训费">软件培训费</option>
@@ -23,9 +24,12 @@
 <option value="纵横公路工程造价管理系统V9.0">纵横公路工程造价管理系统V9.0</option>
 <option value="纵横公路工程设计数量表算量软件V3.3">纵横公路工程设计数量表算量软件V3.3</option>
 <option value="纵横公路工程计量支付决算一体化软件V3.3">纵横公路工程计量支付决算一体化软件V3.3</option>
+<option value="纵横公路养护造价管理云版软件V3.0">纵横公路养护造价管理云版软件V3.0</option>
+
 <option value="纵横公路造价编审软件V9.0">纵横公路造价编审软件V9.0</option>
 <!-- <option value="纵横公路养护造价管理软件V10.1">纵横公路养护造价管理软件V10.1</option>  -->
 <option value="纵横公路工程计量支付决算一体化云版软件V3.3">纵横公路工程计量支付决算一体化云版软件V3.3</option>
+<option value="纵横公路养护造价管理云版软件V3.0">纵横公路养护造价管理云版软件V3.0</option>
 <option value="培训费">培训费</option>
 <option value="服务费">服务费</option>
 <option value="软件培训费">软件培训费</option>

protected/view/admin/invoicePrintStayAchieve.html

@@ -36,8 +36,6 @@
 	  					<a <!-- if {{status}}=='TOPRINT' --> class="now" <!-- endif --> href="/invoicePrintStayAchieve/1/TOPRINT">待打印</a>
 	  					<a <!-- if {{status}}=='PRINTED' --> class="now" <!-- endif --> href="/invoicePrintStayAchieve/1/PRINTED" >已打印</a></li>
 	  					
-	  					
-	  					
 	  					<li>
 							<select name="invoiceType" node-invoiceType >
 								<option <!-- if {{invoiceType}}=='ALL' --> selected <!-- endif --> value="ALL">类型</option>
@@ -50,6 +48,7 @@
 								<option <!-- if {{invoiceTrain}}=='ALL' --> selected <!-- endif --> value="ALL">所有</option>
 								<option <!-- if {{invoiceTrain}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">个人发票</option>
 								<option <!-- if {{invoiceTrain}}=='TRAIN' --> selected <!-- endif --> value="TRAIN">培训班发票</option>
+								
 							</select>
 						</li>
 						<!-- if {{invoiceTrain}}=='TRAIN' -->

protected/view/admin/receipt_menu.html

@@ -40,6 +40,7 @@
 	<!-- if isPaymentsShow({{staff.0.sid}}) -->	
 	<li><a href="/paymentsCollect" <!-- if {{receiptMemu}}=="paymentsCollect" --> class="selected" <!-- endif --> >日常收支汇总</a></li>
 	<li><a href="/wasteBook" <!-- if {{receiptMemu}}=="wasteBook" --> class="selected" <!-- endif --> >公司流水</a></li>
+	<li><a href="/wasteBookReport" <!-- if {{receiptMemu}}=="wasteBookReport" --> class="selected" <!-- endif --> >流水报表</a></li>
 	<!-- endif -->
 	
 	

protected/view/comm/header.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang=zh-cn xmlns="http://www.w3.org/1999/xhtml"> 
+<head  >
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<link rel="shortcut icon" href="<?= WEB_SITE_GLOBAL ?>images/favicon.ico"> 
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/global.css"> 
+	<script src="<?= WEB_SITE_GLOBAL ?>js/jquery-1.7.2.min.js"></script>
+	<script src="<?= WEB_SITE_GLOBAL ?>js/global.js"></script>
+</head>

protected/view/expenses/payments.html

@@ -78,6 +78,15 @@
 												保证金
 												<!-- elseif {{list' value.accountType}}==10 -->
 												理财收入
+												<!-- elseif {{list' value.accountType}}==13 -->
+													理财
+													<!-- if {{list' value.operatingBankType}}==1 -->
+													(理财账号)
+													<!-- elseif {{list' value.operatingBankType}}==2 -->
+													(公司账号)
+													<!-- endif -->
+												<!-- elseif {{list' value.accountType}}==14 -->
+												存款
 												<!-- endif -->
 											
 											</td>
@@ -85,7 +94,12 @@
 											
 											
 											<td class="taR">￥{{list' value.receivedPrice}}</td>
-											<td>{{list' value.receivedBank}}</td>
+											<td>{{list' value.receivedBank}}
+												<!-- if {{list' value.operatingBankType}}==1 -->
+												({{list' value.depositMethod}})
+												<!-- endif -->
+
+											</td>
 											<td>
 											{{list' value.receivedDate}}
 											</td>
@@ -114,6 +128,19 @@
 											理财支出
 											<!-- elseif {{list' value.expenditureType}}==10 -->
 											工资
+											<!-- elseif {{list' value.expenditureType}}==11 -->
+											理财
+												<!-- if {{list' value.operatingBankType}}==1 -->
+												(理财账号)
+												<!-- elseif {{list' value.operatingBankType}}==2 -->
+												(公司账号)
+												<!-- endif -->
+											<!-- elseif {{list' value.expenditureType}}==12 -->
+											存款
+											<!-- elseif {{list' value.expenditureType}}==13 -->
+											纵横文库提现
+											<!-- elseif {{list' value.expenditureType}}==14 -->
+											其他
 											<!-- endif -->
 											
 											</td>
@@ -122,7 +149,12 @@
 											
 											
 											<td class="taR">￥{{list' value.expenditurePrice}}</td>
-											<td>{{list' value.expenditureBank}}</td>
+											<td>
+												{{list' value.expenditureBank}}
+												<!-- if {{list' value.operatingBankType}}==1 -->
+												({{list' value.depositMethod}})
+												<!-- endif -->
+											</td>
 											<td>
 											{{list' value.expenditureDate}}
 											</td>
@@ -259,7 +291,7 @@
 							<th class="taC">选择收支</th>
 							<td>
 								<select name="payMentsType" node-payMentsSelect>
-									<option value="INCOME">收入</option>
+									<option selected value="INCOME">收入</option>
 									<option value="EXPENDITURE">支出</option>
 									<option value="FinancialBox">理财</option>
 									<option value="Bank">银行互转</option>
@@ -305,7 +337,6 @@
 												<div>
 													<label class="radio inline"><input name="outlayAccountMsg" value="固定" checked type="radio">固定</label>
 													<label class="radio inline"><input name="outlayAccountMsg" value="活期" type="radio">活期</label>
-													<!-- <label class="radio inline"><input name="outlayAccountMsg" value="个人理财固定" type="radio">个人理财固定</label> -->
 												</div>
 											</td>
 										</tr>
@@ -358,14 +389,14 @@
 											<th class="taC">理财</th>
 											<td>
 												<select name="revenueAccountType" >
-													<option value='7'>广发理财</option>
-													<option value='9'>工行理财</option>
+													<option value='广发理财'>广发理财</option>
+													<option value='工行理财'>工行理财</option>
+													<option value='个人理财(广发)'>个人理财(广发)</option>
 												</select>
 
 												<div>
-													<label class="radio inline"><input name="revenueAccountMsg" value="公司固定" checked type="radio">公司固定</label>
-													<label class="radio inline"><input name="revenueAccountMsg" value="公司活期" type="radio">公司活期</label>
-													<label class="radio inline"><input name="revenueAccountMsg" value="个人理财固定" type="radio">个人理财固定</label>
+													<label class="radio inline"><input name="revenueAccountMsg" value="固定" checked type="radio">固定</label>
+													<label class="radio inline"><input name="revenueAccountMsg" value="活期" type="radio">活期</label>
 												</div>
 											</td>
 										</tr>
@@ -413,6 +444,7 @@
 
 				<!-- 银行互转 -->
 				<div id="Bank" style="display:none">
+				<form action="/paymentsBankDo" method="post" id="paymentsIncome" class="nice-validator n-default" novalidate="novalidate">
 				<table class="table table-bordered table-condensed">
 					<tbody>
 						<tr>
@@ -428,29 +460,28 @@
 										<tr>
 											<th class="taC">支出银行</th>
 											<td>
-												<select>
-													<option>请选择</option>
-													<option>广发存款</option>
-													<option>工行存款</option>
+												<select name="outlayBank">
+													<option value="(纵横广发)广发存款">(纵横广发)广发存款</option>
+													<option value="纵横工行">纵横工行</option>
+													<option value="个人存款">个人存款</option>
 												</select>
-												<p>可提取余额：￥0</p>
 											</td>
 										</tr>
 										<tr>
 											<th class="taC">支出金额</th>
-											<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+											<td><input name="outlayPrice" 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>
+											<td><input name="outlayMsg" type="text"></td>
 										</tr>
 										<tr>
 											<th class="taC">银行支出时间</th>
-											<td><input type="date"></td>
+											<td><input name="outlayDate" type="date" value="{{date}}"></td>
 										</tr>
 										<tr>
 											<th class="taC">备注</th>
-											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+											<td><textarea name="outlayRemarks" class="form-control" name="remarks" rows="3"></textarea></td>
 										</tr>
 									</tbody>
 								</table>
@@ -464,29 +495,28 @@
 										<tr>
 											<th class="taC">收款银行</th>
 											<td>
-												<select>
-													<option value="纵横广发">纵横广发</option>
-													<option value="个人广发">个人广发</option>
-													<option value="华润银行">（广发）纵横知道</option>
+												<select name="revenueBank">
+													<option value="(纵横广发)广发存款">(纵横广发)广发存款</option>
 													<option value="纵横工行">纵横工行</option>
+													<option value="个人存款">个人存款</option>
 												</select>
 											</td>
 										</tr>
 										<tr>
 											<th class="taC">收款金额</th>
-											<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+											<td><input name="revenuePrice" 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>
+											<td><input name="revenueMsg" type="text"></td>
 										</tr>
 										<tr>
 											<th class="taC">银行到款时间</th>
-											<td><input type="date"></td>
+											<td><input name="revenueDate" type="date" value="{{date}}"></td>
 										</tr>
 										<tr>
 											<th class="taC">备注</th>
-											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+											<td><textarea name="revenueRemarks" class="form-control" name="remarks" rows="3"></textarea></td>
 										</tr>
 									</tbody>
 								</table>
@@ -494,6 +524,11 @@
 						</tr>
 					</tbody>
 				</table>
+				<div class="modal-footer">
+					<input type="submit" value="确认录入" class="button">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+				</form>
 				</div>
 
 
@@ -519,11 +554,10 @@
 								<option value='5'>退汇</option>
 								<option value='6'>其他</option>
 								
-								<option value='7'>广发理财</option>
+								<!-- <option value='7'>广发理财</option>
 								<option value='9'>工行理财</option>
-								
 								<option value='11'>广发存款</option>
-								<option value='12'>工行存款</option>
+								<option value='12'>工行存款</option> -->
 
 
 								<option value='8'>保证金</option>
@@ -622,14 +656,16 @@
 								<option value="2">总部电话费</option>
 								<option value="3">缴税</option>
 								
-								<option value='4'>广发理财</option>
+								<!-- <option value='4'>广发理财</option>
 								<option value='6'>工行理财</option>
 								<option value='8'>广发存款</option>
-								<option value='9'>工行存款</option>
+								<option value='9'>工行存款</option> -->
 
 								<option value="5">保证金</option>
-								
 								<option value="10">工资</option>
+								<option value="13">纵横文库提现</option>
+								<option value="14">其他</option>
+								
 							</select>
 							<!--缴税 二级-->
 							<div node-expenditureMsg3 style="display:none">

protected/view/expenses/paymentsAchieve.html

@@ -169,10 +169,19 @@
 												保证金
 												<!-- elseif {{list' value.accountType}}==10 -->
 												理财收入
-									<!-- elseif {{list' value.accountType}}==11 -->
-									广发存款
-									<!-- elseif {{list' value.accountType}}==12 -->
-									工行存款
+												<!-- elseif {{list' value.accountType}}==11 -->
+												广发存款
+												<!-- elseif {{list' value.accountType}}==12 -->
+												工行存款
+												<!-- elseif {{list' value.accountType}}==13 -->
+												理财
+													<!-- if {{list' value.operatingBankType}}==1 -->
+													(理财账号)
+													<!-- elseif {{list' value.operatingBankType}}==2 -->
+													(公司账号)
+													<!-- endif -->
+												<!-- elseif {{list' value.accountType}}==14 -->
+												存款
 												<!-- endif -->
 								<!-- if {{list' value.accountMsg}}!='' -->				
 								/ {{list' value.accountMsg}}				
@@ -180,14 +189,26 @@
 								</td>
 								<td><a href="#saea-detail5" node-income=waste data-key="{{list' value.aidKey}}" data-toggle="modal">{{list' value.bookSerial}}</a></td>
 								<td class="taR">￥{{list' value.receivedPrice}}</td>
-								<td>{{list' value.receivedBank}}</td>
+								<td>{{list' value.receivedBank}}
+									<!-- if {{list' value.operatingBankType}}==1 -->
+									({{list' value.depositMethod}})
+									<!-- endif -->
+								</td>
 											<td>
 											{{list' value.receivedDate}}
 											</td>
 											<td>{{list' value.inputDate}}</td>
 								
 								<td><a href="#nodeincome" style="display:none" node-income='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">编辑</a> 
-								<a href="#delincome" del-income='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a></td>
+
+								<!-- if {{list' value.accountType}}==13 || {{list' value.accountType}}==14 -->
+								<a href="#abook" delabook data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a>
+								<!-- else -->
+								<a href="#delincome" del-income='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a>
+								<!-- endif -->
+								
+							
+							</td>
 							</tr>
 							<!-- else -->
 							<tr>
@@ -207,28 +228,51 @@
 											保证金
 											<!-- elseif {{list' value.expenditureType}}==7 -->
 											理财支出
-									<!-- elseif {{list' value.expenditureType}}==8 -->
-									广发存款
-									<!-- elseif {{list' value.expenditureType}}==9 -->
-									工行存款
-									<!-- elseif {{list' value.expenditureType}}==10 -->
-											工资
+											<!-- elseif {{list' value.expenditureType}}==8 -->
+											广发存款
+											<!-- elseif {{list' value.expenditureType}}==9 -->
+											工行存款
+											<!-- elseif {{list' value.expenditureType}}==10 -->
+													工资
+											<!-- elseif {{list' value.expenditureType}}==11 -->
+											理财
+												<!-- if {{list' value.operatingBankType}}==1 -->
+												(理财账号)
+												<!-- elseif {{list' value.operatingBankType}}==2 -->
+												(公司账号)
+												<!-- endif -->
+											<!-- elseif {{list' value.expenditureType}}==12 -->
+											存款
+											<!-- elseif {{list' value.expenditureType}}==13 -->
+											纵横文库提现
+											<!-- elseif {{list' value.expenditureType}}==14 -->
+											其他
 											<!-- endif -->
-								<!-- if {{list' value.expenditureMsg}}!='' -->				
+								<!-- if {{list' value.expenditureMsg}}!=''&&{{list' value.expenditureType}}!=11&&{{list' value.expenditureType}}!=12 -->				
 								/ {{list' value.expenditureMsg}}				
 								<!-- endif -->
 								
 								</td>
 								<td><a href="#saea-detail4" node-pay=waste data-key="{{list' value.aidKey}}" data-toggle="modal" >{{list' value.bookSerial}}</a></td>
 								<td class="taR">￥{{list' value.expenditurePrice}}</td>
-								<td>{{list' value.expenditureBank}}</td>
+								<td>
+									{{list' value.expenditureBank}}
+									<!-- if {{list' value.operatingBankType}}==1 -->
+									({{list' value.depositMethod}})
+									<!-- endif -->
+								</td>
 											<td>
 											{{list' value.expenditureDate}}
 											</td>
 											<td>{{list' value.inputDate}}</td>
 								<td>
 								<a href="#nodeEXPENDITURE" style="display:none" node-EXPENDITURE='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">编辑</a> 
-								<a href="#delincome" del-income='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a></td>
+								<!-- if {{list' value.expenditureType}}==11 || {{list' value.expenditureType}}==12 -->
+								<a href="#abook" delabook data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a>
+								<!-- else -->
+								<a href="#delincome" del-income='detail' data-isKey="{{list' value.aidKey}}" data-toggle="modal">删除</a>
+								<!-- endif -->
+							</td>
 							</tr>
 							<!-- endif -->
 							<!-- endloop -->
@@ -593,9 +637,7 @@
 		</div>
 	</div>	
 			
-			
-
-<!--弹出（日收支）-->
+		
 <div class="modal hide fade" id="delincome">
 
 <form action="/paymentsDelDo" method="post" id="paymentsExpenditure" class="nice-validator n-default" novalidate="novalidate">
@@ -619,6 +661,41 @@
 			</div></div>
 </form>
 	</div>	
-<script type="text/javascript">autoFlashHeight();</script>
+
+	<div class="modal hide fade" id="abook">
+
+		<form action="/paymentsDelete" method="post" id="paymentsExpenditure" class="nice-validator n-default" novalidate="novalidate">
+		
+		<input type="hidden" name="aidKey" id="pdkey" value="">
+		
+				<div class="modal-dialog ">
+					<div class="modal-content">
+						<div class="modal-header">
+							<h3>删除收支</h3>
+						</div>
+						<div class="modal-body">
+							<p>确认删除该收支？</p>
+						</div>
+						<div class="modal-footer">
+						
+							<input type="submit" value="确认删除" class="button">
+						
+							<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+						</div>
+					</div></div>
+		</form>
+			</div>
+
+
+<script type="text/javascript">
+autoFlashHeight();
+
+$(function () {
+	$('a[delabook]').click(function () {
+		var key = $(this).attr("data-isKey");
+		$("#pdkey").val(key);
+	});
+})
+</script>
 
 </body>

protected/view/expenses/wasteBook.html

@@ -23,14 +23,111 @@
 					<div class="borad-news">
 						<div class="saeaList">
 							<div class="clearfix">
+							
+							
+								<table class="table table-bordered table-condensed">
+								<thead>
+								<tr><th colspan="8">存款-录入系统前金额</th></tr>
+								</thead>
+								<tbody>
+									<tr>
+									<th class="taC">广发存款</th>
+									<td>{{store.bank.CGBDeposit}}</td>
+									<th class="taC">工行存款</th>
+									<td>{{store.bank.ICBCDeposit}}</td>
+									<th class="taC">纵横广发(纵横知道)</th>
+									<td>{{store.bank.HUADeposit}}</td>
+									<th class="taC">个人存款</th>
+									<td>{{store.bank.PersonalDeposit}}</td>
+									
+									</tr>
+								</tbody>
+								</table>
+							
+							
+								<table class="table table-bordered table-condensed">
+								<thead>
+								<tr><th colspan="8">存款-收入的流水金额(日常收入,发票,借款,借款报销,报销单,对公汇款,培训班结算)</th></tr>
+								</thead>
+								<tbody>
+									<tr>
+									<th class="taC">广发存款</th>
+									<td>{{wasteStatistics.CGBDeposit}}</td>
+									<th class="taC">工行存款</th>
+									<td>{{wasteStatistics.ICBCDeposit}}</td>
+									<th class="taC">纵横广发(纵横知道)</th>
+									<td>{{wasteStatistics.HUADeposit}}</td>
+									<th class="taC">个人存款</th>
+									<td>{{wasteStatistics.PersonalDeposit}}</td>
+									
+									</tr>
+								</tbody>
+								</table>
+							
+							<table class="table table-bordered table-condensed">
+								<thead>
+								<tr><th colspan="8">存款-支出的流水金额(日常支出,收款退款,借款,借款报销,报销单,对公汇款,培训班结算)</th></tr>
+								</thead>
+								<tbody>
+									<tr>
+									<th class="taC">广发存款</th>
+									<td>{{wastePay.CGBDeposit}}</td>
+									<th class="taC">工行存款</th>
+									<td>{{wastePay.ICBCDeposit}}</td>
+									<th class="taC">纵横广发(纵横知道)</th>
+									<td>{{wastePay.HUADeposit}}</td>
+									<th class="taC">个人存款</th>
+									<td>{{wastePay.PersonalDeposit}}</td>
+									
+									</tr>
+								</tbody>
+								</table>
+							
+							<table class="table table-bordered table-condensed">
+								<thead>
+								<tr><th colspan="6">存款-日常收支改版的流水金额(日常支出，日常收入)</th></tr>
+								</thead>
+								<tbody>
+									<tr>
+									<th class="taC">广发存款</th>
+									<td>{{wasteNewPay.CGBDeposit}}</td>
+									<th class="taC">工行存款</th>
+									<td>{{wasteNewPay.ICBCDeposit}}</td>
+									
+									<th class="taC">个人存款</th>
+									<td>{{wasteNewPay.PersonalDeposit}}</td>
+									
+									</tr>
+								</tbody>
+								</table>
+							
+							<table class="table table-bordered table-condensed">
+								<thead>
+								<tr><th colspan="6">理财-公司账号的流水金额</th></tr>
+								</thead>
+								<tbody>
+									<tr>
+									<th class="taC">广发存款</th>
+									<td>{{wasteCompanyAccount.CGBDeposit}}</td>
+									<th class="taC">工行存款</th>
+									<td>{{wasteCompanyAccount.ICBCDeposit}}</td>
+									
+									<th class="taC">个人存款</th>
+									<td>{{wasteCompanyAccount.PersonalDeposit}}</td>
+									
+									</tr>
+								</tbody>
+								</table>
+							
+							
 								<table class="table table-bordered table-condensed">
 									<tbody>
 									
 									<tr>
                                             <th class="taC">（纵横广发）广发存款</th>
-                                            <td>￥{{waste.bank.CGBDeposit}}</td>
+                                            <td>￥{{numberFormat(waste.bank.CGBDeposit,2)}}</td>
                                             <th class="taC">（纵横广发）纵横知道款</th>
-                                            <td>￥{{waste.bank.HUADeposit}}</td>
+                                            <td>￥{{numberFormat(waste.bank.HUADeposit,2)}}</td>
                                         </tr>
 									
 									<tr>
@@ -39,25 +136,25 @@
 									
 										<tr>
 											<th class="taC">工行存款</th>
-											<td>￥{{waste.bank.ICBCDeposit}}</td>
+											<td>￥{{numberFormat(waste.bank.ICBCDeposit,2)}}</td>
 											<th class="taC">个人存款</th>
-											<td>￥{{waste.bank.PersonalDeposit}}</td>
+											<td>￥{{numberFormat(waste.bank.PersonalDeposit,2)}}</td>
 										</tr>
 										
 										<tr>
 											<th class="taC">广发理财活期</th>
-											<td>￥{{waste.financial.current.CGBDeposit}}</td>
+											<td>￥{{numberFormat(waste.financial.current.CGBDeposit,2)}}</td>
 											<th class="taC">工行理财活期</th>
-											<td>￥{{waste.financial.current.ICBCDeposit}}</td>
+											<td>￥{{numberFormat(waste.financial.current.ICBCDeposit,2)}}</td>
 										</tr>
 										<tr>
                                             <th class="taC" colspan="4">活期结余金额：￥{{cashBalance}}</th>
                                         </tr>
 										<tr>
 											<th class="taC">个人理财固定</th>
-											<td>￥{{waste.financial.fixed.ICBCDeposit}}</td>
+											<td>￥{{numberFormat(waste.financial.fixed.ICBCDeposit,2)}}</td>
 											<th class="taC">广发理财固定</th>
-											<td>￥{{waste.financial.fixed.CGBDeposit}}</td>
+											<td>￥{{numberFormat(waste.financial.fixed.CGBDeposit,2)}}</td>
 										</tr>
 										<tr>
 											<th colspan="4" class="taC">合计存款：￥{{total}}</th>
@@ -88,7 +185,7 @@
 										<!-- loop expenditureList -->
 										<tr>
 											<!-- if {{expenditureList' value.accountType}}==5||{{expenditureList' value.accountType}}==9||{{expenditureList' value.accountType}}==10 -->
-											<td>日常支出（{{expenditureList' value.data.expenditureTypeMsg}}）</td>
+											<td>日常支出-{{expenditureList' value.data.expenditureTypeMsg}}</td>
 											<!-- elseif {{expenditureList' value.accountType}}==1 -->
 											<td>费用管理（借款）</td>
 											<!-- elseif {{expenditureList' value.accountType}}==2 -->
@@ -138,7 +235,7 @@
 										<!-- loop incomeList -->
 										<tr>
 											<!-- if {{expenditureList' value.accountType}}==6||{{expenditureList' value.accountType}}==9||{{expenditureList' value.accountType}}==10 -->
-											<td>日常收入（{{expenditureList' value.data.incomeTypeMsg}}）</td>
+											<td>日常收入-{{expenditureList' value.data.incomeTypeMsg}}</td>
 											<!-- elseif {{expenditureList' value.accountType}}==7||{{expenditureList' value.accountType}}==8 -->
 											<td>发票收款</td>
 											

protected/view/expenses/wasteBookReport.html

@@ -0,0 +1,39 @@
+<!-- include '../admin/header' -->
+
+<link rel=stylesheet
+	href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css">
+<script type="text/javascript"
+	src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+<script src="<?= receipt ?>"></script>
+
+
+
+
+<body style="overflow:hidden;">
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="padding:0;">
+			<!-- http://cld.com:9090/wbReport   scrolling="no" -->
+			<iframe id="wbReportFrame" src="/frame/wasteBookReport" width="100%" border="0" frameborder="0" height="99%"   marginheight="0" marginwidth="0" ></iframe>
+			</div>
+		</div>
+	</div>
+
+<script type="text/javascript">
+autoFlashHeight();
+</script>
+</body>

protected/view/fee/create/receipt.html

@@ -0,0 +1,491 @@
+<!-- include '../../comm/header' -->
+<link href="<?= WEB_SITE_GLOBAL ?>css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.min.js"></script>
+	<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.zh.js"></script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="saeaTitle">费用管理</li>
+						<li><a href="saea-borad.html">公布板</a></li>
+						<li><a href="saea-myList.html" class="selected">我的费用</a></li>
+						<li><a href="saea-slist-1.html">费用汇总</a></li>
+						<li class="topLine"><a href="saea-reportList.html">费用审批</a></li>
+						<li><a href="saea-reportList-pay.html">费用执行</a></li>
+						<li><a href="saea-reportList-remit.html">费用汇款</a></li>
+						<li><a href="saea-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+		  		<div class="borad-news">
+		  			<div class="fixedSide" id="fixedSide">
+		  				<ul>
+		  					<li class="banshi active"><a href="#banshi">办事处</a></li>
+		  					<li class="chalv" style="display: none;"><a href="#chalv">差旅相关</a></li>
+		  					<li class="neibupeixun" style="display: none;"><a href="#neibupeixun">内部培训</a></li>
+		  					<li class="shenpi"><a href="#shenpi">审批</a></li>
+		  				</ul>
+		  			</div>
+		  			<div style="margin-left:30px;">
+						<legend><div class="fR"></div>申请报销相关费用</legend>
+				  		<div class="saeaList" id="saeaList">
+				  			<h4 class="saeaTip">请选择一下需要报销的费用类型</h4>
+				  			<ul class="saeaType clearfix">
+				  				<li class="active" id="banshi-sw">
+				  					<i class="icon-">j</i>
+				  					办事处相关费用
+				  				</li>
+				  				<li id="chalv-sw">
+				  					<i class="icon-">j</i>
+				  					差旅相关费用
+				  				</li>
+				  				<li id="neibupeixun-sw">
+				  					<i class="icon-">j</i>
+				  					内部培训费用
+				  				</li>
+				  			</ul>
+				  			<!--办事处相关费用-->
+				  			<div class="entry receipt-list" id="banshi">
+				  				<div class="seTable">
+				  					<table class="table table-bordered table-condensed table-hover mb-0">
+				  					<tbody>
+				  						<tr><th colspan="2" class="taC">办事处相关费用</th></tr>
+				  						<tr><th>市内交通费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>市内出租费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入市内出租费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>办事处房租</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入办事处房租" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>电话费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入电话费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>水费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入水费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>电费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入电费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>办公费用</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入办公费用" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>邮寄费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入邮寄费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>其他费用</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th class="taR">小计</th><td class="colGreen taR">￥0.00</td></tr>
+				  						<tr><th colspan="2" class="taC">其他</th></tr>
+				  						<tr><th>公关费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>广告费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>借款</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>可自加费用</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入可自加费用" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th class="taR">小计</th><td class="colGreen taR">￥0.00</td></tr>
+				  						<tr><th colspan="2" class="taC">公关费绑定发票</th></tr>
+				  						<tr><th class="colRed">如本次报销有公关费支出，确认是否涉需要绑定发票</th><td class="taR"><!-- <select class="span2"><option>绑定开票</option><option>不需要</option></select> --></td></tr>
+				  						<tr><th></th><td class="taR"><a class="button" href="#add-invoice" data-toggle="modal">添加发票</a></select></td></tr>
+						  								<tr><th>发票</a></th><td class="taR">公关费（￥500.00）</td></tr>
+						  								<tr><th><a href="#invdetail" data-toggle="modal">#F201909187362</a> <a class="fR">移除</a></th><td class="taR">￥<input type="number" value="0" placeholder="输入可自加费用" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr class="warning"><td class="taR"><b>办事处相关费用合计</b></td><td class="colGreed taR"><b style="font-size:24px">￥2160.00</b></td></tr><tr><th colspan="2" class="taC">报销说明</th></tr>
+				  						<tr><th colspan="2">
+				  									<textarea required rows="6" style="width:99%" placeholder="办事处相关费用说明"></textarea>
+				  						</th></tr>
+				  						</tbody>
+				  					</table>
+				  				</div>
+				  				<div class="seCensor receipt-censor">
+				  					<div class="title">
+				  					报销单填写说明
+				  					</div>
+					  				<div class="detail">
+					  					<p>1 办事处水电费标准100元，标准内实报；</p>
+					  					<p>2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+					  					<p>3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+				  					</div>
+				  				</div>
+				  			</div>
+				  			<!--差旅相关费用-->
+				  			<div class="entry receipt-list" id="chalv"  style="display: none;">
+				  				<div class="seTable">
+				  					<table class="table table-bordered table-condensed mb-0">
+			  						<tbody>
+				  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+				  						<tr><td colspan="2">
+				  							<!--行程1-->
+				  							<table class="table table-bordered table-condensed table-hover" style="margin-bottom:5px">
+						  						<tr><th colspan="3" class="taC">行程1# 2020-01-03～2020-01-06<div class="fR "><a href="#del" class="text-danger" data-toggle="modal">删除</a> <a  href="#route-add" data-toggle="modal">编辑</a><div></th></tr>
+						  						<tr><th colspan="3" class="ta"><i class="contactsMark icon-">P</i> 珠海-广州</th></tr>
+						  						<tr><th width="90">往来交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入往来交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th width="90">往来交通费2<p><a href="" class="icon-" title="移除费用">k</a></p></th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入往来交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th>市内交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="市内交通费说明"></textarea></tr>
+						  						<tr><th>出差住宿费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差住宿费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差住宿费说明"></textarea></tr>
+						  						<tr><th>出差补助<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差补助说明"></textarea></tr>
+						  						<tr><th>其他费用<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="其他费用说明"></textarea></tr>
+						  						<tr><th colspan="3" class="ta"><i class="contactsMark icon-">P</i> 广州-东莞</th></tr>
+						  						<tr><th width="90">往来交通费</th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th>市内交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="市内交通费说明"></textarea></tr>
+						  						<tr><th>出差住宿费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差住宿费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差住宿费说明"></textarea></tr>
+						  						<tr><th>出差补助<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差补助说明"></textarea></tr>
+						  						<tr><th>其他费用<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="其他费用说明"></textarea></tr>
+						  						<tr><th colspan="3" class="ta"><i class="contactsMark icon-">P</i> 东莞-珠海</th></tr>
+						  						<tr><th width="90">往来交通费</th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入往来交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th>市内交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="市内交通费说明"></textarea></tr>
+						  						<tr><th>出差住宿费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差住宿费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差住宿费说明"></textarea></tr>
+						  						<tr><th>出差补助<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差补助说明"></textarea></tr>
+						  						<tr><th>其他费用<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="其他费用说明"></textarea></tr>
+						  						<tr><th colspan="3" class="taC">行程1# 小计</th></tr>
+						  						<tr><th>往来交通费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>市内交通费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>出差住宿费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>出差补助</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>其他费用</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th class="taR">合计</th><td class="colGreen taR" colspan="2">￥0.00</td></tr>
+						  					</table>
+				  							<!--行程2-->
+				  							<table class="table table-bordered table-condensed table-hover"style="margin-bottom:5px">
+						  						<tr><th colspan="3" class="taC">行程2# 2020-01-11～2020-01-15<div class="fR "><a href="#del" class="text-danger" data-toggle="modal">删除</a> <a  href="#route-add" data-toggle="modal">编辑</a><div></th></th></tr>
+						  						<tr><th colspan="3" class="ta"><i class="contactsMark icon-">P</i> 珠海-中山</th></tr>
+						  						<tr><th width="90">往来交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入往来交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th>市内交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="市内交通费说明"></textarea></tr>
+						  						<tr><th>出差住宿费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差住宿费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差住宿费说明"></textarea></tr>
+						  						<tr><th>出差补助<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差补助说明"></textarea></tr>
+						  						<tr><th>其他费用<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="其他费用说明"></textarea></tr>
+						  						<tr><th colspan="3" class="ta"><i class="contactsMark icon-">P</i> 中山-珠海</th></tr>
+						  						<tr><th width="90">往来交通费</th><td class="taR" width="100">￥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="往来交通费说明"></textarea>
+						  						</th></tr>
+						  						<tr><th>市内交通费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入市内交通费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="市内交通费说明"></textarea></tr>
+						  						<tr><th>出差住宿费<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差住宿费" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差住宿费说明"></textarea></tr>
+						  						<tr><th>出差补助<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="出差补助说明"></textarea></tr>
+						  						<tr><th>其他费用<p><a href="" class="icon-" title="增加费用">H</a></p></th>
+						  						</th><td class="taR" >￥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span1"></td><th>
+						  									<textarea required rows="2" style="width:99%;margin-bottom:0" placeholder="其他费用说明"></textarea></tr>
+						  						<tr><th colspan="3" class="taC">行程2# 小计</th></tr>
+						  						<tr><th>往来交通费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>市内交通费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>出差住宿费</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>出差补助</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th>其他费用</th><td class="taR" width="200" colspan="2">￥150.00</td></tr>
+						  						<tr><th class="taR">合计</th><td class="colGreen taR" >￥0.00</td><td></td></tr>
+						  					</table>
+				  						</td></tr>
+				  						<tr><th colspan="2" class="taC"><a href="#route-add" data-toggle="modal" class="button">添加新行程</a></th></tr>
+				  						<tr><th colspan="2" class="taC">差旅相关费用合计</th></tr>
+				  						<tr><th>往来交通费</th><td class="taR" width="200">￥150.00</td></tr>
+				  						<tr><th>市内交通费</th><td class="taR" width="200">￥150.00</td></tr>
+				  						<tr><th>出差住宿费</th><td class="taR" width="200">￥150.00</td></tr>
+				  						<tr><th>出差补助</th><td class="taR" width="200">￥150.00</td></tr>
+				  						<tr><th>其他费用</th><td class="taR" width="200">￥150.00</td></tr>
+				  						<tr class="warning"><td class="taR"><b>差旅相关费用合计</b></td><td class="colGreed taR"><b style="font-size:24px">￥495.00</b></td></tr>
+				  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+				  						<tr><th colspan="2">
+				  									<textarea required rows="6" style="width:99%" placeholder="差旅相关费用额外说明"></textarea>
+				  						</th></tr>
+				  						</tbody>
+				  					</table>
+				  				</div>
+				  				<div class="seCensor receipt-censor">
+				  					<div class="title">
+				  					报销单填写说明
+				  					</div>
+					  				<div class="detail">
+					  					<p>1 请按先后发生顺序填写报销明细，交通费（市内交通费及往来交通费）、邮寄费需在批注明注明费用明细（例：珠海-广州70元-佛山20元）；</p>
+					  					<p>2 出差补助30元/天，不需提供发票，只需在报销单上填写清楚；</p>
+					  					<p>3 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处。</p>
+				  					</div>
+				  					<div class="itinerary">
+				  						<h2 class="itineraryTitle">总行程单</h2>
+				  						<div class="itineraryCon">
+				  							<ul>
+				  								<li class="sub-title">行程1# 2020-01-01-2020-01-06</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+							  							<div class="pointLine">
+							  								<div class="timeList">
+							  									<div class="priceList">
+																	<span class="priceTitle">小计</span>
+																	<span class="price">￥1212.00</span>
+																</div>
+							  								</div>
+							  							</div>
+							  						</div>
+				  								</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
+							  							<div class="pointLine">
+							  								<div class="timeList">
+							  									<div class="priceList">
+																	<span class="priceTitle">小计</span>
+																	<span class="price">￥1212.00</span>
+																</div>
+							  								</div>
+							  							</div>
+							  						</div>
+				  								</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>东莞</b></div>
+							  							<div class="pointLine">
+							  								<div class="timeList">
+							  									<div class="priceList">
+																	<span class="priceTitle">小计</span>
+																	<span class="price">￥1212.00</span>
+																</div>
+							  								</div>
+							  							</div>
+							  						</div>
+				  								</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+							  						</div>
+				  								</li>
+				  								<li class="sub-title">行程1# 合计：3636.00</li>
+				  							</ul>
+				  							<ul>
+				  								<li class="sub-title">行程2# 2020-01-11~2020-01-15</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+							  							<div class="pointLine">
+							  								<div class="timeList">
+							  									<div class="priceList">
+																	<span class="priceTitle">小计</span>
+																	<span class="price">￥1212.00</span>
+																</div>
+							  								</div>
+							  							</div>
+							  						</div>
+				  								</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
+							  							<div class="pointLine">
+							  								<div class="timeList">
+							  									<div class="priceList">
+																	<span class="priceTitle">小计</span>
+																	<span class="price">￥1212.00</span>
+																</div>
+							  								</div>
+							  							</div>
+							  						</div>
+				  								</li>
+				  								<li>
+				  									<div class="itineraryList">
+							  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+							  						</div>
+				  								</li>
+				  								<li class="sub-title">行程2# 合计：3636.00</li>
+				  							</ul>
+				  						</div>
+				  					</div>
+				  				</div>
+				  			</div>
+				  			<!--内部培训-->
+				  			<div class="entry receipt-list" id="neibupeixun" style="display: none;">
+				  				<div class="seTable">
+				  					<table class="table table-bordered table-condensed table-hover mb-0">
+				  					<tbody>
+				  						<tr><th colspan="2" class="taC" id="neibupeixun">内部培训费用</th></tr>
+				  						<tr><th>场租费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>薪酬</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入薪酬" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>住宿费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入住宿费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>交通费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入交通费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>餐饮费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入餐饮费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>办公费</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入办公费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>餐费补助</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th>其他</th><td  width="200" class="taR">￥<input type="number" value="0" placeholder="输入其他" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+				  						<tr><th class="taR">合计</th><td class="colGreen taR">￥0.00</td></tr>
+				  						<tr class="warning"><td class="taR"><b>内部培训费用合计</b></td><td class="colGreed taR"><b style="font-size:24px">￥2160.00</b></td></tr>
+				  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+				  						<tr><th colspan="2">
+				  									<textarea required rows="6" style="width:99%" placeholder="内部培训费用说明"></textarea>
+				  						</th></tr>
+				  						</tbody>
+				  					</table>
+				  				</div>
+				  				<div class="seCensor receipt-censor">
+				  					<div class="title">
+				  					报销单填写说明
+				  					</div>
+					  				<div class="detail">
+					  					<p>1 此项费用，仅用于纵横内部培训；</p>
+										<p>2 用于客户的培训费用，请创建“培训班结算”。</p>
+				  					</div>
+				  				</div>
+				  			</div>
+				  			<!--审批流程等-->
+				  			<div class="entry receipt-list" id="shenpi">
+				  				<div class="seTable">
+				  					<table class="table table-bordered table-condensed table-hover mb-0">
+				  						<tr class="warning"><td class="taR"><b>本次报销费用总计</b></td><td class="colGreed taR"><b style="font-size:24px">￥4815.00</b></td></tr>
+				  						<tr><th colspan="2" class="taC">附件</th></tr>
+				  						<tr><td colspan="2">
+				  							<input type="file"><a class="btn btn-primary btn-mini">上传</a>&nbsp;&nbsp;<span>支持jpg、png、doc、docx、els、elsx；最大8M文件。</span>
+				  							<!--已上传文件-->
+				  							<table class="table">
+				  								<thead><th>文件名</th><th>大小</th><th>操作</th></thead>
+				  								<tbody>
+				  									<tr><td><a href="#" target="_blank">发票1.jpg</a></td><td>20kb</td><td><a href="">删除</a></td></tr>
+				  									<tr><td><a href="#" target="_blank">QQ截图20150624170045.png</a></td><td>171kb</td><td><a href="">删除</a></td></tr>
+				  									<tr><td><a href="#" target="_blank">Doc1.docx</a></td><td>47kb</td><td><a href="">删除</a></td></tr>
+				  								</tbody>
+				  							</table>
+				  							<!--已上传文件-->
+				  						</td></tr>
+				  						<tr><th colspan="2" class="taC">报销单审批</th></tr>
+										<tr>
+											<th id="shenpi">选择审批组</th>
+											<td class="taR"><select><option>通用组（何银龄 >  谭玉堂 >赵淑燕）</option></select></td>
+										</tr>
+										<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+										<tr>
+											<th>选择办事处</th>
+											<td class="taR"><select class="span2"><option>总部</option></select></td>
+										</tr>
+										<tr><th colspan="2" class="taC">汇款信息</th></tr>
+										<tr><th>汇款人户名</th><td><input type="text" placeholder="请输入汇款人户名" value="刘飞"></td></tr>
+										<tr><th>汇款开户银行名称</th><td><input type="text" placeholder="请输入汇款开户银行名称" value="建行西安长安路支行"></td></tr>
+										<tr><th>汇款帐号</th><td><input type="text" placeholder="请输入汇款帐号" value="61001720015050000695"></td></tr>
+										<tr><th class="tipFather">联行号&nbsp;<div class="tipContent"><span class="tipGray">?</span><div class="tipConactive"><p>1.如果不是公司广发，务必填上银行联行号</p><p>2.如不清楚银行联行号请咨询报销查款专用 QQ：2870766094</p></div></div></th><td><input type="text" placeholder="请输入联行号" value=""></td></tr>
+				  					</table>
+				  				</div>
+				  				<div class="seCensor receipt-censor">
+				  					<div class="title">
+				  					审批流程
+				  					</div>
+				  				</div>
+				  			</div>
+				  			<div class="btn-display"><a href="saea-confirm.html" class="button">生成报销单 >></a></div>
+						</div>
+					</div>
+				</div>
+		</div>
+	</div>
+	<!--弹出 添加行程 -->
+    <div class="modal hide fade" id="route-add">
+        <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">
+						<tr><th class="taC" colspan="2">行程</th></tr>
+						<tr><th>出发/结束日期</th><td>
+									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" - "
+							    data-language="zh"></td></tr>
+						<tr><th><span class="">┌</span> 出发地</th><td><select><option>广东省</option></select><select><option>珠海市</option></select></td></tr>
+						<tr><th><span class="">├</span> 目的地</th><td><select><option>广东省</option></select><select><option>广州市</option></select><a href="">+添加目的地</a> <a href="">-移除</a></td></tr>
+						<tr><th><span class="">├</span> 目的地</th><td><select><option>广东省</option></select><select><option>东莞市</option></select><a href="">+添加目的地</a> <a href="">-移除</a></td></tr>
+						<tr><th><span class="">└</span> 结束</th><td><select><option>广东省</option></select><select><option>珠海市</option></select></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>
+    </div>
+	<!--结束 弹出 添加行程 -->
+	<!--移除-->
+	<div class="modal hide fade" id="del">
+		<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>
+			<!--移除-->
+<script type="text/javascript">autoFlashHeight();</script>
+
+<script>
+    $(function () {
+        var fixedSide = $("#fixedSide");
+        var entry = $(".entry");
+        var mainTopArr = new Array();
+        for(
+        	var i=0;i<entry.length;i++){
+            var top = entry.eq(i).offset().top;
+            mainTopArr.push(top);
+        }
+        $(".autoHeight").scroll(function(){
+            var scrollTop = $(this).scrollTop();
+            var k;
+            for(
+            	var i=0;i<mainTopArr.length;i++)
+            	{
+	                if(scrollTop>=mainTopArr[i]){
+	                    k=i;
+                }
+            }
+            fixedSide.find("li").eq(k).addClass("active").siblings().removeClass("active");
+        });
+        $('.fixedSide li').click(function(){
+			var t = $('#saeaList .entry').eq($(this).index()).offset().top;
+			$('body,html').animate({"scrollTop":t},500);
+			$(this).addClass('active').siblings().removeClass('active');
+		});
+    });
+    
+
+</script>
+</body>

protected/view/header.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html lang=zh-cn> 
-<head>
+<html lang=zh-cn xmlns="http://www.w3.org/1999/xhtml"> 
+<head  >
 	<meta charset=utf-8> 
 	<title>CLD.System</title> 
 	<link rel="shortcut icon" href="<?= WEB_SITE_GLOBAL ?>images/favicon.ico"> 

protected/view/menu.html

@@ -1,4 +1,5 @@
 
+
 <!-- if isShowMenu('INFORMATION') -->
 <li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine">
 <a href="/" class="icon- <!-- if {{memu}}=="index" --> selected <!-- endif --> ">B</a>
@@ -20,7 +21,7 @@
 <!-- if isShowMenu('BUILD') -->
 
 <li data-placement="right" data-toggle="ctooltip"  data-original-title="云版管理">
-<a href="/cloud/curing/edition" target="_blank" class="icon- <!-- if {{memu}}=="buildActivation" --> selected <!-- endif -->">e</a>
+<a href="/cloud/build/edition" target="_blank" class="icon- <!-- if {{memu}}=="buildActivation" --> selected <!-- endif -->">e</a>
 </li>
 
 <!-- endif -->

protected/view/receipt/expensesDocPrint.html

@@ -542,11 +542,17 @@
 		  						<!-- if !empty({{receiptDetail' value.rlList}}) -->
 		  						
 		  						<!-- loop receiptDetail' value.rlList -->
-		  						<li  <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone" <!-- elseif {{receiptDetail' value' value.status}}==4 --> class="back" <!-- elseif {{receiptDetail' value' value.status}}==2 --> class="post" <!-- endif --> >
+		  						<li  <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone" <!-- elseif {{receiptDetail' value' value.status}}==4 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==2 --> class="post" <!-- endif --> >
 		  							<div class="avtra"><img src="{{receiptDetail' value' value.img}}_2.jpg" width="32"></div>
 		  							<div class="comment">
 		  								<p <!-- if {{receiptDetail' value' value.status}}!=2 --> class="colGray" <!-- endif --> ><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.username}} <!-- if {{receiptDetail' value' value.rolename}}!='' --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
-		  								<p>{{receiptDetail' value' value.opinion}}</p>
+		  								<p>
+											  <!-- if {{receiptDetail' value' value.status}}==1 -->
+											  同意支付
+											  <!-- else -->
+											  {{receiptDetail' value' value.opinion}}
+											  <!-- endif -->
+											</p>
 		  							</div>
 		  						</li>
 		  						<!-- endloop -->

protected/view/receipt/feeLoanReceiptTrave.html

@@ -123,26 +123,26 @@
 									</select>
 								</td>
 							</tr>
-	  					   
-	  					   <tr>
-											<th colspan="2" class="taC">行程详细</th>
-										</tr>
-										<tbody itinerary >
-											
-
-											
-										</tbody>
 
+										<tr>
+											<td colspan="2">
+												<table width="100%" stroke>
 
+												</table>
+											</td>
+										</tr>
+										<tbody strokeNode>
+										</tbody>
 										<tr>
-											<th colspan="2" class="taC"><a href="#route-add"
-												class="button" addStroke data-toggle="modal">设置行程费用单</a></th>
+											<th colspan="2" class="taC"><a href="#" stroke="addNode"
+												class="button" data-toggle="modal">添加新行程</a></th>
 										</tr>
-	  						
-	  						
-	  						
-	  						
-	  						<tbody trave >
+
+										
+
+
+
+										<tbody trave >
 	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
@@ -293,6 +293,8 @@
 					</div>
 					<div class="modal-body saeaList">
 						<input type="hidden" name="ediStrokeId" >
+						<input type="hidden" name="strokeid" id="strokeId" >
+						<input type="hidden" name="strokeIndex" id="strokeIndex" >
 						<table class="table table-bordered table-condensed">
 							<tr>
 								<th class="taC" colspan="4">出发-到达</th>
@@ -300,10 +302,10 @@
 							<tr>
 								<th>出发地</th>
 								<td>
-								<select departureProvince  >
+								<select departureProvince >
 								
 								</select>
-								<select departureCity >
+								<select departureCity>
 								
 								</select>
 								</td>
@@ -315,9 +317,9 @@
 							</tr>
 							<tr>
 								<th>出发日期</th>
-								<td><input type="date" departureDate min="{{itineraryDate}}" ></td>
+								<td><input type="date" departureDate  ></td>
 								<th>到达日期</th>
-								<td><input type="date" arrivalsDate min="{{itineraryDate}}" ></td>
+								<td><input type="date" arrivalsDate  ></td>
 							</tr>
 							<tr>
 								<td colspan="4" class="" msg></td>
@@ -358,10 +360,15 @@
 		<!--结束 弹出 添加行程 -->
  
  <script type="text/javascript">
-			
 			var sessionStorageList='itineraryListLoan';
+			<!-- if {{receiptDetail.itinerary2}} !="" -->
+			sessionStorage.setItem(sessionStorageList,'{{receiptDetail.itinerary2}}');
+			<!-- else -->
+			sessionStorage.setItem(sessionStorageList,'[]');
+			<!-- endif -->
 		</script>
- <script src="<?= itinerary ?>"></script>
+ <script src="<?= itinerary2 ?>"></script>
+		<script src="<?= itinerary2func ?>"></script>
  
 <script >
 
@@ -385,315 +392,11 @@ function resetPageData(){
 	$('#RS').html(0);
 }
 
-/* function fnTotTravelPrice(){
-	var itineraryStr=sessionStorage.getItem("itineraryListLoan");
-	var sessionItinerary= JSON.parse(itineraryStr);
-	$("#itinerary").val(itineraryStr);
-	var priceList=[];
-	for(let i=0;i<sessionItinerary.length;i++){
-		let feeTraveItem=sessionItinerary[i].feeTraveItem;
-		for(let k=0;k<feeTraveItem.length;k++){
-			if(typeof priceList[feeTraveItem[k].id]==='undefined'){
-				priceList[feeTraveItem[k].id]=0;
-			}
-			priceList[feeTraveItem[k].id]+=parseFloat(feeTraveItem[k].price);
-		}
-	}
-	
-	$("input[id^='travel_']").val(0);
-	$("td span").html(0);
-	
-	let travelResult=0;
-	for(let i=0;i<priceList.length;i++){
-		if(typeof priceList[i]==='number'){
-			$("span[travelprice_"+i+"]").html(priceList[i]);
-			$("#travel_"+i+"").val(priceList[i]);
-			travelResult+=priceList[i];
-		}
-	}
-	
-	$("#travelResult").html(travelResult);
-	$("#RS").html(travelResult);
-}
-
-function districtTop(selected){
-	
-	var storage=window.localStorage;
-	
-	if(typeof storage["districtTop"]==='undefined'||storage["districtTop"]===''){
-		$.ajax({
-			url : '/api/district',
-			type : "post",
-			cache : false,
-			dataType : "json",
-			global : true,
-			success : function(data) {
-				storage.setItem("districtTop",JSON.stringify(data.districtList));
-				//districtTop(data.districtList);
-				
-			},
-			error : function(err) {}
-		});
-	}
-	
-	var districtTop=JSON.parse(storage["districtTop"]);
-	
-	var html='';
-	for(let i=0;i<districtTop.length;i++){
-		if(typeof selected!=='undefined'&&selected.departureprovince==districtTop[i].name){
-			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-		}else{
-			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-		}
-		
-	}
-	$("select[departureProvince]").html(html);
-	
-	html='';
-	for(let i=0;i<districtTop.length;i++){
-		if(typeof selected!=='undefined'&&selected.arrivalsprovince==districtTop[i].name){
-			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-		}else{
-			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-		}
-		
-	}
-	$("select[arrivalsProvince]").html(html);
-}
-
-function districtCityBuild(selectDom,obj,selected){
-	
-	var storage=window.localStorage;
-	var id=$('select['+obj+']').val();
-	
-	if(typeof storage["district_"+id]==='undefined'||storage["district_"+id]===''){
-		$.ajax({
-			url : '/api/district?did='+id,
-			type : "post",
-			cache : false,
-			dataType : "json",
-			async:false,
-			global : true,
-			success : function(data) {
-				storage.setItem("district_"+id,JSON.stringify(data.districtList));
-				//districtCity(selectDom,data.districtList);
-			},
-			error : function(err) {}
-		});
-	}
-	
-	districtCity=JSON.parse(storage["district_"+id]);
-	
-	var html='';var cityName='';
-	if(typeof selected!=='undefined'){
-		if(selectDom=='departurecity'){
-			cityName=selected.departurecity;
-		}else{
-			cityName=selected.arrivalscity.substring(1);
-		}
-	}
-	
-	
-	for(let i=0;i<districtCity.length;i++){
-		
-		if(typeof selected!=='undefined'&&cityName==districtCity[i].name){
-			html+='<option selected value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
-		}else{
-			html+='<option value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
-		}
-	}
-	$("select["+selectDom+"]").html(html);
-}
-
-function buildItinerary(list){
-	var html='';
-	for(let i=0;i<list.length;i++){
-		html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
-		html+='<div class="fR"><a href="#route-add" ediStroke data-toggle="modal" dataId="'+i+'" >编辑</a>&nbsp;<a href="#" dataId="'+i+'" removeItinerary class="colRed">移除</a></div></th></tr>';
-		let feeTraveItem=list[i].feeTraveItem;
-		let price=0;
-		for(let k=0;k<feeTraveItem.length;k++){
-			price+=parseFloat(feeTraveItem[k].price);
-			html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
-		}
-		html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
-	}
-	$("tbody[itinerary]").html(html);
-}
-
-function buildFeeTravelItem(feeTraveItem){
-	
-	var html='';
-	for(let i=0;i<feeTraveItem.length;i++){
-		html+='<tr class="remove" ><th>'+feeTraveItem[i].name+'</th>';
-		html+='<td class="taR">￥<input type="number" itemId_'+feeTraveItem[i].id+' data="'+feeTraveItem[i].name+'" dataId="'+feeTraveItem[i].id+'" value="'+feeTraveItem[i].price+'" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
-		html+='<td><input type="text" value="'+feeTraveItem[i].detail+'" itemDetail_'+feeTraveItem[i].id+' placeholder="填写费用说明"></td>';
-		html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
-	}
-	$("tbody[feeTravelItem]").html(html);
-}
-
-function fnGetItineraryData(){
-	var departurecity=$("select[departurecity] option:selected").text();
-	var arrivalscity=$("select[arrivalscity] option:selected").text();
-	var departureprovince=$("select[departureprovince] option:selected").text();
-	var arrivalsprovince=$("select[arrivalsprovince] option:selected").text();
-	
-	var departuredate=$("input[departuredate]").val();
-	var arrivalsdate=$("input[arrivalsdate]").val();
-	
-	var feeTravePriceList=$("tbody[feeTravelItem]").find('input[type=number]');
-	var feeTraveDetailList=$("tbody[feeTravelItem]").find('input[type=text]');
-	
-	if(arrivalscity!==''){
-		arrivalscity='-'+arrivalscity;
-	}
-	if(arrivalsdate!==''){
-		arrivalsdate='~'+arrivalsdate;
-	}
-	
-	var feeTraveItem=[];
-	for(let i=0;i<feeTravePriceList.length;i++){
-		feeTraveItem.push({'id':$(feeTravePriceList[i]).attr('dataId'),'name':$(feeTravePriceList[i]).attr('data'),'price':$(feeTravePriceList[i]).val(),'detail':$(feeTraveDetailList[i]).val()});
-	}
-	
-	var itinerary={'departuredate':departuredate,'departureprovince':departureprovince,'departurecity':departurecity,'arrivalsdate':arrivalsdate,'arrivalsprovince':arrivalsprovince,'arrivalscity':arrivalscity,'feeTraveItem':feeTraveItem};
-	return itinerary;
-}
- */
 
 
  $(function() {
 	 
-	/*  var sessionStorage= window.sessionStorage;
-		var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
-		if(typeof sessionItinerary!=='object'){
-			buildItinerary(JSON.parse(sessionItinerary));
-			fnTotTravelPrice();
-		}
-		
-		$("a[ediStroke]").click(function() {
-			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
-			sessionItinerary=JSON.parse(sessionItinerary);
-			var id=$(this).attr('dataId');
-			
-			var storage=window.localStorage;
-			
-			districtTop(sessionItinerary[id]);
-			districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
-			districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
-			
-			$("input[departuredate]").val(sessionItinerary[id].departuredate);
-			$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
-			
-			buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
-			
-			$("a[additinerarybut]").hide();
-			$("a[ediItineraryBut]").show();
-		});
-		
-		$("a[addStroke]").click(function() {
-			districtTop();
-			districtCityBuild('departurecity','departureprovince');
-			districtCityBuild('arrivalscity','arrivalsprovince');
-			$("input[departuredate]").val('');
-			$("input[arrivalsdate]").val('');
-			$("tbody[feeTravelItem]").html('');
-			
-			$("a[additinerarybut]").show();
-			$("a[ediItineraryBut]").hide();
-		});
-		
-		$("select[departureProvince]").change(function() {
-			districtCityBuild('departurecity','departureprovince');
-		});
-		
-		$("select[arrivalsProvince]").change(function() {
-			districtCityBuild('arrivalscity','arrivalsprovince');
-		});
-		
-		$("a[feeTravelItem]").click(function() {
-			var itemName=$("select[feeTravelItem] option:selected").text();
-			var itemId=$("select[feeTravelItem] option:selected").val();
-			
-			var html='<tr class="remove" ><th>'+itemName+'</th>';
-			html+='<td class="taR">￥<input type="number" itemId_'+itemId+' data="'+itemName+'" dataId="'+itemId+'" value="0" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
-			html+='<td><input type="text" itemDetail_'+itemId+' placeholder="填写费用说明"></td>';
-			html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
-			$("tbody[feeTravelItem]").append(html);
-			
-		});
-		
-		$("tbody[feeTravelItem]").on("click","a[removeFeeTravelItem]",function(){
-			$(this).closest('.remove').remove();
-		});
-		
-		$("tbody[itinerary]").on("click","a[edistroke]",function(){
-			$("input[name=ediStrokeId]").val($(this).attr('dataid'));
-			
-			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
-			sessionItinerary=JSON.parse(sessionItinerary);
-			var id=$(this).attr('dataId');
-			
-			var storage=window.localStorage;
-			
-			districtTop(sessionItinerary[id]);
-			districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
-			districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
-			
-			$("input[departuredate]").val(sessionItinerary[id].departuredate);
-			$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
-			
-			buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
-			
-			$("a[additinerarybut]").hide();
-			$("a[ediItineraryBut]").show();
-			
-		});
-		
-		$("a[ediItineraryBut]").click(function() {
-			var itinerary=fnGetItineraryData();
-			var siIndex=$("input[name=ediStrokeId]").val();
-			
-			var sessionItinerary =JSON.parse(sessionStorage.getItem("itineraryListLoan"));
-			
-			sessionItinerary[siIndex]=itinerary;
-			sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
-			buildItinerary(sessionItinerary);
-			fnTotTravelPrice();
-		});
-		
-		$("a[addItineraryBut]").click(function() {
-			var itinerary=fnGetItineraryData();
-			
-			var sessionItinerary = sessionStorage.getItem("itineraryListLoan");
-			
-			if(typeof sessionItinerary==='object'){
-				sessionItinerary=[];
-				sessionItinerary.push(itinerary);
-				sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
-			}else{
-				sessionItinerary=JSON.parse(sessionItinerary);
-				sessionItinerary.push(itinerary);
-				sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
-			}
-			
-			buildItinerary(sessionItinerary);
-			fnTotTravelPrice();
-		});
-		
-		$("tbody[itinerary]").on("click","a[removeItinerary]",function(){
-			
-			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
-			var id=$(this).attr('dataId');
-			sessionItinerary=JSON.parse(sessionItinerary);
-			sessionItinerary.splice(id,1);
-			sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
-			buildItinerary(sessionItinerary);
-			$("#itinerary").val(JSON.stringify(sessionItinerary));
-			buildItinerary(sessionItinerary);
-			fnTotTravelPrice();
-		}); */
+	
 	 
 	 
  //--------------------------------------------