Commit fe5afda0 authored by 祁正's avatar 祁正

修改日常

parent d5f5ad11
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="projectStatus"> <el-form-item label="审批状态" prop="projectStatus">
<el-select <el-select
v-model="queryParams.approveStatus" v-model="queryParams.approvalStatus"
placeholder="请选择项目状态" placeholder="请选择项目状态"
style="width: 220px" style="width: 220px"
clearable clearable
...@@ -135,21 +135,27 @@ ...@@ -135,21 +135,27 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table @cell-mouse-enter="handleHover" @cell-mouse-leave="handleLeave" :data="costManageList" border @selection-change="handleSelectionChange"> <el-table @cell-mouse-enter="handleHover" @cell-mouse-leave="handleLeave" :data="costManageList" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40" align="right"/> <el-table-column type="selection" width="40" align="right"/>
<el-table-column label="申请人" align="center" prop="approvalUser" fixed width="100px"/> <el-table-column label="申请人" align="center" prop="approvalUser" fixed />
<el-table-column label="项目编号" align="center" prop="projectNumber" width="180px"/> <!-- <el-table-column label="项目编号" align="center" prop="projectNumber" width="180px"/>-->
<el-table-column label="项目名称" align="center" prop="projectName" width="120px"/> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目经理" align="center" prop="projectManager" width="120px"/> <el-table-column label="项目经理" align="center" prop="projectManager" />
<el-table-column label="事业部负责人" align="center" prop="businessMan" width="150px"/> <!-- <el-table-column label="事业部负责人" align="center" prop="businessMan" width="150px"/>-->
<el-table-column label="提交时间" align="center" prop="createTime" width="180px"/> <el-table-column label="提交时间" align="center" prop="createTime" width="180px"/>
<el-table-column label="报销月份" align="center" prop="reimbursementMonth" width="120px"/> <el-table-column label="报销月份" align="center" prop="reimbursementMonth"/>
<el-table-column label="餐饮费" align="center" prop="cateringExpenses" width="100px"/> <el-table-column label="餐饮费" align="center" prop="cateringExpenses" />
<el-table-column label="交通费" align="center" prop="transportExpense" width="100px"/> <el-table-column label="交通费" align="center" prop="transportExpense"/>
<el-table-column label="总额" align="center" prop="totalMoney" width="100px"/> <el-table-column label="总额" align="center" prop="totalMoney" />
<el-table-column label="审批状态" align="center" prop="approvalStatus" width="100px"> <el-table-column label="整体审批状态" align="center" prop="approvalStatus" width="130px">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag :options="cost_daily_status" :value="row.approvalStatus"/> <dict-tag :options="cost_daily_status" :value="row.approvalStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="approvalStatus" label="当前审批状态" align="center">
<template #default="scope">
<!-- {{getCurrentApprovalStatus(scope.row)}}-->
<el-tag size="large" :type="scope.row.currentStatus=== 0?'primary':scope.row.currentStatus> 0?'success':scope.row.currentStatus === -999?'info':'info'">{{scope.row.currentStatus=== 0?'待审批':scope.row.currentStatus > 0?'已通过':scope.row.currentStatus === -999?'未通过':'待前审'}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="detail" label="详情" align="center" width="100px"> <el-table-column prop="detail" label="详情" align="center" width="100px">
<el-tooltip content="详情" placement="top"> <el-tooltip content="详情" placement="top">
<el-button link type="text" @click="handleView(scope.row)"> <el-button link type="text" @click="handleView(scope.row)">
...@@ -271,7 +277,7 @@ getAllProjectName() ...@@ -271,7 +277,7 @@ getAllProjectName()
const reset = () => { const reset = () => {
queryParams.projectName = null queryParams.projectName = null
queryParams.projectType = null queryParams.projectType = null
queryParams.approveStatus = null queryParams.approvalStatus = null
getList() getList()
} }
//获取当前用户角色信息 //获取当前用户角色信息
...@@ -340,9 +346,9 @@ const cancelReject = ()=>{ ...@@ -340,9 +346,9 @@ const cancelReject = ()=>{
const handleSelectionChange = (val) => { const handleSelectionChange = (val) => {
passObjList.length = 0 passObjList.length = 0
for(let item of val){ for(let item of val){
let currentAuditRoleId = item.currentAuditRoleId let currentAudiRoleId = item.currentAudiRoleId
//获取currentAuditRoleId的下标 //currentAudiRoleId
let index = allList.value.findIndex(item=>item.nodeId === currentAuditRoleId) let index = allList.value.findIndex(item=>item.nodeId === currentAudiRoleId)
let obj = { let obj = {
//项目费用id //项目费用id
...@@ -389,9 +395,9 @@ const approvalStatusChange = (status,currentNodeId)=>{ ...@@ -389,9 +395,9 @@ const approvalStatusChange = (status,currentNodeId)=>{
//通过 //通过
const passProjectCost = (row)=>{ const passProjectCost = (row)=>{
console.log(row) console.log(row)
let currentAuditRoleId = row.currentAuditRoleId let currentAudiRoleId = row.currentAudiRoleId
//获取currentAuditRoleId的下标 //获取currentAudiRoleId的下标
let index = allList.value.findIndex(item=>item.nodeId === currentAuditRoleId) let index = allList.value.findIndex(item=>item.nodeId === currentAudiRoleId)
let obj = { let obj = {
//项目费用id //项目费用id
...@@ -424,7 +430,7 @@ const passProjectCost = (row)=>{ ...@@ -424,7 +430,7 @@ const passProjectCost = (row)=>{
const getTopApproveInfo = ()=>{ const getTopApproveInfo = ()=>{
let item2 = costManageList[0] let item2 = costManageList[0]
changProjectNumber.value = item2.projectNumber changProjectNumber.value = item2.projectNumber
let i = allList.value.findIndex((item)=>item.nodeId === item2.currentAuditRoleId) let i = allList.value.findIndex((item)=>item.nodeId === item2.currentAudiRoleId)
if(i === -1) stepActive.value = 1 if(i === -1) stepActive.value = 1
else stepActive.value = i+1 else stepActive.value = i+1
} }
...@@ -438,7 +444,7 @@ const handleHover = (row, column, cell, event) => { ...@@ -438,7 +444,7 @@ const handleHover = (row, column, cell, event) => {
} }
timer = setTimeout(() => { timer = setTimeout(() => {
changProjectNumber.value = row.projectNumber changProjectNumber.value = row.projectNumber
let i = allList.value.findIndex((item)=>item.nodeId === row.currentAuditRoleId) let i = allList.value.findIndex((item)=>item.nodeId === row.currentAudiRoleId)
if(i === -1) stepActive.value = 1 if(i === -1) stepActive.value = 1
else stepActive.value = i+1 else stepActive.value = i+1
...@@ -471,10 +477,10 @@ const getList = () => { ...@@ -471,10 +477,10 @@ const getList = () => {
listDailyApprove(queryParams).then(res => { listDailyApprove(queryParams).then(res => {
loading.value = false; loading.value = false;
total.value = res.total; total.value = res.total;
Object.assign(costManageList,res.data); Object.assign(costManageList,res.rows);
console.log("审批页数据",costManageList); console.log("审批页数据",costManageList);
for(let i in costManageList){ for(let i in costManageList){
costManageList[i].currentStatus = approvalStatusChange(projectCostRequestList[i].approveStatus,projectCostRequestList[i].currentAuditRoleId) costManageList[i].currentStatus = approvalStatusChange(projectCostRequestList[i].approvalStatus,projectCostRequestList[i].currentAudiRoleId)
} }
getTopApproveInfo() getTopApproveInfo()
......
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