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

src/components/Details.vue

@@ -578,6 +578,9 @@ export default {
           case "/happyMoney": // 红包结算
           path = "/LianMengManagement";
           break;
+          case "/OpHotelOrderDetail": // 酒店订单详情
+          path = "/OpHotelOrder";
+          break;
       }
 
       //找到Root
@@ -807,6 +810,9 @@ export default {
           case "/happyMoney": // 红包结算
           path = "/LianMengManagement";
           break;
+          case "/OpHotelOrderDetail": // 酒店订单详情
+          path = "/OpHotelOrder";
+          break;
       }
 
       //找到Root

src/components/FinancialModule/addFinancialDocuments.vue

@@ -492,7 +492,7 @@
                 </div>
                 <div class="_remark">
                     <p>{{$t('system.label_info')}}</p>
-                    <textarea v-model="Description">
+                    <textarea v-model="msg.Description">
                     </textarea>
                 </div>
                 <div>
@@ -915,7 +915,7 @@ export default {
             }
           }
           this.loading = true;
-          this.msg.Description=this.Description;
+        //   this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                   //清除旅客名单数据
@@ -1257,7 +1257,7 @@ export default {
                     if(this.orderObj!=null&&this.orderObj.OrderSource===10){
 
                     }else{
-                         this.Description=this.GetDetail.Description;
+                         this.msg.Description=this.GetDetail.Description;
                     }
                    
                     if(this.orderObj){
@@ -1272,7 +1272,7 @@ export default {
                         this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
                         this.detailList.Number = this.orderObj.CostType ? 1 : 0
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
-                            this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                            this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
                     }
                     if(data.VorcherInos){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -398,7 +398,7 @@
                 </div>
                 <div class="_remark">
                     <p>{{$t('system.label_info')}}</p>
-                    <textarea v-model="Description">
+                    <textarea v-model="msg.Description">
                         
                     </textarea>
                 </div>
@@ -485,6 +485,7 @@ import TicketingModule from "../commonPage/TicketingModule.vue";
 export default {
     data(){
       return{
+        Description:'',
         msg:{
           FrID:0,
           ClientType:0,
@@ -1052,7 +1053,7 @@ export default {
             this.msg.TipGuestList=tipguestInfo;
             
           }
-            this.msg.Description=this.Description;
+            // this.msg.Description=this.Description;
             if(z){
                 this.msg.Status = 0;
             }else{
@@ -1395,7 +1396,7 @@ export default {
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
                         this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
-                            this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                            this.msg.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
                     }
                     if(data.VorcherInos){

src/components/TravelManager/TravelLeader/Leader.vue

@@ -856,7 +856,7 @@ export default {
       //初始化创建、修改表单数据
       let newMsg = {
         ID: "0",
-        Type: "",
+        Type: 1,
         EmployeeId: "",
         Surname: "",
         Name: "",

src/components/TravelManager/TravelList/OpHotelOrder.vue

@@ -83,7 +83,7 @@
         <th>入住时间</th>
         <th>离店时间</th>
         <th>取消费用</th>
-        <!-- <th>操作</th> -->
+        <th>操作</th>
       </tr>
       <tbody v-for="(item,index) in dataList">
         <tr>
@@ -103,7 +103,7 @@
             <td>{{item.CheckInStr}}</td>
             <td>{{item.CheckOutStr}}</td>
             <td>{{item.CancelFee}}</td>
-            <!-- <td>详情</td> -->
+            <td class="cursorpointer" @click="goOrderDetails(item.OrderID)">详情</td>
         </tr>
         <tr>
             <td colspan="6" style="text-align:left;width:600px">
@@ -116,7 +116,7 @@
                     </div>
                 </div>
             </td>
-            <td colspan="6" style="text-align:left;width:600px">
+            <td colspan="7" style="text-align:left;width:600px">
                 <div class="SH_OrderDan">
                     <div>收款单据：</div>
                     <div>
@@ -181,6 +181,15 @@ export default {
     };
   },
   methods: {
+    goOrderDetails(ID){
+      this.$router.push({
+        name: 'OpHotelOrderDetail',
+        query: {
+          ID: ID,
+          blank:'y',
+        }
+      })
+    },
     getList() {
       //获取现有线路列表
       this.loading = true;

src/components/leaderPay2.vue

@@ -488,7 +488,7 @@ input[type="number"] {
           <th>类型</th>
           <th>预计总金额</th>
           <th>实付金额</th>
-          <th>报账金额
+          <!-- <th>报账金额
             <input
               v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
               totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
@@ -496,7 +496,7 @@ input[type="number"] {
               value="保存"
               class="leader2Btn"
               @click="saveBZPrice()"
-            >
+            > -->
           </th>
         </tr>
         <tr v-show="totalList.SelfPayingExpendTotalPrice>0">
@@ -524,49 +524,49 @@ input[type="number"] {
           <td>景点门票</td>
           <td>{{moneyFormat(OtherTotalPrice)}}</td>
           <td>{{moneyFormat(totalScenicPrice)}}</td>
-          <td>
+          <!-- <td>
              <el-input
                 size="mini"
                 class="w150"
                 type="number"
                 v-model="BaoZhangPrice.ScenicPrice" @change="getAllBZPrice"></el-input>
-          </td>
+          </td> -->
         </tr>
         <tr v-show="totalTrafficPrice>0">
           <td>交通</td>
           <td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalTrafficPrice)}}</td>
-          <td>
+          <!-- <td>
              <el-input
                 size="mini"
                 class="w150"
                 type="number"
                 v-model="BaoZhangPrice.BusPrice" @change="getAllBZPrice"></el-input>
-          </td>
+          </td> -->
         </tr>
         <tr v-show="totalDinnerPrice>0">
           <td>餐饮</td>
           <td>{{moneyFormat(IncomeTotalPrice)}}</td>
           <td>{{moneyFormat(totalDinnerPrice)}}</td>
-          <td>
+          <!-- <td>
              <el-input
                 size="mini"
                 class="w150"
                 type="number"
                 v-model="BaoZhangPrice.DiningPrice" @change="getAllBZPrice"></el-input>
-          </td>
+          </td> -->
         </tr>
         <tr v-show="totalHotelPrice>0">
           <td>酒店</td>
           <td>{{moneyFormat(ExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalHotelPrice)}}</td>
-          <td>
+          <!-- <td>
              <el-input
                 size="mini"
                 class="w150"
                 type="number"
                 v-model="BaoZhangPrice.HotelPrice" @change="getAllBZPrice"></el-input>
-          </td>
+          </td> -->
         </tr>
       </table>
       <table border="0" cellspacing="1" class="leaderPayTable" v-if="TotalPriceData.length>0">
@@ -575,7 +575,7 @@ input[type="number"] {
           <th>预付合计</th>
           <th>实际领款</th>
           <th>实付合计</th>
-          <th>实际报账金额</th>
+          <!-- <th>实际报账金额</th> -->
           <th>领队退款</th>
         </tr>
         <tr
@@ -586,7 +586,7 @@ input[type="number"] {
           <td>{{moneyFormat(item.PlanPrice)}}</td>
           <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
           <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
-          <td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td>
+          <!-- <td>{{index == 0 ? moneyFormat(AllBZPrice) : moneyFormat(item.ExpendTotalPrice)}}</td> -->
           <td>{{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}</td>
         </tr>
         <tr v-if="!TotalPriceData.length">
@@ -698,6 +698,7 @@ input[type="number"] {
               class="leader2Btn"
               @click="goZhiDan(item)"
             >
+            
           </td>
         </tr>
         <tr v-if="!TotalNav && !TotalNav.length">
@@ -777,6 +778,48 @@ input[type="number"] {
             <td colspan="5">暂无数据</td>
         </tr>
       </table>
+      <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
+        <tr>
+          <th colspan="7">稽核单据 
+          </th>
+        </tr>
+        <tr v-for="(item, index) in TotalNav">
+          <td colspan="3">{{item.TCNUMS}}</td>
+          <td colspan="3"><el-input
+                size="mini"
+                class="w150"
+                type="number"
+                v-model="item.price"></el-input></td>
+          <td colspan="1">
+            <input
+              type="button"
+              value="制稽核单"
+              class="leader2Btn"
+              @click="ZhiDanJiHe(item)">
+          </td>
+        </tr>
+        <tr>
+          <th width="140">序号</th>
+          <th>单号</th>
+          <th>费用说明</th>
+          <th>日期</th>
+          <th>备注</th>
+          <th>应付/应收金额</th>
+          <th>业务员</th>
+        </tr>
+        <template v-for="(item, index) in TotalNav">
+          <tr v-for="(Sitem, Sindex) in item.FinanceAuditList">
+            <td>{{Sindex+1}}</td>
+            <td><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', Sitem.FinanceId)">{{Sitem.FinanceId}}</span></td>
+            <td>{{Sitem.CostTypeName}}</td>
+            <td>{{Sitem.CreateDate}}</td>
+            <td>{{Sitem.Remark}}</td>
+            <td>{{Sitem.OriginalMoney}}</td>
+            <td>{{Sitem.CreateByStr}}</td>
+          </tr>
+        </template>
+        
+      </table>
       <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
         <tr>
           <th colspan="4">意见调查表</th>
@@ -878,6 +921,29 @@ export default {
     };
   },
   methods: {
+    // 稽核单据
+    ZhiDanJiHe: function(obj){
+      if(!obj.price) {
+        this.$message.error('请输入金额')
+        return
+      }
+      let userinfo = this.getLocalStorage() 
+      let templateID = JSON.stringify([76, 77])
+      let TCIDARR = [obj.TCIDS];
+      let orderObj = {
+        OrderID: 0,
+        OrderSource: 8,
+        Obj: {},
+        SourceID: 0,
+        CostType: 57,
+        TCIDList: TCIDARR,
+        Money: obj.price,
+      };
+      let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${templateID}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
+      let dom = document.querySelector("#blankLink");
+      dom.href = `http://${window.location.host}/#${fullPath}`;
+      dom.click();
+    },
     // 意见调查列表
     goDIaoCha: function (obj){
       let fullPath = `/investigationList?TCID=${obj.TCIDS}&blank=y&tab=问券调查列表`;

src/router/config.js

@@ -1788,6 +1788,13 @@ export default {
                             meta: {
                                 title: '散卖酒店订单'
                             },
+                        }, {
+                            path: '/OpHotelOrderDetail', //操作 散卖酒店订单详情
+                            name: 'OpHotelOrderDetail',
+                            component: resolve => require(['@/components/TravelManager/TravelList/OpHotelOrderDetail'], resolve),
+                            meta: {
+                                title: '散卖酒店订单'
+                            },
                         },{
                             path: '/HotelOrderTotal', //操作 散卖酒店订单统计
                             name: 'HotelOrderTotal',