save

.vscode/settings.json

@@ -8,7 +8,7 @@
   "editor.fontSize": 15,
   "editor.wordWrap": "wordWrapColumn",
   "editor.accessibilitySupport": "auto",
-  "editor.renderFinalNewline": false,
+  "editor.renderFinalNewline": "off",
   "workbench.editor.wrapTabs": true,
   "editor.unicodeHighlight.nonBasicASCII": true
 }

quasar.conf.js

@@ -64,7 +64,7 @@ module.exports = configure(function (ctx) {
       publicPath: ctx.dev ? '/' : './',
       env: ctx.dev
         ? {
-          BASE_APP_API: 'http://192.168.10.9:8083/api/common/post',//http://192.168.10.9:8083/api/common/post  http://192.168.10.206:8015/api/common/post
+          BASE_APP_API: 'http://192.168.10.226:8015/api/common/post',//http://192.168.10.226:8015/api/common/post  http://192.168.10.206:8015/api/common/post
           JAVA_URL_API: 'http://efficient.oytour.com',
           VERSION:require('./package.json').version,
 

src/api/travel.ts

+import { HttpResponse } from '../@types'
+import request from './request'
+
+class travelService {
+  static async getTravelList(params:any):Promise<HttpResponse>{
+    return request('travelteam_GetTravelTeamPartnerPage',params)
+  }
+  static async addOrder(params:any):Promise<HttpResponse>{
+    return request('travelteam_GetTravelTeamPartnerPage',params)
+  }
+  static async newOrder(params:any):Promise<HttpResponse>{
+    return request('sellorder_post_SetTravelTeamOrderForB2B',params)
+  }
+}
+
+export default travelService

src/config/dictionary.ts

@@ -93,5 +93,9 @@ class DirtionmaryHelper {
    * 元素滚动參數
    */
    static readonly SCROLL_AREA_OBJ = "scrollareaobj"
+   /**
+    * 包机订单列表
+    */
+    static readonly TRAVEL_ORDER_OBJ = "travelOrderObj"
 }
 export { userDictionmary,DirtionmaryHelper }

src/i18n/zh-TW/index.ts

@@ -354,6 +354,11 @@ export default {
       first: '帳單',
       second: '月度請求書',
       three: '匯款說明'
+    },
+    travel: {
+      first: '包机',
+      second: '包机服务',
+      three: ' '
     }
   },
   login: {

src/pages/travel/components/OrderList.vue

+  <template>
+  <div>
+    <q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" flat v-for="(x,index) in orders">
+      <div>{{x.GTeamName}}</div>
+      <!-- <div>{{x.CreateTime}}</div> -->
+      <div>{{x.StartDate}}</div>
+      <div>
+        <div>{{x.Remark}}</div>
+      </div>
+      <div>
+        <q-btn @click="ViewPayment(x)">下单</q-btn>
+      </div>
+    </q-card>
+    <q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="pages.pageCount > 0" flat>
+      <q-pagination class="full-width justify-end" v-model="pages.pageIndex" color="primary" :max="pages.pageCount" :input="true" @update:model-value="changePageHandler" />
+    </q-card>
+    <q-inner-loading :showing="loading" :label="$t('loading')" label-class="text-grey-6 f12" />
+  </div>
+  <div class="text-center q-mt-xl" v-if="(!orders || orders.length == 0) && !loading">
+    <svg-icon :size="50" color="nav" icon="General/Clipboard.svg"></svg-icon>
+    <div class="q-mt-md f12 text-grey-6">{{ $t('noneData') }}</div>
+  </div>
+  <q-dialog v-model="showOrderdDetail">
+    <!-- <OrderdDetail :OrderID="OrderID"></OrderdDetail> -->
+  </q-dialog>
+
+  <q-dialog v-model="showAddOrder">
+    <AddOrder :info="info" @close="showAddOrder = false"></AddOrder>
+  </q-dialog>
+
+</template>
+
+<script lang="ts">
+import { DirtionmaryHelper } from '../../../config/dictionary'
+import { defineComponent, inject, reactive, toRefs, watch, toRaw } from 'vue'
+import travelService from '../../../api/travel'
+import { ApiResult } from '../../../@types/enumHelper'
+import message from '../../../utils/message'
+import { RoomType, StandardStatus } from '../../../@types'
+import { getHotelOrderStatus, getHotelRoomType, moneyFormat } from '../../../utils/tools'
+import { useI18n } from 'vue-i18n'
+import svgIcon from '../../../global/svg-icon.vue'
+import { copyToClipboard, useQuasar } from 'quasar'
+import { currentRouter } from '../../../router'
+// import OrderdDetail from './OrderdDetail.vue'
+// import BankAccount from '../../BankAccount.vue'
+import AddOrder from './addOrder.vue'
+
+export default defineComponent({
+  components: {AddOrder },
+  setup(props) {
+    const search = inject(DirtionmaryHelper.TRAVEL_ORDER_OBJ) as any
+    const { t } = useI18n()
+    const $q = useQuasar()
+
+    watch(search, (n, o) => {
+      if (data.loading) return
+      data.pages.pageIndex = 1
+      data.orders = []
+      methods.initOrders()
+    })
+
+    const data = reactive({
+      info: {},
+      copyId: 0,
+      showAddOrder: false,
+      OrderID: '',
+      showOrderdDetail: false,
+      orders: [] as Array<any>,
+      status: [] as Array<StandardStatus>,
+      rooms: [] as Array<RoomType>,
+      pages: {
+        pageIndex: 1,
+        pageSize: 10,
+        pageCount: 0
+      },
+      loadingCel: false,
+      loading: false,
+      cols: [
+      { name: 'HotelName', label: t('v101.scatteredOrderList.table1'), field: (row: any) => row.HotelName, align: 'left' },
+        { name: 'Number', label: t('v101.scatteredOrderList.table3'), field: (row: any) => row.Number, align: 'left' },
+        { name: 'DiscountMoney', label: t('v101.scatteredOrderList.youhui'), field: (row: any) => `${row.DiscountMoney.toFixed(2)}`, align: 'left' },
+        { name: 'CustomerPayMoney', label: t('v101.scatteredOrderList.table5'), field: (row: any) => row.CustomerPayMoney.toFixed(2), align: 'left' },
+        { name: 'Money', label: t('hotelorder.col.m'), field: (row: any) => row.Money.toFixed(2), align: 'left' },
+      ] as any,
+      mobileCols: [
+        { name: 'HotelName', label: t('v101.scatteredOrderList.table1'), align: 'left' },
+        { name: 'OrderID', label: t('v101.scatteredOrderList.table2'), field: (row: any) => row.OrderID, align: 'left' },
+        { name: 'CustomerPayMoney', label: t('v101.scatteredOrderList.table5'), field: (row: any) => row.CustomerPayMoney.toFixed(2), align: 'left' },
+      ]
+    })
+
+    const methods = {
+      ViewPayment(info:any) {
+        data.info = toRaw(info)
+        console.log('ViewPayment', toRaw(info))
+        data.showAddOrder = true
+      },
+      canCelHotel(ThirdOrderNo) {
+        $q.dialog({
+          title: t('dialog.titles.horder'),
+          message: t('dialog.contents.horder'),
+          cancel: true,
+          persistent: true
+        }).onOk(() => {
+          methods.cancellations(ThirdOrderNo)
+        })
+      },
+      cancellations(ThirdOrderNo){
+        if(data.loadingCel) return
+        let msg ={
+            bookingNumber:ThirdOrderNo,
+            CancelBy: search.CustomerId,
+            CancelType:2
+        }
+        let param = Object.assign(msg)
+        data.loadingCel = true
+        travelService.getTravelList(param)
+          .then(r => {
+            if (r.data.resultCode == ApiResult.SUCCESS) {
+              message.successMsg(`${t('success')}`)
+              methods.initOrders()
+            } else {
+              message.errorMsg(r.data.message)
+            }
+            data.loadingCel = false
+          })
+          .catch(e => {
+            message.errorMsg(e.message)
+            data.loadingCel = false
+          })
+      },
+      getDetail(OrderID){
+        data.showOrderdDetail = true
+        data.OrderID = OrderID
+      },
+      
+      initOrders() {
+        data.loading = true
+        let param = Object.assign(data.pages, search)
+        travelService.getTravelList(param)
+        .then(r => {
+          data.loading = false
+          if (r.data.resultCode == ApiResult.SUCCESS) {
+            // r.data.data.pageData.forEach((x: any) => {
+            //   x.typeInfo = data.status.find(y => y.StatusId == x.OrderStatus) ?? data.status[1]
+            //   x.SendType = data.sends.find(y => y.Id == x.MailingState) ?? data.sends[0]
+            //   x.Money = 0
+            //   let Money = 0
+            //   x.DetailList.forEach((y:any)=>{
+            //     Money+=y.Money
+            //   })
+            //   x.Money= Number(Money+x.MailingMoney)
+            // })
+            data.orders = r.data.data.pageData
+            data.pages.pageCount = r.data.data.pageCount
+          } else {
+            message.errorMsg(r.data.message)
+          }
+        }).catch(e => {
+          message.errorMsg(e.message)
+          data.loading = false
+        })
+      },
+      init() {
+        data.status = getHotelOrderStatus()
+        data.rooms = getHotelRoomType()
+        methods.initOrders()
+      },
+      setCopyHandler(order: any, ctx?: string) {
+        if (ctx) {
+          data.copyId = -1
+          copyToClipboard(ctx)
+        } else {
+          data.copyId = order.OrderID
+          copyToClipboard(order.ThirdOrderNo)
+        }
+
+        setTimeout(() => {
+          data.copyId = 0
+        }, 2000)
+      }
+    }
+
+    methods.init()
+    return {
+      ...toRefs(data),
+      ...methods,
+      moneyFormat
+    }
+  }
+})
+</script>
+
+<style>
+.light-border table,
+.light-border table td,
+.light-border .q-table__middle,
+.light-border.borders,
+.light-border table th {
+  border-color: #eee !important;
+  white-space: wrap;
+}
+.light-border .room-item {
+  height: 28px;
+  line-height: 28px;
+  border-bottom: 1px solid #eee;
+}
+.light-border .room-item:last-child {
+  border-bottom: none;
+}
+.light-border .max-hotelname {
+  width: 140px;
+  height: 28px;
+  line-height: 28px;
+}
+.orderListDialog-title{
+  position: relative;
+}
+.orderListDialog-title span{
+  font-size: 20px;
+}
+.orderListDialog-close{
+  position: absolute;
+  right: 0;
+  top: -10px;
+  font-size: 26px;
+}
+.orderListDialog-bg{
+  background: #5098FF;
+  border-radius: 10px;
+}
+.orderListDialog-img{
+  background: url('../../../assets/images/wallet.png')no-repeat right #5098FF;
+  background-size: 97px 100%;
+}
+</style>

src/pages/travel/components/OrderListHeader.vue

+<template>
+  <div class="rounded-borders bg-white row items-center q-pa-md">
+    <q-select v-if="$q.platform.is.desktop" class="q-mr-md"  style="min-width: 150px" v-model="search.B2BSelectOrderState"  @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
+    <q-input class="q-mr-md" v-model="search.HotelName" dense standout :label="$t('v101.scatteredOrderList.first')"/>
+    <div class="col"></div>
+    <q-btn color="primary" unelevated :label="$t('query')"  @click="setQueryHandler"/>
+  </div>
+  <div class="rounded-borders bg-white q-pa-sm q-mt-md mobile-only">
+    <q-tabs v-model="search.B2BSelectOrderState" class="text-cyan" dense>
+      <q-tab :name="x.StatusId" :label="x.StatusName" v-for="x in status" @click="setOrderStatus(x.StatusId)"/>
+    </q-tabs>
+  </div>
+</template>
+
+<script lang="ts">
+import { DirtionmaryHelper } from '../../../config/dictionary'
+import { computed, defineComponent, inject, reactive, ref, toRefs } from 'vue'
+import { OrderType, RoomType, StandardStatus } from '../../../@types'
+import { getScatteredHotelOrderStatus, getHotelOrderType, getHotelRoomType } from '../../../utils/tools'
+import { date,useQuasar } from 'quasar'
+
+export default defineComponent({
+  setup(props) {
+    const qDateProxy = ref(null) as any
+    const $q = useQuasar()
+
+    const data = reactive({
+      status: [] as Array<StandardStatus>,
+      cancelStatus: {} as StandardStatus | undefined,
+      dateRangeFormat: '',
+      dateRange: {} as any,
+      rooms: [] as Array<RoomType>,
+      orderTypes: [] as Array<OrderType>,
+      canHide: false
+    })
+    const realSearch = inject(DirtionmaryHelper.TRAVEL_ORDER_OBJ) as any
+    const search = reactive(JSON.parse(JSON.stringify(realSearch)))
+    const methods = {
+      initStatus() {
+        let allStatus = getScatteredHotelOrderStatus()
+        data.status = allStatus.filter((x: StandardStatus) => {
+          return x.StatusId != 4
+        })
+        data.cancelStatus = allStatus.find((x: StandardStatus) => {
+          return x.StatusId == 4
+        })
+        data.rooms = getHotelRoomType(true)
+        data.orderTypes = getHotelOrderType(true)
+      },
+      optionsFn(cd: any) {
+        return cd < date.formatDate(date.addToDate(new Date(), { days: 1 }), 'YYYY/MM/DD')
+      },
+      dateRangeHandler(e: any) {
+        search.StartTime = `${e.from.year}/${e.from.month}/${e.from.day}`
+        search.EndTime = `${e.to.year}/${e.to.month}/${e.to.day} `
+        data.dateRangeFormat = `${search.StartTime} - ${search.EndTime} `
+        if (qDateProxy.value) qDateProxy.value.hide()
+      },
+      setQueryHandler(){
+        realSearch.B2BSelectOrderState=search.B2BSelectOrderState
+        realSearch.CustomerId=search.CustomerId
+        realSearch.HotelName=search.HotelName
+      },
+      setOrderStatus(statusId:number){
+        realSearch.B2BSelectOrderState=statusId
+      }
+    }
+
+    const searchCnt = computed(() => {
+      let setCnt = 0
+      if ($q.platform.is.mobile) {
+        if (realSearch.HotelName) setCnt++
+      }
+      return setCnt
+    })
+
+    methods.initStatus()
+    return {
+      ...toRefs(data),
+      ...methods,
+      search,
+      searchCnt
+    }
+  }
+})
+</script>
+
+<style></style>

src/pages/travel/components/addOrder.vue

+<style scoped>
+/* .background {
+    backface-visibility: #fff;
+    padding: 20px;
+} */
+.heading {
+    font-size: 20px;
+    font-weight: bold;
+}
+.title {
+  margin: 20px 0 10px 0;
+}
+</style>
+<template>
+  <q-card flat class="q-pa-md" style="background: #fff; width: 600px; min-width: 375px">
+    <div class="bacakground">
+        <div class="heading">新增/修改订单</div>
+      <q-form>
+        <div class="row">
+          <div class="col">
+            <div class="title">成人数量</div>
+            <q-input
+              v-model="addMsg.ManNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @keyup.native="checkInteger(addMsg, 'ManNum')"
+              @update:model-value="
+                getNumber();
+                getHouseNo();
+                getTotalPrice();
+              "
+            ></q-input
+            >
+          </div>
+          <div class="col">
+            <div class="title">老人数量</div>
+            <q-input
+              v-model="addMsg.OldPeopleNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @keyup.native="checkInteger(addMsg, 'OldPeopleNum')"
+              @update:model-value="
+                getNumber();
+                getHouseNo();
+                getTotalPrice();
+                autoRemarks('OldPeopleNum', '老人人数');
+              "
+            ></q-input>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col">
+            <div class="title">单房数量</div>
+            <q-input
+              v-model="addMsg.SingleRoomNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @keyup.native="checkInteger(addMsg, 'SingleRoomNum')"
+              @update:model-value="
+                yzBigBed2();
+                getTotalPrice();
+                autoRemarks('SingleRoomNum', '单房数量');
+              "
+            ></q-input>
+          </div>
+          <!-- <div>
+          <div>分摊人</div>
+          <q-input
+            v-model="addMsg.CommissionSharePeople"
+            class="col q-mr-md"
+            mask="#"
+            reverse-fill-mask
+            dense
+            type="text"
+            standout
+            
+          ></q-input>
+        </div> -->
+          <div class="col">
+            <div class="title">经济舱</div>
+            <q-input
+              v-model="addMsg.YSeatNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @keyup.native="checkInteger(addMsg, 'YSeatNum')"
+            ></q-input>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col">
+            <div class="title">头等舱</div>
+            <q-input
+              v-model="addMsg.FSeatNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @update:model-value="getNumber()"
+            ></q-input>
+          </div>
+          <div class="col">
+            <div class="title">商务舱</div>
+            <q-input
+              v-model="addMsg.ESeatNum"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+              @update:model-value="getNumber()"
+            ></q-input>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col">
+            <div class="title">联系人</div>
+            <q-input
+              v-model="addMsg.ContactName"
+              class="col q-mr-md"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+            ></q-input>
+          </div>
+          <div class="col">
+            <div class="title">联系人电话</div>
+            <q-input
+              v-model="addMsg.ContactMobile"
+              class="col q-mr-md"
+              mask="#"
+              reverse-fill-mask
+              dense
+              type="text"
+              standout
+              
+            ></q-input>
+          </div>
+        </div>
+        <div>
+          <div class="title">备注</div>
+          <q-input
+            v-model="addMsg.Remarks"
+            class="col q-mr-md"
+            reverse-fill-mask
+            dense
+            type="text"
+            standout
+            
+          ></q-input>
+        </div>
+        <div class="row justify-between items-center">
+          <div class="title">订单价格</div>
+          <div class=" text-subtitle2 text-weight-bolder text-primary">{{ addMsg.PreferPrice }}</div>
+        </div>
+        <div class="row justify-end">
+        <q-btn unelevated class="bg-grey-3 hover q-mr-md" @click="cancel">取消</q-btn>
+        <q-btn  color="primary" unelevated class="q-ml-md" @click="saveOrder">确认</q-btn></div>
+      </q-form>
+    </div>
+  </q-card>
+</template>
+
+<script>
+import { defineComponent, inject, reactive, toRefs, watch } from "vue";
+import travelService from "../../../api/travel";
+import { ApiResult } from "../../../@types/enumHelper";
+import message from "../../../utils/message";
+import { getStoreGetter } from "../../../store/utils";
+export default defineComponent({
+  props: ["info"],
+  components: {},
+  setup(props,context) {
+    console.log("addOrder", props, props.info, props.info.TCID);
+    const addMsg = reactive({
+      OrderSource: 2,
+      price: 0,
+      GroupTypeNeedHouse: 0,
+      OrderId: 0,
+      OneSex: 0,
+      TCID: 0,
+      CustomerType: 2, // 默认为普通客户
+      GroupType: 1,
+      IndustryCategory: "",
+      ContactName: "",
+      ContactMobile: "",
+      CustomerId: "",
+      DepartureCityId: 0,
+      ReturnArriveCityId: "",
+      IsIntermodal: "2",
+      IsReturnIntermodal: "2",
+      Unit_Price: 0,
+      TC_Price: 0,
+      ManNum: 0, // 成人数量
+      ChirdNum: 0, // 小孩数量
+      ChirdNoNeedBedNum: 0,
+      ChirdNeedBedNum: 0,
+      BabyNum: 0,
+      OldPeopleNum: 0,
+      SingleRoomNum: 0,
+      PreferPrice: 0,
+      YSeatNum: 0,
+      ESeatNum: 0,
+      FSeatNum: 0,
+      Commission: 0,
+      ClientSource: 0,
+      BrandId: 0,
+      TradeWay: "2",
+      PlatformAccount: "",
+      PlatformOrder: "",
+      GuestNum: 0,
+      IsChildrenTour: 0,
+      IsBirdDiscount: 0,
+      PredictRoomNum: 0,
+      BigRoomNum: 0,
+      TripleRoomNum: 0,
+      TradeDate: "",
+      CostType: "",
+      Remarks: "",
+      VisaNum: 0,
+      SafeNum: 0,
+      AirticketNum: 0,
+      ScenicRefundArr: [],
+      GoCityTime: "",
+      BackCityTime: "",
+      CommissionSharePeople: 0,
+      CommissionShareMoney: 0,
+      OrderForm: "1",
+      SonControlID: "-1",
+      IsShowMessagesMoney: "2",
+      QuotationUrl: "", //单团附件
+    });
+    const data = reactive({
+      ScenicRefundList: [],
+      khlxList: [],
+      ctlxList: [],
+      addObj: {},
+      copyId: 0,
+      showBankAccount: false,
+      OrderID: "",
+      showOrderdDetail: false,
+      pages: {
+        pageIndex: 1,
+        pageSize: 10,
+        pageCount: 0,
+      },
+      loadingCel: false,
+      loading: false,
+      userInfo: null,
+    });
+    data.addObj = props.info;
+    data.userInfo = getStoreGetter("user", "getUser");
+    addMsg.TCID = props.info.TCID;
+    addMsg.TC_Price = data.addObj.B2BPrice;
+    addMsg.Unit_Price = data.addObj.B2BPrice;
+    const methods = {
+        cancel() {context.emit('close')},
+      //验证只能输入整数【负数：isMinus传true】
+      checkInteger(item, filed, isMinus) {
+        var value = "" + item[filed]; //转字符串
+        var t = value.charAt(0);
+        value = value.replace(this.$commonUtils.Regex.isInteger, "");
+        //是否允许负数
+        if (isMinus && t == "-") {
+          value = "-" + value;
+        }
+        item[filed] = value;
+      },
+      getHouseNo() {
+        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床  减去 儿童不占床
+        let etbzc = 0;
+        addMsg.PredictRoomNum =
+          (Number(addMsg.AirticketNum) +
+            (Number(addMsg.ManNum) +
+              Number(addMsg.ChirdNeedBedNum) -
+              etbzc +
+              Number(addMsg.OldPeopleNum)) -
+            Number(addMsg.TripleRoomNum) * 3 -
+            Number(addMsg.SingleRoomNum)) /
+            2 +
+          Number(addMsg.SingleRoomNum) +
+          Number(addMsg.TripleRoomNum);
+        console.log("getHouseNo", addMsg.PredictRoomNum);
+      },
+      getNumber() {
+        let ChirdNum = addMsg.ChirdNoNeedBedNum * 1 + addMsg.ChirdNeedBedNum * 1;
+        addMsg.ChirdNum = addMsg.ChirdNoNeedBedNum * 1 + addMsg.ChirdNeedBedNum * 1;
+        addMsg.VisaNum =
+          Number(addMsg.AirticketNum) +
+          Number(addMsg.ManNum) +
+          ChirdNum +
+          Number(addMsg.BabyNum) +
+          Number(addMsg.OldPeopleNum);
+        addMsg.SafeNum =
+          Number(addMsg.AirticketNum) +
+          Number(addMsg.ManNum) +
+          ChirdNum +
+          Number(addMsg.BabyNum) +
+          Number(addMsg.OldPeopleNum);
+        var TotalNumber =
+          Number(addMsg.AirticketNum) +
+          Number(addMsg.ManNum) +
+          ChirdNum +
+          Number(addMsg.BabyNum) +
+          Number(addMsg.OldPeopleNum);
+        var SeatNum =
+          Number(addMsg.ManNum) +
+          Number(addMsg.ChirdNum) +
+          Number(addMsg.OldPeopleNum) -
+          (Number(addMsg.ESeatNum) + Number(addMsg.FSeatNum));
+        addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
+        methods.autoRemarks("VisaNum", "不要签证数量");
+      },
+      yzBigBed2() {
+        let x =
+          Number(addMsg.AirticketNum) +
+          Number(addMsg.ManNum) +
+          Number(addMsg.ChirdNeedBedNum) +
+          Number(addMsg.OldPeopleNum) -
+          Number(addMsg.SingleRoomNum);
+        let y = x - Number(addMsg.TripleRoomNum) * 3 - Number(addMsg.BigRoomNum) * 2;
+        if (y < 0) {
+          addMsg.SingleRoomNum = 0;
+        }
+        methods.getHouseNo();
+        methods.autoRemarks("SingleRoomNum", "单房数量");
+      },
+      // 自动添加备注
+      autoRemarks(key, text) {},
+      // 计算价格
+      getTotalPrice() {
+        console.log("PreferPrice", addMsg.PreferPrice);
+        addMsg.ChirdNum = addMsg.ChirdNoNeedBedNum * 1 + addMsg.ChirdNeedBedNum * 1;
+        if (data.addObj.IsBirdDiscount == 1) {
+          //早鸟优惠
+          //addMsg.Unit_Price  //成交单价
+          //BabyPrice 婴儿价
+          //BabyChargePrice  儿童附加费
+          //OldManChargePrice  老人 附加费
+          //DiscountPrice 早鸟优惠
+          let chengren =
+            Number(addMsg.ManNum) *
+            (Number(addMsg.Unit_Price) - data.addObj.DiscountPrice);
+          let ertong =
+            Number(addMsg.ChirdNum) *
+            (Number(addMsg.Unit_Price) -
+              data.addObj.DiscountPrice +
+              data.addObj.BabyChargePrice);
+
+          let yinger = Number(addMsg.BabyNum) * data.addObj.BabyPrice;
+          let laoren =
+            Number(addMsg.OldPeopleNum) *
+            (Number(addMsg.Unit_Price) -
+              data.addObj.DiscountPrice +
+              data.addObj.OldManChargePrice);
+          let zafeiqianzhen =
+            data.addObj.OtherPrice *
+              (Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.OldPeopleNum)) +
+            data.addObj.VisaPrice *
+              (Number(addMsg.AirticketNum) +
+                Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.OldPeopleNum)) -
+            (data.addObj.BackVisaPrice || 0) *
+              (Number(addMsg.AirticketNum) +
+                Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.BabyNum) +
+                Number(addMsg.OldPeopleNum) -
+                Number(addMsg.VisaNum));
+          let danfang = Number(addMsg.SingleRoomNum) * data.addObj.SingleRoomPrice;
+          let ertongbed =
+            data.addObj.ChildNeedPrice * Number(addMsg.ChirdNeedBedNum) -
+            data.addObj.ChildNoNeedPrice *
+              (Number(addMsg.ChirdNum) - Number(addMsg.ChirdNeedBedNum));
+          let lianyun = 0;
+          let dandijie;
+          dandijie = (data.addObj.SingleDMCPrice || 0) * Number(addMsg.AirticketNum);
+          addMsg.PreferPrice =
+            dandijie +
+            lianyun +
+            chengren +
+            ertong +
+            yinger +
+            laoren +
+            zafeiqianzhen +
+            danfang +
+            ertongbed;
+        } else {
+          let chengren = Number(addMsg.ManNum) * Number(addMsg.Unit_Price);
+          let ertong =
+            Number(addMsg.ChirdNum) *
+            (Number(addMsg.Unit_Price) + data.addObj.BabyChargePrice);
+          let yinger = Number(addMsg.BabyNum) * data.addObj.BabyPrice;
+          let laoren =
+            Number(addMsg.OldPeopleNum) *
+            (Number(addMsg.Unit_Price) + data.addObj.OldManChargePrice);
+          let zafeiqianzhen =
+            data.addObj.OtherPrice *
+              (Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.OldPeopleNum)) +
+            data.addObj.VisaPrice *
+              (Number(addMsg.AirticketNum) +
+                Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.OldPeopleNum)) -
+            (data.addObj.BackVisaPrice || 0) *
+              (Number(addMsg.AirticketNum) +
+                Number(addMsg.ManNum) +
+                Number(addMsg.ChirdNum) +
+                Number(addMsg.BabyNum) +
+                Number(addMsg.OldPeopleNum) -
+                Number(addMsg.VisaNum));
+          let danfang = Number(addMsg.SingleRoomNum) * data.addObj.SingleRoomPrice;
+          let ertongbed =
+            data.addObj.ChildNeedPrice * Number(addMsg.ChirdNeedBedNum) -
+            data.addObj.ChildNoNeedPrice *
+              (Number(addMsg.ChirdNum) - Number(addMsg.ChirdNeedBedNum));
+          let lianyun = 0;
+          let dandijie;
+          dandijie = (data.addObj.SingleDMCPrice || 0) * Number(addMsg.AirticketNum);
+
+          addMsg.PreferPrice =
+            dandijie +
+            lianyun +
+            chengren +
+            ertong +
+            yinger +
+            laoren +
+            zafeiqianzhen +
+            danfang +
+            ertongbed;
+        }
+        console.log("PreferPrice", addMsg.PreferPrice);
+        // TODO 需要注释回来的函数
+        // methods.getTicheng();
+        //   methods.getTypePrice();
+      },
+      getTicheng() {
+        //提成
+        let num =
+          Number(addMsg.ManNum) + Number(addMsg.ChirdNum) + Number(addMsg.OldPeopleNum);
+        let yh = 0;
+        if (num > 0) {
+          this.apipost(
+            "sellorder_get_GetOrderMinPrice",
+            {
+              ltID: data.addObj.ltID,
+              Num: num,
+            },
+            (res) => {
+              yh = res.data.data;
+            },
+            (err) => {}
+          );
+        }
+        //  let cj='成交单价-最低成交价格（标准单价-符合人数[成人，儿童，老人]条件的最高少价）'
+        let chajia = Number(addMsg.Unit_Price) - (addMsg.TC_Price - yh);
+        let ewtc = chajia > 0 ? chajia * 0.5 * num : chajia * num; //额外提成
+        addMsg.Commission = (Number(addMsg.PreferPrice) * 0.01 + ewtc).toFixed(2);
+        addMsg.CommissionShareMoney = 0;
+        if (
+          (addMsg.CustomerType == 1 || addMsg.CustomerType == 2) &&
+          addMsg.CommissionSharePeople != ""
+        ) {
+          if (addMsg.CommissionSharePeople != "-1") {
+            if (addMsg.Commission > 0) {
+              addMsg.CommissionShareMoney = addMsg.Commission / 2;
+              addMsg.Commission = addMsg.Commission - addMsg.CommissionShareMoney;
+            } else {
+              addMsg.CommissionShareMoney = 0;
+            }
+          }
+        }
+      },
+      getTypePrice() {
+        //addMsg.ContactName = ''
+        //addMsg.ContactMobile = ''
+        if (addMsg.CustomerType == 1) {
+          addMsg.TC_Price = data.addObj.B2BMemberPrice;
+          addMsg.Unit_Price = data.addObj.B2BMemberPrice;
+          //addMsg.CustomerId = ''
+        }
+        if (addMsg.CustomerType == 2) {
+          addMsg.TC_Price = data.addObj.B2BPrice;
+          addMsg.Unit_Price = data.addObj.B2BPrice;
+          //addMsg.CustomerId = ''
+        }
+        if (addMsg.CustomerType == 3) {
+          addMsg.TC_Price = data.addObj.B2CMemberPrice;
+          addMsg.Unit_Price = data.addObj.B2CMemberPrice;
+          addMsg.CustomerId = 0;
+          addMsg.CommissionShareMoney = 0;
+        }
+        if (addMsg.CustomerType == 4) {
+          addMsg.TC_Price = data.addObj.B2CPrice;
+          addMsg.Unit_Price = data.addObj.B2CPrice;
+          addMsg.CustomerId = 0;
+          addMsg.CommissionShareMoney = 0;
+        }
+        this.Unit_PriceList = [];
+        let maxPeopleNum =
+          Number(addMsg.ManNum) +
+          Number(addMsg.ChirdNoNeedBedNum) +
+          Number(addMsg.ChirdNeedBedNum) +
+          Number(addMsg.OldPeopleNum) +
+          Number(addMsg.AirticketNum);
+        if (maxPeopleNum > 0) {
+          this.apipost(
+            "sellorder_post_GetLessPrice",
+            {
+              TCID: data.addObj.TCID,
+              MaxPeopleNum: maxPeopleNum,
+            },
+            (res) => {
+              this.LessMoney = res.data.data.lessMoney;
+              if (parseFloat(this.LessMoney) > 0) {
+                for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
+                  var obj = {
+                    ID: "",
+                    LessMoney: "",
+                  };
+                  obj.ID = addMsg.Unit_Price - i * 10;
+                  obj.LessMoney = addMsg.Unit_Price - i * 10;
+                  this.Unit_PriceList.push(obj);
+                }
+                if (
+                  this.Unit_PriceList.findIndex(
+                    (markers) => markers.ID == addMsg.Unit_Price
+                  ) < 0
+                ) {
+                  var obj = {
+                    ID: "",
+                    LessMoney: "",
+                  };
+                  obj.ID = addMsg.Unit_Price;
+                  obj.LessMoney = addMsg.Unit_Price;
+                  this.Unit_PriceList.push(obj);
+                }
+              } else {
+                var obj = {
+                  ID: "",
+                  LessMoney: "",
+                };
+                obj.ID = addMsg.Unit_Price;
+                obj.LessMoney = addMsg.Unit_Price;
+                this.Unit_PriceList.push(obj);
+              }
+            },
+            (err) => {}
+          );
+        }
+      },
+      clearMsg() {
+        addMsg.OrderId = 0;
+        addMsg.TCID = 0;
+        addMsg.IsIntermodal = "2";
+        addMsg.IsReturnIntermodal = "2";
+        addMsg.Unit_Price = 0;
+        addMsg.TC_Price = 0;
+        addMsg.ManNum = 0;
+        addMsg.ChirdNum = 0;
+        addMsg.ChirdNeedBedNum = 0;
+        addMsg.BabyNum = 0;
+        addMsg.OldPeopleNum = 0;
+        addMsg.SingleRoomNum = 0;
+        addMsg.PreferPrice = 0;
+        addMsg.YSeatNum = 0;
+        addMsg.ESeatNum = 0;
+        addMsg.FSeatNum = 0;
+        addMsg.Commission = 0;
+        addMsg.BrandId = 0;
+        addMsg.PlatformAccount = "";
+        addMsg.TradeWay = "2";
+        addMsg.GuestNum = 0;
+        addMsg.IsChildrenTour = 0;
+        addMsg.OrderId = 0;
+        addMsg.IsBirdDiscount = 0;
+        addMsg.PredictRoomNum = 0;
+        addMsg.BigRoomNum = 0;
+        addMsg.TripleRoomNum = 0;
+        addMsg.TradeDate = "";
+        addMsg.CostType = "";
+        addMsg.PlatformOrder = "";
+        addMsg.Remarks = "";
+        addMsg.MinOrderPrice = "";
+        addMsg.VisaNum = 0;
+        addMsg.SafeNum = 0;
+        addMsg.AirticketNum = 0;
+        addMsg.ScenicRefundArr = [];
+        addMsg.CommissionSharePeople = "-1";
+        addMsg.CommissionShareMoney = 0;
+        addMsg.IsShowMessagesMoney = "2";
+        addMsg.OneSex = 0;
+      },
+      saveOrder() {
+        console.log("EmployeeId", data.userInfo);
+        addMsg.CustomerId = data.userInfo.accountId;
+        addMsg.GuestNum = Number(addMsg.ManNum) + Number(addMsg.OldPeopleNum);
+        travelService
+          .newOrder(addMsg)
+          .then((r) => {
+            data.loading = false;
+            if (r.data.resultCode == ApiResult.SUCCESS) {
+              // r.data.data.pageData.forEach((x: any) => {
+              //   x.typeInfo = data.status.find(y => y.StatusId == x.OrderStatus) ?? data.status[1]
+              //   x.SendType = data.sends.find(y => y.Id == x.MailingState) ?? data.sends[0]
+              //   x.Money = 0
+              //   let Money = 0
+              //   x.DetailList.forEach((y:any)=>{
+              //     Money+=y.Money
+              //   })
+              //   x.Money= Number(Money+x.MailingMoney)
+              // })
+              data.orders = r.data.data.pageData;
+              data.pages.pageCount = r.data.data.pageCount;
+            } else {
+              message.errorMsg(r.data.message);
+            }
+          })
+          .catch((e) => {
+            message.errorMsg(e.message);
+            data.loading = false;
+          });
+      },
+    };
+    return {
+      ...toRefs(data),
+      addMsg,
+      ...methods,
+    };
+  },
+});
+</script>
+
+<style></style>

