From aaa8f39e8aa756454b464ea14281d1f87207ff0c Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Tue, 20 Jan 2026 17:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderIssure/soIssueNotify/newSoIssueNotify.vue       | 9 +++++++--
 .../soIssueNotify/searchIssureNotifyForCK.vue            | 2 +-
 .../soIssueNotify/searchOvertimeMaterialList.vue         | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
index 7b46ee7..f998c34 100644
--- a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
@@ -320,7 +320,8 @@
             <el-form-item :label="'要求发料时间'" >
               <el-date-picker
                 style="width: 165px"
-                v-model="notifyOrderData.needDate"
+                v-model="notifyOrderData.needDate" 
+                popper-class="no-atTheMoment"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择日期">
@@ -1733,7 +1734,8 @@
         this.notifyOrderData.qtyrequired=row.qtyrequired
         this.notifyOrderData.sResourceid=row.sResourceid
         this.notifyOrderData.issureQty=''
-        this.notifyOrderData.needDate=this.dayjs().format("YYYY-MM-DD HH:mm")
+        //this.notifyOrderData.needDate=this.dayjs().format("YYYY-MM-DD HH:mm")
+        this.$set(this.notifyOrderData,'needDate','')
         this.notifyOrderData.locationNo=row.sResourceid;
         this.saveSeqNoModalFlag=true
       },
@@ -2275,5 +2277,8 @@
   .board666 .el-table .error-row {
     background: #f86868;
   }
+  .el-picker-panel.no-atTheMoment .el-button--text.el-picker-panel__link-btn {
+    display: none;
+  }
 </style>
 
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index fba4b85..9b9c71a 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -263,7 +263,7 @@
       return {
         height:200,
         modelFlag:false,
-        activeName: 'detail',
+        activeName: 'sub',
         dataList: [],
         dataList2: [],
         dataList3: [],
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue b/src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue
index 2cb86ad..199136b 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue
@@ -71,14 +71,14 @@
 
     <el-table :data="dataList" :height="height" border v-loading="dataListLoading" style="width: 100%;"
       highlight-current-row ref="mainTable">
-      <el-table-column header-align="center" align="center" width="170" label="操作">
+      <el-table-column header-align="center" align="center" width="110" label="操作">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.timeoutReason"
             placeholder="选择超时原因"
             size="mini"
             class="selectReason"
-            style="width: 150px"
+            style="width: 100px"
             @change="(val) => onTimeoutReasonChange(val, scope.row)"
           >
             <el-option
@@ -496,6 +496,9 @@ export default {
       getEamWorkShop({}).then(({ data }) => {
         if (data && data.code === 0) {
           this.workShopList = data.rows
+          this.workShopList = this.workShopList.filter((item) => {
+            return item.workShopId == 'WS005' || item.workShopId == 'WS006'
+          })
         }
       })
       this.searchTable()