From d9443bb30614059e280e2cf1ff4b04eccb8a907e Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 17 Aug 2026 10:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8B=BE=E5=8A=9F=E8=83=BD=E6=98=AF?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AF=A5=E5=B7=A5=E5=BA=8F=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=90=8C=E6=97=B6=E8=83=8C=E6=99=AF=E7=BD=AE?=
 =?UTF-8?q?=E7=81=B0=EF=BC=8C=E4=B8=8D=E6=98=AF=E7=BB=99=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=82=E6=97=A5=E6=9C=9F=E4=B8=80=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=B0=B1=E4=BC=9A=E5=85=A8=E9=83=A8=E6=8E=92=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sampleTracking/projectProofTracking.vue   | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue
index 0275045..143aaeb 100644
--- a/src/views/modules/sampleTracking/projectProofTracking.vue
+++ b/src/views/modules/sampleTracking/projectProofTracking.vue
@@ -120,14 +120,14 @@
         v-for="(item, processColumnIndex) in visibleProcessColumns"
         :key="`${item.code}_${item.sortNo || ''}_${processColumnIndex}`"
         :label="item.label"
-        width="120"
+        width="134"
         align="center"
         header-align="center"
       >
         <template slot-scope="scope">
           <div
             v-if="isProcessColumnVisibleForRow(scope.row, item)"
-            :class="['process-cell', isProcessComplete(scope.row, item) ? 'is-complete' : '']"
+            :class="['process-cell', isProcessStatusComplete(scope.row, item) ? 'is-complete' : '']"
           >
             <el-date-picker
               v-if="batchEditMode"
@@ -140,7 +140,7 @@
             />
             <div
               v-else
-              class="process-content"
+              :class="['process-content', isProcessStatusComplete(scope.row, item) ? 'is-complete' : '']"
               @mouseenter="handleProcessTooltipMouseEnter(scope.row, item, $event)"
               @mousemove="handleProcessTooltipMouseMove($event)"
               @mouseleave="handleProcessTooltipMouseLeave"
@@ -158,8 +158,8 @@
                 class="process-complete-btn"
                 type="success"
                 size="mini"
-                plain v-show="!isProcessComplete(scope.row, item)"
-                :disabled="isProcessComplete(scope.row, item)"
+                plain v-show="!isProcessStatusComplete(scope.row, item)"
+                :disabled="isProcessStatusComplete(scope.row, item)"
                 @click.stop="markProcessComplete(scope.row, item)"
               >√</el-button>
             </div>
@@ -3001,22 +3001,25 @@ export default {
         return
       }
       const actualDate = this.formatDate(dateVal)
-      // 工序日期被清空时，状态必须回退为“未完成”，避免出现“无日期但已完成”的脏状态。
-      const nextStatus = actualDate ? '已完成' : '未完成'
+      // 业务要求：表格选择日期仅更新日期，不自动改变工序状态（状态由“√”动作控制）。
+      const currentStatus = row[processCol.statusField] ? String(row[processCol.statusField]).trim() : ''
+      const nextStatus = currentStatus || '未完成'
       this.updateProcessFromTable(row, processCol, {
         status: nextStatus,
         actualDate: actualDate,
-        remark: actualDate ? '表格直接选择日期' : '表格清空实际完成日期'
+        remark: actualDate ? '表格直接修改实际完成日期（状态不变）' : '表格清空实际完成日期（状态不变）'
       }, true)
     },
     markProcessComplete (row, processCol) {
-      if (!row || !processCol || this.isProcessComplete(row, processCol)) {
+      if (!row || !processCol || this.isProcessStatusComplete(row, processCol)) {
         return
       }
-      const today = this.formatDate(new Date())
+      // 若用户已手工选择日期，打勾仅改状态，不覆盖已选日期；无日期时才补当天。
+      const currentActualDate = this.formatDate(row[processCol.actualField])
+      const nextActualDate = currentActualDate || this.formatDate(new Date())
       this.updateProcessFromTable(row, processCol, {
         status: '已完成',
-        actualDate: today,
+        actualDate: nextActualDate,
         remark: '表格一键完成'
       }, false, '工序已标记为完成')
     },
@@ -3330,6 +3333,20 @@ export default {
       }
       return historyDateList.join('\n')
     },
+    isProcessStatusComplete (row, processCol) {
+      if (!row || !processCol) {
+        return false
+      }
+      const statusVal = row[processCol.statusField]
+      const status = statusVal ? String(statusVal).trim() : ''
+      if (!status || status === '未完成' || status === '进行中') {
+        return false
+      }
+      if (status === '已完成' || status === '打样完成') {
+        return true
+      }
+      return status.indexOf('完成') > -1 && status.indexOf('未') === -1
+    },
     isProcessComplete (row, processCol) {
       if (!row || !processCol) {
         return false
@@ -3676,6 +3693,17 @@ export default {
   background: #ececec;
 }
 
+.process-cell.is-complete .el-input__inner {
+  background: #ececec;
+  border-color: #d5d7de;
+  color: #8c8c8c;
+}
+
+.process-cell.is-complete .el-input.is-disabled .el-input__inner {
+  background: #ececec;
+  color: #8c8c8c;
+}
+
 .process-cell.is-complete .link-date {
   color: #8c8c8c;
 }