1

global/vue/fee/receipt_trave_component.js

@@ -477,6 +477,12 @@ Vue.component("trave", {
                 this.traveList[index].total = total.toFixed(2);
             });
         },
+        blurSetTraveDay:function (event){
+            // 补齐日期
+            // 交互事件没有合适的，日期控件会重复触发失去焦点
+            console.log(event.target.value)
+            console.log(this.tripTime)
+        },
     },
     template:
         `
@@ -667,7 +673,7 @@ Vue.component("trave", {
                     <tr>
                         <th>出发/结束日期</th>
                         <td><input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
-                                data-multiple-dates-separator=" - " data-language="zh" @blur.prevent="changeCount" v-model="tripTime" >
+                                data-multiple-dates-separator=" - " data-language="zh" @blur.prevent="changeCount" v-model="tripTime" @blur="blurSetTraveDay" >
                             &nbsp;&nbsp;旅程合计：<b class="colRed">{{ traveDay }}</b>天        
                         </td>
                     </tr>

protected/controller/InvoiceController.php

@@ -263,6 +263,7 @@ class InvoiceController extends DooController {
 		$this->render ( "/admin/invoiceExpress", $this->data );
 	}
 	function invoiceAdd() {
+// 		include Doo::conf()->BASE_PATH.'diagnostic/debug.php';
 		session_start ();
 		/*Doo::loadModel ( 'invoice' );
 		$invoice = new invoice ();
@@ -6084,7 +6085,9 @@ class InvoiceController extends DooController {
 		
 		if ($status == 'UNRECORD')
 			$con .= ' and printStatus=1 and untreadStatus=0';
-		elseif ($status == 'RECORD')
+		elseif ($status == 'BAD'){
+			$con .= ' and badDebt=1 ';
+		}elseif ($status == 'RECORD')
 			$con .= ' and printStatus=1 and untreadStatus=3';
 		elseif ($status == 'BOUNCED')
 			$con .= ' and untreadStatus=2';

protected/controller/MainController.php

@@ -7330,7 +7330,7 @@ class MainController extends DooController {
 		$tag = new tag ();
 		
 		$mailList = $eMailList->find ( array (
-				'where' => ' status=0 and staffId=' . $this->staff [0] ['sid'],
+				'where' => ' (status=0 or status=2) and staffId=' . $this->staff [0] ['sid'],
 				'desc' => 'elid',
 				'asArray' => true 
 		) );

protected/view/admin/invoiceAS.html

@@ -34,6 +34,7 @@
 	  					<li>  
 	  					<a <!-- if {{status}}=='All' --> class="now" <!-- endif -->  href="/invoiceAS">所有</a>
 	  					<a <!-- if {{status}}=='UNRECORD' --> class="now" <!-- endif --> href="/invoiceAS/1/UNRECORD" title="未入账">未入账</a>
+	  					<a <!-- if {{status}}=='BAD' --> class="now" <!-- endif --> href="/invoiceAS/1/BAD" title="坏账">坏账</a>
 	  					<a <!-- if {{status}}=='RECORD' --> class="now" <!-- endif --> href="/invoiceAS/1/RECORD" title="已入账">已入账</a>
 	  					<a <!-- if {{status}}=='BOUNCED' --> class="now" <!-- endif --> href="/invoiceAS/1/BOUNCED" title="已退票">已退票</a>
 	  					<a <!-- if {{status}}=='PARTRECORD' --> class="now" <!-- endif --> href="/invoiceAS/1/PARTRECORD" title="部分入账">部分入账</a>
@@ -124,6 +125,10 @@
 	                                  	已退票
 	                        <!-- elseif {{list' value.untreadStatus}}==1 -->
 	                                  	正在退票
+	                       	
+	                        <!-- endif -->
+	                        <!-- if {{list' value.badDebt}}==1 -->
+	                        坏账
 	                        <!-- endif -->
 							</td>
 							

protected/view/fee/create/receipt.html

@@ -138,18 +138,6 @@
 
 							
 
-
-
-
-
-
-
-
-
-
-							
-
-
 							<h4 class="saeaTip">请选择一下需要报销的费用类型</h4>
 							<ul class="saeaType clearfix">
 								<li @click="selectReceipt($event,menu)" v-bind:class="{ active: menu.show }" v-for="menu in receiptTypeMenu" v-cloak>

protected/view/mail_list.html

@@ -25,6 +25,10 @@
 				<div class="mailSpread">
 					<div class="mailList mailAutoHeigh">
 						<div class="listItem">
+							<!-- if {{empty(mailList)}} -->
+							没有需要发送的邮单
+							<!-- else -->
+							
 							<ul>
 							<!-- loop mailList -->
 								<li>
@@ -63,6 +67,7 @@
 								</li>
 							<!-- endloop -->
 							</ul>
+							<!-- endif -->
 						</div>
 					</div>
 					<!-- loop mailList -->