Skip to content

GitLab

"...paceperfect-cameraconsole.git" did not exist on "ce47b172c6d05209d177d75ff1a7e691eb596082"
Commit 2423ec69 authored by 柳 佳乐's avatar 柳 佳乐
Browse files

20221104

parent 344202ed
Expand all Hide whitespace changes
Inline Side-by-side
finance @ 6e137f66
Subproject commit 6e137f66e7646a55ebb0681483b9c502249d0d84
src/api/assets.js 0 → 100644
View file @ 2423ec69
import request from '@/utils/request'
///fixedAssets/queryBypageAll 查询公司资产（分页）
export function queryBypageAll(data) {
return request({
url: '/fixedAssets/queryBypageAll',
method: 'post',
data
})
}
///fixedAssets/insert添加
export function insert(data) {
return request({
url: '/fixedAssets/insert',
method: 'post',
data
})
}
///fixedAssets/update修改管理者
export function update(data) {
return request({
url: '/fixedAssets/update',
method: 'post',
data
})
}
////fixedAssets/queryBypage管理者查询负责的资产
export function queryBypage(data) {
return request({
url: '/fixedAssets/queryBypage',
method: 'post',
data
})
}
///fixedAssets/selectByFixedId 查询单挑记录
export function selectByFixedId(data) {
return request({
url: '/fixedAssets/selectByFixedId',
method: 'post',
data
})
}
///fixedAssets/update 修改资产信息
export function updates(data) {
return request({
url: '/fixedAssets/update',
method: 'post',
data
})
}
///fixedUse/useRegistered 使用登记
export function useRegistered(data) {
return request({
url: '/fixedUse/useRegistered',
method: 'post',
data
})
}
////fixedUse/returnRegistration 归还登记
export function returnRegistration(data) {
return request({
url: '/fixedUse/returnRegistration',
method: 'post',
data
})
}
///fixedUse/queryByPageByFixedId
//分页查询(管理者查询固定资产的使用记录)
export function queryByPageByFixedId(data) {
return request({
url: '/fixedUse/queryByPageByFixedId',
method: 'post',
data
})
}
///fixedAssets/lose丢失
export function lose(data) {
return request({
url: '/fixedAssets/lose',
method: 'post',
data
})
}
////fixedUse/queryBypage查询自己的使用情况
export function queryBypageget(data) {
return request({
url: '/fixedUse/queryBypage',
method: 'post',
data
})
}
\ No newline at end of file
src/api/companyFile.js 0 → 100644
View file @ 2423ec69
import request from '@/utils/request'
//分页查询(查询全公司的)
export function queryBypage(data) {
return request({
url: '/companyFile/queryBypage',
method: 'post',
data
})
}
//上传公司文件/file/companyFile
export function companyFile(data) {
return request({
url: '/file/companyFile',
method: 'post',
data
})
}
//上传本人文件/companyFile/queryBypageByuserId
export function queryBypageByuserId(data) {
return request({
url: '/companyFile/queryBypageByuserId',
method: 'post',
data
})
}
src/api/project.js
View file @ 2423ec69
...@@ -52,59 +52,62 @@ export function selectByProjectId(data) { ...@@ -52,59 +52,62 @@ export function selectByProjectId(data) {
}) })
} }
//发票添加 //发票添加
export function insertList(data){ export function insertList(data) {
return request({ return request({
url:'/invoice/insert', url: '/invoice/insert',
method:'post', method: 'post',
data data
}) })
} }
//发票查询（带着分页） //发票查询（带着分页）
///invoice/queryBypage ///invoice/queryBypage
export function queryBypageIncomeAdd(data){ export function queryBypageIncomeAdd(data) {
return request({ return request({
url:'/invoice/queryBypage', url: '/invoice/queryBypage',
method:'post', method: 'post',
data data
}) })
} }
//查询发票编号 //查询发票编号
//POST/invoice/selectAllBystatus //POST/invoice/selectAllBystatus
export function selectAllBystatus(data){ export function selectAllBystatus(data) {
return request({ return request({
url:'/invoice/selectAllBystatus', url: '/invoice/selectAllBystatus',
method:'post', method: 'post',
data data
}) })
} }
///invoice/updatesubmit报销提交修改 ///invoice/updatesubmit报销提交修改
export function updatesubmit(data){ export function updatesubmit(data) {
return request({ return request({
url:'/invoice/updatesubmit', url: '/invoice/updatesubmit',
method:'post', method: 'post',
data data
}) })
} }
//查询发票图片 //查询发票图片
export function selectAllById(data){ export function selectAllById(data) {
return request({ return request({
url:'/invoice/selectAllById', url: '/invoice/selectAllById',
method:'post', method: 'post',
data data
}) })
} }
//删除关系
export function deletBystatus(data) { ///enclosure/selectById附件查询
export function selectByIdF(data) {
return request({ return request({
url: '/invoice/deletBystatus', url: '/enclosure/selectById',
method: 'post', method: 'post',
data data
}) })
} }
///enclosure/selectById附件查询
export function selectByIdF(data) { ///invoice/deletBystatus
//删除关系
export function deletBystatus(data) {
return request({ return request({
url: '/enclosure/selectById', url: '/invoice/deletBystatus',
method: 'post', method: 'post',
data data
}) })
...@@ -118,7 +121,7 @@ export function deleteById(data) { ...@@ -118,7 +121,7 @@ export function deleteById(data) {
}) })
} }
///invoice/delete删除发票，彻底删除 ///invoice/delete删除发票，彻底删除
export function deleteexpen(data) { export function deleteexpen(data) {
return request({ return request({
url: '/invoice/delete', url: '/invoice/delete',
method: 'post', method: 'post',
......
src/api/spendreimbursement.js 0 → 100644
View file @ 2423ec69
import request from '@/utils/request.js'
// 展示数据
// /trip/selectByUserId 分页查询(查询本人) post
export function queryBypage(data) {
return request({
url:'/trip/selectByUserId',
method:'post',
data
})
}
// /trip/selectByHeadman 分页查询（小组长查询） post
export function queryByheadman(data) {
return request({
url:'/trip/selectByHeadman',
method:'post',
data
})
}
// /trip/selectByFinance 分页查询（财务人员查询） post
export function queryBypagefinance(data) {
return request({
url:'/trip/selectByFinance',
method:'post',
data
})
}
// 查询报销类别
// /Type/selectAll 查询类别（不带分页） post
// 传的值 companyId typeCategory=0
export function selectTypeitem(data) {
return request({
url:'/Type/selectAll',
method:'post',
data
})
}
// 查询项目列表
// /project/selectAll 查询项目列表(不分页) post
export function selectProjectitem(data) {
return request({
url:'/project/selectAll',
method:'post',
data
})
}
// 添加随从人员
// /user/secletAllStaff 获取全部员工不带分页 post
export function selectProjectpeople(data) {
return request({
url:'/user/secletAllStaff',
method:'post',
data
})
}
// 添加数据
// /trip/insert post
export function insert(data) {
return request({
url:'/trip/insert',
method:'post',
data
})
}
// 添加随从人员 修改随从人员
// /tripPersonnel/insertBatch 添加和更改 post
export function insertId(data) {
return request({
url:'/tripPersonnel/insertBatch',
method:'post',
data
})
}
// 查询随从人员
// /tripPersonnel/selectAll post
export function selectAll(data) {
return request({
url:'/tripPersonnel/selectAll',
method:'post',
data
})
}
// 小组长审批
// /trip/headamApproval post
export function Approval(data) {
return request({
url:'/trip/headamApproval',
method:'post',
data
})
}
// 财务审批
// /trip/financeApproval post
export function finApproval(data) {
return request({
url:'/trip/financeApproval',
method:'post',
data
})
}
//撤回
export function reimbursementListid(tripId) {
return request({
url:`/trip/withdraw/${tripId}`,
method: 'post'
})
}
// /trip/resubmit 重新提交.
export function resubmit(data) {
return request({
//url: `/reimbursement/resubmit/${reimbursementId}`,
url:'/trip/resubmit',
method: 'post',
data
})
}
// 查看详情 /trip/selectByTripId post
export function selectByTripId(data) {
return request({
//url: `/reimbursement/resubmit/${reimbursementId}`,
url:'/trip/selectByTripId',
method: 'post',
data
})
}
// 修改 /trip/update post
export function update(data) {
return request({
//url: `/reimbursement/resubmit/${reimbursementId}`,
url:'/trip/update',
method: 'post',
data
})
}
// /invoice/updatesubmit 报销提交修改(添加发票)
export function Addinvoice(data) {
return request({
//url: `/reimbursement/resubmit/${reimbursementId}`,
url:'/invoice/updatesubmit',
method: 'post',
data
})
}
\ No newline at end of file
src/router/index.js
View file @ 2423ec69
...@@ -7,90 +7,103 @@ import Layout from '@/layout' ...@@ -7,90 +7,103 @@ import Layout from '@/layout'
/** /**
* 定义组件名称和组件对象的map对象 * 定义组件名称和组件对象的map对象
*/ */
export const componentMap = { export const componentMap = {
'layout': require('@/layout').default, 'layout': require('@/layout').default,
'permission_menu': () => import('@/views/permission/menu').then(m=>m.default), 'permission_menu': () => import('@/views/permission/menu').then(m => m.default),
'permission_role': () => import('@/views/permission/role').then(m => m.default),
'permission_role': () => import('@/views/permission/role').then(m=>m.default),
'company_list':()=>import('@/views/company/index').then(m=>m.default), 'company_list': () => import('@/views/company/index').then(m => m.default),
'company_add':()=>import('@/views/company/addcompany').then(m=>m.default), 'company_add': () => import('@/views/company/addcompany').then(m => m.default),
'personal_vue': ()=>import('@/views/personal/personal').then(m=>m.default), 'personal_vue': () => import('@/views/personal/personal').then(m => m.default),
'staff_list':()=>import('@/views/staff/staffList').then(m=>m.default), 'staff_list': () => import('@/views/staff/staffList').then(m => m.default),
'staff_add':()=>import('@/views/staff/addStaff').then(m=>m.default), 'staff_add': () => import('@/views/staff/addStaff').then(m => m.default),
'staff_updata':()=>import('@/views/staff/updataStaff').then(m=>m.default), 'staff_updata': () => import('@/views/staff/updataStaff').then(m => m.default),
'type_list':()=>import('@/views/type/typeList').then(m=>m.default), 'type_list': () => import('@/views/type/typeList').then(m => m.default),
'type_add':()=>import('@/views/type/typeAdd').then(m=>m.default), 'type_add': () => import('@/views/type/typeAdd').then(m => m.default),
'type_updata':()=>import('@/views/type/typeUpdata').then(m=>m.default), 'type_updata': () => import('@/views/type/typeUpdata').then(m => m.default),
'project_list':()=>import('@/views/project/projectList').then(m=>m.default), 'project_list': () => import('@/views/project/projectList').then(m => m.default),
'project_add':()=>import('@/views/project/projectAdd').then(m=>m.default), 'project_add': () => import('@/views/project/projectAdd').then(m => m.default),
'project_updata':()=>import('@/views/project/projectUpdata').then(m=>m.default), 'project_updata': () => import('@/views/project/projectUpdata').then(m => m.default),
'project_member_list':()=>import('@/views/project/member/memberList').then(m=>m.default), 'project_member_list': () => import('@/views/project/member/memberList').then(m => m.default),
'project_member_updata':()=>import('@/views/project/member/memberUpdata').then(m=>m.default), 'project_member_updata': () => import('@/views/project/member/memberUpdata').then(m => m.default),
'project_income_list':()=>import('@/views/project/income/incomeList').then(m=>m.default), 'project_income_list': () => import('@/views/project/income/incomeList').then(m => m.default),
'project_income_add':()=>import('@/views/project/income/incomeAdd').then(m=>m.default), 'project_income_add': () => import('@/views/project/income/incomeAdd').then(m => m.default),
'project_income_updata':()=>import('@/views/project/income/incomeUpdata').then(m=>m.default), 'project_income_updata': () => import('@/views/project/income/incomeUpdata').then(m => m.default),
'project_expend_list':()=>import('@/views/project/expend/expendList').then(m=>m.default), 'project_expend_list': () => import('@/views/project/expend/expendList').then(m => m.default),
'project_expend_add':()=>import('@/views/project/expend/expendAdd').then(m=>m.default), 'project_expend_add': () => import('@/views/project/expend/expendAdd').then(m => m.default),
'project_expend_updata':()=>import('@/views/project/expend/expendUpdata').then(m=>m.default), 'project_expend_updata': () => import('@/views/project/expend/expendUpdata').then(m => m.default),
//报销单 //报销单
'expense_list': () => import('@/views/expense/expenseList.vue').then(m => m.default), 'expense_list': () => import('@/views/expense/expenseList.vue').then(m => m.default),
//负责项目列表 //负责项目列表
'beresponsiblefor_List':()=>import('@/views/project/beresponsiblefor/beresponsibleforList').then(m => m.default), 'beresponsiblefor_List': () => import('@/views/project/beresponsiblefor/beresponsibleforList').then(m => m.default),
//参与项目列表 //参与项目列表
'participatein_List':()=>import('@/views/project/participatein/participateinList').then(m => m.default), 'participatein_List': () => import('@/views/project/participatein/participateinList').then(m => m.default),
'reimbursement_list':()=>import('@/views/reimbursement/reimbursementList').then(m=>m.default), 'reimbursement_list': () => import('@/views/reimbursement/reimbursementList').then(m => m.default),
'reimbursement_add':()=>import('@/views/reimbursement/reimbursementAdd').then(m=>m.default), 'reimbursement_add': () => import('@/views/reimbursement/reimbursementAdd').then(m => m.default),
'reimbursement_updata':()=>import('@/views/reimbursement/reimbursementUpdata').then(m=>m.default), 'reimbursement_updata': () => import('@/views/reimbursement/reimbursementUpdata').then(m => m.default),
//'reimbursement_print':()=>import('@/views/reimbursement/reimbursementPrint').then(m=>m.default), //'reimbursement_print':()=>import('@/views/reimbursement/reimbursementPrint').then(m=>m.default),
'reimbursement_finance_list':()=>import('@/views/reimbursement/finance/financeList').then(m=>m.default), 'reimbursement_finance_list': () => import('@/views/reimbursement/finance/financeList').then(m => m.default),
'reimbursement_headman_list':()=>import('@/views/reimbursement/headman/headmanList').then(m=>m.default), 'reimbursement_headman_list': () => import('@/views/reimbursement/headman/headmanList').then(m => m.default),
'businessTravel_list':()=>import('@/views/businessTravel/businessTravelList').then(m=>m.default), 'businessTravel_list': () => import('@/views/businessTravel/businessTravelList').then(m => m.default),
'businessTravel_add':()=>import('@/views/businessTravel/businessTravelAdd').then(m=>m.default), 'businessTravel_add': () => import('@/views/businessTravel/businessTravelAdd').then(m => m.default),
'businessTravel_updata':()=>import('@/views/businessTravel/businessTravelUpdata').then(m=>m.default), 'businessTravel_updata': () => import('@/views/businessTravel/businessTravelUpdata').then(m => m.default),
'businessTravel_finance_list':()=>import('@/views/businessTravel/finance/financeList').then(m=>m.default), 'businessTravel_finance_list': () => import('@/views/businessTravel/finance/financeList').then(m => m.default),
'businessTravel_headman_list':()=>import('@/views/businessTravel/headman/headmanList').then(m=>m.default), 'businessTravel_headman_list': () => import('@/views/businessTravel/headman/headmanList').then(m => m.default),
'reimburtype_list': () => import('@/views/reimebursementItem/reimebursementItemList.vue').then(m => m.default), 'reimburtype_list': () => import('@/views/reimebursementItem/reimebursementItemList.vue').then(m => m.default),
'reimebursementItem_Add': () => import('@/views/reimebursementItem/reimebursementItemAdd.vue').then(m => m.default), 'reimebursementItem_Add': () => import('@/views/reimebursementItem/reimebursementItemAdd.vue').then(m => m.default),
'reimebursementItem_Update': () => import('@/views/reimebursementItem/reimebursementItemUpdate.vue').then(m => m.default), 'reimebursementItem_Update': () => import('@/views/reimebursementItem/reimebursementItemUpdate.vue').then(m => m.default),
'apply_businessTravel_list':()=>import('@/views/businessTravel/apply/applyBusinessTravelList').then(m=>m.default), 'apply_businessTravel_list': () => import('@/views/businessTravel/apply/applyBusinessTravelList').then(m => m.default),
'apply_businessTravel_add':()=>import('@/views/businessTravel/apply/applyBusinessTravelAdd').then(m=>m.default), 'apply_businessTravel_add': () => import('@/views/businessTravel/apply/applyBusinessTravelAdd').then(m => m.default),
'apply_businessTravel_updata':()=>import('@/views/businessTravel/apply/applyBusinessTravelUpdata').then(m=>m.default), 'apply_businessTravel_updata': () => import('@/views/businessTravel/apply/applyBusinessTravelUpdata').then(m => m.default),
'apply_businessTravel_finance_list': () => import('@/views/businessTravel/apply/finance/financeList').then(m => m.default),
'apply_businessTravel_headman_list': () => import('@/views/businessTravel/apply/headman/headmanList').then(m => m.default),
'apply_businessTravel_finance_list':()=>import('@/views/businessTravel/apply/finance/financeList').then(m=>m.default), 'contract_list': () => import('@/views/contract/contractList').then(m => m.default),
'apply_businessTravel_headman_list':()=>import('@/views/businessTravel/apply/headman/headmanList').then(m=>m.default), 'contract_type': () => import('@/views/contract/contractType').then(m => m.default),
'add_contract': () => import('@/views/contract/components/addContract').then(m => m.default),
'contract_list':()=>import('@/views/contract/contractList').then(m=>m.default), 'examine_approve': () => import('@/views/pettyMoney/examineApprove').then(m => m.default),
'contract_type':()=>import('@/views/contract/contractType').then(m=>m.default), 'add_petty_money_record': () => import('@/views/pettyMoney/addPettyMoneyRecord').then(m => m.default),
'add_contract':()=>import('@/views/contract/components/addContract').then(m=>m.default), 'petty_money_record': () => import('@/views/pettyMoney/pettyMoneyRecord').then(m => m.default),
'examine_approve':()=>import('@/views/pettyMoney/examineApprove').then(m=>m.default), // 出差报销列表
'add_petty_money_record':()=>import('@/views/pettyMoney/addPettyMoneyRecord').then(m=>m.default), 'spendreimbursement_List': () => import('@/views/Spendreimbursement/spendreimbursementList.vue').then(m => m.default),
'petty_money_record':()=>import('@/views/pettyMoney/pettyMoneyRecord').then(m=>m.default), // 添加出差报销
'spendreimbursement_Add': () => import('@/views/Spendreimbursement/spendreimbursementAdd.vue').then(m => m.default),
'spendreimbursement_finance_List': () => import('@/views/Spendreimbursement/finance/financeList.vue').then(m => m.default),
'spendreimbursement_headman_List': () => import('@/views/Spendreimbursement/headman/headmanList.vue').then(m => m.default),
'spendreimbursementList_Update': () => import('@/views/Spendreimbursement/spendreimbursementListUpdate.vue').then(m => m.default),
// 公司文件模块
'company_file_list':()=>import('@/views/companyFile/companyFileList').then(m=>m.default),
'self_file_list':()=>import('@/views/companyFile/selfFileList').then(m=>m.default),
'company_file_add':()=>import('@/views/companyFile/companyFileAdd').then(m=>m.default),
} }
/** /**
...@@ -113,11 +126,10 @@ export const componentMap = { ...@@ -113,11 +126,10 @@ export const componentMap = {
} }
*/ */
export const asyncRoutes=[ export const asyncRoutes = [
] ]
export const constantRoutes = [ export const constantRoutes = [{
{
path: '/login', path: '/login',
component: () => import('@/views/login/index'), component: () => import('@/views/login/index'),
hidden: true hidden: true
...@@ -138,7 +150,7 @@ export const constantRoutes = [ ...@@ -138,7 +150,7 @@ export const constantRoutes = [
// hidden: true, // hidden: true,
component: Layout, component: Layout,
redirect: '/personal', redirect: '/personal',
}, },
] ]
...@@ -146,8 +158,11 @@ export const constantRoutes = [ ...@@ -146,8 +158,11 @@ export const constantRoutes = [
const createRouter = () => new Router({ const createRouter = () => new Router({
// mode: 'history', // require service support // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({
routes: constantRoutes,asyncRoutes y: 0
}),
routes: constantRoutes,
asyncRoutes
}) })
......
src/views/Spendreimbursement/finance/financeList.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/Spendreimbursement/headman/headmanList.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/Spendreimbursement/spendreimbursementAdd.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/Spendreimbursement/spendreimbursementAdd_Copy.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/Spendreimbursement/spendreimbursementList copy.vue 0 → 100644
View file @ 2423ec69
<template>
<div class="container">
<!-- 添加按钮 -->
<div class="total_top">
<el-button
type="success"
icon="el-icon-circle-plus"
@click="insertreimebursementItem"
>申请出差报销</el-button
>
</div>
<!-- 表格内容区域 -->
<div class="total_content">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" class="demo-table-expand">
<el-descriptions
title="报销详情"
:column="5"
border
style="width: 100%"
>
<el-descriptions-item label="组长审批状态" :span="2">
<el-tag
:type="
props.row.tripStatus == 0
? 'info'
: props.row.tripStatus == 2
? 'danger'
: 'success'
"
>
{{
props.row.tripStatus == 0
? "待审批"
: props.row.tripStatus == 2
? "驳回"
: "通过"
}}
</el-tag>
</el-descriptions-item>
<el-descriptions-item
label="组长审批时间"
:span="3"
:formatter="timestampToTime"
>{{ props.row.headmanTime }}</el-descriptions-item
>
<el-descriptions-item label="组长驳回缘由" :span="5">{{
props.row.headmanRefute || "无"
}}</el-descriptions-item>
<el-descriptions-item label="财务审批状态" :span="2">
<el-tag
:type="
props.row.tripStatus == 4
? 'danger'
: props.row.tripStatus == 3
? 'success'
: 'info'
"
>
{{
props.row.tripStatus == 4
? "驳回"
: props.row.tripStatus == 3
? "通过"
: "待审批"
}}
</el-tag>
</el-descriptions-item>
<el-descriptions-item
label="财务审批时间"
:span="3"
:formatter="timestampToTime"
>{{ props.row.financeTime }}</el-descriptions-item
>
<el-descriptions-item label="财务驳回缘由" :span="5">{{
props.row.finaceRefute || "无"
}}</el-descriptions-item>
<el-descriptions-item label="查看详情" :span="5">
<el-button
@click="getdetails(props.row)"
type="primary"
style="margin: 5px"
size="mini"
>查看详情</el-button
>
</el-descriptions-item>
</el-descriptions>
</el-form>
</template>
</el-table-column>
<el-table-column label="序号" width="50px">
<template slot-scope="scope">
{{
(queryitem.pageNum - 1) * queryitem.pageSize + scope.$index + 1
}}
</template>
</el-table-column>
<el-table-column label="项目列表" prop="projectName"> </el-table-column>
<el-table-column label="申报总金额" prop="applyTotalAmountSmall">
</el-table-column>
<el-table-column label="核报总金额">
<template slot-scope="props">
{{ props.row.verifyTotalAmountSmall || "还未核实金额" }}
</template>
</el-table-column>
<el-table-column label="组长审批人">
<template slot-scope="props">
{{ props.row.financeName || "暂无" }}
</template>
</el-table-column>
<el-table-column label="财务审批人">
<template slot-scope="props">
{{ props.row.financeName || "暂无" }}
</template>
</el-table-column>
<el-table-column
label="报销日期"
prop="applyTime"
:formatter="timestampToTime"
>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="props">
<el-tag
:type="
props.row.tripStatus == 0
? 'info'
: props.row.tripStatus == 1 || props.row.tripStatus == 3
? 'success'
: 'danger'
"
>
{{
props.row.tripStatus == 0
? "待审批"
: props.row.tripStatus == 1
? "小组长通过"
: props.row.tripStatus == 2
? "小组长驳回"
: props.row.tripStatus == 3
? "财务通过"
: props.row.tripStatus == 4
? "财务驳回"
: "不存在"
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
style="margin: 5px"
size="mini"
icon="el-icon-edit"
type="info"
@click="updatereimbursementList(scope.row)"
v-if="scope.row.tripStatus != 3 && scope.row.tripStatus != 1"
>修改信息</el-button
>
<el-button
style="margin: 5px"
size="mini"
icon="el-icon-edit-outline"
type="success"
@click="updatebtn(scope.row)"
v-if="scope.row.tripStatus != 3 && scope.row.tripStatus != 1"
>修改随行人员</el-button
>
<el-button
style="margin: 5px"
size="mini"
type="danger"
@click="Resubmit(scope.row)"
v-if="scope.row.tripStatus == 2 || scope.row.tripStatus == 4"
>重新提交</el-button
>
<el-button
style="margin: 5px"
size="mini"
type="info"
@click="withdraw(scope.row)"
v-if="scope.row.tripStatus == 0"
>
撤回</el-button
>
<el-link
type="success"
style="margin: 5px"
size="mini"
v-if="scope.row.tripStatus == 3"
>已通过</el-link
>
<el-link
type="info"
style="margin: 5px"
size="mini"
v-if="scope.row.tripStatus == 1"
>待审批</el-link
>
</template>
</el-table-column>
</el-table>
<!-- 查看详情 -->
<el-drawer
title="查看详情"
:visible.sync="drawer"
:direction="direction"
size="50%"
>
<el-form :inline="true" label-width="180px">
<el-row>
<el-col :span="12">
<div>
<el-form-item label="审批状态">
<el-tag
:type="
paramlist.tripStatus == 0
? 'info'
: paramlist.tripStatus == 1 || paramlist.tripStatus == 3
? 'success'
: 'danger'
"
>
{{
paramlist.tripStatus == 0
? "待审批"
: paramlist.tripStatus == 1
? "小组长通过"
: paramlist.tripStatus == 2
? "小组长驳回"
: paramlist.tripStatus == 3
? "财务通过"
: paramlist.tripStatus == 4
? "财务驳回"
: "不存在"
}}
</el-tag>
</el-form-item>
<el-form-item label="附件数量">
<span>{{ paramlist.enclosureNumber }}</span>
</el-form-item>
<el-form-item label="出差理由">
<span>{{ paramlist.tripReason }}</span>
</el-form-item>
<el-form-item label="出发地点">
<span>{{ paramlist.fromPlace }}</span>
</el-form-item>
<el-form-item label="目的地点">
<span>{{ paramlist.purposePlace }}</span>
</el-form-item>
<el-form-item label="经过地点">
<span>{{ paramlist.transitPlace }}</span>
</el-form-item>
<el-form-item label="交通工具">
<span>{{ paramlist.vehicle }}</span>
</el-form-item>
<el-form-item label="伙食补贴">
<span>{{ paramlist.foodAllowance }}</span>
</el-form-item>
<el-form-item label="公杂补贴">
<span>{{ paramlist.publicMiscellaneousSubsidy }}</span>
</el-form-item>
<el-form-item label="随从人员">
<span
v-for="item in paramlist.entouragelist"
:key="item.tripId"
style="margin: 0px 5px"
>{{ item.userName }}</span
>
</el-form-item>
</div>
</el-col>
<el-col :span="12">
<div>
<el-form-item label="火车/汽车/轮船费">
<span>{{ paramlist.tripCost }}</span>
</el-form-item>
<el-form-item label="机票费">
<span>{{ paramlist.planeTicket }}</span>
</el-form-item>
<el-form-item label="汽油费">
<span>{{ paramlist.trafficCost }}</span>
</el-form-item>
<el-form-item label="住宿费">
<span>{{ paramlist.lodgingCost }}</span>
</el-form-item>
<el-form-item label="其他费用">
<span>{{ paramlist.otherCost }}</span>
</el-form-item>
<el-form-item label="备注">
<span>{{ paramlist.remarks }}</span>
</el-form-item>
<el-form-item label="无票据说明">
<span>{{ paramlist.nobillExplain }}</span>
</el-form-item>
<el-form-item label="是否领取补贴">
<span>{{ paramlist.receiveSubsidy == 0 ? "否" : "是" }}</span>
</el-form-item>
<el-form-item label="天数">
<span>{{ paramlist.days }}</span>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
</el-drawer>
<!-- 对话框1 -->
<el-dialog title="修改随从人员" :visible.sync="dialogFormVisible">
<!-- 输入框的布局 -->
<el-row :gutter="20">
<el-col :span="16"
><div class="grid-content bg-purple">
<el-input placeholder="请输入..."></el-input></div
></el-col>
<el-col :span="8"
><div class="grid-content bg-purple">
<el-button type="primary" @click="onSubmit">查询</el-button>
</div></el-col
>
</el-row>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="员工" name="first">
<!-- v-model 绑定的是 数据少的那个数组 -->
<el-checkbox-group v-model="peopleId">
<el-checkbox
v-for="item in collectProjectpeople"
:label="item.userId"
:key="item.userId"
>{{ item.userName }}</el-checkbox
>
</el-checkbox-group>
</el-tab-pane>
<el-tab-pane label="财务人员" name="second">财务人员</el-tab-pane>
<el-tab-pane label="小组长" name="third">小组长</el-tab-pane>
<button @click="btn">测试</button>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false"
>确 定</el-button
>
</div>
</el-dialog>
</div>
<!-- 分页区域 -->
<div class="block">
<el-pagination
layout="->, total, prev, pager, next"
:total="10"
:page-size="queryitem.pageSize"
@current-change="getpagelist"
>
</el-pagination>
</div>
</div>
</template>
<script>
import { queryBypage } from "@/api/spendreimbursement";
import { selectAll } from "@/api/spendreimbursement";
import { reimbursementListid, resubmit } from "@/api/spendreimbursement";
// insertId
import { insertId } from "@/api/spendreimbursement.js";
//selectProjectpeople
import { selectProjectpeople } from "@/api/spendreimbursement.js";
export default {
created() {
this.Projectpeople.companyId = this.$store.getters.companyId;
// 获取 userId
this.queryitem.userId = this.$store.getters.urId;
this.reimebursementprojectpeopleItem();
this.getpagelist();
},
data() {
return {
activeName: "second",
list1: [],
queryitem: {
pageNum: 1,
pageSize: 10,
userId: null,
},
//抽屉
drawer: false,
// 对话框
dialogFormVisible: false,
// 接受的数据
tableData: [],
// 收集随从人员进行展示
collectProjectpeople: [],
// 随从成员
Projectpeople: {
companyId: null,
},
// 随从人员
entouragelist: [],
paramlist: {},
peopleId: [],
// 收集所选择的随从人员
insertBatch: [
{
personnelId: null,
tripId: null,
},
],
list: [],
};
},
methods: {
handleClick(tab, event) {
console.log(event);
},
// 这是测试的数据
btn() {
console.log(this.peopleId);
console.log(this.list1);
// this.insertBatch.splice(this.insertBatch.indexOf(0), 1);
// this.peopleId.forEach((item) => {
// let obj = {};
// obj.personnelId = item;
// obj.tripId = 3;
// this.insertBatch.push(obj);
// });
// insertId(this.insertBatch)
// .then((result) => {
// if (result.success) {
// console.log(result);
// } else {
// this.$message.error(result.msg);
// }
// })
// .catch((error) => {
// this.$message.error("失败");
// });
// this.insertBatch = [];
},
// 修改随从人员
updatereimbursementPeople() {
// 第二个方法
insertId(this.insertBatch)
.then((result) => {
if (result.success) {
this.$message.success("添加成功！");
// 添加成功以后 把表单的数据清空
this.$refs.ruleform.resetFields();
} else {
this.$message.error(result.msg);
}
})
.catch((error) => {
this.$message.error("失败");
});
},
// 查询de所有随从人员
reimebursementprojectpeopleItem() {
selectProjectpeople(this.Projectpeople)
.then((res) => {
if (res.code == 20000) {
this.collectProjectpeople = res.data;
} else {
this.$message.error("失败");
}
})
.catch((error) => {
this.$message.error("查询失败");
});
},
//添加的方法
insertreimebursementItem() {
this.$router.push("/spendreimbursementAdd");
},
// 展示数据的方法
getpagelist(pager = 1) {
this.queryitem.pageNum = pager;
queryBypage(this.queryitem)
.then((res) => {
if (res.success) {
this.tableData = res.data.list;
res.data.list.forEach((item) => {
selectAll({ tripId: item.tripId })
.then((resu) => {
if (resu.success) {
item.entouragelist = resu.data;
this.list = resu.data;
resu.data.forEach((element) => {
let obj = {};
let personnelId = "";
personnelId = element.personnelId;
obj.personnelId = element.personnelId;
obj.tripId = element.tripId;
this.peopleId.push(personnelId);
this.list1.push(obj);
});
} else {
this.$message.error(resu.msg);
}
})
.catch((error) => {
this.$message.error("失败");
});
});
} else {
this.$message.error(res.msg);
}
})
.catch((error) => {
this.$message.error("查询失败");
});
},
// 跳转修改页面
updatereimbursementList(data) {
this.$router.push({
path: "/spendreimbursementListUpdate",
//query 找到我们需要的字段
query: {
tripid: data.tripId,
},
});
},
// 弹窗展示
updatebtn() {
this.dialogFormVisible = true;
},
// 查看详情
getdetails(data) {
this.drawer = true;
this.paramlist = data;
},
// 从新提交
Resubmit(data) {
resubmit(data)
.then((res) => {
if (res.success) {
this.$message.success("重新提交成功，等待审批");
this.getpagelist();
} else {
this.$message.error(res.msg);
}
})
.catch((error) => {
this.$message.error("重新提交失败");
});
},
// 撤回申请
withdraw(data) {
reimbursementListid(data.tripId).then((res) => {
if (res.success) {
this.getpagelist();
}
});
},
//时间处理
timestampToTime(row, column, cellValue) {
return cellValue.split(" ")[0];
},
},
};
</script>
<style scoped>
.total_content {
padding: 0px 15px;
}
.demo-table-expand {
font-size: 0;
padding: 0px 100px;
width: 100%;
}
.demo-table-expand label {
width: 90px;
color: #99a9bf;
}
.demo-table-expand .el-form-item {
margin-right: 150px;
margin-bottom: 0;
width: 80%;
}
.total_top {
margin: 15px 20px;
}
</style>
\ No newline at end of file
src/views/Spendreimbursement/spendreimbursementList.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/Spendreimbursement/spendreimbursementListUpdate.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/assets/administration/administrationUpdate.vue 0 → 100644
View file @ 2423ec69
<template>
<div>
<div>
<el-row style="margin:20px 0px">
<el-col :xl="12" :lg="12" :md="12" :sm="12" :xs="24">
<el-form
:model="FixedAssetsAddDTO"
:rules="rules"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="资产编号" prop="fixedCode">
<el-input v-model="FixedAssetsAddDTO.fixedCode" laceholder="请输入资产编号"></el-input>
</el-form-item>
<el-form-item label="资产名称" prop="fixedName">
<el-input v-model="FixedAssetsAddDTO.fixedName" laceholder="请输入资产名称"></el-input>
</el-form-item>
<el-form-item label="资产金额" prop="fixedMoney">
<el-input v-model="FixedAssetsAddDTO.fixedMoney" laceholder="请输入资产金额"></el-input>
</el-form-item>
<el-form-item label="资产地址" prop="fixedAddress">
<el-input v-model="FixedAssetsAddDTO.fixedAddress" laceholder="请输入资产地址"></el-input>
</el-form-item>
<el-form-item label="提交时间">
<el-input v-model="FixedAssetsAddDTO.registerTime" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="登记详情">
<el-input
type="textarea"
:rows="2"
placeholder="请输入登记信息"
v-model="FixedAssetsAddDTO.fixedDetails"
></el-input>
</el-form-item>
<el-form-item label="登记备注">
<el-input v-model="FixedAssetsAddDTO.registerRemarks" laceholder="请输入登记备注"></el-input>
</el-form-item>
<el-form-item label="资产负责人">
<el-input v-model="FixedAssetsAddDTO.fixedControllerName" :disabled="true"></el-input>
</el-form-item>
<el-form-item style="margin-top:60px">
<el-button type="success" @click="submitForm()">提交</el-button>
<el-button @click="back()">返回</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
import { selectByFixedId, updates } from "@/api/assets";
export default {
data() {
return {
FixedAssetsAddDTO: {
companyId: null,
fixedAddress: null, //资产地址
fixedCode: null, //资产编号（不重复）
fixedController: null, //选择资产负责人
fixedDetails: null, //登记详情
fixedMoney: null, //资产金额
fixedName: null, //资产名称
fixedState: 0, //默认为0
registerRemarks: null, //登记备注
registerTime: null, //登记时间
userId: null
}, //添加资产
rules: {
fixedName: [
{ required: true, message: "请输入活动名称", trigger: "change" }
],
fixedCode: [
{ required: true, message: "请收入资产编号", trigger: "change" }
],
fixedAddress: [
{
required: true,
message: "请输入资产地址",
trigger: "change"
}
],
fixedMoney: [
{ required: true, message: "请输入资产金额", trigger: "change" }
]
}
};
},
computed: {
fixedId() {
return this.$route.query.id;
}
},
created() {
this.selectget();
},
methods: {
//查询要修改的信息
selectget() {
selectByFixedId({ fixedId: this.fixedId })
.then(res => {
if (res.success) {
this.FixedAssetsAddDTO = res.data;
} else {
this.$message.error(res.msg);
}
})
.catch(e => {
this.$message.error("查询该条资产失败");
});
},
//提交
submitForm() {
updates(this.FixedAssetsAddDTO)
.then(res => {
if (res.success) {
this.$message({
message: "修改资产信息成功",
type: "success"
});
this.$router.push("/administrationlsit");
} else {
this.$message.error(res.msg);
}
})
.catch(e => {
this.$message.error("错了哦，这是一条错误消息");
});
},
//返回
back(){
this.$router.push("/administrationlsit");
}
}
};
</script>
<style>
</style>
\ No newline at end of file
src/views/assets/administration/administrationlist.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/assets/administration/administrationselect.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/assets/assetsUpedata.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/assets/assetslist.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
src/views/assets/assetuse/assetuselist.vue 0 → 100644
View file @ 2423ec69
<template>
<div style="margin:20px 2%">
<div class="hangeg">
<el-form :inline="true" :model="queryDTO">
<el-form-item label="资产名称">
<el-input v-model="queryDTO.fixedName"></el-input>
</el-form-item>
<el-form-item label="资产编号">
<el-input v-model="queryDTO.fixedCode"></el-input>
</el-form-item>
<el-form-item label="归还状态">
<el-select v-model="queryDTO.useState" placeholder="请选择">
<el-option
v-for="item in optionsget"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-left:0px">
<el-button type="primary" icon="el-icon-search" @click="selectgetlist()">查询</el-button>
<el-button type="info" icon="el-icon-refresh" @click="backget()">重置</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="tableData"
style="width:99%"
:cell-style="{'text-align':'center'}"
:header-cell-style="{'text-align':'center'}"
border
>
<el-table-column label="序号" width="80" align="center">
<template slot-scope="scope">
{{
(queryDTO.pageNum - 1) * queryDTO.pageSize + scope.$index + 1
}}
</template>
</el-table-column>
<el-table-column prop="fixedName" label="资产名称"></el-table-column>
<el-table-column prop="fixedCode" label="资产编号"></el-table-column>
<el-table-column prop="userName" label="使用姓名">
<template slot-scope="scope">
<el-tag>{{scope.row.userName}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="useStartTime" label="使用时间"></el-table-column>
<el-table-column prop="prop" label="归还时间">
<template slot-scope="scope">{{scope.row.useEndTime==null?'暂未归还':scope.row.useEndTime}}</template>
</el-table-column>
<el-table-column prop="useState" label="资产状态">
<template slot-scope="scope">
<el-tag
:type="scope.row.useState== '0' ? 'danger' : scope.row.useState == '1' ? 'success':'warning' "
>{{scope.row.useState == '0' ? '未归还' : scope.row.useState == '1' ? '已归还':'已丢失'}}</el-tag>
</template>
</el-table-column>
</el-table>
<el-pagination
@current-change="handleCurrentChange"
:current-page.sync="queryDTO.pageNum"
:page-size="queryDTO.pageSize"
layout="total, prev, pager, next"
:total="total"
></el-pagination>
</div>
</template>
<script>
import { queryBypageget } from "@/api/assets";
export default {
data() {
return {
queryDTO: {
pageNum: 1,
pageSize: 10,
userId: null,
fixedCode: null, //资产编号
useState: null, //归还状态
fixedName: null //资产名称
},
optionsget: [
{
value: 0,
label: "未归还"
},
{
value: 1,
label: "已归还"
},
{
value: 2,
label: "已丢失"
}
],
tableData: [],
total: null
};
},
created() {
this.queryDTO.userId = this.$store.getters.urId; //获取账号使用者的usid
this.getlist();
},
methods: {
//分页
handleCurrentChange(val) {
this.queryDTO.pageNum = val;
this.getlist();
},
//重置
backget() {
this.queryDTO= {
pageNum: 1,
pageSize: 10,
userId: this.$store.getters.urId,
fixedCode: null, //资产编号
useState: null, //资产状态
fixedName: null //资产名称
}
this.getlist();
},
//搜索
selectgetlist() {
this.getlist();
},
//分页查询
getlist() {
queryBypageget(this.queryDTO)
.then(res => {
if (res.success) {
this.tableData = res.data.list;
this.total = res.data.total;
} else {
this.$message.error(res.msg);
}
})
.catch(e => {
this.$$message.error(e.msg);
});
}
}
};
</script>
<style>
</style>
\ No newline at end of file
src/views/companyFile/companyFileAdd.vue 0 → 100644
View file @ 2423ec69
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment