From e4cd59b4ece7c8280631a4d0d7b557810de4d94a Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Thu, 11 Sep 2025 17:02:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/activity/components/EditDialog.vue  |  1 -
 .../pages/mettingMgt/mettingYuYue/index.vue   | 35 ++++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/pages/activity/components/EditDialog.vue b/src/views/pages/activity/components/EditDialog.vue
index 000db05..97504ec 100644
--- a/src/views/pages/activity/components/EditDialog.vue
+++ b/src/views/pages/activity/components/EditDialog.vue
@@ -153,7 +153,6 @@ function handleOk() {
                 ...values,
                 cover: formData.value.cover ? spliceUrl(formData.value.cover[0]) : '',
                 images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [],
-                signupNum: formData.value.signupNum || 0,
                 status: 1
             }
             let result = null
diff --git a/src/views/pages/mettingMgt/mettingYuYue/index.vue b/src/views/pages/mettingMgt/mettingYuYue/index.vue
index 9c331ef..5c464da 100644
--- a/src/views/pages/mettingMgt/mettingYuYue/index.vue
+++ b/src/views/pages/mettingMgt/mettingYuYue/index.vue
@@ -1,11 +1,11 @@
 <template>
-       <x-search-bar class="mb-8-2">
+    <x-search-bar class="mb-8-2">
         <template #default="{ gutter, colSpan }">
             <a-form :label-col="{ style: { width: '40px' } }" :model="searchFormData" layout="inline">
                 <a-row :gutter="gutter">
                     <a-col v-bind="colSpan">
                         <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="2">企业申请</a-select-option>
                             </a-select>
@@ -22,7 +22,7 @@
                 </a-row>
             </a-form>
         </template>
-</x-search-bar>
+    </x-search-bar>
     <a-row :gutter="8" :wrap="false">
         <a-col flex="auto">
             <a-card type="flex">
@@ -36,15 +36,15 @@
                         <template v-if="'startTime' === column.dataIndex">
                             <span>{{ record.startTime + ' - ' + record.endTime }}</span>
                         </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>
                         </template>
-                         <template v-if="'status' === column.dataIndex">
-                             <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag>
-                             <a-tag color="#666666" v-if="record.status === 2">待审核</a-tag>
-                             <a-tag color="#f50" v-if="record.status === 99">审核不通过</a-tag>
-                             <!-- <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag> -->
+                        <template v-if="'status' === column.dataIndex">
+                            <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag>
+                            <a-tag color="#666666" v-if="record.status === 2">待审核</a-tag>
+                            <a-tag color="#f50" v-if="record.status === 99">审核不通过</a-tag>
+                            <!-- <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag> -->
                         </template>
                         <template v-if="'applyTheme' === column.dataIndex">
                             <span>{{ applyThemeMap[record.applyTheme] || '未知' }}</span>
@@ -55,16 +55,15 @@
                                 :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
                         </template>
                         <template v-if="column.dataIndex === 'rebackApplyPdf'">
-                            <a v-if="record.rebackApplyPdf" :href="config('http.apiBasic') + record.rebackApplyPdf"
-                                 rel="noopener noreferrer">
+                            <a v-if="record.rebackApplyPdf" target="_blank"
+                                :href="config('http.apiBasic') + record.rebackApplyPdf" rel="noopener noreferrer">
                                 查看承诺报表
                             </a>
                             <span v-else>无</span>
                         </template>
                         <template v-if="column.dataIndex === 'rebackCovenantPdf'">
-                            <a v-if="record.rebackCovenantPdf"
-                                :href="config('http.apiBasic') + record.rebackCovenantPdf" 
-                                rel="noopener noreferrer">
+                            <a v-if="record.rebackCovenantPdf" target="_blank"
+                                :href="config('http.apiBasic') + record.rebackCovenantPdf" rel="noopener noreferrer">
                                 查看申请报表
                             </a>
                             <span v-else>无</span>
@@ -108,6 +107,7 @@ import { useI18n } from 'vue-i18n'
 import { orderStatus } from '@/enums/index.js'
 import { status } from 'nprogress'
 import dayjs from 'dayjs'
+import axios from 'axios'
 defineOptions({
     name: 'mettingYuYue',
 })
