收入确认页面接口对接、调账申请页面接口对接、付款申请单页面接口对接、报销页面接口对接
This commit is contained in:
27
src/api/calibration/paymentApplicationForm/index.ts
Normal file
27
src/api/calibration/paymentApplicationForm/index.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
import request from '@/utils/request'
|
||||
const AUTH_BASE_URL = '/api2'
|
||||
|
||||
/*
|
||||
* 付款申请单
|
||||
* */
|
||||
|
||||
// 新增付款请单
|
||||
export const FinancePaymentRequest = (data: any) => {
|
||||
const formData = new FormData()
|
||||
formData.append('reason', data.reason)
|
||||
formData.append('amount', data.amount)
|
||||
formData.append('times', data.times)
|
||||
formData.append('payee', data.payee)
|
||||
formData.append('bankcard', data.bankcard)
|
||||
formData.append('BankName', data.BankName)
|
||||
formData.append('applicant', data.applicant)
|
||||
formData.append('personincharge', data.personincharge)
|
||||
return request({
|
||||
url: `${AUTH_BASE_URL}/finance/payment-request`,
|
||||
method: 'post',
|
||||
data: formData,
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -84,16 +84,10 @@ export const UserEditorialStaff = (data: any) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 人员展示接口
|
||||
export const UserPersonnelDetails = (data: any) => {
|
||||
const formData = new FormData()
|
||||
formData.append('account', data.account)
|
||||
// 人员列表
|
||||
export const UserPersonneldisplay = () => {
|
||||
return request({
|
||||
url: `${AUTH_BASE_URL}/user/personnel-details`,
|
||||
method: 'post',
|
||||
data: formData,
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data'
|
||||
}
|
||||
url: `${AUTH_BASE_URL}/user/personneldisplay`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
25
src/api/calibration/reimbursement/index.ts
Normal file
25
src/api/calibration/reimbursement/index.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import request from '@/utils/request'
|
||||
const AUTH_BASE_URL = '/api2'
|
||||
|
||||
/*
|
||||
* 报销
|
||||
* */
|
||||
|
||||
// 新增报销
|
||||
export const FinanceReimbursement = (data: any) => {
|
||||
const formData = new FormData()
|
||||
formData.append('person', data.person)
|
||||
formData.append('times', data.times)
|
||||
formData.append('reason', data.reason)
|
||||
formData.append('amount', data.amount)
|
||||
formData.append('FeeDescription', data.FeeDescription)
|
||||
formData.append('personincharge', data.personincharge)
|
||||
return request({
|
||||
url: `${AUTH_BASE_URL}/finance/reimbursement`,
|
||||
method: 'post',
|
||||
data: formData,
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -93,29 +93,36 @@
|
||||
@close="handleCloseDialog"
|
||||
>
|
||||
<el-form ref="roleFormRef" :model="formData" :rules="rules" label-width="auto">
|
||||
<el-form-item label="姓名" prop="username">
|
||||
<el-input v-model="formData.username" placeholder="请输入姓名" />
|
||||
</el-form-item>
|
||||
<el-form-item label="身份证" prop="card">
|
||||
<el-input v-model="formData.card" placeholder="请输入身份证" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入职时间" prop="Dateofjoining">
|
||||
<el-form-item label="收款日期" prop="times">
|
||||
<el-date-picker
|
||||
v-model="formData.Dateofjoining"
|
||||
v-model="formData.times"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="请选择入职时间"
|
||||
placeholder="请选择收款日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位" prop="position">
|
||||
<el-input v-model="formData.position" placeholder="请输入岗位" />
|
||||
<el-form-item label="合同号" prop="ContractNo">
|
||||
<el-input v-model="formData.ContractNo" placeholder="请输入合同号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工资" prop="salary">
|
||||
<el-input v-model="formData.salary" placeholder="请输入工资" />
|
||||
<el-form-item label="客户名称" prop="CustomerID">
|
||||
<el-input v-model="formData.CustomerID" placeholder="请输入客户名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收款金额" prop="amount">
|
||||
<el-input v-model="formData.amount" placeholder="请输入收款金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="情况" prop="situation">
|
||||
<el-input v-model="formData.situation" placeholder="请输入情况" />
|
||||
</el-form-item>
|
||||
<el-form-item label="代办审核人" prop="personincharge">
|
||||
<el-select v-model="formData.personincharge" placeholder="请选择代办审核人">
|
||||
<el-option
|
||||
v-for="item in personinchargeList"
|
||||
:key="item.id"
|
||||
:label="item.username"
|
||||
:value="item.username"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="提交人" prop="username">-->
|
||||
<!-- <el-input v-model="formData.username" placeholder="请输入提交人" />-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
@@ -196,7 +203,8 @@ import { DeviceEnum } from '@/enums/settings/device-enum'
|
||||
import RoleAPI, { RolePageVO } from '@/api/system/role-api'
|
||||
import { UserDeleteDepartment } from '@/api/calibration/department'
|
||||
import { FinanceIssueDetail } from '@/api/calibration/invoiceApplication'
|
||||
import { FinanceUserRegister } from '@/api/calibration/onboardingRegistration'
|
||||
import { FinanceLoan } from '@/api/calibration/accountAdjustmentApplication'
|
||||
import { UserPersonneldisplay } from '@/api/calibration/personnelManagement'
|
||||
|
||||
defineOptions({
|
||||
name: 'Role',
|
||||
@@ -212,6 +220,7 @@ const permTreeRef = ref()
|
||||
const loading = ref(false)
|
||||
const ids = ref<number[]>([])
|
||||
const total = ref(0)
|
||||
const personinchargeList = ref<any[]>([])
|
||||
|
||||
const queryParams = reactive<any>({
|
||||
pageNum: 1,
|
||||
@@ -233,20 +242,21 @@ const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? '600
|
||||
|
||||
// 角色表单
|
||||
const formData = reactive<any>({
|
||||
username: '',
|
||||
card: '',
|
||||
Dateofjoining: '',
|
||||
position: '',
|
||||
salary: '',
|
||||
times: '',
|
||||
ContractNo: '',
|
||||
CustomerID: '',
|
||||
amount: '',
|
||||
situation: '',
|
||||
personincharge: ''
|
||||
})
|
||||
|
||||
const rules = reactive({
|
||||
username: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||
card: [{ required: true, message: '请输入身份证', trigger: 'blur' }],
|
||||
Dateofjoining: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
|
||||
position: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
|
||||
salary: [{ required: true, message: '请输入工资', trigger: 'blur' }]
|
||||
times: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||
ContractNo: [{ required: true, message: '请输入身份证', trigger: 'blur' }],
|
||||
CustomerID: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
|
||||
amount: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
|
||||
situation: [{ required: true, message: '请输入工资', trigger: 'blur' }],
|
||||
personincharge: [{ required: true, message: '请输入工资', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
// 选中的角色
|
||||
@@ -321,7 +331,7 @@ function handleSubmit() {
|
||||
})
|
||||
.finally(() => (loading.value = false))
|
||||
} else {
|
||||
FinanceUserRegister(formData)
|
||||
FinanceLoan(formData)
|
||||
.then(() => {
|
||||
ElMessage.success('新增成功')
|
||||
handleCloseDialog()
|
||||
@@ -452,7 +462,11 @@ function togglePermTree() {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const DepartmentList = () => {
|
||||
UserPersonneldisplay().then((res: any) => {
|
||||
personinchargeList.value = res.data
|
||||
})
|
||||
}
|
||||
// 权限筛选
|
||||
watch(permKeywords, (val) => {
|
||||
permTreeRef.value!.filter(val)
|
||||
@@ -475,5 +489,6 @@ function handleparentChildLinkedChange(val: any) {
|
||||
|
||||
onMounted(() => {
|
||||
handleQuery()
|
||||
DepartmentList()
|
||||
})
|
||||
</script>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -93,29 +93,36 @@
|
||||
@close="handleCloseDialog"
|
||||
>
|
||||
<el-form ref="roleFormRef" :model="formData" :rules="rules" label-width="auto">
|
||||
<el-form-item label="姓名" prop="username">
|
||||
<el-input v-model="formData.username" placeholder="请输入姓名" />
|
||||
</el-form-item>
|
||||
<el-form-item label="身份证" prop="card">
|
||||
<el-input v-model="formData.card" placeholder="请输入身份证" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入职时间" prop="Dateofjoining">
|
||||
<el-form-item label="收款日期" prop="times">
|
||||
<el-date-picker
|
||||
v-model="formData.Dateofjoining"
|
||||
v-model="formData.times"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="请选择入职时间"
|
||||
placeholder="请选择收款日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位" prop="position">
|
||||
<el-input v-model="formData.position" placeholder="请输入岗位" />
|
||||
<el-form-item label="合同号" prop="ContractNo">
|
||||
<el-input v-model="formData.ContractNo" placeholder="请输入合同号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工资" prop="salary">
|
||||
<el-input v-model="formData.salary" placeholder="请输入工资" />
|
||||
<el-form-item label="客户名称" prop="CustomerID">
|
||||
<el-input v-model="formData.CustomerID" placeholder="请输入客户名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收款金额" prop="amount">
|
||||
<el-input v-model="formData.amount" placeholder="请输入收款金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收入分配" prop="allocate">
|
||||
<el-input v-model="formData.allocate" placeholder="请输入收入分配" />
|
||||
</el-form-item>
|
||||
<el-form-item label="代办审核人" prop="personincharge">
|
||||
<el-select v-model="formData.personincharge" placeholder="请选择代办审核人">
|
||||
<el-option
|
||||
v-for="item in personinchargeList"
|
||||
:key="item.id"
|
||||
:label="item.username"
|
||||
:value="item.username"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="提交人" prop="username">-->
|
||||
<!-- <el-input v-model="formData.username" placeholder="请输入提交人" />-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
@@ -196,7 +203,8 @@ import { DeviceEnum } from '@/enums/settings/device-enum'
|
||||
import RoleAPI, { RolePageVO } from '@/api/system/role-api'
|
||||
import { UserDeleteDepartment } from '@/api/calibration/department'
|
||||
import { FinanceIssueDetail } from '@/api/calibration/invoiceApplication'
|
||||
import { FinanceUserRegister } from '@/api/calibration/onboardingRegistration'
|
||||
import { FinanceConfirm } from '@/api/calibration/revenueRecognition'
|
||||
import { UserPersonneldisplay } from '@/api/calibration/personnelManagement'
|
||||
|
||||
defineOptions({
|
||||
name: 'Role',
|
||||
@@ -222,6 +230,7 @@ const queryParams = reactive<any>({
|
||||
const roleList = ref<RolePageVO[]>()
|
||||
// 菜单权限下拉
|
||||
const menuPermOptions = ref<OptionType[]>([])
|
||||
const personinchargeList = ref<any[]>([])
|
||||
|
||||
// 弹窗
|
||||
const dialog = reactive({
|
||||
@@ -233,20 +242,21 @@ const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? '600
|
||||
|
||||
// 角色表单
|
||||
const formData = reactive<any>({
|
||||
username: '',
|
||||
card: '',
|
||||
Dateofjoining: '',
|
||||
position: '',
|
||||
salary: '',
|
||||
times: '',
|
||||
ContractNo: '',
|
||||
CustomerID: '',
|
||||
amount: '',
|
||||
allocate: '',
|
||||
personincharge: ''
|
||||
})
|
||||
|
||||
const rules = reactive({
|
||||
username: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||
card: [{ required: true, message: '请输入身份证', trigger: 'blur' }],
|
||||
Dateofjoining: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
|
||||
position: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
|
||||
salary: [{ required: true, message: '请输入工资', trigger: 'blur' }]
|
||||
times: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||
ContractNo: [{ required: true, message: '请输入身份证', trigger: 'blur' }],
|
||||
CustomerID: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
|
||||
amount: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
|
||||
allocate: [{ required: true, message: '请输入工资', trigger: 'blur' }],
|
||||
personincharge: [{ required: true, message: '请输入工资', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
// 选中的角色
|
||||
@@ -321,7 +331,7 @@ function handleSubmit() {
|
||||
})
|
||||
.finally(() => (loading.value = false))
|
||||
} else {
|
||||
FinanceUserRegister(formData)
|
||||
FinanceConfirm(formData)
|
||||
.then(() => {
|
||||
ElMessage.success('新增成功')
|
||||
handleCloseDialog()
|
||||
@@ -453,6 +463,12 @@ function togglePermTree() {
|
||||
}
|
||||
}
|
||||
|
||||
const DepartmentList = () => {
|
||||
UserPersonneldisplay().then((res: any) => {
|
||||
personinchargeList.value = res.data
|
||||
})
|
||||
}
|
||||
|
||||
// 权限筛选
|
||||
watch(permKeywords, (val) => {
|
||||
permTreeRef.value!.filter(val)
|
||||
@@ -475,5 +491,6 @@ function handleparentChildLinkedChange(val: any) {
|
||||
|
||||
onMounted(() => {
|
||||
handleQuery()
|
||||
DepartmentList()
|
||||
})
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user