上传
This commit is contained in:
@@ -12,7 +12,7 @@ VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
|||||||
# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
|
# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
2
.env.dev
2
.env.dev
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080'
|
|||||||
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://118.31.23.45:48080'
|
|||||||
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
6
.env.pro
6
.env.pro
@@ -4,13 +4,13 @@ VITE_NODE_ENV=production
|
|||||||
VITE_DEV=false
|
VITE_DEV=false
|
||||||
|
|
||||||
# 请求路径
|
# 请求路径
|
||||||
VITE_BASE_URL='/crm-api'
|
VITE_BASE_URL='/oa-api'
|
||||||
|
|
||||||
# 上传路径
|
# 上传路径
|
||||||
VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='/oa-api/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
|
|||||||
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080'
|
|||||||
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080'
|
|||||||
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
|
||||||
|
|
||||||
# 接口前缀
|
# 接口前缀
|
||||||
VITE_API_BASEPATH=/crm-api
|
VITE_API_BASEPATH=/oa-api
|
||||||
|
|
||||||
# 接口地址
|
# 接口地址
|
||||||
VITE_API_URL=/admin-api
|
VITE_API_URL=/admin-api
|
||||||
|
|||||||
@@ -54,9 +54,9 @@ router.beforeEach(async (to, from, next) => {
|
|||||||
const tenantId = getTenantId()
|
const tenantId = getTenantId()
|
||||||
const appId = getAppId()
|
const appId = getAppId()
|
||||||
if (tenantId && appId) {
|
if (tenantId && appId) {
|
||||||
next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
|
next(`/oa/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
|
||||||
} else {
|
} else {
|
||||||
next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
|
next(`/oa/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,6 +106,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
// {
|
||||||
|
// path: '/Basic',
|
||||||
|
// component: Layout,
|
||||||
|
// name: 'Basic',
|
||||||
|
// meta: {},
|
||||||
|
// redirect: '/Basic/menu',
|
||||||
|
// children: [
|
||||||
|
// {
|
||||||
|
// path: 'menu',
|
||||||
|
// component: () => import('@/views/Basic/Menu/index.vue'),
|
||||||
|
// name: 'Menu',
|
||||||
|
// meta: {
|
||||||
|
// canTo: true,
|
||||||
|
// hidden: true,
|
||||||
|
// noTagsView: false,
|
||||||
|
// icon: 'ep:user',
|
||||||
|
// title: '菜单管理'
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// ]
|
||||||
|
// },
|
||||||
{
|
{
|
||||||
path: '/login',
|
path: '/login',
|
||||||
component: () => import('@/views/Login/Login.vue'),
|
component: () => import('@/views/Login/Login.vue'),
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div>
|
|
||||||
<el-tabs v-model="tabName">
|
|
||||||
<el-tab-pane label="员工列表" name="employee">
|
|
||||||
<EmployeeList />
|
|
||||||
</el-tab-pane>
|
|
||||||
<el-tab-pane label="员工提成方案" name="commissionPlan">
|
|
||||||
<CommissionPlan />
|
|
||||||
</el-tab-pane>
|
|
||||||
</el-tabs>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="Salary">
|
|
||||||
import EmployeeList from './Comp/EmployeeList.vue'
|
|
||||||
import CommissionPlan from './Comp/CommissionPlan.vue'
|
|
||||||
|
|
||||||
const tabName = ref('employee')
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped></style>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div> 考勤设置 </div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="WorkAttendance"></script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped></style>
|
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script name="CommissionPlan" setup>
|
<script name="CommissionPlan" setup>
|
||||||
import DialogPlan from './DialogPlan.vue'
|
import DialogPlan from './Comp/DialogPlan.vue'
|
||||||
const searchForm = ref({
|
const searchForm = ref({
|
||||||
name: undefined,
|
name: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script name="EmployeeList" setup>
|
<script name="EmployeeList" setup>
|
||||||
import DialogSalary from './DialogSalary.vue'
|
import DialogSalary from './Comp/DialogSalary.vue'
|
||||||
const searchForm = ref({
|
const searchForm = ref({
|
||||||
name: undefined,
|
name: undefined,
|
||||||
status: 0,
|
status: 0,
|
||||||
7
src/views/Home/Salary/index.vue
Normal file
7
src/views/Home/Salary/index.vue
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<div> 工资条 </div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="SalarySlip"></script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped></style>
|
||||||
76
src/views/Pers/Employee/index.vue
Normal file
76
src/views/Pers/Employee/index.vue
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-form :model="searchForm" inline>
|
||||||
|
<el-form-item>
|
||||||
|
<el-input v-model="searchForm.name" placeholder="请输入员工姓名" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-radio-group v-model="searchForm.status">
|
||||||
|
<el-radio :label="0"> 在职 </el-radio>
|
||||||
|
<el-radio :label="1"> 离职 </el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button @click="handleQuery">新增</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="tableList" border stripe>
|
||||||
|
<el-table-column type="index" width="50" />
|
||||||
|
<el-table-column label="用户姓名" prop="nickname" />
|
||||||
|
<el-table-column label="部门" key="deptName" prop="deptName" />
|
||||||
|
<el-table-column label="手机号码" prop="mobile" width="120" />
|
||||||
|
<el-table-column label="在职状态" prop="status" />
|
||||||
|
<el-table-column label="参与考勤" width="150">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-switch
|
||||||
|
v-model="scope.row.status"
|
||||||
|
:active-value="0"
|
||||||
|
:inactive-value="1"
|
||||||
|
@change="handleStatusChange(scope.row)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<Pagination
|
||||||
|
:total="total"
|
||||||
|
v-model:page="searchForm.pageNo"
|
||||||
|
v-model:limit="searchForm.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script name="OAEmployee" setup>
|
||||||
|
const searchForm = ref({
|
||||||
|
name: undefined,
|
||||||
|
status: 0,
|
||||||
|
pageNo: 1,
|
||||||
|
pageSize: 20
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
const handleQuery = () => {
|
||||||
|
searchForm.value.pageNo = 1
|
||||||
|
getList()
|
||||||
|
}
|
||||||
|
|
||||||
|
const loading = ref(false)
|
||||||
|
const tableList = ref([])
|
||||||
|
const total = ref(0)
|
||||||
|
/** 查询列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
tableList.value = [1, 2]
|
||||||
|
// const data = await UserApi.getUserPage(queryParams)
|
||||||
|
// tableList.value = data.list
|
||||||
|
// total.value = data.total
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped></style>
|
||||||
7
src/views/Pers/Setting/index.vue
Normal file
7
src/views/Pers/Setting/index.vue
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<template>
|
||||||
|
<div> 人事配置 </div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="PersSetting"></script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped></style>
|
||||||
@@ -40,11 +40,11 @@ export default ({ command, mode }) => {
|
|||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
rewrite: (path) => path.replace(new RegExp(`^/call-api`), '')
|
rewrite: (path) => path.replace(new RegExp(`^/call-api`), '')
|
||||||
},
|
},
|
||||||
['/crm-api']: {
|
['/oa-api']: {
|
||||||
target: env.VITE_BASE_URL,
|
target: env.VITE_BASE_URL,
|
||||||
ws: false,
|
ws: false,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
rewrite: (path) => path.replace(new RegExp(`^/crm-api`), '')
|
rewrite: (path) => path.replace(new RegExp(`^/oa-api`), '')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user