no message

src/assets/css/allorder.css

+.Black {
+  color: Black;
+}
+.red {
+  color: #fd397a;
+}
+.blue {
+  color: #409eff;
+}
+.gray {
+  color: gray;
+}
+.px-10px{
+  padding: 0 10px;
+}
\ No newline at end of file

src/components/HomeNav/HomeNavTop.vue

@@ -29,6 +29,9 @@
   font-size: 16px;
   cursor: pointer;
   font-family: perfectFont;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .nav-right .nav-right-menu ul li:first-child {
   margin-left: 0px;
@@ -46,10 +49,14 @@
   flex: unset;
   width: 240px;
   justify-content: flex-end;
+  
 }
 .nav-right .nav-right-info .right-item {
   text-align: right;
   padding-left: 20px;
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
 }
 /* .nav-right .nav-right-info .right-item:last-child{
     margin: 0px;
@@ -63,11 +70,13 @@
   font-size: 12px;
   color: #bbb;
   margin-right: 5px;
+  white-space: nowrap;
 }
 .nav-right .nav-right-info .right-item .usr-name {
   font-size: 16px;
   font-weight: bold;
   color: black;
+  white-space: nowrap;
 }
 .nav-right .nav-right-info .right-item i {
   font-size: 20px;

src/components/customerManage/customerOrder.vue

@@ -60,7 +60,7 @@
 <template>
     <div class="customerManage">
         <div class="tools">
-            <h1>订单管理</h1>
+            <h1>机票订单统计管理</h1>
             <div class="rightmenu">
                 <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button>
             </div>

src/components/customerManage/myCustomerOrder.vue

@@ -60,7 +60,7 @@
 <template>
     <div class="customerManage">
         <div class="tools">
-            <h1>订单管理</h1>
+            <h1>机票订单管理</h1>
             <div class="rightmenu">
                 <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button>
             </div>
@@ -246,7 +246,7 @@
                 <span class="red">{{StatModel.CancelNum}}人</span>
             </div>
         </div>
-        <div class="query-box status-box">
+        <div class="query-box status-box px-10px">
             <div class="status-text">
                 <div class="tis-k" style="background: #2961FE"></div>
                 <span>已打单</span>
@@ -355,6 +355,9 @@ export default {
       let data = JSON.parse(this.$route.query.erpOrderObj);
       this.msg.OrderId = data.OrderId;
     }
+    if (this.$route.query.OrderId) {
+      this.msg.OrderId = this.$route.query.OrderId;
+    }
     this.Employee(); //业务员
     this.GetTicketStatusEnumList(); //出票枚举
     this.GetOrderStatusEnumList(); //订单状态枚举

src/components/customerManage/orderList.vue

@@ -327,7 +327,7 @@ export default {
                 Name: '套餐',
                 Id: '4'
             }, {
-                Name: '套餐',
+                Name: '其他',
                 Id: '5'
             }
         ],

src/components/myOrdersAllType/components/orderList.vue

+<!--订单列表-->
+<template>
+  <div>
+    <el-table
+        v-loading="loading"
+        stripe
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        row-class-name="font-size-12">
+        <el-table-column 
+            label="商品类型"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-tag size="mini">{{scope.row.OrderTypeName}}</el-tag>
+            </template>
+        </el-table-column>
+        <el-table-column 
+            width="130"
+            prop="CreateTimeStr"
+            label="日期"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+            label="客人姓名"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span class="colorblue font-color-link"  @click="openNameDetails(scope.row)">
+                {{scope.row.GuestName}}
+              </span>
+            </template>
+        </el-table-column>
+        <el-table-column 
+            prop="SaleName"
+            label="销售姓名"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="LureEmpName"
+            label="引流姓名"
+            show-overflow-tooltip>
+        </el-table-column>
+        
+        <el-table-column 
+            label="商品名称"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.Name" placement="top">
+                <p style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</p>
+              </el-tooltip>
+            </template>
+        </el-table-column>
+        <el-table-column 
+            prop="Money"
+            label="总金额"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="CostMoney"
+            label="成本"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+            label="待收"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="{'red':scope.row.DueInMoney>0}">{{scope.row.DueInMoney}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column 
+            prop="Income"
+            label="实收"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="PlatformTax"
+            label="手续费"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="Refund"
+            label="退款"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="DiscountsMoney"
+            label="优惠"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column 
+            prop="StateName"
+            label="状态"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.StateName}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column 
+            label="操作"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button>
+            </template>
+        </el-table-column>
+      </el-table>
+      <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
+        <!-- {{drawer}} -->
+        <customerInfoBox :CustomerId="CustomerId" :activeNameNum="activeNameNum" :receiptType="receiptType"/>
+    </el-drawer>
+    <!-- 单号抽屉 -->
+    <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
+        <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum" />
+    </el-drawer>
+    <!-- 提成详情 -->
+    <commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
+</div>
+</template>
+
+<script>
+  import customerInfoBox from "../../guestManagement/customerInfoBox";
+import orderDetailsDrawer from "../../customerManage/orderDetailsDrawer";
+import commissionPopUp from "../../dialogModel/commissionPopUp";
+export default {
+  components: {
+    customerInfoBox,
+    orderDetailsDrawer,
+    commissionPopUp
+  },
+  props: {
+    pagesTitle: {
+      type: String,
+      default: "",
+    },
+    //订单
+    dataList: {
+      type: Array,
+      default: null,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    superManage: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      CustomerId: "",
+      CustomerName: "",
+      currentOrder: null,
+      parameters:{},
+      receiptType:{},
+      drawer: false,
+      orderDrawer: false,
+      commissionPopUpVisible: false,
+      activeNameNum:"1",
+    };
+  },
+  created() {},
+  watch: {
+    loading: {
+      handler(val, oldVal) {
+        this.loading = val;
+      },
+      deep: true,
+    },
+    pagesTitle: {
+        handler(val, oldVal) {
+            this.pagesTitle = val
+        },
+        immediate: true
+    },
+  },
+  mounted() {
+    let $this = this;
+    this.userInfo = this.getLocalStorage();
+    this.MsgBus.$on("closeaddContacts", function() {
+      $this.commissionPopUpVisible = false;
+      $this.emptyMore()
+    });
+  },
+  methods: {
+    goDetails(row){
+      let data = [{
+          path: "",
+          OrderId: row.OrderId,
+          Type: ''
+        }]
+        let href
+        let url = this.domainManager().erpRoutingUrl;
+        
+      let command = row.OrderType
+      if (row.OrderType == 1) {
+        let name = ''
+        if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
+          name = 'myCustomerOrder'
+        }else{
+          name = 'customerOrder'
+        }
+        this.$router.push({
+          name: name,
+          query: {
+            OrderId: row.OrderId,
+            blank: "y",
+          }
+        });
+      }else{
+        if (row.OrderType == 6) {
+          if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
+            data[0].path = 'VisaProductEditOrder'
+          }else{
+            data[0].path = 'VisaProductEditOrderOP'
+          }
+          href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+        }else if (row.OrderType == 2) {//3跟团 4一日游
+          data[0].path = 'enrollTotal'
+          href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+        }
+        else if (row.OrderType == 3) {//酒店
+          if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
+            data[0].path = 'singleProductHotelOrder'
+          }else{
+            data[0].path = 'singleProductHotelOrderOP'
+          }
+          href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+        }
+        else if (row.OrderType == 4) {//门票
+          if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
+            data[0].path = 'SingleticketOrderList'
+          }else{
+            data[0].path = 'SingleticketOrderListOP'
+          }
+          href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+        }
+        else if (row.OrderType == 5) {//包车
+            this.GetAdminCarOrderPageList(row,url,href,data)
+        }
+        else if (row.OrderType == 7) {//jalan酒店
+          // if(this.pagesTitle=='销售'){
+          //   data[0].path = 'CharterOrderList'
+          // }else{
+          //   data[0].path = 'CharterOrderListOP'
+          // }
+          // href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+        }
+        if(href){window.open(href);}
+        
+      }
+    },
+    GetAdminCarOrderPageList(row,url,href,data){
+      let msg = {
+              pageIndex: 1,
+              pageSize: 5,
+              OrderType: '',
+              OrderId: row.OrderId,
+              OrderNo: '',
+              SurName: '',
+              Name: '',
+              OrderStatus: 0,
+              StartTime: '',
+              EndTime: '',
+              OrderSTime: '',
+              OrderETime: '',
+              ProductName: '',
+              Mobile: '',//电话
+              IsSelectSale: 1,
+              EnterID: 0,//业务员
+          }
+          this.apipost2('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
+              if (res.data.resultCode == 1) {
+                let pageData = res.data.data.pageData
+                let OrderType
+                if(pageData&&pageData.length>0){
+                    OrderType = pageData[0].OrderType
+                }
+                data[0].Type = OrderType?OrderType:4
+                if(this.pagesTitle=='销售'||this.pagesTitle=='详情'){
+                  data[0].path = 'CharterOrderList'
+                }else{
+                  data[0].path = 'CharterOrderListOP'
+                }
+                href =url +"automaticLogin?token=" +this.getLocalStorage().token +"&data=" +JSON.stringify(data);
+                window.open(href)
+              }
+          })
+    },
+    // 提成列表
+    commissionDetails(item){
+      this.parameters = item
+      this.commissionPopUpVisible = true
+    },
+    openNameDetails(item) {
+      this.drawer = true;
+      this.CustomerId = item.GuestId;
+      this.CustomerName = item.GuestName;
+    },
+    handleClose(done) {
+      done();
+    },
+    closeOrderDrawerHandler() {
+      this.currentOrder = null;
+      this.orderDrawer = false;
+    },
+  },
+};
+</script>
+<style scoped>
+  @import "../../../assets/css/allorder.css";
+</style>

src/components/myOrdersAllType/customerOrderAllType.vue

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

src/components/myOrdersAllType/myCustomerOrderAllType.vue

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

src/main.js

@@ -122,7 +122,33 @@ Vue.prototype.moneyFormat = function (value) {
   }
   return x1 + x2;
 },
-
+    // 计算当前日期的前后日期
+    Vue.prototype.getBeforeDate = function (num, time) {
+      let n = num;
+      let d = '';
+      if (time) {
+      d = new Date(time);
+      } else {
+      d = new Date();
+      }
+      let year = d.getFullYear();
+      let mon = d.getMonth() + 1;
+      let day = d.getDate();
+      if (day <= n) {
+      if (mon > 1) {
+          mon = mon - 1;
+      } else {
+          year = year - 1;
+          mon = 12;
+      }
+      }
+      d.setDate(d.getDate() - n);
+      year = d.getFullYear();
+      mon = d.getMonth() + 1;
+      day = d.getDate();
+      let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day);
+      return s;
+  }
   // 注册
   Vue.filter('priceFormat', function (value) {
     if (value == null) {

src/plugins/index.js

@@ -13,13 +13,14 @@ export default {
             Vue.prototype.domainManager = function() {
                 //CRM API
                 let domainUrl = "";
-                domainUrl = "http://192.168.10.46:8500";
-                // domainUrl = "http://192.168.10.36:8098";
+                // domainUrl = "http://192.168.10.46:8500";
+                domainUrl = "http://192.168.10.9:8098";
+                // domainUrl = "http://crm.oytour.com"
                 //domainUrl = "http://localhost:5003";
                 let locationName = window.location.hostname;
                 //旅游ERPApi
                 let domainPostUrl = ""
-                domainPostUrl = "http://192.168.10.36:8083";
+                domainPostUrl = "http://192.168.10.9:8083";
                 //domainPostUrl = "http://192.168.10.46";
                 if (this.isOnline()) {
                     if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) {
@@ -43,7 +44,7 @@ export default {
                     javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
                     ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
                     UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
-                    erpRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://yx.oytour.com/#/" : "http://www.test.com:8081/#/",
+                    erpRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://yx.oytour.com/#/" : "http://localhost:8081/#/"// "http://www.test.com:8081/#/",
                 };
                 return obj;
             },

src/router.js

@@ -20,6 +20,8 @@ import customerOrder from "./components/customerManage/customerOrder"
 import myCustomerOrder from "./components/customerManage/myCustomerOrder"
 import automaticLogin from './views/automaticLogin'
 import planeTicketOrder from './components/planeTicketOrder/index'
+import myCustomerOrderAllType from "./components/myOrdersAllType/myCustomerOrderAllType"
+import customerOrderAllType from "./components/myOrdersAllType/customerOrderAllType"
 import Test from './components/Test'
 Vue.use(Router);
 
@@ -518,10 +520,26 @@ export default new Router({
             path: "/myCustomerOrder",
             name: "myCustomerOrder",
             component: myCustomerOrder,
+            meta: {
+                title: "机票订单"
+            }
+        },
+        {
+            path: "/myCustomerOrderAllType",
+            name: "myCustomerOrderAllType",
+            component: myCustomerOrderAllType,
             meta: {
                 title: "我的订单"
             }
         },
+        {
+            path: "/customerOrderAllType",
+            name: "customerOrderAllType",
+            component: customerOrderAllType,
+            meta: {
+                title: "订单统计"
+            }
+        },
         {
             path: "/planeTicketOrder",
             name: "planeTicketOrder",

src/views/login.vue

@@ -120,7 +120,7 @@
           Domain: "fcrmyx.oytour.com",
         };
         if (!this.isOnline()) {
-          msg.Domain = "www.test.com";
+          msg.Domain = "localhost";//www.test.com localhost
         }
         this.apipost("/api/Login/UserLogin", msg, (res) => {
           var jsonData = res.data;