Leo_Ding/JinShan_admin
1
0
Fork 0
generated from Leo_Ding/web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_admin

Browse Source
This commit is contained in:
qiuyuan 2025-12-22 14:37:13 +08:00
commit e4dca18e39
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -12,8 +12,8 @@ VITE_ROUTER_BASE=/
VITE_ROUTER_HISTORY=hash VITE_ROUTER_HISTORY=hash
# api # api
VITE_API_BASIC=https://jinshan.nantong.info # VITE_API_BASIC=https://jinshan.nantong.info
# VITE_API_BASIC=http://10.10.1.6:8071 VITE_API_BASIC=http://10.10.1.6:8071
VITE_API_HTTP=/api/v1/ VITE_API_HTTP=/api/v1/
# storage # storage
VITE_STORAGE_NAMESPACE = gin-admin_local_ VITE_STORAGE_NAMESPACE = gin-admin_local_

6
src/views/pages/activity/components/EditDialog.vue
View File

@ -203,11 +203,7 @@ function handleOk() {
cover: formData.value.cover ? spliceUrl(formData.value.cover[0]) : '', cover: formData.value.cover ? spliceUrl(formData.value.cover[0]) : '',
images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [], images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [],
signupNum: formData.value.signupNum || 0, signupNum: formData.value.signupNum || 0,
status: 1, status: 1
// 使用格式化后的时间
endSignupAt: formatTime(values.endSignupAt),
startAt: formatTime(values.startAt),
endAt: formatTime(values.endAt)
} }
let result = null let result = null

32
src/views/pages/mettingMgt/mettingYuYue/index.vue
View File

@ -6,8 +6,9 @@
<a-col v-bind="colSpan"> <a-col v-bind="colSpan">
<a-form-item label="状态" name="status"> <a-form-item label="状态" name="status">
<a-select v-model:value="searchFormData.applyType" allowClear> <a-select v-model:value="searchFormData.applyType" allowClear>
<a-select-option :value="1">个人申请</a-select-option> <a-select-option :value="''">全部</a-select-option>
<a-select-option :value="2">企业申请</a-select-option> <a-select-option :value="2">个人申请</a-select-option>
<a-select-option :value="1">企业申请</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -22,7 +23,7 @@
</a-row> </a-row>
</a-form> </a-form>
</template> </template>
</x-search-bar> </x-search-bar>
<a-row :gutter="8" :wrap="false"> <a-row :gutter="8" :wrap="false">
<a-col flex="auto"> <a-col flex="auto">
<a-card type="flex"> <a-card type="flex">
@ -37,8 +38,8 @@
<span>{{ record.startTime + ' - ' + record.endTime }}</span> <span>{{ record.startTime + ' - ' + record.endTime }}</span>
</template> </template>
<template v-if="'applyType' === column.dataIndex"> <template v-if="'applyType' === column.dataIndex">
<span v-if="record.applyType === 1">个人申请</span> <span v-if="record.applyType === 2">个人申请</span>
<span v-if="record.applyType === 2">企业申请</span> <span v-if="record.applyType === 1">企业申请</span>
</template> </template>
<template v-if="'status' === column.dataIndex"> <template v-if="'status' === column.dataIndex">
<a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag> <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag>
@ -54,17 +55,16 @@
<a-image :width="60" <a-image :width="60"
:src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" /> :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
</template> </template>
<template v-if="column.dataIndex === 'rebackApplyPdf'"> <template v-if="column.dataIndex === 'covenantPdf'">
<a v-if="record.rebackApplyPdf" :href="config('http.apiBasic') + record.rebackApplyPdf" <a v-if="record.covenantPdf" target="_blank"
rel="noopener noreferrer"> :href="config('http.apiBasic') + record.covenantPdf" rel="noopener noreferrer">
查看承诺报表 查看承诺报表
</a> </a>
<span v-else>无</span> <span v-else>无</span>
</template> </template>
<template v-if="column.dataIndex === 'rebackCovenantPdf'"> <template v-if="column.dataIndex === 'applyPdf'">
<a v-if="record.rebackCovenantPdf" <a v-if="record.applyPdf" target="_blank"
:href="config('http.apiBasic') + record.rebackCovenantPdf" :href="config('http.apiBasic') + record.applyPdf" rel="noopener noreferrer">
rel="noopener noreferrer">
查看申请报表 查看申请报表
</a> </a>
<span v-else>无</span> <span v-else>无</span>
@ -108,6 +108,7 @@ import { useI18n } from 'vue-i18n'
import { orderStatus } from '@/enums/index.js' import { orderStatus } from '@/enums/index.js'
import { status } from 'nprogress' import { status } from 'nprogress'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import axios from 'axios'
defineOptions({ defineOptions({
name: 'mettingYuYue', name: 'mettingYuYue',
}) })
@ -131,13 +132,13 @@ const columns = [
// { title: '结束时间', dataIndex: 'endTime' }, // { title: '结束时间', dataIndex: 'endTime' },
{ title: '申请签名', dataIndex: 'applySign' }, { title: '申请签名', dataIndex: 'applySign' },
// { title: '备注', dataIndex: 'remark' }, // { title: '备注', dataIndex: 'remark' },
{ title: '申请报表', dataIndex: 'rebackCovenantPdf' }, { title: '申请报表', dataIndex: 'applyPdf' },
{ title: '承诺报表', dataIndex: 'rebackApplyPdf' }, { title: '承诺报表', dataIndex: 'covenantPdf' },
{ title: t('button.action'), key: 'action', fixed: 'right', width: 80, align: 'center' }, { title: t('button.action'), key: 'action', fixed: 'right', width: 80, align: 'center' },
] ]
const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination()
searchFormData.value = { searchFormData.value = {
applyType: 1, applyType: '',
} }
const remark = ref('') const remark = ref('')
const currentInfo = ref({}) const currentInfo = ref({})
@ -259,6 +260,7 @@ function handleResetSearch() {
async function onOk() { async function onOk() {
await getPageList() await getPageList()
} }
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped></style>