@@ -118,8 +118,8 @@ const columns = [
     // { title: '负责人', dataIndex: 'concatName' },
     // { title: '负责人手机号', dataIndex: 'concatPhone' },
     { title: '申请类型', dataIndex: 'applyType', width: 100 },
-    { title: '申请主题', dataIndex: 'applyTheme', width: 100  },
-    { title: '申请人', dataIndex: 'userName', width: 100  },
+    { title: '申请主题', dataIndex: 'applyTheme', width: 100 },
+    { title: '申请人', dataIndex: 'userName', width: 100 },
     // { title: '申请人手机号', dataIndex: 'userPhone' },
     // { title: '申请人身份证', dataIndex: 'userCardId', width: 120 },
     { title: '申请人地址', dataIndex: 'userAddress' },
@@ -184,7 +184,7 @@ async function getPageList() {
 const auditHandleEdit = (obj = {}) => {
     currentForm.value = obj
     open.value = true
-    
+
 }
 const handleClick = async () => {
     try {
@@ -259,6 +259,7 @@ function handleResetSearch() {
 async function onOk() {
     await getPageList()
 }
+
 </script>
 
 <style lang="less" scoped></style>

From 27cb890c3e87fac8467d25f5d8ccc638ec729339 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Tue, 16 Sep 2025 19:08:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +--
 .../pages/mettingMgt/mettingYuYue/index.vue   | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.env.dev b/.env.dev
index a402490..67fc2c9 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ VITE_ROUTER_BASE=/
 VITE_ROUTER_HISTORY=hash
 
 # api
-VITE_API_BASIC=https://jinshan.nantong.info
-# VITE_API_BASIC=http://10.10.1.6:8071
+# VITE_API_BASIC=https://jinshan.nantong.info
+VITE_API_BASIC=http://10.10.1.6:8071
 VITE_API_HTTP=/api/v1/
 # storage
 VITE_STORAGE_NAMESPACE = gin-admin_local_
\ No newline at end of file
diff --git a/src/views/pages/mettingMgt/mettingYuYue/index.vue b/src/views/pages/mettingMgt/mettingYuYue/index.vue
index 5c464da..294b2e8 100644
--- a/src/views/pages/mettingMgt/mettingYuYue/index.vue
+++ b/src/views/pages/mettingMgt/mettingYuYue/index.vue
@@ -6,8 +6,9 @@
                     <a-col v-bind="colSpan">
                         <a-form-item label="状态" name="status">
                             <a-select v-model:value="searchFormData.applyType" allowClear>
-                                <a-select-option :value="1">个人申请</a-select-option>
-                                <a-select-option :value="2">企业申请</a-select-option>
+                                <a-select-option :value="''">全部</a-select-option>
+                                <a-select-option :value="2">个人申请</a-select-option>
+                                <a-select-option :value="1">企业申请</a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
@@ -37,8 +38,8 @@
                             <span>{{ record.startTime + ' - ' + record.endTime }}</span>
                         </template>
                         <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 v-if="'status' === column.dataIndex">
                             <a-tag color="#87d068" v-if="record.status === 3">审核通过</a-tag>
@@ -54,16 +55,16 @@
                             <a-image :width="60"
                                 :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
                         </template>
-                        <template v-if="column.dataIndex === 'rebackApplyPdf'">
-                            <a v-if="record.rebackApplyPdf" target="_blank"
-                                :href="config('http.apiBasic') + record.rebackApplyPdf" rel="noopener noreferrer">
+                        <template v-if="column.dataIndex === 'covenantPdf'">
+                            <a v-if="record.covenantPdf" target="_blank"
+                                :href="config('http.apiBasic') + record.covenantPdf" rel="noopener noreferrer">
                                 查看承诺报表
                             </a>
                             <span v-else>无</span>
                         </template>
-                        <template v-if="column.dataIndex === 'rebackCovenantPdf'">
-                            <a v-if="record.rebackCovenantPdf" target="_blank"
-                                :href="config('http.apiBasic') + record.rebackCovenantPdf" rel="noopener noreferrer">
+                        <template v-if="column.dataIndex === 'applyPdf'">
+                            <a v-if="record.applyPdf" target="_blank"
+                                :href="config('http.apiBasic') + record.applyPdf" rel="noopener noreferrer">
                                 查看申请报表
                             </a>
                             <span v-else>无</span>
@@ -131,13 +132,13 @@ const columns = [
     // { title: '结束时间', dataIndex: 'endTime' },
     { title: '申请签名', dataIndex: 'applySign' },
     // { title: '备注', dataIndex: 'remark' },
-    { title: '申请报表', dataIndex: 'rebackCovenantPdf' },
-    { title: '承诺报表', dataIndex: 'rebackApplyPdf' },
+    { title: '申请报表', dataIndex: 'applyPdf' },
+    { title: '承诺报表', dataIndex: 'covenantPdf' },
     { title: t('button.action'), key: 'action', fixed: 'right', width: 80, align: 'center' },
 ]
 const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination()
 searchFormData.value = {
-    applyType: 1,
+    applyType: '',
 }
 const remark = ref('')
 const currentInfo = ref({})