From ecb9ece90cb766214e682f33d4c670b2d09b8ca3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 18:03:56 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/sys/task/already-task.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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..3541edc 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
@@ -49,6 +49,8 @@
</el-table>
<!-- 宸插姙浠诲姟寮圭獥 -->
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
+ <ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -57,6 +59,9 @@
import cloneDeep from 'lodash/cloneDeep'
import InfiniteLoading from 'vue-infinite-loading'
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
+ import Cookies from "js-cookie";
+ import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
+ import TestCheckOrder from "@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue";
export default {
data() {
@@ -80,8 +85,10 @@
}
},
components: {
+ TestCheckOrder,
InfiniteLoading,
- ItemCirculatOrder
+ ItemCirculatOrder,
+ ConfigItemWarehouse
},
watch:{
},
@@ -146,13 +153,9 @@
});
},
- getTransformHeight(transformHeight){
+ getTransformHeight(){
let Height=document.documentElement.clientHeight
- if(transformHeight){
return Height-(650-403)
- }else{
- return Height-650
- }
},
async getQuery(){
this.handleInfiniteLoadingBeforeGet()
@@ -186,12 +189,18 @@
},
check(row) {
console.log(row, "task row");
- let row2 = cloneDeep(row)
- row2.stepMarker = null
if (row.flowCode === 'wplz') {
- this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
- } else if (row.flowCode === 'aaa') {
- //this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
+ this.$nextTick(()=>{
+ this.$refs.itemCirculatOrder.$refs.dialog.init(row.bizId,row, true)
+ })
+ } else if (row.flowCode === 'pzxrk') {
+ this.$nextTick(()=>{
+ this.$refs.configItemWarehouse.$refs.dialog.init(row.bizId,row, true)
+ })
+ } else if (row.flowCode === 'csjcd') {
+ this.$nextTick(()=>{
+ this.$refs.testCheckOrder.$refs.dialog.init(row.bizId,row, true)
+ })
}
else {
if (row.stepReadRouterId === null){
--
Gitblit v1.9.1