From c0860f494545adf7a3257d43e95c02b10214be9a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 12 Jun 2024 16:59:44 +0800
Subject: [PATCH] 1

---
 src/views/modules/board/SORoutingBoardAll.vue | 10 ++++-
 src/views/modules/schedule/cancelSfdc.vue     | 39 ++++++++++++++++++-
 src/views/modules/schedule/searchSfdc.vue     | 39 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/board/SORoutingBoardAll.vue b/src/views/modules/board/SORoutingBoardAll.vue
index 593e1e0..1eddfdb 100644
--- a/src/views/modules/board/SORoutingBoardAll.vue
+++ b/src/views/modules/board/SORoutingBoardAll.vue
@@ -151,10 +151,16 @@
     },
     methods: {
       tableRowClassName ({row, rowIndex}) {
-        if ( new Date(row.sScheduledDate) <new Date(this.dayjs().format('YYYY-MM-DD'))) {
+        const needDate = new Date(row.needDate).setHours(0, 0, 0, 0);  // 将日期设置为当天的零点
+        const todayDate = new Date(this.dayjs().format('YYYY-MM-DD')).setHours(0, 0, 0, 0);  // 将日期设置为当天的零点
+        const mintianDate = new Date(this.dayjs().add(1, 'day').format('YYYY-MM-DD')).setHours(0, 0, 0, 0);  // 将日期设置为当天的零点
+        if ( needDate ===todayDate) {
           return 'false-row'
         }
-        if (row.outWorkFlag == 'N') {
+        // if (row.outWorkFlag == 'N') {
+        //   return 'success-row'
+        // }
+        if (  needDate ===mintianDate) {
           return 'success-row'
         }
 
diff --git a/src/views/modules/schedule/cancelSfdc.vue b/src/views/modules/schedule/cancelSfdc.vue
index 415e6e4..bea2d1b 100644
--- a/src/views/modules/schedule/cancelSfdc.vue
+++ b/src/views/modules/schedule/cancelSfdc.vue
@@ -17,8 +17,8 @@
       <el-form-item :label="'工序编码'">
         <el-input v-model="searchData.itemNo" type="number" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心编码'">
-        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+      <el-form-item :label="'生产线名称'">
+        <el-input v-model="searchData.lineName" style="width: 120px"></el-input>
       </el-form-item>
     </el-form>
     <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
@@ -263,6 +263,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "lineName",
+            columnLabel: "生产线名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
@@ -399,6 +416,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "planTime",
+            columnLabel: "计划生产时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
@@ -468,6 +502,7 @@
           operatorName:'',
           resourceId:'',
           shiftNo:'',
+          lineName:'',
         },
       }
     },
diff --git a/src/views/modules/schedule/searchSfdc.vue b/src/views/modules/schedule/searchSfdc.vue
index 7d891a7..da4ab82 100644
--- a/src/views/modules/schedule/searchSfdc.vue
+++ b/src/views/modules/schedule/searchSfdc.vue
@@ -17,8 +17,8 @@
       <el-form-item :label="'工序编码'">
         <el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心编码'">
-        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+      <el-form-item :label="'生产线名称'">
+        <el-input v-model="searchData.lineName" style="width: 120px"></el-input>
       </el-form-item>
     </el-form>
     <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
@@ -302,6 +302,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "lineName",
+            columnLabel: "生产线名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
@@ -438,6 +455,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "planTime",
+            columnLabel: "计划生产时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
@@ -507,6 +541,7 @@
           operatorName:'',
           resourceId:'',
           shiftNo:'',
+          lineName:'',
         },
         badList:[],
         badModalFlag:false,