From d680da2d83e7b4342de1f9c5cec902de5438e33a Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Sun, 1 Mar 2026 00:07:16 +0800
Subject: [PATCH] 1

---
 .../docSync/components/TencentDocConfig.vue   | 26 ++++++-----------
 .../components/TencentDocAutoWriteConfig.vue  | 28 ++++++-------------
 src/views/system/jdorder/orderList.vue        |  4 +--
 3 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/src/views/jarvis/docSync/components/TencentDocConfig.vue b/src/views/jarvis/docSync/components/TencentDocConfig.vue
index d689bc7..95fb19b 100644
--- a/src/views/jarvis/docSync/components/TencentDocConfig.vue
+++ b/src/views/jarvis/docSync/components/TencentDocConfig.vue
@@ -154,39 +154,29 @@
           </div>
         </el-card>
 
-        <!-- 同步进度 -->
+        <!-- 表格行数（从接口获取，用于决定同步范围） -->
         <el-card v-if="config.progressHint || config.currentProgress" class="progress-card-wrapper">
           <div slot="header" class="card-header">
             <i class="el-icon-data-line"></i>
-            <span>同步进度</span>
+            <span>表格行数</span>
           </div>
           <div class="progress-content">
             <div v-if="config.currentProgress" class="progress-detail">
               <div class="progress-item">
-                <span class="label">当前进度</span>
-                <span class="value">第 {{ config.currentProgress }} 行</span>
+                <span class="label">当前有数据行数</span>
+                <span class="value">第 {{ config.currentProgress }} 行（接口获取）</span>
               </div>
               <div class="progress-item">
-                <span class="label">下次同步</span>
-                <span class="value">
-                  <template v-if="config.currentProgress <= (form.startRow + 49)">
-                    第 {{ form.startRow }} 行
-                  </template>
-                  <template v-else-if="config.currentProgress > (form.startRow + 100)">
-                    第 {{ config.currentProgress - 100 }} 行
-                  </template>
-                  <template v-else>
-                    第 {{ form.startRow }} 行
-                  </template>
-                </span>
+                <span class="label">下次同步起始</span>
+                <span class="value">第 {{ config.nextStartRow != null ? config.nextStartRow : form.startRow }} 行</span>
               </div>
               <div class="progress-hint">
                 <i class="el-icon-info"></i>
-                系统自动回溯检查，防止遗漏
+                由接口实时获取表格行数，不再使用本地保存的进度
               </div>
             </div>
             <div v-else class="no-progress">
-              {{ config.progressHint || '暂无同步进度' }}
+              {{ config.progressHint || '暂无表格行数（请先授权并配置）' }}
             </div>
           </div>
         </el-card>
diff --git a/src/views/system/jdorder/components/TencentDocAutoWriteConfig.vue b/src/views/system/jdorder/components/TencentDocAutoWriteConfig.vue
index 41be51b..9f32600 100644
--- a/src/views/system/jdorder/components/TencentDocAutoWriteConfig.vue
+++ b/src/views/system/jdorder/components/TencentDocAutoWriteConfig.vue
@@ -135,39 +135,29 @@
           </div>
         </div>
 
-        <!-- 同步进度 -->
-        <div v-if="config.progressHint" class="progress-card">
+        <!-- 表格行数（从接口获取，用于决定同步范围） -->
+        <div v-if="config.progressHint || config.currentProgress" class="progress-card">
           <div class="card-header">
             <i class="el-icon-data-line"></i>
-            <span>同步进度</span>
+            <span>表格行数</span>
           </div>
           <div class="progress-content">
             <div v-if="config.currentProgress" class="progress-detail">
               <div class="progress-item">
-                <span class="label">当前进度</span>
-                <span class="value">第 {{ config.currentProgress }} 行</span>
+                <span class="label">当前有数据行数</span>
+                <span class="value">第 {{ config.currentProgress }} 行（接口获取）</span>
               </div>
               <div class="progress-item">
-                <span class="label">下次同步</span>
-                <span class="value">
-                  <template v-if="config.currentProgress <= (form.startRow + 49)">
-                    第 {{ form.startRow }} 行
-                  </template>
-                  <template v-else-if="config.currentProgress > (form.startRow + 100)">
-                    第 {{ config.currentProgress - 100 }} 行
-                  </template>
-                  <template v-else>
-                    第 {{ form.startRow }} 行
-                  </template>
-                </span>
+                <span class="label">下次同步起始</span>
+                <span class="value">第 {{ config.nextStartRow != null ? config.nextStartRow : form.startRow }} 行</span>
               </div>
               <div class="progress-hint">
                 <i class="el-icon-info"></i>
-                系统自动回溯检查，防止遗漏
+                由接口实时获取表格行数，不再使用本地保存的进度
               </div>
             </div>
             <div v-else class="no-progress">
-              {{ config.progressHint }}
+              {{ config.progressHint || '暂无表格行数（请先授权并配置）' }}
             </div>
           </div>
         </div>
diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 152a582..f9c3f08 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -1507,8 +1507,8 @@ export default {
         confirmMsg += `数据起始行: ${config.startRow}\n`
         
         if (config.currentProgress) {
-          confirmMsg += `\n当前进度: 第 ${config.currentProgress} 行\n`
-          confirmMsg += config.progressHint + '\n'
+          confirmMsg += `\n表格行数: 第 ${config.currentProgress} 行（接口获取）\n`
+          confirmMsg += (config.progressHint || '') + '\n'
         }
         
         confirmMsg += `\n防重推送: ${config.skipPushedOrders ? '已启用（跳过已推送订单）' : '已禁用'}\n`