出差申请-通过

src/api/examineAndApprove/examineAndApprove.js

@@ -80,6 +80,8 @@ export function projectCostReimbursementNotPass(query) {
     })
 }
 
+
+//  3.出差申请审批
 //出差申请-通过
 export function tripApplicationApproval(query) {
     return request({
@@ -88,15 +90,6 @@ export function tripApplicationApproval(query) {
         data:query
     })
 }
-//  3.出差申请审批
-//出差申请审批-通过
-export function tripApplicationPass(query) {
-    return request({
-        url: '/expenseApproval/tripApplicationApproval',
-        method: 'post',
-        data:query
-    })
-}
 //出差申请审批-驳回
 export function tripApplicationPassNotPass(query) {
     return request({

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

@@ -167,24 +167,23 @@
 
 
   <!--  驳回弹出框-->
-  <el-dialog  style="width: 745px;height: 300px;margin-top: 300px" :fullscreen="true"  v-model="dialogFormVisible" title="驳回" >
+  <el-dialog  style="width: 745px;height: 300px;margin-top: 300px" :fullscreen="true" v-model="dialogFormVisible" title="驳回" >
     <template #header>
       <div class="text_weight">驳回<el-divider /></div>
     </template>
     <div style="padding: 5px;display: flex;flex-direction:column;">
       <div class="text">驳回原因</div>
-      <div style="width: 95%;margin-top:10px"> <el-input  :rows="3" type="textarea" v-model="form.name" placeholder="请输入驳回原因" /></div>
+      <div style="width: 95%;margin-top:10px"> <el-input v-model="rejectObj.groundsForRejection" :rows="3" type="textarea" placeholder="请输入驳回原因" /></div>
     </div>
     <template #footer>
       <div style="position: absolute;left: 35%;display: flex">
-        <el-button @click="dialogFormVisible = false"  class="btn-B">取消</el-button>
-        <el-button  @click="dialogFormVisible"  class="btn-A" type="primary">确定</el-button>
+        <el-button @click="cancelReject"  class="btn-B">取消</el-button>
+        <el-button  @click="sureReject"  class="btn-A" type="primary">确定</el-button>
       </div>
     </template>
   </el-dialog>
 
 
-
 </template>
 
 <script setup >
@@ -196,8 +195,9 @@ import {ElMessage} from "element-plus";
 import {
   getApproveNodeList,
   getProjectName,
-  getRoleId, projectCostReimbursementNotPass,
-  tripApplicationApproval
+  getRoleId,
+  tripApplicationApproval,
+  tripApplicationPassNotPass
 } from "../../../../api/examineAndApprove/examineAndApprove.js";
 const { project_status,cost_daily_status,project_type} = proxy.useDict('project_status', 'cost_daily_status','project_type');
 
@@ -356,7 +356,6 @@ const handleHover = (row, column, cell, event) => {
   if (timer) {
     clearTimeout(timer);
   }
-  console.log(row)
   timer = setTimeout(() => {
     changProjectNumber.value = row.projectNumber
     let i = allList.value.findIndex((item)=>item.nodeId === row.currentAuditRoleId)
@@ -389,7 +388,6 @@ const oneClickPass = ()=>{
 }
 //通过
 const passProjectCost = (row)=>{
-  console.log(row)
   let currentAuditRoleId = row.currentAuditRoleId
   //获取currentAuditRoleId的下标
   let index = allList.value.findIndex(item=>item.nodeId === currentAuditRoleId)
@@ -435,19 +433,19 @@ const sureReject = ()=>{
     //如果是一键驳回
     let list = passObjList.map((item)=>{
       return {
-        tripApplicationId:item.id,
+        tripApplicationId:item.tripApplicationId,
         groundsForRejection:rejectObj.groundsForRejection
       }
     })
 
-    projectCostReimbursementNotPass(list).then(res=>{
+    tripApplicationPassNotPass(list).then(res=>{
       dialogFormVisible.value = false
       cancelReject()
       getList()
     })
   }else {
     //不是一键驳回
-    projectCostReimbursementNotPass([rejectObj]).then(res=>{
+    tripApplicationPassNotPass([rejectObj]).then(res=>{
       dialogFormVisible.value = false
       cancelReject()
       getList()