From 7b8e525766b1676931f164d7ee5994e166fad1f7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 28 十二月 2023 16:21:48 +0800
Subject: [PATCH] 	modified:   src/views/plan/productionschedul/index.vue

---
 src/views/plan/productionschedul/index.vue |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 9117ea8..cd1b614 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -3,7 +3,7 @@
     <basic-container>
       <el-row>
         <el-col :span="14" style="height:100vh">
-          <el-row style="height:50%;padding:0px 10px;">
+          <el-row style="height:70%;padding:0px 10px;">
             <el-col :span="24">
               <div>
                 <span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
@@ -42,7 +42,7 @@
               </div>
             </el-col>
           </el-row>
-          <el-row style="height:50%;padding:0px 10px;">
+          <el-row style="height:30%;padding:0px 10px;">
             <el-col :span="24">
               <div>
                 <span style="position: relative;top:0px;color:#34BD66">宸插畬鎴�</span>
@@ -79,6 +79,8 @@
                 <el-timeline>
                     <el-timeline-item
                       placement="top"
+                      :color="(item.planTime||item.actualTime) ? '#34BD66' :null"
+                      :icon="(item.planTime||item.actualTime) ? 'el-icon-circle-check' :null"
                       v-for="(item, index) in scheduleList"
                       :key="index"
                       :timestamp="item.title">
@@ -223,7 +225,7 @@
           prop:'id',
           order:'descending'
         },
-        height: 230,
+        height: 360,
         selection: true,
         columnBtn: false,
         index: true,
@@ -333,7 +335,7 @@
           prop:'id',
           order:'descending'
         },
-        height: 250,
+        height: 150,
         selection: true,
         columnBtn: false,
         index: true,
@@ -660,18 +662,17 @@
       }
     },
     selectionRow(val){
-      // if (val.length > 1) {
-      //   const preVal = val.shift();
-      //   this.$refs.crud.toggleRowSelection(preVal, false);
-      // }
-      // else{
-      //   this.scheduleList=[]
-      // }
+      if (val.length > 1) {
+        const preVal = val.shift();
+        this.$refs.crud.toggleRowSelection(preVal, false);
+      }
+      else{
+        this.scheduleList=[]
+      }
       this.multipleSelection = val
-      // this.getScheduleById(val[0].id)
+      this.getScheduleById(val[0].mid)
     },
     selectionFinishedRow(val){
-      console.log(val);
       if (val.length > 1) {
         const preVal = val.shift();
         this.$refs.finished.toggleRowSelection(preVal, false);

--
Gitblit v1.9.3