Merge remote-tracking branch 'origin/master'

src/views/system/dept.vue

@@ -165,6 +165,9 @@
             <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
           </div>
         </div>
+        <div v-if="oaSyncProgress.dumpFilePath" class="oa-sync-meta">
+          原始数据 JSON：{{ oaSyncProgress.dumpFilePath }}
+        </div>
       </div>
       <template #footer>
         <span class="dialog-footer">
@@ -253,6 +256,7 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
       },
       parentId: 0,
       page: {
@@ -658,7 +662,7 @@ export default {
   methods: {
     handleOaOrgFullSync() {
       this.$confirm(
-        '全量同步将拉取 OA 全部公司/部门；已存在且 OA 更新时间一致的记录会跳过。是否清除后同步？选择“是”将保留顶级「外部组织」与集团锚点(id=135/GWWL)，删除其余组织后再同步；选择“否”则直接全量同步。',
+        '全量同步将拉取 OA 公司/部门（仅保留二级公司 oaId=2、135 及其子公司与部门）；已存在且 OA 更新时间一致的记录会跳过。是否清除后同步？选择“是”将保留顶级「外部组织」与集团锚点(id=1/GWWL)，删除其余组织后再同步；选择“否”则直接全量同步。',
         '全量同步',
         {
           confirmButtonText: '是',
@@ -709,6 +713,7 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
       };
       this.runOaOrgSyncPages();
     },
@@ -742,6 +747,9 @@ export default {
         this.oaSyncProgress.total = page.total || 0;
         this.oaSyncProgress.synced += page.syncedCount || 0;
         this.oaSyncProgress.skipped += page.skippedCount || 0;
+        if (page.dumpFilePath) {
+          this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
+        }
         if (page.finished) {
           break;
         }

src/views/system/user.vue

@@ -364,6 +364,9 @@
                 <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
               </div>
             </div>
+            <div v-if="oaSyncProgress.dumpFilePath" class="oa-sync-meta">
+              原始数据 JSON：{{ oaSyncProgress.dumpFilePath }}
+            </div>
           </div>
           <template #footer>
             <span class="dialog-footer">
@@ -450,6 +453,7 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
       },
       page: {
         pageSize: 10,
@@ -712,6 +716,7 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
       };
       this.runOaSyncPages();
     },
@@ -746,6 +751,9 @@ export default {
           this.oaSyncProgress.total = page.total || 0;
           this.oaSyncProgress.synced += page.syncedCount || 0;
           this.oaSyncProgress.skipped += page.skippedCount || 0;
+          if (page.dumpFilePath) {
+            this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
+          }
           if (page.finished) {
             this.oaSyncStatus = 'done';
             break;

src/views/vehicle/customer-archive.vue

@@ -486,7 +486,7 @@
                   :options="deptTree"
                   :props="deptCascaderProps"
                   disabled
-                  placeholder="桂物物流集团"
+                  placeholder="广西现代物流集团有限公司"
                 />
               </el-form-item>
             </el-col>
@@ -1588,7 +1588,7 @@ const customerArchiveListRoute = '/vehicle/customer-archive';
 const customerArchiveFormRoute = '/vehicle/customer-archive/form';
 const customerArchiveListRefreshKey = 'customer-archive-list-refresh';
 /** 客商所属组织固定为顶层组织 */
-const FIXED_OWNER_DEPT_NAME = '桂物物流集团';
+const FIXED_OWNER_DEPT_NAME = '广西现代物流集团有限公司';
 
 const createTimeRangeMap = {
   createTimeRange: ['createTimeStart', 'createTimeEnd'],
@@ -3205,7 +3205,7 @@ export default {
       );
     },
     /**
-     * 客商所属组织固定为顶层「桂物物流集团」，表单不可编辑。
+     * 客商所属组织固定为顶层「广西现代物流集团有限公司」，表单不可编辑。
      */
     applyFixedOwnerDept() {
       if (!this.isArchivePage || this.readonly) {