Commit 9fd6988d authored by qiyaxin's avatar qiyaxin

新增报销初始化bug修复

parent e54963d7
...@@ -136,32 +136,36 @@ const resetForm = () => { ...@@ -136,32 +136,36 @@ const resetForm = () => {
costReimbursementDetail.actualAmount = '' costReimbursementDetail.actualAmount = ''
costReimbursementDetail.description = '' costReimbursementDetail.description = ''
} }
//获取编辑详情
//初始化 获取编辑详情
let type = route.query.type let type = route.query.type
let id = parseInt(route.query.id) let id = parseInt(route.query.id)
if (type === "新增"){ const initData = () =>{
getCostRequestDetail(id).then(res=>{ if (type === "新增"){
let obj = res.data getCostRequestDetail(id).then(res=>{
//字典转换 let obj = res.data
obj.projectType = projectTypeOptions.find(item=>item.dictValue === String(obj.projectType)).dictLabel //字典转换
obj.projectStatus = projectStatusOptions.find(item=>item.dictValue === String(obj.projectStatus)).dictLabel obj.projectType = projectTypeOptions.find(item=>item.dictValue === String(obj.projectType)).dictLabel
obj.projectStatus = projectStatusOptions.find(item=>item.dictValue === String(obj.projectStatus)).dictLabel
Object.assign(costReimbursementDetail, obj);
}) Object.assign(costReimbursementDetail, obj);
}else if(type === "编辑"){ })
//编辑页面 }else if(type === "编辑"){
console.log("路由",id) //编辑页面
getReimbursementDetail(id).then(res=>{ console.log("路由",id)
console.log("报销详情",res) getReimbursementDetail(id).then(res=>{
let obj = res.data console.log("报销详情",res)
//字典转换 let obj = res.data
obj.projectType = projectTypeOptions.find(item=>item.dictValue === String(obj.projectType)).dictLabel //字典转换
obj.projectStatus = projectStatusOptions.find(item=>item.dictValue === String(obj.projectStatus)).dictLabel obj.projectType = projectTypeOptions.find(item=>item.dictValue === String(obj.projectType)).dictLabel
obj.projectStatus = projectStatusOptions.find(item=>item.dictValue === String(obj.projectStatus)).dictLabel
Object.assign(costReimbursementDetail, obj);
}) Object.assign(costReimbursementDetail, obj);
})
}
} }
//提交按钮 //提交按钮
const handleSubmit = ()=>{ const handleSubmit = ()=>{
formRef.value.validate((valid) => { formRef.value.validate((valid) => {
...@@ -223,8 +227,9 @@ onMounted(() => { ...@@ -223,8 +227,9 @@ onMounted(() => {
//项目状态字典 //项目状态字典
getDicts("project_status").then(response => { getDicts("project_status").then(response => {
Object.assign(projectStatusOptions, response.data); Object.assign(projectStatusOptions, response.data);
}); });
//初始化
initData()
}) })
......
...@@ -57,33 +57,24 @@ ...@@ -57,33 +57,24 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" align="center"> <el-table-column prop="projectName" label="项目名称" align="center">
<template #default="{row}">
<span @mouseenter="handleHover(row)" @mouseleave="handleLeave">{{row.projectName}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectType" label="项目类型" align="center"> <el-table-column prop="projectType" label="项目类型" align="center">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag :options="project_type" :value="row.projectType" @mouseenter="handleHover(row)" @mouseleave="handleLeave"/> <dict-tag :options="project_type" :value="row.projectType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userName" label="事业部负责人" align="center"> <el-table-column prop="userName" label="事业部负责人" align="center">
<template #default="{row}">
<span @mouseenter="handleHover(row)" @mouseleave="handleLeave">{{row.userName}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="expenseType" label="费用类型" align="center" width="200px"> <el-table-column prop="expenseType" label="费用类型" align="center" width="200px">
<template #default="scope"> <template #default="scope">
<dict-tag :options="project_cost_type" :value="scope.row.costType" @mouseenter="handleHover(scope.row)" @mouseleave="handleLeave"/> <dict-tag :options="project_cost_type" :value="scope.row.costType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sumMoney" label="预计金额(元)" align="center"> <el-table-column prop="sumMoney" label="预计金额(元)" align="center">
<template #default="{row}">
<div @mouseenter="handleHover(row)" @mouseleave="handleLeave">{{row.sumMoney}}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="approvalStatus" label="审批状态" align="center"> <el-table-column prop="approvalStatus" label="审批状态" align="center">
<template #default="scope"> <template #default="scope">
<dict-tag :options="project_cost_request_status" :value="scope.row.approveStatus" @mouseenter="handleHover(scope.row)" @mouseleave="handleLeave"/> <dict-tag :options="project_cost_request_status" :value="scope.row.approveStatus"/>
</template> </template>
</el-table-column> </el-table-column>
...@@ -91,17 +82,17 @@ ...@@ -91,17 +82,17 @@
<el-table-column label="操作" align="center" width="200px"> <el-table-column label="操作" align="center" width="200px">
<template #default="scope" > <template #default="scope" >
<el-tooltip content="详情" placement="top"> <el-tooltip content="详情" placement="top">
<el-button link type="text" @click="handleView(scope.row)" @mouseenter="handleHover(scope.row)" @mouseleave="handleLeave"> <el-button link type="text" @click="handleView(scope.row)">
<img src="@/assets/icons/common/check.png" height="32" width="32"/> <img src="@/assets/icons/common/check.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="申请报销" placement="top"> <el-tooltip content="申请报销" placement="top">
<el-button link type="text" @click="handleToAdd(scope.row)" @mouseenter="handleHover(scope.row)" @mouseleave="handleLeave"> <el-button link type="text" @click="handleToAdd(scope.row)" >
<img src="@/assets/icons/common/reimbursement.png" height="32" width="32"/> <img src="@/assets/icons/common/reimbursement.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button link type="text" @click="handleDelete(scope.row)" @mouseenter="handleHover(scope.row)" @mouseleave="handleLeave"> <el-button link type="text" @click="handleDelete(scope.row)" >
<img src="@/assets/icons/common/delete.png" height="32" width="32"/> <img src="@/assets/icons/common/delete.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -330,7 +330,7 @@ const handleDelete=(row)=> { ...@@ -330,7 +330,7 @@ const handleDelete=(row)=> {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");
}).catch(() => { }).catch(() => {
proxy.$modal.msgError("删除失败"); // proxy.$modal.msgError("删除失败");
}); });
} }
......
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