Merge commit '98abe1b8' into dev

# Conflicts: # src/viewsPc/booking/pay.vue # src/viewsPc/match/pay.vue # src/viewsPc/seat/api/index.js # vite.config.js

Merge commit '98abe1b8' into dev
# Conflicts: # src/viewsPc/booking/pay.vue # src/viewsPc/match/pay.vue # src/viewsPc/seat/api/index.js # vite.config.js
杨炀
Showing 10 changed files with 225 additions and 91 deletions
src/apiPc/booking.js
src/viewsPc/booking/addInvoice.vue
src/viewsPc/booking/invoiceDetail.vue
src/viewsPc/center/index.vue
src/viewsPc/center/myCanKP.vue
src/viewsPc/center/myReservation.vue
src/viewsPc/components/querybackNumber.vue
src/viewsPc/guide/index.vue
src/viewsPc/index_en.vue
src/viewsPc/seat/api/index.js
--- a/src/apiPc/booking.js
View file @05fe6c4
+++ b/src/apiPc/booking.js
View file @05fe6c4
@@ -208,6 +208,7 @@ export function submitCptInvoice(form) {
        data: form
    })
 }
 export function editInvoice(form) {
    return request({
        url: `/ota/invoice`,
@@ -215,6 +216,14 @@ export function editInvoice(form) {
        data: form
    })
 }
+export function editInvoiceMatch(form) {
+    return request({
+        url: `/cpt/invoice`,
+        method: 'put',
+        data: form
+    })
+}
 export function editCptInvoice(form) {
    return request({
        url: `/cpt/invoice`,
@@ -378,6 +387,13 @@ export function getInvoiceDetail(invoiceId) {
        method: 'get'
    })
 }
+export function getInvoiceDetailMatch(invoiceId) {
+    return request({
+        url: `/cpt/invoice/${invoiceId}`,
+        method: 'get'
+    })
+}
 export function getReceipt(query) {
    // type 1是下载 2是发送到邮箱
    return request({
--- a/src/viewsPc/booking/addInvoice.vue
View file @05fe6c4
+++ b/src/viewsPc/booking/addInvoice.vue
View file @05fe6c4
@@ -9,12 +9,13 @@
          <el-col :span="24">
            <!--已选订单-->
            <div class="border-info" v-for="b in list" :key="b.id">
-              <label class="blueTag" v-if="b.orderType == 0"> {{ language==0?'酒店订单':'HOTEL' }}</label>
+              <label class="blueTag" v-if="orderType == 0"> {{ language==0?'酒店订单':'HOTEL' }}</label>
              <label class="orangeTag" v-if="b.orderType == 1"> {{ language==0?'车辆订单':'TRANSPORTATION' }}</label>
              <label class="purpleTag" v-if="b.orderType == 2"> {{ language==0?'餐饮订单':'DINING' }}</label>
              <label class="pinkTag" v-if="b.orderType == 3"> {{ language==0?'化妆订单':'MakeUp' }}</label>
              <label class="yellowTag" v-if="b.orderType == 4"> {{ language==0?'拍摄订单':'Shooting'}}</label>
-              <label class="bg-primary" v-if="!b.orderType"> {{ language==0?'赛事报名':'REGISTRATION' }}</label>
+              <label class="yellowTag" v-if="orderType == 6"> {{ language==0?'票务':'Ticket'}}</label>
+              <label class="bg-primary" v-if="orderType==5"> {{ language==0?'赛事报名':'REGISTRATION' }}</label>
              <h3 v-if="b.name">{{ b.name }}</h3>
              <h3 v-if="b.cptName">{{ b.cptName }}</h3>
@@ -61,7 +62,7 @@
            <div class="border-rr mt20 pd20">
              <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
                <el-form-item :label="language == 0 ?'开票金额':'Amount'">
-                  <span class="bigprice">¥{{totalMoney}}</span>
+                  <span class="bigprice">{{paymentType==1?'¥':'€'}}{{totalMoney}}</span>
                </el-form-item>
                <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm">
@@ -71,9 +72,7 @@
 <!--                    <el-radio value="3" v-if="kpType.indexOf('3')!=-1">{{ language == 0 ? '纸质专票' : 'Paper-special-invoice' }}</el-radio>-->
                  </el-radio-group>
                </el-form-item>
-<!--                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="address">-->
-<!--                  <el-input v-model="form.address"/>-->
-<!--                </el-form-item>-->
 <!--                <el-form-item :label="`邮寄地址`" v-else required>-->
 <!--                  <el-button plain type="primary" size="small" v-if="addrList.length==0" @click="goEditAddress">-->
 <!--                    +{{ language==0?'添加地址':'Add' }}-->
@@ -100,6 +99,9 @@
                <el-form-item :label="language == 0 ?`税号`:'Duty Paragraph'" required v-if="form.invoiceType=='0'" prop="invoiceTfn">
                  <el-input v-model="form.invoiceTfn"/>
                </el-form-item>
+                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
+                  <el-input v-model="form.invoiceEmail"/>
+                </el-form-item>
                <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
                  <el-form-item :label="`地址`" required prop="invoiceAddress">
                    <el-input v-model="form.invoiceAddress"/>
@@ -151,13 +153,15 @@ import dayjs from 'dayjs'
 import {ElMessage,ElMessageBox} from "element-plus";
 import useUserStore from "@/store/modules/user";
 import {getCurrentInstance} from "@vue/runtime-core";
+import {submitTitckInvoice, invoice, TitckUpdateInvoice} from '@/viewsPc/seat/api/index'
 import {
  addressList,
  editInvoice,
+  editInvoiceMatch,
  submitInvoice,
  getInvoiceDetailBills,
  getInvoiceDetail,
-  submitCptInvoice, getBaseInfoByActiveId, getLeagueInvoiceDetail, getLeagueInvoiceDetailPC
+  submitCptInvoice, getBaseInfoByActiveId, getLeagueInvoiceDetail, getLeagueInvoiceDetailPC,getInvoiceDetailMatch
 } from "@/apiPc/booking";
 const {proxy} = getCurrentInstance()
@@ -169,6 +173,8 @@ const form = ref({
  invoiceForm: '1',
  invoiceType: '0'
 })
+const orderType=ref(1)
+const paymentType=ref(1)
 const list = ref([])
 const addrList = ref([])
 const nowAddress = ref({})
@@ -179,7 +185,7 @@ const rules = ref({
  invoiceType: [
    {required: true, message: language.value==0?'请选择发票类型':'Please select invoice type', trigger: 'change'}
  ],
-  address: [
+  invoiceEmail: [
    {required: true, message: language.value==0?'请输入邮箱':'Please enter email', trigger: 'blur'}
  ],
  invoiceForm: [
@@ -207,15 +213,23 @@ const rules = ref({
 const isEdit = ref(false)
 let invoiceId
 let cptId
 onMounted(() => {
+  console.log(route.query)
+  orderType.value=route.query.orderType
+  paymentType.value=route.query.paymentType
  if(route.query.orders){
    let obj = JSON.parse(decodeURIComponent(route.query.orders)) || {}
    if(obj.cptId){
      cptId = obj.cptId
-    }
+    }else if(obj.activeId){
-    if(obj.activeId){
      cptId = obj.activeId
+    }else{
+      cptId = '1778253367748993026'
    }
+    console.log(obj)
    getRemark()
    let arr = []
    list.value.push(obj)
@@ -234,6 +248,7 @@ onMounted(() => {
    totalMoney.value = route.query.totalMoney
    form.value.total = totalMoney.value
  }
  // if(route.query.kpType){
  //   kpType.value = route.query.kpType
  //   if(kpType.value.indexOf('2')>-1 || kpType.value.indexOf('3')>-1){
@@ -247,6 +262,8 @@ onMounted(() => {
    invoiceId = route.query.invoiceId
    getList()
  }
  if(user.userName.indexOf('@')>-1){
    form.value.address = user.userName
  }
@@ -257,6 +274,7 @@ function getList() {
    getLeagueInvoiceDetailPC(invoiceId).then(res => {
      // 订单
      list.value = res.data;
+      console.log(list.value)
      cptId = res.rows[0].activeId||res.rows[0].cptId
      getRemark()
      for (var bill of list.value) {
@@ -275,14 +293,34 @@ function getList() {
    });
  }
-  getInvoiceDetail(invoiceId).then(res => {
+  // 回显
-    form.value = res.data;
+  if (orderType.value==6){
-    totalMoney.value = form.value.total
+    invoice(invoiceId).then(res=>{
-    // if (form.value.invoiceForm == '1') {
+      // console.log(res)
-    //   email.value = form.value.address
+      form.value = res.data;
-    // }
+      form.value.invoiceForm='1'
-    // getAddrList()
+      totalMoney.value = form.value.total
-  });
+    })
+  }else if(orderType.value==5){
+    getInvoiceDetailMatch(invoiceId).then(res => {
+      form.value = res.data;
+      totalMoney.value = form.value.total
+      // if (form.value.invoiceForm == '1') {
+      //   email.value = form.value.address
+      // }
+      // getAddrList()
+    });
+  }else{
+    getInvoiceDetail(invoiceId).then(res => {
+      form.value = res.data;
+      totalMoney.value = form.value.total
+      // if (form.value.invoiceForm == '1') {
+      //   email.value = form.value.address
+      // }
+      // getAddrList()
+    });
+  }
 }
 function goEditAddress(id) {
@@ -324,6 +362,7 @@ function submit() {
          form.value.activeId =  cptId
          form.value.total = totalMoney.value
          form.value.version = 2
+          form.value.invoicePhone=paymentType.value
          if (isEdit.value) {
            update()
          } else {
@@ -335,19 +374,35 @@ function submit() {
 }
 function update() {
-  editInvoice(form.value).then(res=>{
+  if (orderType.value==6){
-    //返回列表
+    TitckUpdateInvoice(form.value).then(res=>{
-    backList()
+      //返回列表
-  })
+      backList()
+    })
+  }else if(orderType.value==5){
+    editInvoiceMatch(form.value).then(res=>{
+      //返回列表
+      backList()
+    })
+  }else{
+    editInvoice(form.value).then(res=>{
+      //返回列表
+      backList()
+    })
+  }
 }
 function add() {
-  if(list.value[0].orderType||list.value[0].orderType==0){
+  if(orderType.value==6){
+    submitTitckInvoice(form.value).then((res)=>{
+      backList()
+    })
+  }else if(list.value[0].orderType||list.value[0].orderType==0){
    submitInvoice(form.value).then(res=>{
      //返回列表
      backList()
    })
  } else {
-    console.log(list.value[0].orderType,'2')
    submitCptInvoice(form.value).then(res=>{
      //返回列表
      backList()
--- a/src/viewsPc/booking/invoiceDetail.vue
View file @05fe6c4
+++ b/src/viewsPc/booking/invoiceDetail.vue
View file @05fe6c4
@@ -61,17 +61,7 @@
                  <span v-if="form.invoiceForm=='2'">纸质普票</span>
                  <span v-if="form.invoiceForm=='3'">纸质专票</span>
                </el-form-item>
-                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="address">
-                 {{form.address}}
-                </el-form-item>
-                <el-form-item :label="`邮寄地址`" v-else required>
-                  <div class="flexCenter">
-                    <div>
-                      <div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>
-                      <div class="smallSize">{{nowAddress.addName}}</div>
-                    </div>
-                  </div>
-                </el-form-item>
                <el-form-item :label="`发票类型`" required prop="invoiceType">
                  <span v-show="form.invoiceType=='0'"> 企业</span>
                  <span v-show="form.invoiceType=='1'"> 个人非企业</span>
@@ -82,6 +72,17 @@
                <el-form-item :label="`税号`" required v-if="form.invoiceType=='0'" prop="invoiceTfn">
                 {{form.invoiceTfn}}
                </el-form-item>
+                <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail">
+                  {{form.invoiceEmail}}
+                </el-form-item>
+                <el-form-item :label="`邮寄地址`" v-else required>
+                  <div class="flexCenter">
+                    <div>
+                      <div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>
+                      <div class="smallSize">{{nowAddress.addName}}</div>
+                    </div>
+                  </div>
+                </el-form-item>
                <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
                  <el-form-item :label="`地址`" required prop="invoiceAddress">
                    {{form.invoiceAddress}}
@@ -119,7 +120,9 @@ import dayjs from 'dayjs'
 import {ElMessage,ElMessageBox} from "element-plus";
 import useUserStore from "@/store/modules/user";
 import {getCurrentInstance} from "@vue/runtime-core";
-import {addressList, editInvoice, submitInvoice,getInvoiceDetailBills,getInvoiceDetail} from "@/apiPc/booking";
+import {addressList, editInvoice, submitInvoice,getInvoiceDetailBills,getInvoiceDetail,getInvoiceDetailMatch} from "@/apiPc/booking";
+import {submitTitckInvoice, invoice, TitckUpdateInvoice} from '@/viewsPc/seat/api/index'
 const {proxy} = getCurrentInstance()
 const user = useUserStore().user
@@ -130,12 +133,13 @@ const list = ref([])
 const addrList = ref([])
 const nowAddress = ref({})
 const totalMoney = ref(0)
+const orderType=ref(0)
 const form = ref({})
 const rules = ref({
  invoiceType: [
    {required: true, message: language.value==0?'请选择发票类型':'Please select invoice type', trigger: 'change'}
  ],
-  address: [
+  invoiceEmail: [
    {required: true, message: language.value==0?'请输入邮箱':'Please enter email', trigger: 'blur'}
  ],
  invoiceForm: [
@@ -166,6 +170,7 @@ onMounted(() => {
  if(route.query.activeId){
    form.value.activeId = route.query.activeId
  }
+  orderType.value=route.query.orderType
  invoiceId = route.query.invoiceId
  getList()
@@ -178,14 +183,33 @@ function getList() {
      bill.messageObj = JSON.parse(bill.message)
    }
  });
-  getInvoiceDetail(invoiceId).then(res => {
+  if (orderType.value==6){
-    form.value = res.data;
+    invoice(invoiceId).then(res=>{
-    totalMoney.value = form.value.total
+      // console.log(res)
-    if (form.value.invoiceForm == '1') {
+      form.value = res.data;
-      email.value = form.value.address
+      form.value.invoiceForm=1
-    }
+      totalMoney.value = form.value.total
-    getAddrList()
+    })
-  });
+  }else if(orderType.value==5){
+    getInvoiceDetailMatch(invoiceId).then(res => {
+      form.value = res.data;
+      totalMoney.value = form.value.total
+      if (form.value.invoiceForm == '1') {
+        email.value = form.value.address
+      }
+      getAddrList()
+    });
+  }else{
+    getInvoiceDetail(invoiceId).then(res => {
+      form.value = res.data;
+      totalMoney.value = form.value.total
+      if (form.value.invoiceForm == '1') {
+        email.value = form.value.address
+      }
+      getAddrList()
+    });
+  }
 }
 function getAddrList() {
  addressList(user.userId).then(res=>{
--- a/src/viewsPc/center/index.vue
View file @05fe6c4
+++ b/src/viewsPc/center/index.vue
View file @05fe6c4
@@ -156,13 +156,13 @@ const menus = ref([
    picUrl2: '/img/nav_30_dwn.png',
    isActive: false
  },
-  // {
+  {
-  //   name: language.value==0?'发票申请':'Electronic invoice',
+    name: language.value==0?'发票申请':'Electronic invoice',
-  //   routeName: 'myKP',
+    routeName: 'myKP',
-  //   picUrl1: '/img/fp.svg',
+    picUrl1: '/img/fp.svg',
-  //   picUrl2: '/img/fp_dwn.svg',
+    picUrl2: '/img/fp_dwn.svg',
-  //   isActive: false
+    isActive: false
-  // }
+  }
 ])
 const menusEn = ref([
  {
@@ -251,13 +251,13 @@ const menus3 = ref([
    picUrl2: '/img/c7.png',
    isActive: false
  },
-  // {
+  {
-  //   name: language.value==0?'发票申请':'Electronic invoice',
+    name: language.value==0?'发票申请':'Electronic invoice',
-  //   routeName: 'myKP',
+    routeName: 'myKP',
-  //   picUrl1: '/img/fp.svg',
+    picUrl1: '/img/fp.svg',
-  //   picUrl2: '/img/fp_dwn.svg',
+    picUrl2: '/img/fp_dwn.svg',
-  //   isActive: false
+    isActive: false
-  // }
+  }
 ])
 const menus3En = ref([
  {
@@ -332,13 +332,13 @@ const menusPersonal = ref([
      picUrl2: '/img/nav_30_dwn.png',
      isActive: false
    },
-  // {
+  {
-  //   name: language.value==0?'发票申请':'Electronic invoice',
+    name: language.value==0?'发票申请':'Electronic invoice',
-  //   routeName: 'myKP',
+    routeName: 'myKP',
-  //   picUrl1: '/img/fp.svg',
+    picUrl1: '/img/fp.svg',
-  //   picUrl2: '/img/fp_dwn.svg',
+    picUrl2: '/img/fp_dwn.svg',
-  //   isActive: false
+    isActive: false
-  // }
+  }
 ])
 const menusPersonalEn = ref([
    {
@@ -386,6 +386,7 @@ const menusPersonalEn = ref([
 ])
 let currMenu
 onMounted(() => {
+  console.log(route.query)
  if(!user.utype){
    router.push({name: 'home'})
    return
--- a/src/viewsPc/center/myCanKP.vue
View file @05fe6c4
+++ b/src/viewsPc/center/myCanKP.vue
View file @05fe6c4
@@ -14,12 +14,32 @@
        <el-tab-pane :label="language==0?'餐饮订单':'DINING'" name="2"></el-tab-pane>
        <el-tab-pane :label="language==0?'摄像订单':'Shooting'" name="4"></el-tab-pane>
      </el-tabs>
+      <div>
+        <el-form label-width="90" size="small">
+          <el-form-item label="开票状态">
+            <el-select
+              v-model="query.invoiced"
+              clearable
+              placeholder="选择发票状态"
+              style="width: 200px"
+              @change="getList"
+            >
+              <el-option label="全部" value="0" />
+              <el-option label="未申请发票" value="1" />
+              <el-option label="已申请发票" value="2" />
+              <el-option label="已开发票" value="3" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div v-show="list&&list.length>0" style="padding-left: 28px;color: red;font-size: 15px">温馨提示:发票申请成功后，将以电子发票的形式发送至您邮箱，请注意查收！</div>
+      </div>
      <el-empty :image="`/img/order_no.png`" :image-size="228"  v-if="list?.length == 0"/>
      <div v-if="activeName=='6'" class="pd20">
        <div v-for="b in list" class="item" v-loading="loading">
          <div class="title">
            <label class="orangeTag"> {{ language==0?'票务':'Ticket' }} </label>
            <span>{{b.orderSn}}</span>
+            <span class="fr text-warning status">{{b.invoiceStr}}</span>
          </div>
            <el-row class="pd20 mt10" justify="space-between" align="middle">
@@ -40,13 +60,13 @@
              <el-col :lg="6" :md="16" :sm="16" :xs="16">
                <div class="text-right">
                  <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.payType!='2'" @click.stop="gokp(b)">
-                    {{ language == 0 ? '开发票' : 'Invoice' }}
+                    {{ language == 0 ? '申请开票' : 'Invoice' }}
                  </el-button>
                  <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.payType!='2'" @click.stop="editkp(b)">
-                    {{ language == 0 ? '重开发票' : 'Rebilling' }}
+                    {{ language == 0 ? '重新申请' : 'Rebilling' }}
                  </el-button>
                  <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
-                             @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }}
+                             @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
                  </el-button>
                </div>
              </el-col>
@@ -76,13 +96,13 @@
            <el-col :lg="6" :md="16" :sm="16" :xs="16">
              <div class="text-right">
                <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource=='100'" @click.stop="gokp(b)">
-                  {{ language == 0 ? '开发票' : 'Invoice' }}
+                  {{ language == 0 ? '申请开票' : 'Invoice' }}
                </el-button>
                <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.languageSource=='100'" @click.stop="editkp(b)">
-                  {{ language == 0 ? '重开发票' : 'Rebilling' }}
+                  {{ language == 0 ? '重新申请' : 'Rebilling' }}
                </el-button>
                <el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource=='100'"
-                           @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }}
+                           @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
                </el-button>
                <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource!='100'" plain round  @click.stop="goSj(b)">
                  {{ language == 0 ? '开收据' : 'Receipt' }}
@@ -145,13 +165,13 @@
            <el-col :lg="6" :md="16" :sm="16" :xs="16">
              <div class="text-right">
                <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType!='3'" @click.stop="gokp(b)">
-                  {{ language == 0 ? '开发票' : 'Invoice' }}
+                  {{ language == 0 ? '申请开票' : 'Invoice' }}
                </el-button>
                <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.paymentType!='3'" @click.stop="editkp(b)">
-                  {{ language == 0 ? '重开发票' : 'Rebilling' }}
+                  {{ language == 0 ? '重新申请' : 'Rebilling' }}
                </el-button>
                <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
-                           @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }}
+                           @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
                </el-button>
 <!--                <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType=='3'" plain round  @click.stop="goSj(b)">-->
 <!--                  {{ language == 0 ? '开收据' : 'Receipt' }}-->
@@ -213,7 +233,8 @@ const user = useUserStore().user || {}
 const userStore = useUserStore();
 const query = ref({
  createById: user.userId,
-  orderType:'5'
+  orderType:'5',
+  invoiced:'0'
 })
 const {proxy} = getCurrentInstance()
 const list = ref([])
@@ -228,14 +249,13 @@ onMounted(() => {
 const getList = () => {
  loading.value = true
  if(query.value.orderType=='5'){
-    getCanInvoiceBm().then(res=>{
+    getCanInvoiceBm(query.value).then(res=>{
      list.value = res.rows
      loading.value = false
    })
  }else if(query.value.orderType=='6'){
    login()
  }else {
-    query.value.invoiced = 1
    getCanInvoiceBills(query.value).then(res=>{
      list.value = res.rows
      for (let b of list.value) {
@@ -247,6 +267,7 @@ const getList = () => {
 }
 const login = async () => {
+  // 票务
  const userId = userStore.user?.userId;
  const sign = md5(`uid=${userId}lgo1acfkw51jfo`, 32);
  return loginFree({
@@ -254,16 +275,18 @@ const login = async () => {
    sign,
  }).then((res) => {
    setToken(res.data.token);
-    getCanInvoiceTicket().then(res=>{
+    getCanInvoiceTicket(query.value).then(res=>{
      loading.value = false
      list.value = res.data.lists
    })
  })
 }
 const handleClick = (e) => {
  console.log(e.paneName)
  query.value.orderType = e.paneName
  list.value = []
+  query.value.invoiced='0'
  getList()
 }
 const gokp = (item) => {
@@ -271,7 +294,9 @@ const gokp = (item) => {
    path: '/booking/addInvoice',
    query: {
      orders: encodeURIComponent(JSON.stringify(item)),
-      totalMoney:item.total||item.totalPayAmount
+      totalMoney:item.total||item.totalPayAmount||item.payAmount,
+      paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType,
+      orderType:query.value.orderType
    }
  })
 }
@@ -279,9 +304,11 @@ const editkp = (item) => {
  router.push({
    name:'addInvoice',
    query:{
-      invoiceId:item.invoiceId,
+      invoiceId:query.value.orderType==6?item.invoiceIdStr :item.invoiceId,
      type:activeName.value,
-      isEdit:true
+      isEdit:true,
+      orderType:query.value.orderType,
+      paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType,
    }
  })
 }
@@ -289,8 +316,10 @@ const showDetail = (item) => {
  router.push({
    name:'invoiceDetail',
    query:{
-      invoiceId:item.invoiceId,
+      invoiceId:query.value.orderType==6?item.invoiceIdStr :item.invoiceId,
      type:activeName.value,
+      orderType:query.value.orderType,
+      paymentType:query.value.orderType==6?item.payType:item.paymentType,
    }
  })
 }
--- a/src/viewsPc/center/myReservation.vue
View file @05fe6c4
+++ b/src/viewsPc/center/myReservation.vue
View file @05fe6c4
@@ -152,8 +152,7 @@ function goDetail(b) {
    name: 'bookingPay',
    query: {
      orderId: b.id,
-      orderType: b.orderType,
+      orderType: b.orderType
-      activeId:b.activeId
    }
  })
 }
--- a/src/viewsPc/components/querybackNumber.vue
View file @05fe6c4
+++ b/src/viewsPc/components/querybackNumber.vue
View file @05fe6c4
 <template>
  <el-dialog
-      v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Competition Number'" append-to-body
+      v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Back Number'" append-to-body
      center class="pcloginpop"
      close-icon="CircleClose" destroy-on-close
      width="460px"
@@ -8,8 +8,8 @@
    <div style="min-height: 300px">
      <div v-if="!type||type==''">
-        <div @click="type='0'" class="rItem">{{ language == 0 ? '个人查询':'Personal Query' }}</div>
+        <div @click="type='0'" class="rItem">个人查询</div>
-        <div @click="type='1'" class="rItem">{{ language == 0 ? '团队查询':'Team Query' }}</div>
+        <div @click="type='1'" class="rItem">团队查询</div>
      </div>
      <div v-if="type=='0'">
@@ -59,7 +59,7 @@
            {{language == 0 ? '查询' : 'Search' }}
          </el-button>
        </div>
-        <span class="tip">*{{ language == 0 ?'模糊查询':'Fuzzy query' }}</span>
+        <span class="tip">*模糊查询</span>
        <div v-if="teamlist.length>0" class="temell mt20">
          <el-collapse v-model="activeNames" accordion>
--- a/src/viewsPc/guide/index.vue
View file @05fe6c4
+++ b/src/viewsPc/guide/index.vue
View file @05fe6c4
@@ -313,7 +313,7 @@
              </div>
              <div>
                <a target="_blank" class="text-primary"
-                   href="https://wdsfwuxicenter.com/stage-api/fs/file/WUXI_COMPETITION_TIMETABLE.pdf">
+                   href="https://wdsfwuxicenter.com/stage-api/fs/file/Schedule-WDSF_ASIAN_DANCESPORT_FESTIVAL_2024.WUXI.pdf">
                  <el-icon style="position: relative;top: 2px">
                    <download/>
                  </el-icon>
--- a/src/viewsPc/index_en.vue
View file @05fe6c4
+++ b/src/viewsPc/index_en.vue
View file @05fe6c4
@@ -142,7 +142,7 @@
 <!--                <a class="zn-btn ml20 btn-q forPc"  v-show="matchData?.id=='1778253367748993026'" style="font-size: 15px;margin-right: 20px" @click="popMaster">-->
 <!--                  Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>-->
 <!--                </a>-->
-                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="backNumberSearch">Competition Number</a>
+                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="backNumberSearch">Back Number</a>
 <!--                <div>-->
 <!--                  <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service-->
 <!--                  </a>-->
--- a/src/viewsPc/seat/api/index.js
View file @05fe6c4
+++ b/src/viewsPc/seat/api/index.js
View file @05fe6c4
@@ -54,3 +54,13 @@ export const payCallback = (data) =>
  request("POST", `/api/order/palPayTicket/callback/`, data);
 export const getCanInvoiceTicket = (data) =>
  request("GET", `/api/order/getOrderInvoiceList`, data);
+// 票务
+export const submitTitckInvoice = (data) =>
+  request("POST", `/api/invoice/makeInvoice`,data);
+// 重新开票回显
+export const invoice = (data) =>
+  request("GET", `/api/invoice/${data}`);
+export const TitckUpdateInvoice = (data) =>
+  request("POST", `/api/invoice/updateInvoice`,data);