From 1246c38873d39b6382b96ac046f65ac3c7732c71 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 23 Jan 2026 13:46:21 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-23=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/OQCResultEntry.vue       | 24 ++++----
 .../modules/warehouse/labelTransactionLog.vue | 56 +++++++++++++------
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index 57e515e..d12a5ba 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -136,18 +136,18 @@
               <el-form-item label="送检日期">
                 <el-date-picker
                   v-model="searchData.startDate2"
-                  type="date"
-                  value-format='yyyy-MM-dd'
-                  format='yyyy-MM-dd'
+                  type="datetime"
+                  value-format='yyyy-MM-dd HH:mm'
+                  format='yyyy-MM-dd HH:mm'
                   placeholder="开始日期"
                   style="width: 44%">
                 </el-date-picker>
                 <span style="margin: 0 6px; color: #DCDFE6;">~</span>
                 <el-date-picker
                   v-model="searchData.endDate2"
-                  type="date"
-                  value-format='yyyy-MM-dd'
-                  format='yyyy-MM-dd'
+                  type="datetime"
+                  value-format='yyyy-MM-dd HH:mm'
+                  format='yyyy-MM-dd HH:mm'
                   placeholder="结束日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -157,18 +157,18 @@
               <el-form-item label="检验日期">
                 <el-date-picker
                   v-model="searchData.startDate"
-                  type="date"
-                  value-format='yyyy-MM-dd'
-                  format='yyyy-MM-dd'
+                  type="datetime"
+                  value-format='yyyy-MM-dd HH:mm'
+                  format='yyyy-MM-dd HH:mm'
                   placeholder="开始日期"
                   style="width: 44%">
                 </el-date-picker>
                 <span style="margin: 0 6px; color: #DCDFE6;">~</span>
                 <el-date-picker
                   v-model="searchData.endDate"
-                  type="date"
-                  value-format='yyyy-MM-dd'
-                  format='yyyy-MM-dd'
+                  type="datetime"
+                  value-format='yyyy-MM-dd HH:mm'
+                  format='yyyy-MM-dd HH:mm'
                   placeholder="结束日期"
                   style="width: 44%">
                 </el-date-picker>
diff --git a/src/views/modules/warehouse/labelTransactionLog.vue b/src/views/modules/warehouse/labelTransactionLog.vue
index 1cd8cbe..a444abd 100644
--- a/src/views/modules/warehouse/labelTransactionLog.vue
+++ b/src/views/modules/warehouse/labelTransactionLog.vue
@@ -28,7 +28,7 @@
 
         <template v-if="searchExpanded">
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="2">
               <el-form-item label="BU">
                 <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 100%">
                   <el-option
@@ -40,7 +40,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="2">
               <el-form-item label="变动类型">
                 <el-select v-model="searchData.documentType" placeholder="请选择" clearable style="width: 100%">
                   <el-option
@@ -52,6 +52,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="变动单号">
+                <el-input v-model="searchData.transactionId" clearable placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="标签条码">
                 <el-input v-model="searchData.rollNo" clearable placeholder="请输入"></el-input>
@@ -76,7 +81,7 @@
           <el-row :gutter="16">
             <el-col :span="4">
               <el-form-item label="传输状态">
-                <el-select v-model="searchData.syncedFlag" placeholder="请选择" clearable style="width: 100%">
+                <el-select v-model="searchData.syncedFlag" placeholder="请选择" clearable style="width: 114%">
                   <el-option label="已传输" value="Y"></el-option>
                   <el-option label="待传输" value="N"></el-option>
                 </el-select>
@@ -97,16 +102,24 @@
                 <el-input v-model="searchData.orderLineNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="变动日期">
                 <el-date-picker
-                  v-model="searchData.transactionDateRange"
-                  type="daterange"
-                  range-separator="~"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  value-format="yyyy-MM-dd"
-                  style="width: 100%">
+                  v-model="searchData.startDate"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm"
+                  format="yyyy-MM-dd HH:mm"
+                  placeholder="开始日期"
+                  style="width: 44%">
+                </el-date-picker>
+                <span style="margin: 0 8px; color: #DCDFE6;">~</span>
+                <el-date-picker
+                  v-model="searchData.endDate"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm"
+                  format="yyyy-MM-dd HH:mm"
+                  placeholder="结束日期"
+                  style="width: 44%">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -240,7 +253,9 @@ export default {
         partNo: '',
         partDesc: '',
         spec: '',
-        transactionDateRange: [],
+        startDate: '',
+        endDate: '',
+        transactionId: '',
         documentNo: '',
         orderNo: '',
         orderLineNo: '',
@@ -315,7 +330,8 @@ export default {
     // 初始化默认日期为今天
     initDefaultDate() {
       const today = this.formatDate(new Date())
-      this.searchData.transactionDateRange = [today, today]
+      this.searchData.startDate = today + ' 00:00'
+      this.searchData.endDate = today + ' 23:59'
     },
 
     // 格式化日期
@@ -342,8 +358,9 @@ export default {
         partNo: this.searchData.partNo,
         partDesc: this.searchData.partDesc,
         spec: this.searchData.spec,
-        startDate: this.searchData.transactionDateRange && this.searchData.transactionDateRange[0] ? this.searchData.transactionDateRange[0] : '',
-        endDate: this.searchData.transactionDateRange && this.searchData.transactionDateRange[1] ? this.searchData.transactionDateRange[1] : '',
+        startDate: this.searchData.startDate || '',
+        endDate: this.searchData.endDate || '',
+        transactionId: this.searchData.transactionId,
         documentNo: this.searchData.documentNo,
         orderNo: this.searchData.orderNo,
         orderLineNo: this.searchData.orderLineNo,
@@ -378,7 +395,9 @@ export default {
         partNo: '',
         partDesc: '',
         spec: '',
-        transactionDateRange: [],
+        startDate: '',
+        endDate: '',
+        transactionId: '',
         documentNo: '',
         orderNo: '',
         orderLineNo: '',
@@ -422,10 +441,11 @@ export default {
 
       // 校验：只能选择待传输（syncedFlag不为'已传输'）且有错误消息的记录
       const invalidItems = this.dataListSelections.filter(item =>
-        item.syncedFlag === '已传输' || !item.syncedErrorMsg || item.syncedErrorMsg.trim() === ''
+        item.syncedFlag === '已传输'
+        // || !item.syncedErrorMsg || item.syncedErrorMsg.trim() === ''
       )
       if (invalidItems.length > 0) {
-        this.$message.warning('只能选择待传输且有错误消息的记录进行手动重试！')
+        this.$message.warning('只能选择待传输的记录进行手动重试！')
         return
       }