Commit 7bdb1475 authored by yanzhengyang's avatar yanzhengyang

差旅报销、出差申请bug修复

parent bf20e3da
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<script setup > <script setup >
import {listTripApplication,projectList,deleteTripApplication} from "../../../api/costManage/cost.js"; import {listTripApplication,projectList,deleteTripApplication} from "../../../api/costManage/cost.js";
import { listUser } from "@/api/system/user.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";
...@@ -253,11 +253,11 @@ const getProjectList = () => { ...@@ -253,11 +253,11 @@ const getProjectList = () => {
}) })
// console.log("我是项目数据",projectOption.value) // console.log("我是项目数据",projectOption.value)
}) })
listUser().then(response => { getProjectManagerName().then(response => {
managerOptions.value = response.rows.map(item => { managerOptions.value = response.data.map(item => {
return { return {
value: item.userId, value: item.projectManagerId,
label: item.nickName label: item.projectManagerName
} }
}) })
}) })
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
</template> </template>
<script setup > <script setup >
import { listUser } from "@/api/system/user.js"; import { getProjectManagerName} from "@/api/examineAndApprove/examineAndApprove.js"
import {listTripReimburse,projectList,deleteTripReimburse} from "@/api/costManage/cost.js"; import {listTripReimburse,projectList,deleteTripReimburse} from "@/api/costManage/cost.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";
...@@ -224,11 +224,11 @@ const getProjectList = () => { ...@@ -224,11 +224,11 @@ const getProjectList = () => {
}) })
// console.log("我是项目数据",projectOption.value) // console.log("我是项目数据",projectOption.value)
}) })
listUser().then(response => { getProjectManagerName().then(response => {
managerOptions.value = response.rows.map(item => { managerOptions.value = response.data.map(item => {
return { return {
value: item.userId, value: item.projectManagerId,
label: item.nickName label: item.projectManagerName
} }
}) })
}) })
......
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