src/pages/travel/order.vue

+<template>
+  <div class="fix-height-subpage column no-wrap q-pa-md">
+    <order-list-header></order-list-header>
+    <div class="col q-mt-md">
+      <order-list></order-list>
+    </div>
+  </div>
+</template>
+  
+  <script lang="ts">
+  import { inject, provide, reactive, toRefs, defineComponent,onMounted } from 'vue';
+import travelService from '../../api/travel'
+import { SendType, StandardStatus } from '../../@types'
+import { ApiResult } from '../../@types/enumHelper'
+import message from '../../utils/message'
+import { useI18n } from 'vue-i18n'
+import OrderListHeader from './components/OrderListHeader.vue';
+import OrderList from './components/OrderList.vue';
+import { DirtionmaryHelper } from '../../config/dictionary';
+  export default defineComponent({
+    components: {OrderListHeader, OrderList},
+    props: ['OrderId'],
+    setup(props) {
+    const { t } = useI18n()
+       const data = reactive({
+      PaymentDialog: false,
+      orders: [] as Array<any>,
+      status: [] as Array<StandardStatus>,
+      sends: [] as Array<SendType>,
+      showBankAccount: false,
+      pages: {
+        pageIndex: 1,
+        pageSize: 10,
+        pageCount: 0
+      },
+      loading: false,
+      copyId: 0,
+      expendsOrderId: 0,
+      cols: [
+        { name: 'Date', label: t('v102.ticket.jq')+'('+t('v102.ticket.d')+')', field: (row: any) => row.Date, align: 'left' },
+        { name: 'TicketName', label: t('v102.ticket.hn'), field: (row: any) => row.TicketName, align: 'left' },
+        { name: 'Num', label: t('v102.ticket.sl'), field: (row: any) => row.Num, align: 'left' },
+        { name: 'Money', label: t('hotelorder.col.m'), field: (row: any) => row.Money, align: 'left' }
+      ] as any[],
+      modifyOrder:{} as any,
+      showModify:false,
+    })
+
+      const search = reactive({
+        GTeamName:"", // 包机名称
+        FlightCompany:"", // 航空公司
+        FlightNo:"", // 航班号  
+        SelectEndDate:"", // 出发开始时间  
+        SelectStartDate:"", // 出发结算时间
+      })
+      const methods = {
+      }
+      provide(DirtionmaryHelper.TRAVEL_ORDER_OBJ,search)
+      onMounted(()=>{
+        
+      })
+      return {
+        // ...toRefs(data),
+        ...methods
+      }
+    }
+  })
+  </script>
+  
+  <style>
+  
+  </style>
+  
\ No newline at end of file

src/router/routes.ts

@@ -36,7 +36,7 @@ const routes: RouteRecordRaw[] = [
       { path: '/scheduledTrip/details/:id/:tcid', component: () => import('pages/scheduledTrip/detailsNew.vue') },
       { path: '/scheduledTrip/preview/:tripId', component: () => import('pages/scheduledTrip/TripOrderPreview.vue') },
       { path: '/scheduledTrip/order/:orderId?', component: () => import('pages/scheduledTrip/TripOrder.vue') },
-      
+      { path: '/travel/order', component: () => import('pages/travel/order.vue') },
     ]
   },
   {

src/utils/menus.ts

@@ -137,6 +137,27 @@ const useMenus = {
                 }
             ]
         })
+        menus.push({
+            name: t('menu.travel.first'),
+            url: '',
+            id: 10,
+            parentId: 0,
+            icon: 'Shopping/Money.svg',
+            childs: [
+                {
+                    name: t('menu.travel.second'),
+                    url: '/travel/order',
+                    id: 11,
+                    parentId: 10,
+                },
+                // {
+                //     name: t('menu.travel.three'),
+                //     url: '/comingsoon',
+                //     id: 12,
+                //     parentId: 10,
+                // }
+            ]
+        })
         return menus
     }
 }