From 35d86e8e773dc25c25b6951f15e55cedb026a8ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 二月 2024 16:12:11 +0800
Subject: [PATCH] 生产调度

---
 src/views/plan/productionschedul/index.vue |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 4f05a4f..13e02e7 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -62,14 +62,6 @@
               @size-change="handleSizeChange"
               :page="finishedPage"
               @selection-change="selectionFinishedRow">
-              <!-- <template #menu="{ row, index }">
-                <el-button
-                v-if="permissions.plan_productionschedul_del"
-                type="text"
-                icon="el-icon-delete"
-                size="small"
-                @click="deleteHandle(row, index)">鍒犻櫎</el-button>
-              </template> -->
               </avue-crud>
             </el-col>
           </el-row>
@@ -110,8 +102,7 @@
     title="缂栬緫鏃堕棿绾�"
     :visible.sync="dialogVisible"
     top="5vh"
-    width="50%"
-    :before-close="handleClose">
+    width="50%">
       <div style="height:60vh;overflow-y: scroll;">
         <el-timeline>
           <el-timeline-item
@@ -130,7 +121,7 @@
                       v-model="item.planTime"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       type="datetime"
-                      placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+                      placeholder="閫夋嫨璁″垝鏃堕棿">
                     </el-date-picker>
                   </el-col>
                 </el-row>
@@ -144,7 +135,7 @@
                       v-model="item.actualTime"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       type="datetime"
-                      placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+                      placeholder="閫夋嫨瀹為檯鏃堕棿">
                     </el-date-picker>
                   </el-col>
                 </el-row>
@@ -289,6 +280,19 @@
             prop: 'product',
             label: '浜у搧鍚�',
             overHidden: true,
+          },
+          {
+            minWidth: 120,
+            prop: 'status',
+            label: '褰撳墠鐘舵��',
+            overHidden: true,
+          },
+          {
+            minWidth: 120,
+            prop: 'time',
+            label: '涓存湡鏃堕棿',
+            overHidden: true,
+            formatter: (row,columnValue)=> this.formatDate(row,columnValue)
           },
           {
             minWidth: 120,
@@ -594,12 +598,6 @@
         "productActualTime": data[5].actualTime,
         "productPlanTime": data[5].planTime,
         "mids": mIds,
-        // "contractNo": orderObj.contractNo,
-        // "customerName": orderObj.customerName,
-        // "deliveryDate": orderObj.deliveryDate,
-        // "orderTime": orderObj.orderTime,
-        // "productType": orderObj.productType,
-        // "projectName": orderObj.projectName
       }
       fillTime(obj).then(res=>{
         if(res.status===200){
@@ -613,9 +611,6 @@
         console.error(error);
       })
 
-    },
-    handleClose(done){
-      done()
     },
     initTimeLine(data){
       let scheduleList = []
@@ -666,15 +661,8 @@
       }
     },
     selectionRow(val){
-      if (val.length > 1) {
-        const preVal = val.shift();
-        this.$refs.crud.toggleRowSelection(preVal, false);
-      }
-      else{
-        this.scheduleList=[]
-      }
       this.multipleSelection = val
-      this.getScheduleById(val[0].mid)
+      this.getScheduleById(val[val.length-1].mid)
     },
     selectionFinishedRow(val){
       if (val.length > 1) {

--
Gitblit v1.9.3