From 39581398de2d2647e62a45baaff2164259d77298 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 31 Jul 2026 15:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=88=B0erf=5Fexp=5Fapply=E8=A1=A8=E6=9F=A5=E6=89=BE=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BC=96=E7=A0=81=3Derf=5Fexp=5Fapply=E7=9A=84project?=
 =?UTF-8?q?=5Fno=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9B=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E6=89=93=E6=A0=B7=E5=8D=95=E5=8F=B7=E7=9A=84=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AFerf=5Fexp?=
 =?UTF-8?q?=5Fapply=E7=9A=84apply=5Fno=EF=BC=88=E4=B9=9F=E5=B0=B1=E6=98=AF?=
 =?UTF-8?q?=E8=AF=B4=E8=AF=95=E9=AA=8C=E5=8D=95=E5=85=B6=E5=AE=9E=E5=B0=B1?=
 =?UTF-8?q?=E6=98=AFTracking=E7=9A=84=E6=89=93=E6=A0=B7=E5=8D=95=EF=BC=89;?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=9F=90=E4=B8=80=E4=B8=AA=E6=89=93=E6=A0=B7?=
 =?UTF-8?q?=E5=8D=95=E5=90=8E=E5=9B=9E=E5=A1=AB=E6=89=93=E6=A0=B7=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E9=A2=84=E8=AE=A1=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sampleTracking/projectProofTracking.vue   | 94 ++++++++++++++-----
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue
index d645eff..7fc8aac 100644
--- a/src/views/modules/sampleTracking/projectProofTracking.vue
+++ b/src/views/modules/sampleTracking/projectProofTracking.vue
@@ -541,9 +541,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="isOneKeyCreateFieldVisible('proofingNumber')">
-            <el-form-item label="数量">
-              <el-input v-model.number="oneKeyForm.proofingNumber" style="width: 100%"></el-input>
+          <el-col :span="6" v-show="isOneKeyCreateFieldVisible('requiredDeliveryDate')">
+            <el-form-item label="预计完成日期">
+              <el-date-picker
+                v-model="oneKeyForm.requiredDeliveryDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-show="isOneKeyCreateFieldVisible('planStartDate')">
@@ -560,20 +566,17 @@
         </el-row>
 
         <el-row :gutter="16">
-          <el-col :span="6" v-show="isOneKeyCreateFieldVisible('requiredDeliveryDate')">
-            <el-form-item label="预计完成日期">
-              <el-date-picker
-                v-model="oneKeyForm.requiredDeliveryDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-                style="width: 100%">
-              </el-date-picker>
+          <el-col :span="6" v-show="isOneKeyCreateFieldVisible('proofingNumber')">
+            <el-form-item label="数量">
+              <el-input v-model.number="oneKeyForm.proofingNumber" style="width: 100%"></el-input>
+              <div v-if="oneKeySelectedApplyOption" class="apply-qty-reference">
+                试验申请数量参考：{{ getApplyQuantityDisplayText(oneKeySelectedApplyOption.applyQuantity) }}
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="isOneKeyCreateFieldVisible('requiredDeliveryDate') ? 18 : 24" v-show="isOneKeyCreateFieldVisible('remark')">
             <el-form-item label="备注">
-              <el-input type="textarea" :rows="2" v-model="oneKeyForm.remark" style="width: 100%"></el-input>
+              <el-input v-model="oneKeyForm.remark" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -676,8 +679,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="数量" required>
-              <el-input v-model="proofDialogData.proofingNumber" style="width: 100%" />
+            <el-form-item label="打样开始日期" required>
+              <el-date-picker
+                v-model="proofDialogData.planStartDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -703,14 +712,11 @@
 
         <el-row :gutter="16">
           <el-col :span="6">
-            <el-form-item label="打样开始日期" required>
-              <el-date-picker
-                v-model="proofDialogData.planStartDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-                style="width: 100%">
-              </el-date-picker>
+            <el-form-item label="数量" required>
+              <el-input v-model="proofDialogData.proofingNumber" style="width: 100%" />
+              <div v-if="proofDialogSelectedApplyOption" class="apply-qty-reference">
+                试验申请数量：{{ getApplyQuantityDisplayText(proofDialogSelectedApplyOption.applyQuantity) }}
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -726,7 +732,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注">
-              <el-input v-model="proofDialogData.remark" style="width: 100%" type="textarea" :rows="2"></el-input>
+              <el-input v-model="proofDialogData.remark" style="width: 100%" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1144,6 +1150,24 @@ export default {
       }
       const visibleColumns = this.processColumns.filter(item => visibleCodes.indexOf(item.code) > -1)
       return visibleColumns.length > 0 ? visibleColumns : this.processColumns
+    },
+    oneKeySelectedApplyOption () {
+      const selectedApplyNo = this.oneKeyForm && !this.isBlankValue(this.oneKeyForm.proofingNo)
+        ? String(this.oneKeyForm.proofingNo).trim()
+        : ''
+      if (!selectedApplyNo) {
+        return null
+      }
+      return this.oneKeyProofingApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null
+    },
+    proofDialogSelectedApplyOption () {
+      const selectedApplyNo = this.proofDialogData && !this.isBlankValue(this.proofDialogData.proofingNo)
+        ? String(this.proofDialogData.proofingNo).trim()
+        : ''
+      if (!selectedApplyNo) {
+        return null
+      }
+      return this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null
     }
   },
   methods: {
@@ -2137,6 +2161,12 @@ export default {
     isBlankValue (value) {
       return value == null || String(value).trim() === ''
     },
+    getApplyQuantityDisplayText (applyQuantity) {
+      if (this.isBlankValue(applyQuantity)) {
+        return '未维护'
+      }
+      return String(applyQuantity).trim()
+    },
     normalizeProjectNo (projectNo) {
       if (this.isBlankValue(projectNo)) {
         return ''
@@ -2181,7 +2211,8 @@ export default {
           optionMap[applyNo] = true
           optionRows.push({
             applyNo: applyNo,
-            expectedFinishDate: this.formatDate(item.expectedFinishDate)
+            expectedFinishDate: this.formatDate(item.expectedFinishDate),
+            applyQuantity: this.isBlankValue(item.quantityReq) ? '' : String(item.quantityReq).trim()
           })
         })
         return optionRows
@@ -2238,7 +2269,8 @@ export default {
             // 历史记录可能早于 ERF 规范化，保留原打样单号避免编辑场景被强制清空。
             nextOptions.unshift({
               applyNo: currentProofingNo,
-              expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate)
+              expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate),
+              applyQuantity: ''
             })
           }
           if (!hasCurrent && !keepCurrentIfMissing) {
@@ -3559,6 +3591,16 @@ export default {
   margin-bottom: 10px;
 }
 
+.apply-qty-reference {
+  margin-top: 6px;
+  padding: 4px 8px;
+  border-radius: 4px;
+  background: #ecf5ff;
+  color: #2667a8;
+  font-size: 12px;
+  line-height: 18px;
+}
+
 .big-label a {
   color: #35b4b4;
 }