车订单列表

src/components/CarDealerOrder/CarDealerOrderList.vue

+<style>
+
+
+</style>
+
+<template>
+  <div>
+      <ReservationOrder :pagesTitle="pagesTitle"></ReservationOrder>
+  </div>
+</template>
+<script>
+  import ReservationOrder from './components/ReservationOrder.vue';
+  export default {
+    components: { ReservationOrder },
+    data() {
+      return {
+        pagesTitle:'销售',
+      };
+    },
+
+    methods: {
+
+
+    },
+    mounted() {
+
+    },
+  };
+
+</script>
+
+<style>
+
+</style>

src/components/CarDealerOrder/CarDealerOrderListOP.vue

+<style>
+
+
+</style>
+
+<template>
+  <div>
+      <ReservationOrder :pagesTitle="pagesTitle"></ReservationOrder>
+  </div>
+</template>
+<script>
+  import ReservationOrder from './components/ReservationOrder.vue';
+  export default {
+    components: { ReservationOrder },
+    data() {
+      return {
+        pagesTitle:'OP',
+      };
+    },
+
+    methods: {
+
+
+    },
+    mounted() {
+
+    },
+  };
+
+</script>
+
+<style>
+
+</style>

src/components/Details.vue

@@ -993,7 +993,7 @@
         window.localStorage.navTabs = JSON.stringify(this.tabs)
     },
     created() {
-      this.typeSystem = localStorage.typeSystem
+      if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
     }
   };
 

src/components/FinancialModule/BasicDocuments.vue

@@ -903,7 +903,7 @@
           <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
           <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
-            @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderListOP':'CarDealerOrderList')">
+            @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
             {{'车行订单:'+GetDetail.ReFinanceId}}</div>
 
           <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@@ -2387,7 +2387,7 @@ class="w135 _border_b_1">
             NewFinanceId: FrID,
             blank: "y",
           };
-          
+
             this.$router.push({
             path: "/HelpBranch",
             query
@@ -2398,13 +2398,13 @@ else if (Type==2) {
             id: FrID,
             blank: "y",
           };
-          
+
             this.$router.push({
             path: "/CapitalAllocationDetail",
             query
           });
           }
-          
+
         },
 
       // 发票审核
@@ -2600,7 +2600,6 @@ else if (Type==2) {
                 OrderId: this.GetDetail.ReFinanceId,
               }}, `${href}`)
             }else{
-              return
               this.$router.push({
                 path: path,
                 query: {
@@ -2620,7 +2619,7 @@ else if (Type==2) {
             }
           });
           }
-          
+
         }
 
       },

src/components/FinancialModule/FinancialDocuments.vue

