no message

杨炀
Showing 7 changed files with 92 additions and 22 deletions
src/viewsPc/booking/pay.vue
src/viewsPc/center/myReservation.vue
src/viewsPc/components/querybackNumber.vue
src/viewsPc/guide/index.vue
src/viewsPc/index_en.vue
src/viewsPc/match/pay.vue
vite.config.js
--- a/src/viewsPc/booking/pay.vue
View file @d793ca6
+++ b/src/viewsPc/booking/pay.vue
View file @d793ca6
@@ -245,14 +245,17 @@
                </div>
              </el-col>
              <el-col :lg="24">
-                <el-button round class="mt20 btn-lineG" size="large" v-if="form.viewStatus=='1'||form.viewStatus=='5'" type="primary" @click="exportPdf">
+                <div class="text-center">
-                  <el-icon><Upload /></el-icon>
+                  <el-button round class="mt20 btn-lineG" size="large" v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&type == 'hotel'" type="primary" @click="exportPdf">
-                  {{ language==0?'导出酒店预订单':'Export PDF' }}
+                    <el-icon><Upload /></el-icon>
-                </el-button>
+                    {{ language==0?'导出酒店预订单':'Export PDF' }}
-                <el-button round class="mt20 btn-lineG" size="large" v-if="form.viewStatus=='1'||form.viewStatus=='5'" type="primary"
+                  </el-button>
-                           @click="exportPdf">
+                  <el-button round class="mt20 btn-lineG" size="large" v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&(type=='makeUp'||type=='hotel')" type="primary"
-                  {{ language==0?'下载收据':'Upload Invoice' }}
+                             @click="downInvoice">
-                </el-button>
+                    <el-icon><Download /></el-icon>
+                    {{ language==0?'下载收据':'DownLoad Invoice' }}
+                  </el-button>
+                </div>
              </el-col>
            </el-row>
          </div>
@@ -374,6 +377,24 @@
      </el-result>
    </div>
    <Dialog ref="DialogRef" />
+    <el-dialog :title="language==0?'开收据':'Issue a receipt'" v-model="showSJDialog" width="460px"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+      <div class="flex">
+        <el-form-item :label="language==0?'开票人':'Name'">
+          <div class="flex">
+            <el-input v-model="lpName" :placeholder="language==0?'请输入开票人':'Please enter your name'"></el-input>
+            <el-button type="primary" @click="submitSJ">{{ language == 0 ? '提交并下载' : 'Submit' }}</el-button>
+          </div>
+        </el-form-item>
+      </div>
+      <div class="tip mt20" v-if="remark">
+        <label>{{ language == 0 ? '开电子收据须知' : 'Receipt notice' }}:</label>
+        <div class="pd10">
+          {{ remark }}
+        </div>
+      </div>
+    </el-dialog>
  </div>
 </template>
@@ -400,10 +421,10 @@ const groupId = ref()
 import useUserStore from "@/store/modules/user";
 import FileUpload from "@/components/FileUpload";
 import {useStorage} from "@vueuse/core/index";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {
  cancelOrder,
-  cancelOrder2,
+  cancelOrder2, getBaseInfoByActiveId,
  getCarBilldetailbyId,
  getFoodBilldetailbyId,
  getMealOrderInfoByLogex, getPhotoOrderInfo, getPhotoOrderInfoByLogex
@@ -420,6 +441,10 @@ const formInfo=ref({})
 const type = ref('')
 const errorBox = ref(false)
 const hideconfirmbtn = ref(false)
+const remark = ref('')
+const showSJDialog = ref(false)
+const loading = ref(false)
+const lpName = ref('')
 const user = useUserStore().user
 if (useUserStore().user) {
@@ -453,7 +478,9 @@ onMounted(() => {
        break
    }
  }
+  if(route.query.matchId){
+    matchId.value = route.query.matchId
+  }
  getData()
 })
