From 120de6a9a5a0e4ef7ffd271741a7000cce87ad77 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 6 Jun 2024 18:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/rq.scss                       |  3 ++
 .../material/com_issureSo_add_or_update.vue   | 49 ++++++++++++-------
 src/views/modules/material/issureSo.vue       | 34 ++++++-------
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 5ebd2df..245e5f7 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -77,3 +77,6 @@
   font-weight: bold;
   color: rgb(23, 179, 163);
 }
+.el-table .error-row {
+  background: #eee77c;
+}
diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue
index c6ff4f6..eb0619d 100644
--- a/src/views/modules/material/com_issureSo_add_or_update.vue
+++ b/src/views/modules/material/com_issureSo_add_or_update.vue
@@ -77,6 +77,7 @@
         :data="dataList"
         height="300"
         border
+        :row-class-name="tableRowClassName"
         v-loading="false"
         style="width: 100%; ">
         <el-table-column
@@ -248,23 +249,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 200002,
-            serialNumber: '200002Table4WdrNo',
-            tableId: "200002Table4",
-            tableName: "发料单已扫卷",
-            columnProp: "wdrNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "W/D/R",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
+          // },{
+          //   userId: this.$store.state.user.name,
+          //   functionId: 200002,
+          //   serialNumber: '200002Table4WdrNo',
+          //   tableId: "200002Table4",
+          //   tableName: "发料单已扫卷",
+          //   columnProp: "wdrNo",
+          //   headerAlign: "center",
+          //   align: "left",
+          //   columnLabel: "W/D/R",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 80
           },{
             userId: this.$store.state.user.name,
             functionId: 200002,
@@ -544,7 +545,7 @@
         saveIssureCach(inData).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
-            this.$message.success( '操作成功')
+            this.$message.success( '操作成功'+data.str)
             searchTransDetailAndSubCach(this.dataForm).then(({data})=>{
               this.dataList = data.rows
             })
@@ -555,7 +556,17 @@
           }
         })
       },
-
+      tableRowClassName ({row, rowIndex}) {
+        var currentDate = new Date();
+        var futureDate = new Date();
+        futureDate.setDate(currentDate.getDate() + 90);
+        var date = new Date(row.expiredDate)
+        if (date.getTime() < futureDate.getTime()) {
+          console.log('快过期了')
+          return 'error-row'
+        }
+        return ''
+      },
 
 
     },
diff --git a/src/views/modules/material/issureSo.vue b/src/views/modules/material/issureSo.vue
index 221c5ce..b48cf47 100644
--- a/src/views/modules/material/issureSo.vue
+++ b/src/views/modules/material/issureSo.vue
@@ -482,23 +482,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 200002,
-            serialNumber: '200002Table2WdrNo',
-            tableId: "200002Table2",
-            tableName: "生产发料明细",
-            columnProp: "wdrNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "W/D/R",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
+          // },{
+          //   userId: this.$store.state.user.name,
+          //   functionId: 200002,
+          //   serialNumber: '200002Table2WdrNo',
+          //   tableId: "200002Table2",
+          //   tableName: "生产发料明细",
+          //   columnProp: "wdrNo",
+          //   headerAlign: "center",
+          //   align: "left",
+          //   columnLabel: "W/D/R",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 100
           },{
             userId: this.$store.state.user.name,
             functionId: 200002,