出差申请审批列表

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

@@ -55,7 +55,7 @@
         <text>{{changProjectNumber}}</text>
       </div>
       <div >
-        <FlowChart  :dataList="list" :itemWidth="'130px'" :activeIndex="2"/>
+        <FlowChart  :dataList="list" :itemWidth="'130px'" :activeIndex="stepActive"/>
       </div>
     </div>
     <!-- 列表 -->
@@ -115,18 +115,18 @@
 
   </div>
   <!--  驳回弹出框-->
-  <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"  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>
@@ -224,7 +224,8 @@ const getList=()=> {
     total.value = response.total
     Object.assign(ReimbursementRequestList, response.rows);
     for(let i in ReimbursementRequestList){
-      ReimbursementRequestList[i].currentStatus = approvalStatusChange(ReimbursementRequestList[i].approveStatus,ReimbursementRequestList[i].currentAuditNodeId)
+      console.log(ReimbursementRequestList[i])
+      ReimbursementRequestList[i].currentStatus = approvalStatusChange(ReimbursementRequestList[i].reimbursmentApproveStatus,ReimbursementRequestList[i].currentAuditNodeId)
     }
     getTopApproveInfo()
   });
@@ -268,6 +269,9 @@ const rowSelectable = (row) => {
 
 //获取当前审批状态 返回值0表示当前用户可以审核，大于0已经审核过了，小于0表示表示还没到当前用户
 const approvalStatusChange = (status,currentNodeId)=>{
+  console.log("status",status)
+  console.log("currentNodeId",currentNodeId)
+
   //如果状态为未通过，那么这里返回-999
   if(status === 1) return -999
   if(status === 3) return 999
@@ -299,9 +303,11 @@ 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)
+    let i = allList.value.findIndex((item)=>item.nodeId === row.currentAuditNodeId)
+    console.log(i)
     if(i === -1)  stepActive.value = 1
     else stepActive.value = i+1
 
@@ -331,7 +337,7 @@ const oneClickPass = ()=>{
 //通过
 const passProjectCost = (row)=>{
   console.log(row)
-  let currentAuditRoleId = row.currentAuditRoleId
+  let currentAuditRoleId = row.currentAuditNodeId
   //获取currentAuditRoleId的下标
   let index = allList.value.findIndex(item=>item.nodeId === currentAuditRoleId)
 
@@ -353,7 +359,7 @@ const passProjectCost = (row)=>{
     obj.nextNodeId = allList.value[index + 1].nodeId
     obj.isEndApproval = false
   }
-
+  console.log("obj",obj)
   projectCostReimbursementPass([obj]).then(res=>{
     console.log("响应",res)
     if(res.code === 200){

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

@@ -148,6 +148,8 @@ import {getProjectName, getApproveNodeList, getRoleId,projectCostPass,projectCos
 import {getCostRequestList} from "../../../../api/projectCostRequest/projectCostRequest.js";
 const list = ref([]) // 流程图内容,只有值
 const allList = ref([]) // 流程图内容,完整的列表
+const loading = ref(true);
+const total = ref(0);
 
 //当前登录用户角色组
 const currentUserRoleInfoList = ref([])
@@ -169,7 +171,6 @@ const dialogFormVisible = ref(false)
 
 const changProjectNumber = ref('')
 const stepActive = ref(1)
-const total = ref(0);
 const queryParams = reactive({
   pageNum:1,
   pageSize:10,
@@ -396,22 +397,25 @@ const getNodeList = ()=>{
       return item.roleName
     })
   })
-
 }
-//  列表
+// 项目费用申请 列表
 const projectCostRequestList = reactive([]);
 const getList=()=> {
+  loading.value = true;
   getCostRequestList(queryParams).then(response => {
+    loading.value = false;
     total.value = response.total
     Object.assign(projectCostRequestList, response.rows);
     for(let i in projectCostRequestList){
       projectCostRequestList[i].currentStatus = approvalStatusChange(projectCostRequestList[i].approveStatus,projectCostRequestList[i].currentAuditRoleId)
     }
-    console.log("列表",projectCostRequestList)
+    console.log("项目费用申请审批-列表",projectCostRequestList)
 
     getTopApproveInfo()
   });
 }
+
+
 onMounted(async ()=>{
   //获取所有审批列表
   await getNodeList()
@@ -420,9 +424,6 @@ onMounted(async ()=>{
   //获取列表
   await getList()
 })
-
-
-
 </script>