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

.env.prod

@@ -4,7 +4,7 @@ NODE_ENV=production
 # app
 VITE_TITLE=JinShan-Admin
 VITE_PUBLIC_PATH=/
-VITE_OUT_DIR=dist
+VITE_OUT_DIR=index
 VITE_PERMISSION=true
 
 # router

.gitignore

@@ -9,6 +9,7 @@ lerna-debug.log*
 
 node_modules
 dist
+index
 dist-ssr
 *.local
 */.vitepress/cache/**/*

src/locales/lang/zh-CN/menu.js

@@ -52,5 +52,5 @@ export default {
     aiHelper:'AI助手',
     abbreviation:'活动报名',
     orderArea:'工单区域管理',
-    vote:'信息登记'
+    vote:'信息登记',
 }

src/router/routes/pages.js

@@ -249,16 +249,16 @@ export default [
             permission: '*',
         },
     },
-    {
+     {
         path: 'vote/index',
         name: 'vote',
         component: 'pages/vote/index.vue',
         meta: {
-            icon: 'icon-huodongliebiao-copy',
+            icon: 'icon-yonghu',
             title: '信息登记',
             isMenu: true,
             keepAlive: true,
             permission: '*',
         },
-    }
+    },
 ]

src/views/pages/mettingMgt/mettingYuYue/index.vue

@@ -50,7 +50,10 @@
                         <template v-if="'applyTheme' === column.dataIndex">
                             <span>{{ applyThemeMap[record.applyTheme] || '未知' }}</span>
                         </template>
-
+                        <template v-if="'userName' === column.dataIndex">
+                            <span v-if="record.applyType === 2">{{ record.userName}}</span>
+                            <span v-if="record.applyType === 1">{{ record.companyName}}</span>
+                        </template>
                         <template v-if="column.dataIndex === 'applySign'">
                             <a-image :width="60"
                                 :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
@@ -63,8 +66,8 @@
                             <span v-else>无</span>
                         </template>
                         <template v-if="column.dataIndex === 'applyPdf'">
-                            <a v-if="record.applyPdf" target="_blank"
-                                :href="config('http.apiBasic') + record.applyPdf" rel="noopener noreferrer">
+                            <a v-if="record.applyPdf" target="_blank" :href="config('http.apiBasic') + record.applyPdf"
+                                rel="noopener noreferrer">
                                 查看申请报表
                             </a>
                             <span v-else>无</span>

src/views/pages/vote/index.vue

@@ -102,7 +102,7 @@ import apis from '@/apis'
 import { config } from '@/config'
 import { usePagination } from '@/hooks'
 import dayjs from 'dayjs'
-import EditDialog from './components/EditDialog.vue'
+// import EditDialog from './components/EditDialog.vue'
 import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
 import { useI18n } from 'vue-i18n'
 import { orderStatus } from '@/enums/index.js'
@@ -285,4 +285,4 @@ async function onOk() {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>