费用审批-日常、出差列表修改

src/api/examineAndApprove/examineAndApprove.js

@@ -100,6 +100,14 @@ export function dailyCostNotPass(query) {
 }
 
 //  3.出差申请审批
+//出差申请-列表
+export function tripApplicationList(query) {
+    return request({
+        url: '/expenseApproval/tripExpenseList',
+        method: 'get',
+        params: query
+    })
+}
 //出差申请-通过
 export function tripApplicationApproval(query) {
     return request({

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

@@ -127,8 +127,8 @@
           <dict-tag :options="project_type" :value="scope.row.projectType"/>
         </template>
       </el-table-column>
-      <el-table-column label="出差地点" align="center" prop="tripAddress" min-width="120"/>
-      <el-table-column label="出差事由" align="center" prop="tripReason" min-width="150"/>
+      <el-table-column label="出差地点" align="center" prop="tripAddress" min-width="120" show-overflow-tooltip/>
+      <el-table-column label="出差事由" align="center" prop="tripReason" min-width="150" show-overflow-tooltip/>
       <el-table-column label="预计开始时间" align="center" prop="tripStartDate" min-width="150"></el-table-column>
       <el-table-column label="预计结束时间" align="center" prop="tripEndDate" min-width="150"></el-table-column>
       <el-table-column label="项目经理" align="center" prop="projectUserName" min-width="120"/>
@@ -196,19 +196,19 @@
 import {onMounted, reactive, ref} from "vue";
 const { proxy } = getCurrentInstance();
 import FlowChart from '@/components/FlowChart/index.vue'
-import {listTripApplication, projectList} from "../../../../api/costManage/cost.js";
 import {ElMessage} from "element-plus";
 import {
   getApproveNodeList, getProjectManagerName,
   getProjectName,
   getRoleId,
+  tripApplicationList,
   tripApplicationApproval,
   tripApplicationPassNotPass
-} from "../../../../api/examineAndApprove/examineAndApprove.js";
+} from "@/api/examineAndApprove/examineAndApprove.js";
 import {useRouter} from "vue-router";
 import {ArrowDown} from "@element-plus/icons-vue";
 const router = useRouter();
-const { project_status,cost_daily_status,project_type} = proxy.useDict('project_status', 'cost_daily_status','project_type');
+const {cost_daily_status,project_type} = proxy.useDict( 'cost_daily_status','project_type');
 
 const list = ref([]) // 流程图内容,只有值
 const allList = ref([]) // 流程图内容,值和角色id
@@ -313,7 +313,7 @@ const getRoleInfo = ()=>{
 //  列表
 const ReimbursementRequestList = ref([]);
 const getList=()=> {
-  listTripApplication(queryParams).then(response => {
+  tripApplicationList(queryParams).then(response => {
     // console.log("出差申请-列表",response.rows)
     total.value = response.total
    ReimbursementRequestList.value = response.rows

src/views/costManage/tripApplication/index.vue

@@ -133,8 +133,8 @@
             <dict-tag :options="project_type" :value="scope.row.projectType"/>
           </template>
         </el-table-column>
-        <el-table-column label="出差地点" align="center" prop="tripAddress" min-width="120" :show-overflow-tooltip="true"/>
-        <el-table-column label="出差事由" align="center" prop="tripReason" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column label="出差地点" align="center" prop="tripAddress" min-width="120" show-overflow-tooltip/>
+        <el-table-column label="出差事由" align="center" prop="tripReason" min-width="100" show-overflow-tooltip/>
         <el-table-column label="预计开始时间" align="center" prop="tripStartDate" min-width="130"/>
         <el-table-column label="预计结束时间" align="center" prop="tripEndDate" min-width="130"/>
         <el-table-column label="项目经理" align="center" prop="projectUserName" min-width="120"/>