Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -202,12 +202,21 @@
                 </tr>
                 <tr>
                     <td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
-                    <td></td>
+                    <!-- <td></td>
                     <td></td>
                     <td> {{ moneyFormat(endRStartMoney) }} </td>
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td> {{ moneyFormat(endStartMoney) }} </td> -->
+
+
+                    <td> {{ moneyFormat(wShou) }} </td>
+                    <td> {{ moneyFormat(wZhi) }} </td>
+                    <td> {{ moneyFormat(endRStartMoney) }} </td>
+                    <td></td>
+                    <td> {{ moneyFormat(bShou) }} </td>
+                    <td> {{ moneyFormat(bZhi) }} </td>
                     <td> {{ moneyFormat(endStartMoney) }} </td>
                 </tr>
             </table>
@@ -437,6 +446,10 @@ export default {
           allBPrice:0,
           allWPrice:0,
           userInfo:{},
+          wShou:0,
+          wZhi:0,
+          bShou:0,
+          bZhi:0,
         }
     },created(){
       this.userInfo = this.getLocalStorage();
@@ -584,23 +597,35 @@ export default {
             }
             this.endStartMoney = '';
             this.endRStartMoney ='';
+            this.bShou = 0;
+            this.wShou = 0;
+            this.bZhi = 0;
+            this.wZhi = 0;
             this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
               
                  if(res.data.resultCode==1){
                     let data = res.data.data;
                     if(data.length){
                         this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;  // 外币
-                        this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0;  //  本位币
-                        let endStartMoney = 0,
-                            endRStartMoney = 0;
+                        this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0;  //  本位币
+                        let endStartMoney =  this.StartMoney;
+                        let endRStartMoney = this.RStartMoney;
                         data.forEach( ( x , i ) => {
                             if(x.Type==1){
-                                endRStartMoney = endStartMoney + x.OriginalMoney;
+                                // endRStartMoney = endStartMoney + x.OriginalMoney;
+                                // endStartMoney = endStartMoney + x.Money;
+                                // x.enRSMoney = endRStartMoney;
+                                // x.enSMoney = endStartMoney;
+                                this.bShou = this.bShou + x.Money;
+                                this.wShou = this.wShou + x.OriginalMoney;
+                                endRStartMoney = endRStartMoney + x.OriginalMoney;
                                 endStartMoney = endStartMoney + x.Money;
-                                x.enRSMoney = endRStartMoney;
+                                x.enRSMoney = endRStartMoney;//外币收入
                                 x.enSMoney = endStartMoney;
                             }else if(x.Type==2){
-                                endRStartMoney = endStartMoney - x.OriginalMoney;
+                                this.bZhi = this.bZhi + x.Money;
+                                this.wZhi = this.wZhi + x.OriginalMoney;
+                                endRStartMoney = endRStartMoney - x.OriginalMoney;
                                 endStartMoney = endStartMoney - x.Money;
                                 x.enRSMoney = endRStartMoney;
                                 x.enSMoney = endStartMoney;

src/components/FinancialModule/addFinancialProcess.vue

@@ -367,7 +367,7 @@
 				<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
 				<div class="approval_page_content">
 					<div class="approval_person_content">
-						<span class="approval_span_type">流程设置{{$t('fnc.mrspliucheng')}}</span>
+						<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
 						<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
 						
 						<div class="approval_person_list fl">

src/components/Restaurant/FoodOrder.vue

@@ -214,6 +214,12 @@ export default {
       this.currentPage = 1;
     },
     getList() {
+      if(!this.msg.startDate){
+        this.msg.startDate="";
+      }
+      if(!this.msg.endDate){
+        this.msg.endDate="";
+      }
       this.loading = true;
       this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => {
         this.loading = false;

src/components/scenicSpot/ScenTicketOrder.vue

@@ -268,13 +268,18 @@ export default {
       this.currentPage = 1;
     },
     getList() {
+      if(!this.msg.startDate){
+        this.msg.startDate="";
+      }
+      if(!this.msg.endDate){
+        this.msg.endDate="";
+      }
       this.loading = true;
       this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => {
         this.loading = false;
         if (res.data.resultCode === 1) {
             this.total = res.data.data.count;
             this.dataList = res.data.data.pageData;
-            console.log(this.dataList,'datalist');
         } else {
           this.Error(res.data.message)
         }