saea-confirm 删除 ，功能整合至 saea-borad

.idea/workspace.xml

@@ -31,16 +31,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-confirm.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/saea-confirm.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="32" column="36" selection-start-line="32" selection-start-column="36" selection-end-line="32" selection-end-column="36" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="saea-myList.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/saea-myList.html">
           <provider selected="true" editor-type-id="text-editor">
@@ -51,7 +41,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-borad.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="saea-borad.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/saea-borad.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="288">
@@ -83,15 +73,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="saea-reportList-pay.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="saea-reportList-pay.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/saea-reportList-pay.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-357">
-              <caret line="282" column="36" selection-start-line="282" selection-start-column="36" selection-end-line="282" selection-end-column="36" />
+            <state relative-caret-position="1024">
+              <caret line="154" column="59" selection-start-line="154" selection-start-column="59" selection-end-line="154" selection-end-column="59" />
               <folding>
                 <element signature="n#style#0;n#th#0;n#tr#18;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#b#0;n#td#1;n#tr#20;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#div#2;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
                 <element signature="n#style#0;n#b#0;n#td#1;n#tr#21;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#b#0;n#td#1;n#tr#22;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -135,11 +124,11 @@
         <option value="$PROJECT_DIR$/saea-reportList-history.html" />
         <option value="$PROJECT_DIR$/saea-reportList-detail.html" />
         <option value="$PROJECT_DIR$/admin-myinfo.html" />
-        <option value="$PROJECT_DIR$/saea-reportList-pay.html" />
         <option value="$PROJECT_DIR$/saea-myList.html" />
         <option value="$PROJECT_DIR$/saea-reportList.html" />
         <option value="$PROJECT_DIR$/css/global.css" />
         <option value="$PROJECT_DIR$/saea-borad.html" />
+        <option value="$PROJECT_DIR$/saea-reportList-pay.html" />
       </list>
     </option>
   </component>
@@ -263,12 +252,12 @@
       <workItem from="1474613576957" duration="11333000" />
       <workItem from="1474856454943" duration="13187000" />
       <workItem from="1474940103302" duration="15208000" />
-      <workItem from="1475027900309" duration="5974000" />
+      <workItem from="1475027900309" duration="6627000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="68032000" />
+    <option name="totallyTimeSpent" value="68685000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
@@ -672,20 +661,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/saea-reportList-pay.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-357">
-          <caret line="282" column="36" selection-start-line="282" selection-start-column="36" selection-end-line="282" selection-end-column="36" />
-          <folding>
-            <element signature="n#style#0;n#th#0;n#tr#18;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#20;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#div#2;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#21;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#td#1;n#tr#22;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/saea-confirm.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
@@ -720,5 +695,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/saea-reportList-pay.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1024">
+          <caret line="154" column="59" selection-start-line="154" selection-start-column="59" selection-end-line="154" selection-end-column="59" />
+          <folding>
+            <element signature="n#style#0;n#th#0;n#tr#18;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#b#0;n#td#1;n#tr#20;n#tbody#0;n#table#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#b#0;n#td#1;n#tr#21;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#b#0;n#td#1;n#tr#22;n#tbody#0;n#table#1;n#div#0;n#div#3;n#div#1;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

saea-confirm.html

