From 2362b4edde464b69a9ad0b2e4f5827a766d475ea Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Sun, 20 Sep 2026 09:55:01 +0800
Subject: [PATCH] =?UTF-8?q?Sample=20marking=20Year=E3=80=81Sample=20markin?=
 =?UTF-8?q?g=20Month=E9=9C=80=E8=A6=81=E5=86=8D=E6=94=B9=E4=B8=8B=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=EF=BC=8C=E4=BC=98=E5=85=88=E8=8E=B7=E5=8F=96=E6=89=93?=
 =?UTF-8?q?=E6=A0=B7=E5=AE=9E=E9=99=85=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=89=93=E6=A0=B7=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F=E6=98=AF=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E9=82=A3=E5=B0=B1=E8=8E=B7=E5=8F=96=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F=202=E3=80=81Sample=20marki?=
 =?UTF-8?q?ng=20Year=E3=80=81Sample=20marking=20Month=E7=9A=84=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E9=9C=80=E8=A6=81=E6=94=B9=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=88=90=E9=80=89=E6=8B=A9=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F-=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sampleTracking/projectProofTracking.vue   | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue
index e350014..380674d 100644
--- a/src/views/modules/sampleTracking/projectProofTracking.vue
+++ b/src/views/modules/sampleTracking/projectProofTracking.vue
@@ -99,25 +99,22 @@
         <el-form-item label="打样单号">
           <el-input v-model="searchData.proofingNo" clearable placeholder="请输入打样单号" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="Sample making Year">
-          <el-select v-model="searchData.sampleMakingYear" clearable placeholder="全部" style="width: 110px">
-            <el-option
-              v-for="year in sampleMakingYearOptions"
-              :key="`searchSampleMakingYear_${year}`"
-              :label="year"
-              :value="year"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Sample making Month">
-          <el-select v-model="searchData.sampleMakingMonth" clearable placeholder="全部" style="width: 90px">
-            <el-option
-              v-for="month in sampleMakingMonthOptions"
-              :key="`searchSampleMakingMonth_${month}`"
-              :label="month"
-              :value="month"
-            />
-          </el-select>
+        <el-form-item label="Sample making Date">
+          <el-date-picker
+            v-model="searchData.sampleMakingDateStart"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="开始日期"
+            style="width: 130px"
+          />
+          <span> - </span>
+          <el-date-picker
+            v-model="searchData.sampleMakingDateEnd"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="结束日期"
+            style="width: 130px"
+          />
         </el-form-item>
         <el-form-item label="PM inquery time">
           <el-date-picker
@@ -1701,8 +1698,8 @@ export default {
         proofSyncFlag: '',
         proofingStatusList: [],
         sampleQty: '',
-        sampleMakingYear: '',
-        sampleMakingMonth: '',
+        sampleMakingDateStart: '',
+        sampleMakingDateEnd: '',
         pmInqueryTimeStart: '',
         pmInqueryTimeEnd: '',
         importance: ''
@@ -1984,17 +1981,6 @@ export default {
         return null
       }
       return this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null
-    },
-    sampleMakingYearOptions () {
-      const currentYear = new Date().getFullYear()
-      const years = []
-      for (let year = currentYear; year >= 2022; year--) {
-        years.push(year)
-      }
-      return years
-    },
-    sampleMakingMonthOptions () {
-      return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
     }
   },
   methods: {
@@ -4244,10 +4230,12 @@ export default {
       if (!inData) {
         return inData
       }
-      // 年/月筛选对应打样完成日期；空值转 null，避免空字符串把 Integer 查询参数打坏。
       inData.sampleQty = this.normalizeSearchInteger(inData.sampleQty)
-      inData.sampleMakingYear = this.normalizeSearchInteger(inData.sampleMakingYear)
-      inData.sampleMakingMonth = this.normalizeSearchInteger(inData.sampleMakingMonth)
+      // 日期范围按“实际完成日期优先，为空取预计完成日期”筛选，列表与导出共用。
+      inData.sampleMakingDateStart = this.isBlankValue(inData.sampleMakingDateStart) ? null : inData.sampleMakingDateStart
+      inData.sampleMakingDateEnd = this.isBlankValue(inData.sampleMakingDateEnd) ? null : inData.sampleMakingDateEnd
+      delete inData.sampleMakingYear
+      delete inData.sampleMakingMonth
       inData.pmInqueryTimeStart = this.isBlankValue(inData.pmInqueryTimeStart) ? null : inData.pmInqueryTimeStart
       inData.pmInqueryTimeEnd = this.isBlankValue(inData.pmInqueryTimeEnd) ? null : inData.pmInqueryTimeEnd
       inData.importance = this.isBlankValue(inData.importance) ? '' : this.normalizeImportanceFilter(inData.importance)
@@ -4257,7 +4245,19 @@ export default {
       }
       return inData
     },
+    validateSampleMakingDateRange () {
+      const start = this.searchData.sampleMakingDateStart
+      const end = this.searchData.sampleMakingDateEnd
+      if (start && end && start > end) {
+        this.$message.warning('Sample making Date 开始日期不能晚于结束日期')
+        return false
+      }
+      return true
+    },
     getDataList (flag) {
+      if (!this.validateSampleMakingDateRange()) {
+        return
+      }
       if (flag === 'Y') {
         this.pageIndex = 1
       }
@@ -4324,6 +4324,9 @@ export default {
       })
     },
     async exportTrackingData () {
+      if (!this.validateSampleMakingDateRange()) {
+        return
+      }
       if (this.exportLoading) {
         return
       }
@@ -4435,8 +4438,8 @@ export default {
       this.searchData.proofSyncFlag = ''
       this.searchData.proofingStatusList = []
       this.searchData.sampleQty = ''
-      this.searchData.sampleMakingYear = ''
-      this.searchData.sampleMakingMonth = ''
+      this.searchData.sampleMakingDateStart = ''
+      this.searchData.sampleMakingDateEnd = ''
       this.searchData.pmInqueryTimeStart = ''
       this.searchData.pmInqueryTimeEnd = ''
       this.searchData.importance = ''