Merge remote-tracking branch 'origin/master'

src/api/projectCostReimbursement/projectCostReimbursement.js

@@ -12,7 +12,7 @@ export function getReimbursementList(query) {
 // 获取所有项目名称（查询下拉框）
 export function getProjectName() {
     return request({
-        url: '/projectCostRequest/projectAllList',
+        url: '/dailyReimbursement/dailyReimbursement/projectList',
         method: 'get'
     })
 }

src/api/projectCostRequest/projectCostRequest.js

@@ -26,7 +26,7 @@ export function getProjectList() {
 //获取所有项目名称（查询下拉框）
 export function getProjectName() {
     return request({
-        url: '/projectCostRequest/projectAllList',
+        url: '/dailyReimbursement/dailyReimbursement/projectList',
         method: 'get'
     })
 }

src/views/costManage/projectCostReimbursement/index.vue

@@ -7,9 +7,9 @@
           <el-select style="width: 220px" v-model="queryParams.projectName" placeholder="请选择项目名称" clearable>
             <el-option
                 v-for="item in projectNameList"
-                :key="item"
-                :label="item"
-                :value="item"/>
+                :key="item.projectName"
+                :label="item.projectName"
+                :value="item.projectName"/>
           </el-select>
         </el-form-item>
         <el-form-item  label="项目类型">

src/views/costManage/projectCostRequest/index.vue

@@ -7,9 +7,9 @@
           <el-select style="width: 220px" v-model="queryParams.projectName" placeholder="请选择项目名称" clearable>
             <el-option
                 v-for="item in projectNameList"
-                :key="item"
-                :label="item"
-                :value="item"/>
+                :key="item.projectName"
+                :label="item.projectName"
+                :value="item.projectName"/>
           </el-select>
         </el-form-item>
         <el-form-item  label="项目类型">
@@ -261,6 +261,7 @@ const projectNameList = ref([]);
 const getAllProjectName=()=> {
   getProjectName(queryParams).then(response => {
     projectNameList.value = response.data;
+    // console.log("所有项目",projectNameList.value)
   });
 }
 getAllProjectName()