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

src/components/FinancialModule/BasicDocuments.vue

@@ -290,7 +290,8 @@
                         <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
                         <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                         <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
-                        <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+                        <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+                        <td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
                     </tr>
                 </table>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
@@ -579,7 +580,7 @@
                               <!-- <th width="100px">账户余额</th> -->
                               <th>金额</th>
                               <th width="70">币种</th>
-                              <th width="50px">汇率</th>
+                              <th width="150px">汇率</th>
                               <!-- <th>手续费</th> -->
                               <th width="100px">总金额</th>
                               <!-- <th>操作</th> -->
@@ -634,7 +635,7 @@
                                     <td>
                                         <el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
                                     </td>
-                                    <td>{{Math.round(i.allMoney * 100) / 100}}</td>
+                                    <td>{{(Math.round(i.allMoney * 100)) / 100}}</td>
                                 </tr>
                             </template>
                             <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
@@ -1309,10 +1310,15 @@ export default {
         }
         let allMoney = 0
         this.payMsgList.forEach(x=>{
-            allMoney+= parseFloat(x.allMoney);
-            x.allMoney=Math.round(x.allMoney * 100) / 100;
+            allMoney+= x.allMoney;
+            // x.allMoney=(Math.round(x.allMoney * 100)) / 100;
         })
+        let num=allMoney.toString().split(".")[1].length;
+        if(num==3){
+            allMoney=`${allMoney}1`;
+        }    
         this.allMoney = Math.round(allMoney * 100) / 100;
+        console.log(" this.allMoney", this.allMoney)
     },
     Financial_post_GetFinancLogList(){  // 获取单据日志
       if(this.checkboxShow) return
@@ -1508,9 +1514,13 @@ export default {
                     Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
                     Money = this.payMsgList[index].OriginalMoney;
                     Rate=Rate*100;  
-                this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
-                    
-                    // console.log('this.payMsgList[index].allMoney', this.payMsgList[index].allMoney)                  
+                let newmoney=Money*Rate+fee;
+                let num=newmoney.toString().split(".")[1].length;
+                if(num==1){
+                    newmoney=`${newmoney}1`;
+                }  
+                this.payMsgList[index].allMoney = Math.round( newmoney* 100) / 100 / 100;
+                                    
             } else {
                 this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
                 this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
@@ -1518,8 +1528,16 @@ export default {
                 let fee = this.payMsg.Fee,
                     Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
                     Money = this.payMsg.OriginalMoney;
-                    Rate=Rate*100;                                        
-                this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
+                    Rate=Rate*100;    
+                let newmoney=Money*Rate+fee;
+                if(newmoney.toString().split(".")[1]){
+                    let num=newmoney.toString().split(".")[1].length;
+                    if(num==1){
+                        newmoney=`${newmoney}1`;
+                    } 
+                }
+                                                     
+                this.payMsg.allMoney = Math.round( newmoney* 100) / 100 / 100;                             
 
             }
         },

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -377,7 +377,8 @@
                             <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
                             <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                             <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
-                            <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+                            <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+                            <td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
                         </tr>
                     </table>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">

src/components/Restaurant/FoodOrder.vue

@@ -70,6 +70,7 @@
           <th>客户信息</th>
           <th>客户数量</th>
           <th>订单状态</th>
+          <th>创建日期</th>
           <th>退款状态</th>
         </tr>
         <tr>
@@ -101,6 +102,7 @@
               <span v-if="item.status==2">取消</span>
               <span v-if="item.status==3">待付款</span>
           </td>
+          <td>{{item.createDate}}</td>          
           <td>
               <p v-if="item.RefundStatus!=1">
                   <span v-if="item.RefundStatus==2">退款中</span>