审批-搜索

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

@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item style="padding-left: 5.4%">
             <el-button type="default" class="el-button-defalut" icon="Refresh" @click="reset">重置</el-button>
-            <el-button type="primary" class="el-button-primary" icon="Search" @click="onSearch">查询</el-button>
+            <el-button type="primary" class="el-button-primary" icon="Search" @click="getList">查询</el-button>
         </el-form-item>
       </el-form>
     </div  >
@@ -66,7 +66,7 @@
         <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
         <el-table-column prop="projectType" label="项目类型" align="center">
           <template #default="scope">
-            <dict-tag :options="project_type" :value="scope.row.costType"/>
+            <dict-tag :options="project_type" :value="scope.row.projectType"/>
           </template>
         </el-table-column>
         <el-table-column  prop="timeOfExpense" label="费用发生时间" align="center" min-width="100px"></el-table-column>
@@ -196,7 +196,7 @@ const reset = () => {
   queryParams.projectName = null
   queryParams.projectType = null
   queryParams.reimbursmentApproveStatus = null
-  // getList()
+  getList()
 }
 
 //获取所有流程列表,根据审批id
@@ -219,15 +219,15 @@ const getRoleInfo = ()=>{
 }
 
 //  列表
-const ReimbursementRequestList = reactive([]);
+const ReimbursementRequestList = ref([]);
 const getList=()=> {
   getReimbursementList(queryParams).then(response => {
     console.log("项目费用报销-列表",response.rows)
     total.value = response.total
-    Object.assign(ReimbursementRequestList, response.rows);
-    for(let i in ReimbursementRequestList){
-      console.log(ReimbursementRequestList[i])
-      ReimbursementRequestList[i].currentStatus = approvalStatusChange(ReimbursementRequestList[i].reimbursmentApproveStatus,ReimbursementRequestList[i].currentAuditNodeId)
+    ReimbursementRequestList.value = response.rows
+    for(let i in ReimbursementRequestList.value){
+      console.log(ReimbursementRequestList.value[i])
+      ReimbursementRequestList.value[i].currentStatus = approvalStatusChange(ReimbursementRequestList.value[i].reimbursmentApproveStatus,ReimbursementRequestList.value[i].currentAuditNodeId)
     }
     getTopApproveInfo()
   });
@@ -291,7 +291,7 @@ const approvalStatusChange = (status,currentNodeId)=>{
 
 //获取列表第一个顶部信息
 const getTopApproveInfo = ()=>{
-  let item2 = ReimbursementRequestList[0]
+  let item2 = ReimbursementRequestList.value[0]
   changProjectNumber.value = item2.projectNumber
   let i = allList.value.findIndex((item)=>item.nodeId === item2.currentAuditRoleId)
   if(i === -1)  stepActive.value = 1

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

@@ -66,7 +66,7 @@
         <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
         <el-table-column prop="projectType" label="项目类型" align="center">
           <template #default="scope">
-            <dict-tag :options="project_type" :value="scope.row.costType"/>
+            <dict-tag :options="project_type" :value="scope.row.projectType" />
           </template>
         </el-table-column>
         <el-table-column prop="userName" label="事业部负责人" align="center"></el-table-column>
@@ -413,7 +413,7 @@ const getList=()=> {
   getCostRequestList(queryParams).then(response => {
     loading.value = false;
     total.value = response.total
-    Object.assign(projectCostRequestList.value, response.rows);
+    projectCostRequestList.value = response.rows
     console.log("项目费用申请审批-列表",projectCostRequestList.value)
     for(let i in projectCostRequestList.value){
       projectCostRequestList.value[i].currentStatus = approvalStatusChange(projectCostRequestList.value[i].approveStatus,projectCostRequestList.value[i].currentAuditRoleId)