@@ -1,186 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn> 
-<head>
-	<meta charset=utf-8> 
-	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
-	<link rel="shortcut icon" href="images/favicon.ico"> 
-	<meta name=copyright content=smartcost.com.cn> 
-	<link rel=stylesheet href=css/global.css> 
-	<script src=js/jquery-1.7.1.min.js></script> 
-	<script src=js/global.js></script>
-</head>
-<body>
-	<div class="mainLayout">
-		<div class="mainMenu">
-			<div class="menuItem">
-				<a href="#" class="mLogo">CLD</a>
-				<ul>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="日程表"><a href="#" class="icon-">X</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="开发需求" class="topLine"><a href="#" class="icon-">V</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="费用管理"><a href="#" class="icon- selected">U</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="物品申请"><a href="#" class="icon-">W</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
-				</ul>
-			</div>
-		</div>
-		<div class="warpContent">
-			<div class="subMenu fL">
-				<div class="menuItem">
-					<ul>
-						<li class="saeaTitle">费用管理</li>
-						<li><a href="saea-borad.html">公布版</a></li>
-						<li><a href="saea-myList.html">我的费用</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-dlist-category-year.html">公司汇总</a></li>
-					</ul>
-				</div>
-			</div>
-			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fR"><a class="button" href="saea-myList.html">创建新报销单</a></div>待提交报销单</legend>
-	  		<div class="saeaList">
-	  			<!--普通报销单-->
-	  			<div class="entry">
-	  				<div class="seTable">
-	  					<table class="table table-bordered table-condensed ">
-		  					<tbody><tr>
-		  						<th width="100" class="taC">费用单号</th><td class="colOrange"><b>#B201405286811</b></td>
-		  						<th width="100" class="taC">报销总金额</th><td class="taR colOrange"><b>￥1212.00</b></td>
-		  						</tr>
-		  					</tbody>
-	  					</table>
-	  					<table class="table table-bordered table-condensed" style="margin:1px 0">
-	  						<tr><th width="100">费用组成</th><th class="taC" width="100">办事处相关费用</th><th class="taC" width="100">差旅相关费用</th><th class="taC" width="100">培训班费用</th><th class="taC" width="100">其他</th><th class="taC" width="100">合计</th></tr>
-	  						<tr><th class="taC">合计</th><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td></tr>
-	  					</table>
-	  					<table class="table table-bordered table-condensed" style="margin-top:1px">
-	  						<tr><th width="215" class="taC">费用所在办事处</th><th class="taC">报销说明</th></tr>
-	  						<tr><td>广东办</td><td rowspan="3"><p>说明说明说明说明</p><a href="#" class="sFile">发票1.jpg</a><a href="#" class="sFile">QQ截图20150624170045.png</a><a href="#" class="sFile">Doc1.docx</a></td></tr>
-	  						<tr><th class="taC">审批人</th></tr>
-	  						<tr><td><div class="avtra"><img src="images/avatar-1.png">谭玉堂</div>
-	  								<div class="avtra"><img src="images/avatar-3.png">赵淑燕</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div></td></tr>
-	  					</table>
-	  				</div>
-	  				<div class="seCensor">
-	  					<div class="title">
-	  					创建日期：2014-04-18
-	  					</div>
-	  					<div class="detail">
-	  						<p>*<b>提交审批</b> 后，您的报销单就不能再更改了;</p>
-	  						<div class="btnList">
-		  					<a href="saea-create.html" class="button btn-gray"><< 返回编辑</a>
-		  					<a href="saea-myList.html" class="button">提交审批 >></a>
-		  					</div>
-	  					</div>
-	  				</div>
-	  			</div>
-	  			<!--撤回的报销单-->
-	  			<div class="entry">
-	  				<div class="seal back"></div>
-	  				<div class="seTable">
-	  					<table class="table table-bordered table-condensed ">
-		  					<tbody><tr>
-		  						<th width="100" class="taC">费用单号</th><td class="colOrange"><b>#B201405286811</b></td>
-		  						<th width="100" class="taC">报销总金额</th><td class="taR colOrange"><b>￥1212.00</b></td>
-		  						</tr>
-		  					</tbody>
-	  					</table>
-	  					<table class="table table-bordered table-condensed" style="margin:1px 0">
-	  						<tr><th width="100">费用组成</th><th class="taC" width="100">办事处相关费用</th><th class="taC" width="100">差旅相关费用</th><th class="taC" width="100">培训班费用</th><th class="taC" width="100">其他</th><th class="taC" width="100">合计</th></tr>
-	  						<tr><th class="taC">合计</th><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td></tr>
-	  					</table>
-	  					<table class="table table-bordered table-condensed">
-	  						<tr><th width="215" class="taC">费用所在办事处</th><th class="taC">报销说明</th></tr>
-	  						<tr><td>广东办</td><td rowspan="3"><p>说明说明说明说明</p><a href="#" class="sFile">发票1.jpg</a><a href="#" class="sFile">QQ截图20150624170045.png</a><a href="#" class="sFile">Doc1.docx</a></td></tr>
-	  						<tr><th class="taC">审批人</th></tr>
-	  						<tr><td><div class="avtra"><img src="images/avatar-1.png">谭玉堂</div>
-	  								<div class="avtra"><img src="images/avatar-3.png">赵淑燕</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div></td></tr>
-	  					</table>
-	  				</div>
-	  				<div class="seCensor">
-	  					<div class="title">
-	  					创建日期：2014-04-18
-	  					</div>
-	  					<div class="censorList clearfix">
-	  						<ul>
-	  							<li class="back">
-		  							<div class="avtra"><img src="images/avatar-3.png" width="32"></div>
-		  							<div class="comment">
-		  								<p class="colGray"><span class="fR">2014-02-13</span>赵淑燕</p>
-		  								<p>撤回原因</p>
-		  							</div>
-	  							</li>
-	  						</ul>
-	  					</div>
-	  					<div class="detail">
-	  						<p>*<b>提交审批</b> 后，您的报销单就不能再更改了;</p>
-  						<div class="btnList">
-		  					<a href="saea-edit.html" class="button btn-gray btn-block"><< 返回编辑</a>
-	  					</div>
-	  					</div>
-	  				</div>
-	  			</div>
-	  			<!--撤回编辑后的报销单-->
-	  			<div class="entry">
-	  				<div class="seal back"></div>
-	  				<div class="seTable">
-	  					<table class="table table-bordered table-condensed ">
-		  					<tbody><tr>
-		  						<th width="100" class="taC">费用单号</th><td class="colOrange"><b>#B201405286811</b></td>
-		  						<th width="100" class="taC">报销总金额</th><td class="taR colOrange"><b>￥1212.00</b></td>
-		  						</tr>
-		  					</tbody>
-	  					</table>
-	  					<table class="table table-bordered table-condensed" style="margin:1px 0">
-	  						<tr><th width="100">费用组成</th><th class="taC" width="100">办事处相关费用</th><th class="taC" width="100">差旅相关费用</th><th class="taC" width="100">培训班费用</th><th class="taC" width="100">其他</th><th class="taC" width="100">合计</th></tr>
-	  						<tr><th class="taC">合计</th><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td><td class="colGreen taR">￥0.00</td></tr>
-	  					</table>
-	  					<table class="table table-bordered table-condensed">
-	  						<tr><th width="215" class="taC">费用所在办事处</th><th class="taC">报销说明</th></tr>
-	  						<tr><td>广东办</td><td rowspan="3"><p>说明说明说明说明</p><a href="#" class="sFile">发票1.jpg</a><a href="#" class="sFile">QQ截图20150624170045.png</a><a href="#" class="sFile">Doc1.docx</a></td></tr>
-	  						<tr><th class="taC">审批人</th></tr>
-	  						<tr><td><div class="avtra"><img src="images/avatar-1.png">谭玉堂</div>
-	  								<div class="avtra"><img src="images/avatar-3.png">赵淑燕</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div>
-	  								<div class="avtra"><img src="images/avatar-4.png">杨福芳</div></td></tr>
-	  					</table>
-	  				</div>
-	  				<div class="seCensor">
-	  					<div class="title">
-	  					创建日期：2014-04-18
-	  					</div>
-	  					<div class="censorList clearfix">
-	  						<ul>
-	  							<li class="back">
-		  							<div class="avtra"><img src="images/avatar-3.png" width="32"></div>
-		  							<div class="comment">
-		  								<p class="colGray"><span class="fR">2014-02-13</span>赵淑燕</p>
-		  								<p>撤回原因</p>
-		  							</div>
-	  							</li>
-	  						</ul>
-	  					</div>
-	  					<div class="detail">
-	  						<p>*<b>提交审批</b> 后，您的报销单就不能再更改了;</p>
-  						<div class="btnList">
-		  					<a href="saea-edit.html" class="button btn-gray"><< 返回编辑</a>
-		  					<a href="saea-myList.html" class="button">继续审批 >></a>
-	  					</div>
-	  					</div>
-	  				</div>
-	  			</div>
-				</div>
-			</div>
-<script type="text/javascript">autoFlashHeight();</script>	
-</body>

saea-reportList-pay.html

@@ -152,7 +152,7 @@
 							<div class="title">
 								<span class="fR" title="创建时间">2015-01-13</span>#G201506249876
 							</div>
-							<div class="censorList clearfix censorHeight">
+							<div class="censorList clearfix">
 								<ul>
 									<li class="post">
 										<div class="avtra"><img src="images/avatar-6.png" width="32"></div>
@@ -201,7 +201,7 @@
 							<div class="title">
 								<span class="fR" title="创建时间">2015-01-13</span>#G201506249876
 							</div>
-							<div class="censorList clearfix censorHeight">
+							<div class="censorList clearfix">
 								<ul>
 									<li class="post">
 										<div class="avtra"><img src="images/avatar-6.png" width="32"></div>
@@ -286,7 +286,7 @@
 							<div class="title">
 								<span class="fR" title="创建时间">2015-01-13</span>#G201506249876
 							</div>
-							<div class="censorList clearfix censorHeight">
+							<div class="censorList clearfix">
 								<ul>
 									<li class="post">
 										<div class="avtra"><img src="images/avatar-6.png" width="32"></div>