@@ -1805,7 +1805,7 @@
       };
     },
     created() {
-      this.typeSystem = localStorage.typeSystem
+      if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
       this.isTerminate = -1
       let userinfo = this.getLocalStorage();
       let ActionMenuCode = userinfo.ActionMenuCode;

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -929,7 +929,7 @@
               @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">
               {{'单项车订单:'+GetDetail.ReFinanceId}}</div>
             <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
-              @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderListOP':'CarDealerOrderList')">
+              @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
               {{'车行订单:'+GetDetail.ReFinanceId}}</div>
             <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
@@ -1848,7 +1848,6 @@
                 OrderId: this.GetDetail.ReFinanceId,
               }}, `${href}`)
             }else{
-              return
               this.$router.push({
                 path: path,
                 query: {
@@ -2861,7 +2860,7 @@
       }
     },
     mounted() {
-      this.typeSystem = localStorage.typeSystem
+      if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
 
       // document.onkeydown = this.KeyDown
       // document.onkeyup = this.KeyUp

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -657,7 +657,7 @@ export default {
       }
   },
   mounted(){
-    this.typeSystem = localStorage.typeSystem
+    if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
     if(this.typeSystem==1) this.msg.OtherType = '80'
       let userInfo=this.getLocalStorage();
       this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -596,7 +596,7 @@ tr._item_list td:last-child {
                 </el-select>
               </el-form-item>
             </el-col>
-          
+
           <el-col :span="4">
               <el-form-item label="是否联运：">
                 <el-select v-model="msg.Is_Transport" filterable class="w150">
@@ -611,7 +611,7 @@ tr._item_list td:last-child {
                 <el-input v-model="msg.DMCNUM" class></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :span="4">
               <el-form-item label="领队类型：">
                 <el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
@@ -762,7 +762,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===15">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
-    <span style="cursor: pointer" v-if="rowData.DataType===22">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===23"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
   </div>
 
@@ -778,7 +778,33 @@ Vue.component("TCIDJump", {
       type: Number
     }
   },
+  data() {
+    return {
+      typeSystem: 0
+    }
+  },
+  mounted() {
+    if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
+  },
   methods: {
+    goCarUrl(path,id,row){
+      if(this.typeSystem==1){
+        let href = this.domainManager().CarUrl
+        window.parent.postMessage({
+        event_id: 'CarDealerOrder',
+        data: {
+          OrderId: id,
+        }}, `${href}`)
+      }else{
+        this.$router.push({
+          path: path,
+          query: {
+            OrderId: id,
+            blank: 'y'
+          }
+        });
+      }
+    },
     goUrl(path, id ,row) {
       if(row.TeamType==2){//为一日游的时候跳转到一日游团控列表
         this.$router.push({
@@ -884,7 +910,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===19" @click="goUrl('SingleticketOrderListOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span v-if="rowData.DataType===20">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
-    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
@@ -898,7 +924,33 @@ Vue.component("TCNUMJump", {
       type: Number
     }
   },
+  data() {
+    return {
+      typeSystem: 0
+    }
+  },
+  mounted() {
+    if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
+  },
   methods: {
+    goCarUrl(path,id,row){
+      if(this.typeSystem==1){
+        let href = this.domainManager().CarUrl
+        window.parent.postMessage({
+        event_id: 'CarDealerOrder',
+        data: {
+          OrderId: id,
+        }}, `${href}`)
+      }else{
+        this.$router.push({
+          path: path,
+          query: {
+            OrderId: id,
+            blank: 'y'
+          }
+        });
+      }
+    },
     goHand(path,rowData,type){
       if(type==15){
         let TCID=rowData.TCID;
@@ -2185,9 +2237,11 @@ export default {
       F_GeneralManager:false,
       coinGetList: [],
       coinGetShow: false,
+      typeSystem: 0,
     };
   },
   created() {
+    if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
     this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
     this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
     this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';

src/components/Hotel/reservation/OrderList.vue

@@ -1026,7 +1026,6 @@ export default {
       isShowCorrelation: false,
       CorrelationObj:{},
       is_correlationOP: false,
-      typeSystem: 0
     };
   },
   watch: {
@@ -1059,22 +1058,7 @@ export default {
       }
       this.isShowCorrelation = true;
     },
-    // 车行订单 制成本冲抵单
-    addBalanceout() {
-      let datas = this.$route.query
-      let tradeObj = datas.tradeObj
-      console.log(datas,tradeObj,'-----crmuserInfo')
-      let query = {
-        blank: "y",
-        tab: `新增付款单据`,
-        Type: 2,
-        tradeObj: tradeObj,
-        companyID: 1248
-      };
-      this.queryObj =  query
-      this.cdState = true
-      // this.makeAdocument(row, 0, 3, null, 'Offset')
-    },
+
     isOffset(row, index, num,name){
       this.makeAdocument(row, index, num, name, 'Offset')
     },
@@ -1526,7 +1510,7 @@ export default {
     }
   },
   mounted() {
-    this.typeSystem = localStorage.typeSystem
+
     this.userInfo = this.getLocalStorage();
     let ActionMenuCode = this.userInfo.ActionMenuCode;
     if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){

src/components/index.vue

@@ -1753,7 +1753,7 @@
       },
     },
     mounted() {
-      this.typeSystem = localStorage.typeSystem
+      if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
       let that = this;
       this.qjGroupId = this.QjGroupId();
       this.apipost('user_post_GetNowVote', {}, r => {

src/router/config.js

@@ -1006,6 +1006,22 @@ export default {
                 title: '酒店预定订单'
               },
             },
+            {
+              path: '/CarDealerOrder', //车订单
+              name: 'CarDealerOrder',
+              component: resolve => require(['@/components/CarDealerOrder/CarDealerOrderList'], resolve),
+              meta: {
+                title: '车行订单'
+              },
+            },
+            {
+              path: '/CarDealerOrderOP', //车订单OP
+              name: 'CarDealerOrderOP',
+              component: resolve => require(['@/components/CarDealerOrder/CarDealerOrderListOP'], resolve),
+              meta: {
+                title: '车行订单'
+              },
+            },
             {
               path: '/singleProductModifyHotelOrder', //酒店预定订单变更
               name: 'singleProductModifyHotelOrder',