Merge remote-tracking branch 'origin/master'

src/api/examineAndApprove/examineAndApprove.js

 import request from "../../utils/request.js";
 
-//获取所有项目名称（查询下拉框）
+//获取所有项目（查询下拉框）
 export function getProjectName() {
     return request({
-        url: '/projectCostRequest/projectAllList',
+        url: '/dailyReimbursement/dailyReimbursement/projectList',
         method: 'get'
     })
 }

src/views/costManage/examineAndApprove/components/projectCostReimbursementApprove.vue

@@ -6,9 +6,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/examineAndApprove/components/projectCostRequestApprove.vue

@@ -6,9 +6,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/examineAndApprove/components/tripApplicationApprove.vue

@@ -13,9 +13,9 @@
         >
           <el-option
               v-for="item in projectNameList"
-              :key="item"
-              :label="item"
-              :value="item"
+              :key="item.projectName"
+              :label="item.projectName"
+              :value="item.projectName"
               style="width: 220px"
           />
         </el-select>

src/views/costManage/examineAndApprove/components/tripReimburseApprove.vue

@@ -12,9 +12,9 @@
         >
           <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="项目经理" prop="projectManagerId">