@@ -583,6 +610,7 @@ function MakeUpOrder(){
 return  booking.getMealOrderInfo({orderId: orderId.value}).then(res => {
    form.value=res.data
    totalFee.value=language.value==0?form.value.total:form.value.totalEn
+   matchId.value = form.value.activeId
   MakeUpIno()
   console.log(res)
  }).catch(err => {
@@ -590,7 +618,6 @@ function MakeUpOrder(){
    errorBox.value = true
  })
 }
 function MakeUpIno(){
  booking.getMealOrderInfoByLogex({asmId: form.value.asmId}).then(res=>{
      formInfo.value=res.data
@@ -670,6 +697,48 @@ function handleView(){
  proxy.$refs['DialogRef'].open(language.value==0? form.value.details:form.value.detailsEn)
 }
+function downInvoice() {
+  getremark()
+  if (form.value.receiptFlag == '0') {
+    showSJDialog.value = true
+  } else {
+    showSJ()
+  }
+}
+function getremark(){
+  getBaseInfoByActiveId(matchId.value).then(res => {
+    if (res.data) {
+      remark.value = res.data.remarks
+    }
+  })
+}
+function submitSJ() {
+  loading.value = true
+  ElMessageBox.confirm(language.value == 0 ? '提交后无法修改开票人，确认提交吗？' : 'Confirm to submit ?', {
+    confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
+    cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
+    type: 'warning'
+  }).then(() => {
+    showSJ()
+  })
+}
+const showSJ = () => {
+  // 查看电子收据预览信息
+  var obj = {
+    orderId: orderId.value,
+    type: 1
+  }
+  if (form.value.receiptFlag == '0') {
+    obj.receiptInfo = lpName.value
+  }
+  // 报名
+  proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
+    ...obj
+  }, `Receipt_${new Date().getTime()}.pdf`)
+  showSJDialog.value = false
+  getData()
+}
 </script>
 <style scoped lang="scss">
--- a/src/viewsPc/center/myReservation.vue
View file @d793ca6
+++ b/src/viewsPc/center/myReservation.vue
View file @d793ca6
@@ -152,7 +152,8 @@ 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 @d793ca6
+++ b/src/viewsPc/components/querybackNumber.vue
View file @d793ca6
 <template>
  <el-dialog
-      v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Back Number'" append-to-body
+      v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Competition 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">个人查询</div>
+        <div @click="type='0'" class="rItem">{{ language == 0 ? '个人查询':'Personal Query' }}</div>
-        <div @click="type='1'" class="rItem">团队查询</div>
+        <div @click="type='1'" class="rItem">{{ language == 0 ? '团队查询':'Team Query' }}</div>
      </div>
      <div v-if="type=='0'">
@@ -59,7 +59,7 @@
            {{language == 0 ? '查询' : 'Search' }}
          </el-button>
        </div>
-        <span class="tip">*模糊查询</span>
+        <span class="tip">*{{ language == 0 ?'模糊查询':'Fuzzy query' }}</span>
        <div v-if="teamlist.length>0" class="temell mt20">
          <el-collapse v-model="activeNames" accordion>
--- a/src/viewsPc/guide/index.vue
View file @d793ca6
+++ b/src/viewsPc/guide/index.vue
View file @d793ca6
@@ -313,7 +313,7 @@
              </div>
              <div>
                <a target="_blank" class="text-primary"
-                   href="https://wdsfwuxicenter.com/stage-api/fs/file/Schedule-WDSF_ASIAN_DANCESPORT_FESTIVAL_2024.WUXI.pdf">
+                   href="https://wdsfwuxicenter.com/stage-api/fs/file/WUXI_COMPETITION_TIMETABLE.pdf">
                  <el-icon style="position: relative;top: 2px">
                    <download/>
                  </el-icon>
--- a/src/viewsPc/index_en.vue
View file @d793ca6
+++ b/src/viewsPc/index_en.vue
View file @d793ca6
@@ -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">Back Number</a>
+                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="backNumberSearch">Competition Number</a>
 <!--                <div>-->
 <!--                  <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service-->
 <!--                  </a>-->
--- a/src/viewsPc/match/pay.vue
View file @d793ca6
+++ b/src/viewsPc/match/pay.vue
View file @d793ca6
--- a/vite.config.js
View file @d793ca6
+++ b/vite.config.js
View file @d793ca6
@@ -83,14 +83,14 @@ export default defineConfig(({ mode, command }) => {
        },
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
-          // target: 'http://192.168.1.131:8081/',
+          target: 'http://192.168.1.131:8081/',
          // target: 'https://jijin.wtwuxicenter.com/stage-api',
-          target: 'https://wdsfwuxicenter.com/stage-api/',
+          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
        },
        '/ticket': {
-          target: 'http://192.168.1.118:8098/',
+          target: 'http://192.168.1.131:8081/',
          // target: 'http://192.168.1.131:8081/',
          // target: 'https://jijin.wtwuxicenter.com/h5',
          // target: 'https://ticketh5.wdsfwuxicenter.com/h5/stage-api',