Commit 225ba242 authored by 祁正's avatar 祁正

审批-搜索

parent 63b7a830
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
</el-form-item> </el-form-item>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-form-item style="padding-left: 5.4%"> <el-form-item style="padding-left: 5.4%">
<el-button icon="Refresh" @click="resetQuery" class="el-button-defalut">重置</el-button> <el-button type="default" class="el-button-defalut" icon="Refresh" @click="reset">重置</el-button>
<el-button type="primary" icon="Search" @click="handleQuery" class="el-button-primary">查询</el-button> <el-button type="primary" class="el-button-primary" icon="Search" @click="getList">查询</el-button>
<el-button size="large" type="text" @click="toggleSearch"> <!-- <el-button size="large" type="text" @click="toggleSearch">-->
{{ isExpanded ? ' 收起' : ' 展开' }} <!-- {{ isExpanded ? ' 收起' : ' 展开' }}-->
<el-icon class="el-icon--right"> <!-- <el-icon class="el-icon&#45;&#45;right">-->
<arrow-down /> <!-- <arrow-down />-->
</el-icon> <!-- </el-icon>-->
</el-button> <!-- </el-button>-->
</el-form-item> </el-form-item>
<!-- 可折叠的查询条件 --> <!-- 可折叠的查询条件 -->
<transition> <transition>
...@@ -251,7 +251,7 @@ const reset = () => { ...@@ -251,7 +251,7 @@ const reset = () => {
queryParams.projectName = null queryParams.projectName = null
queryParams.projectType = null queryParams.projectType = null
queryParams.status = null queryParams.status = null
// getList() getList()
} }
//获取所有流程列表,根据审批id //获取所有流程列表,根据审批id
...@@ -274,15 +274,15 @@ const getRoleInfo = ()=>{ ...@@ -274,15 +274,15 @@ const getRoleInfo = ()=>{
} }
// 列表 // 列表
const ReimbursementRequestList = reactive([]); const ReimbursementRequestList = ref([]);
const getList=()=> { const getList=()=> {
listTripApplication(queryParams).then(response => { listTripApplication(queryParams).then(response => {
console.log("出差申请-列表",response.rows) console.log("出差申请-列表",response.rows)
total.value = response.total total.value = response.total
Object.assign(ReimbursementRequestList, response.rows); ReimbursementRequestList.value = response.rows
for(let i in ReimbursementRequestList){ for(let i in ReimbursementRequestList.value){
console.log(ReimbursementRequestList[i]) console.log(ReimbursementRequestList.value[i])
ReimbursementRequestList[i].currentStatus = approvalStatusChange(ReimbursementRequestList[i].status,ReimbursementRequestList[i].currentAuditRoleId) ReimbursementRequestList.value[i].currentStatus = approvalStatusChange(ReimbursementRequestList.value[i].status,ReimbursementRequestList.value[i].currentAuditRoleId)
} }
getTopApproveInfo() getTopApproveInfo()
}); });
...@@ -345,7 +345,7 @@ const approvalStatusChange = (status,currentNodeId)=>{ ...@@ -345,7 +345,7 @@ const approvalStatusChange = (status,currentNodeId)=>{
//获取列表第一个顶部信息 //获取列表第一个顶部信息
const getTopApproveInfo = ()=>{ const getTopApproveInfo = ()=>{
let item2 = ReimbursementRequestList[0] let item2 = ReimbursementRequestList.value[0]
changProjectNumber.value = item2.projectNumber changProjectNumber.value = item2.projectNumber
let i = allList.value.findIndex((item)=>item.nodeId === item2.currentAuditRoleId) let i = allList.value.findIndex((item)=>item.nodeId === item2.currentAuditRoleId)
if(i === -1) stepActive.value = 1 if(i === -1) stepActive.value = 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment