24c59e8d by zhangmeng

旅游

1 parent 82d4fb2e
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 <el-row> 3 <el-row>
4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24"> 4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
5 <div class="person-item"> 5 <div class="person-item">
6 <img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)"> 6 <img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
7 <img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png"> 7 <img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
8 <div class="info"> 8 <div class="info">
9 <div class="name">{{ d.name }} 9 <div class="name">{{ d.name }}
10 <el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" /> 10 <el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" />
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item> 15 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
16 </div> 16 </div>
17 <div> 17 <div>
18 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>--> 18 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
19 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item> 19 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item>
20 </div> 20 </div>
21 <div> 21 <div>
...@@ -76,10 +76,11 @@ function handleQuery() { ...@@ -76,10 +76,11 @@ function handleQuery() {
76 } 76 }
77 77
78 function vipDownLoad(perId) { 78 function vipDownLoad(perId) {
79 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf') 79 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
80 } 80 }
81 81
82 let queryParams = {} 82 let queryParams = {}
83
83 function init() { 84 function init() {
84 queryParams = { 85 queryParams = {
85 pageNum: 0, 86 pageNum: 0,
...@@ -97,7 +98,7 @@ defineExpose({ ...@@ -97,7 +98,7 @@ defineExpose({
97 }) 98 })
98 </script> 99 </script>
99 100
100 <style scoped lang="scss"> 101 <style lang="scss" scoped>
101 .flex { 102 .flex {
102 display: flex; 103 display: flex;
103 justify-content: space-between; 104 justify-content: space-between;
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 <el-row> 3 <el-row>
4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24"> 4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
5 <div class="person-item"> 5 <div class="person-item">
6 <img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)"> 6 <img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
7 <img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png"> 7 <img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
8 <div class="info"> 8 <div class="info">
9 <div class="name">{{ d.name }} 9 <div class="name">{{ d.name }}
10 <el-image 10 <el-image
11 v-if="d.sex=='0'||d.sex=='1'" style="width: 20px;height: 20px;margin-left: 10px" 11 v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female"
12 :src="d.sex=='0'?male:female" 12 style="width: 20px;height: 20px;margin-left: 10px"
13 /> 13 />
14 </div> 14 </div>
15 <div class="flex"> 15 <div class="flex">
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item> 18 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
19 </div> 19 </div>
20 <div> 20 <div>
21 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>--> 21 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
22 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}')||'--' }}</el-form-item> 22 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') || '--' }}</el-form-item>
23 </div> 23 </div>
24 <div> 24 <div>
25 <el-form-item label="考官类型:">{{ d.examinerTypeStr }}</el-form-item> 25 <el-form-item label="考官类型:">{{ d.examinerTypeStr }}</el-form-item>
...@@ -80,10 +80,11 @@ function handleQuery() { ...@@ -80,10 +80,11 @@ function handleQuery() {
80 } 80 }
81 81
82 function vipDownLoad(perId) { 82 function vipDownLoad(perId) {
83 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf') 83 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
84 } 84 }
85 85
86 let queryParams = {} 86 let queryParams = {}
87
87 function init() { 88 function init() {
88 queryParams = { 89 queryParams = {
89 pageNum: 0, 90 pageNum: 0,
...@@ -101,7 +102,7 @@ defineExpose({ ...@@ -101,7 +102,7 @@ defineExpose({
101 }) 102 })
102 </script> 103 </script>
103 104
104 <style scoped lang="scss"> 105 <style lang="scss" scoped>
105 .flex { 106 .flex {
106 display: flex; 107 display: flex;
107 justify-content: space-between; 108 justify-content: space-between;
......
...@@ -117,7 +117,7 @@ function handleQuery() { ...@@ -117,7 +117,7 @@ function handleQuery() {
117 } 117 }
118 118
119 function vipDownLoad(perId) { 119 function vipDownLoad(perId) {
120 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf') 120 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
121 } 121 }
122 122
123 let queryParams = {} 123 let queryParams = {}
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 <el-row> 3 <el-row>
4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24"> 4 <el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
5 <div class="person-item"> 5 <div class="person-item">
6 <img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)"> 6 <img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
7 <img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png"> 7 <img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
8 <div class="info"> 8 <div class="info">
9 <div class="name">{{ d.name }} 9 <div class="name">{{ d.name }}
10 <el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" /> 10 <el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" />
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item> 15 <el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
16 </div> 16 </div>
17 <div> 17 <div>
18 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>--> 18 <!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
19 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item> 19 <el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item>
20 </div> 20 </div>
21 <div> 21 <div>
...@@ -77,10 +77,11 @@ function handleQuery() { ...@@ -77,10 +77,11 @@ function handleQuery() {
77 } 77 }
78 78
79 function vipDownLoad(perId) { 79 function vipDownLoad(perId) {
80 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf') 80 proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
81 } 81 }
82 82
83 let queryParams = {} 83 let queryParams = {}
84
84 function init() { 85 function init() {
85 queryParams = { 86 queryParams = {
86 pageNum: 0, 87 pageNum: 0,
...@@ -97,21 +98,47 @@ defineExpose({ ...@@ -97,21 +98,47 @@ defineExpose({
97 init 98 init
98 }) 99 })
99 </script> 100 </script>
100 <style scoped lang="scss"> 101 <style lang="scss" scoped>
101 .flex{display: flex;justify-content: space-between;} 102 .flex {
102 .person-item{position:relative; 103 display: flex;
103 display: flex;margin: 30px 0;background: #F5F7F9; 104 justify-content: space-between;
104 border-radius: 2px;padding: 10px 20px; 105 }
105 .photo{width: 100px; height: 130px} 106
106 .info{margin-left: 20px;width: 90%; 107 .person-item {
107 .name{font-size: 24px;display: flex;align-items: center; 108 position: relative;
108 margin: 10px 0;} 109 display: flex;
109 .el-form-item--default{margin-bottom: 0;} 110 margin: 30px 0;
111 background: #F5F7F9;
112 border-radius: 2px;
113 padding: 10px 20px;
114
115 .photo {
116 width: 100px;
117 height: 130px
118 }
119
120 .info {
121 margin-left: 20px;
122 width: 90%;
123
124 .name {
125 font-size: 24px;
126 display: flex;
127 align-items: center;
128 margin: 10px 0;
129 }
130
131 .el-form-item--default {
132 margin-bottom: 0;
110 } 133 }
111 .el-form-item__content{ 134 }
135
136 .el-form-item__content {
112 font-size: 18px; 137 font-size: 18px;
113 color: #95A1A6;} 138 color: #95A1A6;
139 }
114 } 140 }
141
115 @media (max-width: 500px) { 142 @media (max-width: 500px) {
116 .person-item { 143 .person-item {
117 margin: 15px 0; 144 margin: 15px 0;
......
...@@ -48,7 +48,9 @@ ...@@ -48,7 +48,9 @@
48 <!-- b.messageObj.ticketDate.name--> 48 <!-- b.messageObj.ticketDate.name-->
49 <!-- }}</p>--> 49 <!-- }}</p>-->
50 <p class="common"> 50 <p class="common">
51 {{ language == 0 ? "张数" : "Location" }}{{ b.messageObj.touristList.length }}{{ language == 0 ? "张" : "tickets" }} 51 {{ language == 0 ? "张数" : "Location" }}{{
52 b.messageObj.touristList.length
53 }}{{ language == 0 ? "张" : "tickets" }}
52 </p> 54 </p>
53 </el-col> 55 </el-col>
54 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 56 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
...@@ -89,7 +91,9 @@ ...@@ -89,7 +91,9 @@
89 b.messageObj.atName 91 b.messageObj.atName
90 }}</p> 92 }}</p>
91 <p class="common"> 93 <p class="common">
92 {{ language == 0 ? "张数" : "Location" }}{{ b.messageObj.orderCustomerList.length }}{{ language == 0 ? "张" : "tickets" }} 94 {{ language == 0 ? "张数" : "Location" }}{{
95 b.messageObj.orderCustomerList.length
96 }}{{ language == 0 ? "张" : "tickets" }}
93 </p> 97 </p>
94 </el-col> 98 </el-col>
95 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 99 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
...@@ -313,10 +317,12 @@ onMounted(() => { ...@@ -313,10 +317,12 @@ onMounted(() => {
313 getList() 317 getList()
314 route.query.orderSn && getDataInfo() 318 route.query.orderSn && getDataInfo()
315 }) 319 })
320
316 async function getDataInfo() { 321 async function getDataInfo() {
317 const res = await getOrderDetail({ orderSn: route.query.orderSn }) 322 const res = await getOrderDetail({ orderSn: route.query.orderSn })
318 formDate.value = res.data 323 formDate.value = res.data
319 } 324 }
325
320 const getList = () => { 326 const getList = () => {
321 loading.value = true 327 loading.value = true
322 if (query.value.orderType == '5') { 328 if (query.value.orderType == '5') {
...@@ -489,12 +495,12 @@ const showSJ = (item) => { ...@@ -489,12 +495,12 @@ const showSJ = (item) => {
489 // 预约 495 // 预约
490 proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, { 496 proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
491 ...obj 497 ...obj
492 }, `Receipt_${new Date().getTime()}.pdf`) 498 }, `Receipt_${new Date().getTime()}.pdf`, {}, 'application/pdf')
493 } else { 499 } else {
494 // 报名 500 // 报名
495 proxy.download(`/ota/signOrder/getReceipt/${obj.orderId}`, { 501 proxy.download(`/ota/signOrder/getReceipt/${obj.orderId}`, {
496 ...obj 502 ...obj
497 }, `Receipt_${new Date().getTime()}.pdf`) 503 }, `Receipt_${new Date().getTime()}.pdf`, {}, 'application/pdf')
498 } 504 }
499 } 505 }
500 const submitSJ = () => { 506 const submitSJ = () => {
......
...@@ -711,7 +711,7 @@ const goPersonInfo = (row) => { ...@@ -711,7 +711,7 @@ const goPersonInfo = (row) => {
711 function downloadVoucher() { 711 function downloadVoucher() {
712 // 下载凭证 712 // 下载凭证
713 proxy.download( 713 proxy.download(
714 `/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf' 714 `/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf', {}, 'application/pdf'
715 ) 715 )
716 } 716 }
717 717
......
...@@ -713,7 +713,7 @@ function exportPdf() { ...@@ -713,7 +713,7 @@ function exportPdf() {
713 fileName = '设项报名清单' 713 fileName = '设项报名清单'
714 proxy.download('/pdf/exportMySignInfoList', { 714 proxy.download('/pdf/exportMySignInfoList', {
715 ...obj 715 ...obj
716 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf') 716 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
717 } else { 717 } else {
718 fileName = 'LIST OF REGISTERED COMPETITIONS' 718 fileName = 'LIST OF REGISTERED COMPETITIONS'
719 proxy.download('/pdf/exportMySignInfoList', { 719 proxy.download('/pdf/exportMySignInfoList', {
......
...@@ -317,7 +317,7 @@ function exportSignList(n) { ...@@ -317,7 +317,7 @@ function exportSignList(n) {
317 } 317 }
318 proxy.download('/league/sign/exportCn', { 318 proxy.download('/league/sign/exportCn', {
319 ...obj 319 ...obj
320 }, `${fileName}_${new Date().getTime()}.xlsx`) 320 }, `${fileName}_${new Date().getTime()}.xlsx`, {}, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
321 } else { 321 } else {
322 if (n == 1) { 322 if (n == 1) {
323 fileName = 'Participant List' 323 fileName = 'Participant List'
...@@ -326,7 +326,7 @@ function exportSignList(n) { ...@@ -326,7 +326,7 @@ function exportSignList(n) {
326 } 326 }
327 proxy.download('/league/sign/exportEn', { 327 proxy.download('/league/sign/exportEn', {
328 ...obj 328 ...obj
329 }, `${fileName}_${new Date().getTime()}.xlsx`) 329 }, `${fileName}_${new Date().getTime()}.xlsx`, {}, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
330 } 330 }
331 } 331 }
332 332
...@@ -341,12 +341,12 @@ function exportPdf() { ...@@ -341,12 +341,12 @@ function exportPdf() {
341 fileName = '设项报名清单' 341 fileName = '设项报名清单'
342 proxy.download('/pdf/exportMySignInfoList', { 342 proxy.download('/pdf/exportMySignInfoList', {
343 ...obj 343 ...obj
344 }, `${fileName}_${new Date().getTime()}.pdf`) 344 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
345 } else { 345 } else {
346 fileName = 'LIST OF REGISTERED COMPETITIONS' 346 fileName = 'LIST OF REGISTERED COMPETITIONS'
347 proxy.download('/pdf/exportMySignInfoList', { 347 proxy.download('/pdf/exportMySignInfoList', {
348 ...obj 348 ...obj
349 }, `${fileName}_${new Date().getTime()}.pdf`) 349 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf')
350 } 350 }
351 } 351 }
352 </script> 352 </script>
......
...@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => {
84 }, 84 },
85 '/dev-api': { 85 '/dev-api': {
86 // target: 'http://192.168.1.213:8081/', 86 // target: 'http://192.168.1.213:8081/',
87 // target: 'http://192.168.1.118:8081', 87 target: 'http://192.168.1.169:8081',
88 target: 'https://jijin.wtwuxicenter.com/stage-api', 88 // target: 'https://jijin.wtwuxicenter.com/stage-api',
89 // target: 'https://wdsfwuxicenter.com/stage-api/', 89 // target: 'https://wdsfwuxicenter.com/stage-api/',
90 changeOrigin: true, 90 changeOrigin: true,
91 rewrite: (p) => p.replace(/^\/dev-api/, '') 91 rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!