Commit 7e672aec authored by liwei's avatar liwei

修改了日常报销的下拉框数据问题

parent a412f3a8
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<el-table-column label="操作" align="center" fixed="right" width="227"> <el-table-column label="操作" align="center" fixed="right" width="227">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="text" @click="handleUpdate(scope.row)" :disabled="!printDis(scope.row)"> <el-button link type="text" @click="handleUpdate(scope.row)" :disabled="scope.row.status == 2">
<img src="@/assets/icons/common/edit.png" height="32" width="32"/> <img src="@/assets/icons/common/edit.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
...@@ -234,7 +234,7 @@ import { listUser } from "@/api/system/user.js"; ...@@ -234,7 +234,7 @@ import { listUser } from "@/api/system/user.js";
import { getProjectManagerName} from "@/api/examineAndApprove/examineAndApprove.js" import { getProjectManagerName} from "@/api/examineAndApprove/examineAndApprove.js"
import {useRouter} from "vue-router"; import {useRouter} from "vue-router";
import {ArrowDown} from "@element-plus/icons-vue"; import {ArrowDown} from "@element-plus/icons-vue";
import {listAllUser} from "../../../api/system/user.js";
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { cost_daily_status,cost_daily_type} = proxy.useDict('cost_daily_status','cost_daily_type'); const { cost_daily_status,cost_daily_type} = proxy.useDict('cost_daily_status','cost_daily_type');
...@@ -338,20 +338,18 @@ const getProjectList = () => { ...@@ -338,20 +338,18 @@ const getProjectList = () => {
} }
}) })
}) })
//项目经理 }
getProjectManagerName().then(res => {
// console.log("我是项目经理测试",res.data) // 获取项目经理和事业部负责人下拉框数据
managerOptions.value = res.data.map(item => { function getUserSelectList(){
listAllUser().then(response => {
headOptions.value = response.data.headerList.map(item => {
return { return {
value: item.projectManagerId, value: item.userId,
label: item.projectManagerName label: item.nickName
} }
}) })
// console.log("我是项目经理",headOptions.value) managerOptions.value = response.data.managerList.map(item => {
})
//事业部负责人
listUser().then(response => {
headOptions.value = response.rows.map(item => {
return { return {
value: item.userId, value: item.userId,
label: item.nickName label: item.nickName
...@@ -473,6 +471,7 @@ onMounted(() => { ...@@ -473,6 +471,7 @@ onMounted(() => {
getList(); getList();
getAllshenpiList(); getAllshenpiList();
getProjectList(); getProjectList();
getUserSelectList();
}) })
</script> </script>
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="170"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="170">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="text" @click="handleUpdate(scope.row)" v-if="printDis(scope.row)"> <el-button link type="text" @click="handleUpdate(scope.row)" :disabled="scope.row.status == 2">
<img src="@/assets/icons/common/edit.png" height="32" width="32"/> <img src="@/assets/icons/common/edit.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="227"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="227">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="text" @click="handleUpdate(scope.row)"> <el-button link type="text" @click="handleUpdate(scope.row)" :disabled="scope.row.status == 2">
<img src="@/assets/icons/common/edit.png" height="32" width="32"/> <img src="@/assets/icons/common/edit.png" height="32" width="32"/>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
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