24c59e8d by zhangmeng

旅游

1 parent 82d4fb2e
......@@ -3,8 +3,8 @@
<el-row>
<el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
<div class="person-item">
<img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)">
<img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png">
<img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
<img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
<div class="info">
<div class="name">{{ d.name }}
<el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" />
......@@ -15,7 +15,7 @@
<el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
</div>
<div>
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item>
</div>
<div>
......@@ -64,22 +64,23 @@ const loading = ref(false)
function handleQuery() {
loading.value = true
queryParams.pageNum++
authentic.query(queryParams).then((res) => {
_.each(res.data.personalList.rows, (r) => {
listData.value.push(r)
})
showMore.value = listData.value.length < res.data.personalList.total
loading.value = false
})
}
function vipDownLoad(perId) {
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf')
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
}
let queryParams = {}
function init() {
queryParams = {
pageNum: 0,
......@@ -88,7 +89,7 @@ function init() {
name: props.query.name
}
listData.value = []
handleQuery()
}
......@@ -97,7 +98,7 @@ defineExpose({
})
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.flex {
display: flex;
justify-content: space-between;
......@@ -110,28 +111,28 @@ defineExpose({
background: #F5F7F9;
border-radius: 2px;
padding: 10px 20px;
.photo {
width: 100px;
height: 130px
}
.info {
margin-left: 20px;
width: 90%;
.name {
font-size: 24px;
display: flex;
align-items: center;
margin: 10px 0;
}
.el-form-item--default {
margin-bottom: 0;
}
}
.el-form-item__content {
font-size: 18px;
color: #95A1A6;
......@@ -141,15 +142,15 @@ defineExpose({
@media (max-width: 500px) {
.person-item {
margin: 15px 0;
.photo {
width: 120px;
height: 140px;
}
.info {
margin-left: 15px;
.name {
font-size: 18px
}
......
......@@ -3,13 +3,13 @@
<el-row>
<el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
<div class="person-item">
<img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)">
<img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png">
<img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
<img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
<div class="info">
<div class="name">{{ d.name }}
<el-image
v-if="d.sex=='0'||d.sex=='1'" style="width: 20px;height: 20px;margin-left: 10px"
:src="d.sex=='0'?male:female"
v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female"
style="width: 20px;height: 20px;margin-left: 10px"
/>
</div>
<div class="flex">
......@@ -18,12 +18,12 @@
<el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
</div>
<div>
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}')||'--' }}</el-form-item>
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') || '--' }}</el-form-item>
</div>
<div>
<el-form-item label="考官类型:">{{ d.examinerTypeStr }}</el-form-item>
</div>
<div style="width: 170px">
<div v-if="d.canDownCert=='1'" class="vipDownLoad" @click="vipDownLoad(d.perId)">
......@@ -68,22 +68,23 @@ const loading = ref(false)
function handleQuery() {
loading.value = true
queryParams.pageNum++
authentic.query(queryParams).then((res) => {
_.each(res.data.personalList.rows, (r) => {
listData.value.push(r)
})
showMore.value = listData.value.length < res.data.personalList.total
loading.value = false
})
}
function vipDownLoad(perId) {
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf')
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
}
let queryParams = {}
function init() {
queryParams = {
pageNum: 0,
......@@ -92,7 +93,7 @@ function init() {
name: props.query.name
}
listData.value = []
handleQuery()
}
......@@ -101,7 +102,7 @@ defineExpose({
})
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.flex {
display: flex;
justify-content: space-between;
......@@ -114,28 +115,28 @@ defineExpose({
background: #F5F7F9;
border-radius: 2px;
padding: 10px 20px;
.photo {
width: 100px;
height: 130px
}
.info {
margin-left: 20px;
width: 90%;
.name {
font-size: 24px;
display: flex;
align-items: center;
margin: 10px 0;
}
.el-form-item--default {
margin-bottom: 0;
}
}
.el-form-item__content {
font-size: 18px;
color: #95A1A6;
......@@ -145,15 +146,15 @@ defineExpose({
@media (max-width: 500px) {
.person-item {
margin: 15px 0;
.photo {
width: 120px;
height: 140px;
}
.info {
margin-left: 15px;
.name {
font-size: 18px
}
......
......@@ -117,7 +117,7 @@ function handleQuery() {
}
function vipDownLoad(perId) {
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf')
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
}
let queryParams = {}
......
......@@ -3,8 +3,8 @@
<el-row>
<el-col v-for="(d,i) in listData" :key="i" :lg="24" :sm="24">
<div class="person-item">
<img v-if="d.photo" class="photo" :src="fillImgUrl(d.photo)">
<img v-else class="photo" style="object-fit: contain;background: #fff;" src="@/assets/v1/default.png">
<img v-if="d.photo" :src="fillImgUrl(d.photo)" class="photo">
<img v-else class="photo" src="@/assets/v1/default.png" style="object-fit: contain;background: #fff;">
<div class="info">
<div class="name">{{ d.name }}
<el-image v-if="d.sex=='0'||d.sex=='1'" :src="d.sex=='0'?male:female" />
......@@ -15,7 +15,7 @@
<el-form-item label="所属省份:">{{ d.provinceName }}</el-form-item>
</div>
<div>
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<!-- <el-form-item label="有效期开始:">{{ parseTime(d.createTime, '{y}-{m}-{d}') }}</el-form-item>-->
<el-form-item label="有效期结束:">{{ parseTime(d.validityDate, '{y}-{m}-{d}') }}</el-form-item>
</div>
<div>
......@@ -26,7 +26,7 @@
<i />会员证
</div>
</div>
</div>
</div>
</div>
......@@ -65,22 +65,23 @@ const loading = ref(false)
function handleQuery() {
loading.value = true
queryParams.pageNum++
authentic.query(queryParams).then((res) => {
_.each(res.data.personalList.rows, (r) => {
listData.value.push(r)
})
showMore.value = listData.value.length < res.data.personalList.total
loading.value = false
})
}
function vipDownLoad(perId) {
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf')
proxy.download(`/person/info/downStuCert/${perId}`, {}, '会员证.pdf', {}, 'application/pdf')
}
let queryParams = {}
function init() {
queryParams = {
pageNum: 0,
......@@ -89,7 +90,7 @@ function init() {
name: props.query.name
}
listData.value = []
handleQuery()
}
......@@ -97,33 +98,59 @@ defineExpose({
init
})
</script>
<style scoped lang="scss">
.flex{display: flex;justify-content: space-between;}
.person-item{position:relative;
display: flex;margin: 30px 0;background: #F5F7F9;
border-radius: 2px;padding: 10px 20px;
.photo{width: 100px; height: 130px}
.info{margin-left: 20px;width: 90%;
.name{font-size: 24px;display: flex;align-items: center;
margin: 10px 0;}
.el-form-item--default{margin-bottom: 0;}
<style lang="scss" scoped>
.flex {
display: flex;
justify-content: space-between;
}
.person-item {
position: relative;
display: flex;
margin: 30px 0;
background: #F5F7F9;
border-radius: 2px;
padding: 10px 20px;
.photo {
width: 100px;
height: 130px
}
.el-form-item__content{
.info {
margin-left: 20px;
width: 90%;
.name {
font-size: 24px;
display: flex;
align-items: center;
margin: 10px 0;
}
.el-form-item--default {
margin-bottom: 0;
}
}
.el-form-item__content {
font-size: 18px;
color: #95A1A6;}
color: #95A1A6;
}
}
@media (max-width: 500px) {
.person-item {
margin: 15px 0;
.photo {
width: 120px;
height: 140px;
}
.info {
margin-left: 15px;
.name {
font-size: 18px
}
......
......@@ -40,7 +40,7 @@
<span>{{ b.id }}</span>
<span class="fr text-warning status">{{ b.invoiceStr }}</span>
</div>
<el-row align="middle" class="pd20 mt10" justify="space-between">
<el-col :lg="9" :md="12" :sm="12" :xs="24">
<h3 class="m0">{{ b.name }}</h3>
......@@ -48,7 +48,9 @@
<!-- b.messageObj.ticketDate.name-->
<!-- }}</p>-->
<p class="common">
{{ language == 0 ? "张数" : "Location" }}{{ b.messageObj.touristList.length }}{{ language == 0 ? "张" : "tickets" }}
{{ language == 0 ? "张数" : "Location" }}{{
b.messageObj.touristList.length
}}{{ language == 0 ? "张" : "tickets" }}
</p>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
......@@ -81,7 +83,7 @@
<span>{{ b.id }}</span>
<span class="fr text-warning status">{{ b.invoiceStr }}</span>
</div>
<el-row align="middle" class="pd20 mt10" justify="space-between">
<el-col :lg="9" :md="12" :sm="12" :xs="24">
<h3 class="m0">{{ b.name }}</h3>
......@@ -89,7 +91,9 @@
b.messageObj.atName
}}</p>
<p class="common">
{{ language == 0 ? "张数" : "Location" }}{{ b.messageObj.orderCustomerList.length }}{{ language == 0 ? "张" : "tickets" }}
{{ language == 0 ? "张数" : "Location" }}{{
b.messageObj.orderCustomerList.length
}}{{ language == 0 ? "张" : "tickets" }}
</p>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
......@@ -174,7 +178,7 @@
<span>{{ language == 0 ? '订单编号:' : 'No.' }} {{ b.id }}</span>
<span class="fr text-warning status">{{ b.invoiceStr }}</span>
</div>
<el-row align="middle" class="pd20 mt10" justify="space-between">
<el-col :lg="9" :md="12" :sm="12" :xs="24">
<div v-if="b.orderType == 0">
......@@ -239,7 +243,7 @@
</div>
</div>
</el-card>
<el-dialog
v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
:title="language==0?'开收据':'Issue a receipt'" width="460px"
......@@ -258,7 +262,7 @@
{{ remark }}
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -313,10 +317,12 @@ onMounted(() => {
getList()
route.query.orderSn && getDataInfo()
})
async function getDataInfo() {
const res = await getOrderDetail({ orderSn: route.query.orderSn })
formDate.value = res.data
}
const getList = () => {
loading.value = true
if (query.value.orderType == '5') {
......@@ -489,12 +495,12 @@ const showSJ = (item) => {
// 预约
proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
...obj
}, `Receipt_${new Date().getTime()}.pdf`)
}, `Receipt_${new Date().getTime()}.pdf`, {}, 'application/pdf')
} else {
// 报名
proxy.download(`/ota/signOrder/getReceipt/${obj.orderId}`, {
...obj
}, `Receipt_${new Date().getTime()}.pdf`)
}, `Receipt_${new Date().getTime()}.pdf`, {}, 'application/pdf')
}
}
const submitSJ = () => {
......@@ -559,11 +565,11 @@ const downloadAndSend = () => {
overflow: visible;
padding: 0 20px 15px;
border-bottom: 1px solid #e5e5e5;
.fr {
margin: -8px 0 0
}
h3 {
display: inline-block;
font-size: 16px;
......@@ -587,28 +593,28 @@ const downloadAndSend = () => {
top: 0;
font-size: 12px;
color: #FFFFFF;
span {
border-radius: 0px 10px 0px 10px;
padding: 4px 10px;
}
.bg-danger {
background: #E60012;
}
.bg-warning {
background: #e89f39;
}
.bg-pink {
background: #F740A6;
}
.bg-primary {
background: var(--el-color-primary)
}
.bg-blue {
background: #00a0e9
}
......@@ -620,38 +626,38 @@ const downloadAndSend = () => {
color: #000000;
margin: 0 0 10px;
}
p {
margin: 8px 0 0;
color: #707070;
font-size: 14px;
}
margin: 0 0 20px;
border: 1px solid #E5E5E5;
border-radius: 10px;
position: relative;
.bbody {
padding: 0 15px 20px;
}
.title {
background: #F7F7F7;
border-bottom: 1px solid #E5E5E5;
span {
font-size: 14px;
color: #4C5359;
}
.status {
font-size: 12px;
font-weight: bold;
padding: 2px 10px;
}
}
.title label {
border-radius: 5px 0 5px 0;
font-size: 12px;
......@@ -659,15 +665,15 @@ const downloadAndSend = () => {
padding: 4px 10px;
margin-right: 10px;
}
.blueTag {
background-color: #1EC886;
}
.purpleTag {
background-color: #717bef;
}
.orangeTag {
background-color: #ff8124;
}
......
......@@ -711,7 +711,7 @@ const goPersonInfo = (row) => {
function downloadVoucher() {
// 下载凭证
proxy.download(
`/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf'
`/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf', {}, 'application/pdf'
)
}
......
......@@ -713,7 +713,7 @@ function exportPdf() {
fileName = '设项报名清单'
proxy.download('/pdf/exportMySignInfoList', {
...obj
}, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf')
}, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
} else {
fileName = 'LIST OF REGISTERED COMPETITIONS'
proxy.download('/pdf/exportMySignInfoList', {
......
......@@ -317,7 +317,7 @@ function exportSignList(n) {
}
proxy.download('/league/sign/exportCn', {
...obj
}, `${fileName}_${new Date().getTime()}.xlsx`)
}, `${fileName}_${new Date().getTime()}.xlsx`, {}, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
} else {
if (n == 1) {
fileName = 'Participant List'
......@@ -326,7 +326,7 @@ function exportSignList(n) {
}
proxy.download('/league/sign/exportEn', {
...obj
}, `${fileName}_${new Date().getTime()}.xlsx`)
}, `${fileName}_${new Date().getTime()}.xlsx`, {}, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
}
}
......@@ -341,12 +341,12 @@ function exportPdf() {
fileName = '设项报名清单'
proxy.download('/pdf/exportMySignInfoList', {
...obj
}, `${fileName}_${new Date().getTime()}.pdf`)
}, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
} else {
fileName = 'LIST OF REGISTERED COMPETITIONS'
proxy.download('/pdf/exportMySignInfoList', {
...obj
}, `${fileName}_${new Date().getTime()}.pdf`)
}, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf')
}
}
</script>
......
......@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => {
},
'/dev-api': {
// target: 'http://192.168.1.213:8081/',
// target: 'http://192.168.1.118:8081',
target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.169:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
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!