Sample marking Year、Sample marking Month需要再改下规则，优先获取打样实际完成日期，如果打样实际完成日期是空的，那就获取预计完成日期

2、Sample marking Year、Sample marking Month的筛选条件需要改下，改成选择开始日期-结束日期的形式

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 = ''