From ddc3c5f70ed391c55dc83cc9d9e9c6d1fa672de5 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 10:58:41 +0800
Subject: [PATCH] 项目表

---
 web/src/views/modules/sys/task/already-task.vue |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index 92ecf8c..1999bc6 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
@@ -54,8 +54,10 @@
 </template>
 
 <script>
+  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() {
@@ -145,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()
@@ -185,10 +183,14 @@
       },
       check(row) {
         console.log(row, "task row");
+        let row2 = cloneDeep(row)
+        row2.stepMarker = null
         if (row.flowCode === 'wplz') {
-          this.$refs.itemCirculatOrder.$refs.dialog.init(row)
+          this.$nextTick(()=>{
+            this.$refs.itemCirculatOrder.$refs.dialog.init(row2.id,row2)
+          })
         } else if (row.flowCode === 'aaa') {
-          //this.$refs.itemCirculatOrder.$refs.dialog.init(row)
+          //this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
         }
         else {
           if (row.stepReadRouterId === null){

--
Gitblit v1.9.1