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>
...@@ -64,22 +64,23 @@ const loading = ref(false) ...@@ -64,22 +64,23 @@ const loading = ref(false)
64 function handleQuery() { 64 function handleQuery() {
65 loading.value = true 65 loading.value = true
66 queryParams.pageNum++ 66 queryParams.pageNum++
67 67
68 authentic.query(queryParams).then((res) => { 68 authentic.query(queryParams).then((res) => {
69 _.each(res.data.personalList.rows, (r) => { 69 _.each(res.data.personalList.rows, (r) => {
70 listData.value.push(r) 70 listData.value.push(r)
71 }) 71 })
72 72
73 showMore.value = listData.value.length < res.data.personalList.total 73 showMore.value = listData.value.length < res.data.personalList.total
74 loading.value = false 74 loading.value = false
75 }) 75 })
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,
...@@ -88,7 +89,7 @@ function init() { ...@@ -88,7 +89,7 @@ function init() {
88 name: props.query.name 89 name: props.query.name
89 } 90 }
90 listData.value = [] 91 listData.value = []
91 92
92 handleQuery() 93 handleQuery()
93 } 94 }
94 95
...@@ -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;
...@@ -110,28 +111,28 @@ defineExpose({ ...@@ -110,28 +111,28 @@ defineExpose({
110 background: #F5F7F9; 111 background: #F5F7F9;
111 border-radius: 2px; 112 border-radius: 2px;
112 padding: 10px 20px; 113 padding: 10px 20px;
113 114
114 .photo { 115 .photo {
115 width: 100px; 116 width: 100px;
116 height: 130px 117 height: 130px
117 } 118 }
118 119
119 .info { 120 .info {
120 margin-left: 20px; 121 margin-left: 20px;
121 width: 90%; 122 width: 90%;
122 123
123 .name { 124 .name {
124 font-size: 24px; 125 font-size: 24px;
125 display: flex; 126 display: flex;
126 align-items: center; 127 align-items: center;
127 margin: 10px 0; 128 margin: 10px 0;
128 } 129 }
129 130
130 .el-form-item--default { 131 .el-form-item--default {
131 margin-bottom: 0; 132 margin-bottom: 0;
132 } 133 }
133 } 134 }
134 135
135 .el-form-item__content { 136 .el-form-item__content {
136 font-size: 18px; 137 font-size: 18px;
137 color: #95A1A6; 138 color: #95A1A6;
...@@ -141,15 +142,15 @@ defineExpose({ ...@@ -141,15 +142,15 @@ defineExpose({
141 @media (max-width: 500px) { 142 @media (max-width: 500px) {
142 .person-item { 143 .person-item {
143 margin: 15px 0; 144 margin: 15px 0;
144 145
145 .photo { 146 .photo {
146 width: 120px; 147 width: 120px;
147 height: 140px; 148 height: 140px;
148 } 149 }
149 150
150 .info { 151 .info {
151 margin-left: 15px; 152 margin-left: 15px;
152 153
153 .name { 154 .name {
154 font-size: 18px 155 font-size: 18px
155 } 156 }
......
...@@ -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,12 +18,12 @@ ...@@ -18,12 +18,12 @@
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>
26 26
27 </div> 27 </div>
28 <div style="width: 170px"> 28 <div style="width: 170px">
29 <div v-if="d.canDownCert=='1'" class="vipDownLoad" @click="vipDownLoad(d.perId)"> 29 <div v-if="d.canDownCert=='1'" class="vipDownLoad" @click="vipDownLoad(d.perId)">
...@@ -68,22 +68,23 @@ const loading = ref(false) ...@@ -68,22 +68,23 @@ const loading = ref(false)
68 function handleQuery() { 68 function handleQuery() {
69 loading.value = true 69 loading.value = true
70 queryParams.pageNum++ 70 queryParams.pageNum++
71 71
72 authentic.query(queryParams).then((res) => { 72 authentic.query(queryParams).then((res) => {
73 _.each(res.data.personalList.rows, (r) => { 73 _.each(res.data.personalList.rows, (r) => {
74 listData.value.push(r) 74 listData.value.push(r)
75 }) 75 })
76 76
77 showMore.value = listData.value.length < res.data.personalList.total 77 showMore.value = listData.value.length < res.data.personalList.total
78 loading.value = false 78 loading.value = false
79 }) 79 })
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,
...@@ -92,7 +93,7 @@ function init() { ...@@ -92,7 +93,7 @@ function init() {
92 name: props.query.name 93 name: props.query.name
93 } 94 }
94 listData.value = [] 95 listData.value = []
95 96
96 handleQuery() 97 handleQuery()
97 } 98 }
98 99
...@@ -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;
...@@ -114,28 +115,28 @@ defineExpose({ ...@@ -114,28 +115,28 @@ defineExpose({
114 background: #F5F7F9; 115 background: #F5F7F9;
115 border-radius: 2px; 116 border-radius: 2px;
116 padding: 10px 20px; 117 padding: 10px 20px;
117 118
118 .photo { 119 .photo {
119 width: 100px; 120 width: 100px;
120 height: 130px 121 height: 130px
121 } 122 }
122 123
123 .info { 124 .info {
124 margin-left: 20px; 125 margin-left: 20px;
125 width: 90%; 126 width: 90%;
126 127
127 .name { 128 .name {
128 font-size: 24px; 129 font-size: 24px;
129 display: flex; 130 display: flex;
130 align-items: center; 131 align-items: center;
131 margin: 10px 0; 132 margin: 10px 0;
132 } 133 }
133 134
134 .el-form-item--default { 135 .el-form-item--default {
135 margin-bottom: 0; 136 margin-bottom: 0;
136 } 137 }
137 } 138 }
138 139
139 .el-form-item__content { 140 .el-form-item__content {
140 font-size: 18px; 141 font-size: 18px;
141 color: #95A1A6; 142 color: #95A1A6;
...@@ -145,15 +146,15 @@ defineExpose({ ...@@ -145,15 +146,15 @@ defineExpose({
145 @media (max-width: 500px) { 146 @media (max-width: 500px) {
146 .person-item { 147 .person-item {
147 margin: 15px 0; 148 margin: 15px 0;
148 149
149 .photo { 150 .photo {
150 width: 120px; 151 width: 120px;
151 height: 140px; 152 height: 140px;
152 } 153 }
153 154
154 .info { 155 .info {
155 margin-left: 15px; 156 margin-left: 15px;
156 157
157 .name { 158 .name {
158 font-size: 18px 159 font-size: 18px
159 } 160 }
......
...@@ -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>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <i />会员证 26 <i />会员证
27 </div> 27 </div>
28 </div> 28 </div>
29 29
30 </div> 30 </div>
31 </div> 31 </div>
32 </div> 32 </div>
...@@ -65,22 +65,23 @@ const loading = ref(false) ...@@ -65,22 +65,23 @@ const loading = ref(false)
65 function handleQuery() { 65 function handleQuery() {
66 loading.value = true 66 loading.value = true
67 queryParams.pageNum++ 67 queryParams.pageNum++
68 68
69 authentic.query(queryParams).then((res) => { 69 authentic.query(queryParams).then((res) => {
70 _.each(res.data.personalList.rows, (r) => { 70 _.each(res.data.personalList.rows, (r) => {
71 listData.value.push(r) 71 listData.value.push(r)
72 }) 72 })
73 73
74 showMore.value = listData.value.length < res.data.personalList.total 74 showMore.value = listData.value.length < res.data.personalList.total
75 loading.value = false 75 loading.value = false
76 }) 76 })
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,
...@@ -89,7 +90,7 @@ function init() { ...@@ -89,7 +90,7 @@ function init() {
89 name: props.query.name 90 name: props.query.name
90 } 91 }
91 listData.value = [] 92 listData.value = []
92 93
93 handleQuery() 94 handleQuery()
94 } 95 }
95 96
...@@ -97,33 +98,59 @@ defineExpose({ ...@@ -97,33 +98,59 @@ 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
110 } 118 }
111 .el-form-item__content{ 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;
133 }
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;
118 145
119 .photo { 146 .photo {
120 width: 120px; 147 width: 120px;
121 height: 140px; 148 height: 140px;
122 } 149 }
123 150
124 .info { 151 .info {
125 margin-left: 15px; 152 margin-left: 15px;
126 153
127 .name { 154 .name {
128 font-size: 18px 155 font-size: 18px
129 } 156 }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <span>{{ b.id }}</span> 40 <span>{{ b.id }}</span>
41 <span class="fr text-warning status">{{ b.invoiceStr }}</span> 41 <span class="fr text-warning status">{{ b.invoiceStr }}</span>
42 </div> 42 </div>
43 43
44 <el-row align="middle" class="pd20 mt10" justify="space-between"> 44 <el-row align="middle" class="pd20 mt10" justify="space-between">
45 <el-col :lg="9" :md="12" :sm="12" :xs="24"> 45 <el-col :lg="9" :md="12" :sm="12" :xs="24">
46 <h3 class="m0">{{ b.name }}</h3> 46 <h3 class="m0">{{ b.name }}</h3>
...@@ -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">
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
81 <span>{{ b.id }}</span> 83 <span>{{ b.id }}</span>
82 <span class="fr text-warning status">{{ b.invoiceStr }}</span> 84 <span class="fr text-warning status">{{ b.invoiceStr }}</span>
83 </div> 85 </div>
84 86
85 <el-row align="middle" class="pd20 mt10" justify="space-between"> 87 <el-row align="middle" class="pd20 mt10" justify="space-between">
86 <el-col :lg="9" :md="12" :sm="12" :xs="24"> 88 <el-col :lg="9" :md="12" :sm="12" :xs="24">
87 <h3 class="m0">{{ b.name }}</h3> 89 <h3 class="m0">{{ b.name }}</h3>
...@@ -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">
...@@ -174,7 +178,7 @@ ...@@ -174,7 +178,7 @@
174 <span>{{ language == 0 ? '订单编号:' : 'No.' }} {{ b.id }}</span> 178 <span>{{ language == 0 ? '订单编号:' : 'No.' }} {{ b.id }}</span>
175 <span class="fr text-warning status">{{ b.invoiceStr }}</span> 179 <span class="fr text-warning status">{{ b.invoiceStr }}</span>
176 </div> 180 </div>
177 181
178 <el-row align="middle" class="pd20 mt10" justify="space-between"> 182 <el-row align="middle" class="pd20 mt10" justify="space-between">
179 <el-col :lg="9" :md="12" :sm="12" :xs="24"> 183 <el-col :lg="9" :md="12" :sm="12" :xs="24">
180 <div v-if="b.orderType == 0"> 184 <div v-if="b.orderType == 0">
...@@ -239,7 +243,7 @@ ...@@ -239,7 +243,7 @@
239 </div> 243 </div>
240 </div> 244 </div>
241 </el-card> 245 </el-card>
242 246
243 <el-dialog 247 <el-dialog
244 v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false" 248 v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
245 :title="language==0?'开收据':'Issue a receipt'" width="460px" 249 :title="language==0?'开收据':'Issue a receipt'" width="460px"
...@@ -258,7 +262,7 @@ ...@@ -258,7 +262,7 @@
258 {{ remark }} 262 {{ remark }}
259 </div> 263 </div>
260 </div> 264 </div>
261 265
262 </el-dialog> 266 </el-dialog>
263 </div> 267 </div>
264 </template> 268 </template>
...@@ -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 = () => {
...@@ -559,11 +565,11 @@ const downloadAndSend = () => { ...@@ -559,11 +565,11 @@ const downloadAndSend = () => {
559 overflow: visible; 565 overflow: visible;
560 padding: 0 20px 15px; 566 padding: 0 20px 15px;
561 border-bottom: 1px solid #e5e5e5; 567 border-bottom: 1px solid #e5e5e5;
562 568
563 .fr { 569 .fr {
564 margin: -8px 0 0 570 margin: -8px 0 0
565 } 571 }
566 572
567 h3 { 573 h3 {
568 display: inline-block; 574 display: inline-block;
569 font-size: 16px; 575 font-size: 16px;
...@@ -587,28 +593,28 @@ const downloadAndSend = () => { ...@@ -587,28 +593,28 @@ const downloadAndSend = () => {
587 top: 0; 593 top: 0;
588 font-size: 12px; 594 font-size: 12px;
589 color: #FFFFFF; 595 color: #FFFFFF;
590 596
591 span { 597 span {
592 border-radius: 0px 10px 0px 10px; 598 border-radius: 0px 10px 0px 10px;
593 padding: 4px 10px; 599 padding: 4px 10px;
594 } 600 }
595 601
596 .bg-danger { 602 .bg-danger {
597 background: #E60012; 603 background: #E60012;
598 } 604 }
599 605
600 .bg-warning { 606 .bg-warning {
601 background: #e89f39; 607 background: #e89f39;
602 } 608 }
603 609
604 .bg-pink { 610 .bg-pink {
605 background: #F740A6; 611 background: #F740A6;
606 } 612 }
607 613
608 .bg-primary { 614 .bg-primary {
609 background: var(--el-color-primary) 615 background: var(--el-color-primary)
610 } 616 }
611 617
612 .bg-blue { 618 .bg-blue {
613 background: #00a0e9 619 background: #00a0e9
614 } 620 }
...@@ -620,38 +626,38 @@ const downloadAndSend = () => { ...@@ -620,38 +626,38 @@ const downloadAndSend = () => {
620 color: #000000; 626 color: #000000;
621 margin: 0 0 10px; 627 margin: 0 0 10px;
622 } 628 }
623 629
624 p { 630 p {
625 margin: 8px 0 0; 631 margin: 8px 0 0;
626 color: #707070; 632 color: #707070;
627 font-size: 14px; 633 font-size: 14px;
628 } 634 }
629 635
630 margin: 0 0 20px; 636 margin: 0 0 20px;
631 border: 1px solid #E5E5E5; 637 border: 1px solid #E5E5E5;
632 border-radius: 10px; 638 border-radius: 10px;
633 position: relative; 639 position: relative;
634 640
635 .bbody { 641 .bbody {
636 padding: 0 15px 20px; 642 padding: 0 15px 20px;
637 } 643 }
638 644
639 .title { 645 .title {
640 background: #F7F7F7; 646 background: #F7F7F7;
641 border-bottom: 1px solid #E5E5E5; 647 border-bottom: 1px solid #E5E5E5;
642 648
643 span { 649 span {
644 font-size: 14px; 650 font-size: 14px;
645 color: #4C5359; 651 color: #4C5359;
646 } 652 }
647 653
648 .status { 654 .status {
649 font-size: 12px; 655 font-size: 12px;
650 font-weight: bold; 656 font-weight: bold;
651 padding: 2px 10px; 657 padding: 2px 10px;
652 } 658 }
653 } 659 }
654 660
655 .title label { 661 .title label {
656 border-radius: 5px 0 5px 0; 662 border-radius: 5px 0 5px 0;
657 font-size: 12px; 663 font-size: 12px;
...@@ -659,15 +665,15 @@ const downloadAndSend = () => { ...@@ -659,15 +665,15 @@ const downloadAndSend = () => {
659 padding: 4px 10px; 665 padding: 4px 10px;
660 margin-right: 10px; 666 margin-right: 10px;
661 } 667 }
662 668
663 .blueTag { 669 .blueTag {
664 background-color: #1EC886; 670 background-color: #1EC886;
665 } 671 }
666 672
667 .purpleTag { 673 .purpleTag {
668 background-color: #717bef; 674 background-color: #717bef;
669 } 675 }
670 676
671 .orangeTag { 677 .orangeTag {
672 background-color: #ff8124; 678 background-color: #ff8124;
673 } 679 }
......
...@@ -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!