From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sys/task/already-task.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index a5fc4a0..0691a61 100644
--- a/web/src/views/modules/sys/task/already-task.vue
+++ b/web/src/views/modules/sys/task/already-task.vue
@@ -6,7 +6,7 @@
<el-input type="text" v-model="dataForm.djxlSystem" v-if="false" />
</el-form>
<el-table ref="table"
- :height="getTransformHeight(transformHeight)"
+ :height="getTransformHeight()"
class="pushtable table-is__left-tz"
v-loading="dataLoading"
:data="dataList"
@@ -27,13 +27,13 @@
<el-table-column align="center" prop="stepName" label="褰撳墠鐘舵��" width="240px"/>
<el-table-column align="center" prop="receiveName" label="鍔炵悊浜�" width="120px"/>
<!-- <el-table-column align="center" prop="statusName" label="鎴戠殑鎰忚" />-->
- <el-table-column label="鎿嶄綔" width="220px">
+ <el-table-column label="鎿嶄綔" width="180px">
<template v-slot="{ row }">
<zt-table-button v-show="row.canRecall == 1 && !$store.state.user.isAdmin" @click="reCall(row)">鎾ゅ洖</zt-table-button>
<zt-table-button @click="check(row,'')" v-if="row.flowCode !== 'yearPlanFlow'">鏌ョ湅</zt-table-button>
<zt-table-button @click="check(row,'')" v-if="row.flowCode === 'yearPlanFlow'">淇敼</zt-table-button>
<zt-table-button @click="flowChart(row)">娴佺▼鍥�</zt-table-button>
- <zt-table-button v-if="row.flowCode != 'yearPlan2'" @click="getFlowTrack(row)">鍔炵悊杞ㄨ抗</zt-table-button>
+<!-- <zt-table-button v-if="row.flowCode != 'yearPlan2'" @click="getFlowTrack(row)">鍔炵悊杞ㄨ抗</zt-table-button>-->
</template>
</el-table-column>
<infinite-loading
@@ -57,6 +57,7 @@
import cloneDeep from 'lodash/cloneDeep'
import InfiniteLoading from 'vue-infinite-loading'
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
+ import Cookies from "js-cookie";
export default {
data() {
@@ -146,13 +147,9 @@
});
},
- getTransformHeight(transformHeight){
+ getTransformHeight(){
let Height=document.documentElement.clientHeight
- if(transformHeight){
return Height-(650-403)
- }else{
- return Height-650
- }
},
async getQuery(){
this.handleInfiniteLoadingBeforeGet()
--
Gitblit v1.9.1