diff --git a/.env.development b/.env.development index c82c8bc..50dbfb1 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV=development VITE_APP_TITLE='律师公益法律服务活动申报与管理平台' -VITE_APP_API_URL='http://127.0.0.1:1024' \ No newline at end of file +VITE_APP_API_URL='/api' \ No newline at end of file diff --git a/.env.localhost b/.env.localhost index 6d15c47..1fca54b 100644 --- a/.env.localhost +++ b/.env.localhost @@ -1,3 +1,3 @@ NODE_ENV=development VITE_APP_TITLE='律师公益法律服务活动申报与管理平台' -VITE_APP_API_URL='http://127.0.0.1:1024' +VITE_APP_API_URL='/api' diff --git a/.env.production b/.env.production index a478a5e..a0d1ae6 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ NODE_ENV=production VITE_APP_TITLE='律师公益法律服务活动申报与管理平台' -VITE_APP_API_URL='https://preview.smartadmin.vip/smart-admin-api' \ No newline at end of file +VITE_APP_API_URL='/api' \ No newline at end of file diff --git a/.env.test b/.env.test index 8743092..1b8a4a8 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,3 @@ NODE_ENV=production VITE_APP_TITLE='律师公益法律服务活动申报与管理平台' -VITE_APP_API_URL='http://127.0.0.1:1024' +VITE_APP_API_URL='/api' diff --git a/src/components/support/table-operator/index.vue b/src/components/support/table-operator/index.vue index 1aa3d36..0df451e 100644 --- a/src/components/support/table-operator/index.vue +++ b/src/components/support/table-operator/index.vue @@ -26,11 +26,12 @@ - + diff --git a/src/config/app-config.js b/src/config/app-config.js index 3f2865f..1c3c903 100644 --- a/src/config/app-config.js +++ b/src/config/app-config.js @@ -1,11 +1,5 @@ /* * 应用默认配置 - * - * @Author: 1024创新实验室-主任:卓大 - * @Date: 2022-09-03 22:07:01 - * @Wechat: zhuda1024 - * @Email: lab1024@163.com - * @Copyright 1024创新实验室 ( https://1024lab.net ),Since 2012 */ export const appDefaultConfig = { // i18n 语言选择 diff --git a/src/constants/system/review-const.js b/src/constants/system/review-const.js index bf37880..1c76665 100644 --- a/src/constants/system/review-const.js +++ b/src/constants/system/review-const.js @@ -23,8 +23,27 @@ export const REVIEW_ENUM = { desc: '拒绝', }, -} - +}; +// 季度枚举 +export const QUARTER_ENUM = { + Q1: { + value: 'Q1', + desc: '第一季度', + }, + Q2: { + value: 'Q2', + desc: '第二季度', + }, + Q3: { + value: 'Q3', + desc: '第三季度', + }, + Q4: { + value: 'Q4', + desc: '第四季度', + }, +}; export default { REVIEW_ENUM, + QUARTER_ENUM, } \ No newline at end of file diff --git a/src/lib/axios.js b/src/lib/axios.js index ed9a6d0..6b3656a 100644 --- a/src/lib/axios.js +++ b/src/lib/axios.js @@ -1,11 +1,6 @@ /* * ajax请求 - * - * @Author: 1024创新实验室-主任:卓大 - * @Date: 2022-09-06 20:46:03 - * @Wechat: zhuda1024 - * @Email: lab1024@163.com - * @Copyright 1024创新实验室 ( https://1024lab.net ),Since 2012 + */ import { message, Modal } from 'ant-design-vue'; import axios from 'axios'; diff --git a/src/store/modules/system/user.js b/src/store/modules/system/user.js index ffa4521..0170efc 100644 --- a/src/store/modules/system/user.js +++ b/src/store/modules/system/user.js @@ -39,6 +39,8 @@ export const useUserStore = defineStore({ needUpdatePwdFlag: false, //是否为超级管理员 administratorFlag: true, + //是否已同意协议 + agreementSignFlag: false, //上次登录ip lastLoginIp: '', //上次登录ip地区 @@ -161,6 +163,7 @@ export const useUserStore = defineStore({ this.departmentName = data.departmentName; this.needUpdatePwdFlag = data.needUpdatePwdFlag; this.administratorFlag = data.administratorFlag; + this.agreementSignFlag = data.agreementSignFlag || false; this.lastLoginIp = data.lastLoginIp; this.lastLoginIpRegion = data.lastLoginIpRegion; this.lastLoginUserAgent = data.lastLoginUserAgent; diff --git a/src/views/business/erp/letter/letter-list.vue b/src/views/business/erp/letter/letter-list.vue index 7697116..5a077df 100644 --- a/src/views/business/erp/letter/letter-list.vue +++ b/src/views/business/erp/letter/letter-list.vue @@ -9,20 +9,24 @@ - - - - 查询 - - - - 重置 - - + + + + + + 查询 + + + @@ -95,12 +99,17 @@ const columns = ref([ { title: '承诺书名称', - dataIndex: 'letterId', + dataIndex: 'letterName', ellipsis: true, }, - { + { title: '用户名称', - dataIndex: 'userId', + dataIndex: 'userName', + ellipsis: true, + }, + { + title: '签约时间', + dataIndex: 'createTime', ellipsis: true, }, ]); diff --git a/src/views/system/home/index.vue b/src/views/system/home/index.vue index b4b4dce..03309b3 100644 --- a/src/views/system/home/index.vue +++ b/src/views/system/home/index.vue @@ -3,6 +3,9 @@ * -->