Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
682aad45 by 杨炀
Options

no message

1 parent eb4281f9
Inline Side-by-side
Showing 5 changed files with 34 additions and 11 deletions
src/viewsPc/booking/Invoicing.vue
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </div> 46 </div>
47 </div> 47 </div>
48 48
49 <chose-bills ref="dialogChoseBillsRef"/> 49 <chose-bills ref="dialogChoseBillsRef" @transfer="getChoosed"/>
50 </template> 50 </template>
51 51
52 <script setup> 52 <script setup>
...@@ -82,9 +82,16 @@ function goAdd() { ...@@ -82,9 +82,16 @@ function goAdd() {
82 } 82 }
83 proxy.$refs['dialogChoseBillsRef'].open(obj) 83 proxy.$refs['dialogChoseBillsRef'].open(obj)
84 } 84 }
85 function getChoosed(list) {
86 console.log(list)
87 }
85 </script> 88 </script>
86 89
87 <style scoped lang="scss"> 90 <style scoped lang="scss">
88 .leftboderTT{ 91 .leftboderTT{
89 font-size: 20px;} 92 font-size: 20px;
93 .btn-lineG{text-transform: uppercase;
94 span{color: #fff;}
95 }
96 }
90 </style> 97 </style>
......
src/viewsPc/booking/component/choseBills.vue
1 <template> 1 <template>
2 <el-dialog v-model="show" :title="title" width="1000px" append-to-body @close="close"> 2 <el-dialog v-model="show" :title="title" width="1000px" append-to-body @close="close">
3 <el-table ref="allBills" :data="tableData" v-loading="loading" @selection-change="handleSelectionChange"> 3 <el-table height="50vh" ref="allBills" :data="tableData" v-loading="loading" @selection-change="handleSelectionChange">
4 <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/> 4 <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>
5 <el-table-column prop="id" label="订单号"></el-table-column> 5 <el-table-column prop="id" :label="language==0?'订单号':'No.'"></el-table-column>
6 <el-table-column prop="id" label="订单类型"></el-table-column> 6 <el-table-column prop="id" :label="language==0?'订单类型':'Order Type'">
7 <el-table-column prop="id" label="订单明细"> 7 <template #default="scope">
8 <span v-if="scope.row.orderType == '0'">{{language==0?'酒店订单':'Hotel Order'}}</span>
9 <span v-if="scope.row.orderType == '1'">{{language==0?'接送订单':'Car Order'}}</span>
10 <span v-if="scope.row.orderType == '2'">{{language==0?'餐饮订单':'Food Order'}}</span>
11 </template>
12 </el-table-column>
13 <el-table-column prop="id" :label="language==0?'订单明细':'Detail'">
8 <template #default="scope"> 14 <template #default="scope">
9 <div v-if="scope.row.orderType == 0"> 15 <div v-if="scope.row.orderType == 0">
10 <p>{{scope.row.messageObj.roomName}}</p> 16 <p>{{scope.row.messageObj.roomName}}</p>
...@@ -26,7 +32,7 @@ ...@@ -26,7 +32,7 @@
26 </div> 32 </div>
27 </template> 33 </template>
28 </el-table-column> 34 </el-table-column>
29 <el-table-column prop="total" label="金额"></el-table-column> 35 <el-table-column prop="total" :label="language==0?'金额':'Amount'"></el-table-column>
30 </el-table> 36 </el-table>
31 <paginationPc 37 <paginationPc
32 v-show="total>0" 38 v-show="total>0"
...@@ -49,6 +55,7 @@ import {reactive, ref, toRefs, watch} from 'vue' ...@@ -49,6 +55,7 @@ import {reactive, ref, toRefs, watch} from 'vue'
49 import {getCurrentInstance} from "@vue/runtime-core"; 55 import {getCurrentInstance} from "@vue/runtime-core";
50 import {useStorage} from "@vueuse/core/index"; 56 import {useStorage} from "@vueuse/core/index";
51 import {getCanInvoiceBills} from "@/apiPc/booking"; 57 import {getCanInvoiceBills} from "@/apiPc/booking";
58 import {ElMessage} from "element-plus";
52 const {proxy} = getCurrentInstance() 59 const {proxy} = getCurrentInstance()
53 const emit = defineEmits([ 'transfer']) 60 const emit = defineEmits([ 'transfer'])
54 const language= useStorage('language',0) 61 const language= useStorage('language',0)
...@@ -92,8 +99,17 @@ const getList = () => { ...@@ -92,8 +99,17 @@ const getList = () => {
92 } 99 }
93 }) 100 })
94 } 101 }
102 function handleSelectionChange(val) {
103 // console.log(val)
104 choosedList = val
105 }
95 const submit = () => { 106 const submit = () => {
96 107 if(choosedList.length==0){
108 ElMessage.warning(language.value==0?'请至少选择一个订单':'Please select at least one order')
109 return
110 }
111 emit('transfer', choosedList)
112 show.value = false
97 } 113 }
98 const cancel = () => { 114 const cancel = () => {
99 show.value = false 115 show.value = false
......
src/viewsPc/match/detail_en.vue
...@@ -200,9 +200,9 @@ ...@@ -200,9 +200,9 @@
200 <el-col :span="24"> 200 <el-col :span="24">
201 <el-table :data="signDoneGroupList"> 201 <el-table :data="signDoneGroupList">
202 <el-table-column prop="groupCode" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/> 202 <el-table-column prop="groupCode" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
203 <el-table-column prop="group" :label="language == 0 ?'组别':'Group'" min-width="120"/>
203 <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/> 204 <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
204 <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/> 205 <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
205 <el-table-column prop="group" :label="language == 0 ?'组别':'Group'" min-width="120"/>
206 <el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/> 206 <el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/>
207 <el-table-column prop="countryName" :label="language == 0 ?'国籍':'Representing'" min-width="130"/> 207 <el-table-column prop="countryName" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
208 <el-table-column prop="groupName" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/> 208 <el-table-column prop="groupName" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
......
src/viewsPc/meta/index.vue
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <div class="picbox" @click="goDetail(newsList2[3])" style="height: calc(50% - 10px);margin-top: 20px"><img :src="fillImgUrl_webSite(newsList2[3]?.picUrl)"/></div> 61 <div class="picbox" @click="goDetail(newsList2[3])" style="height: calc(50% - 10px);margin-top: 20px"><img :src="fillImgUrl_webSite(newsList2[3]?.picUrl)"/></div>
62 </el-col> 62 </el-col>
63 </el-row> 63 </el-row>
64 <el-row :gutter="20" class="mt20"> 64 <el-row :gutter="20">
65 <el-col :lg="8" v-for="(n,index) in newsList2" :key="index" v-show="index>3"> 65 <el-col :lg="8" v-for="(n,index) in newsList2" :key="index" v-show="index>3">
66 <div class="picbox" @click="goDetail(n)" ><img :src="fillImgUrl_webSite(n.picUrl)"/></div> 66 <div class="picbox" @click="goDetail(n)" ><img :src="fillImgUrl_webSite(n.picUrl)"/></div>
67 </el-col> 67 </el-col>
......
vite.config.js
...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 target: 'http://192.168.1.118:8081/', 85 target: 'http://192.168.1.131:8081/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 // target: 'https://dance.itechtop.cn/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!