From 1628d64e44ffaebb8e454d8277c1a969c29bbea8 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 12 May 2025 14:48:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5bug=202=E3=80=81=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=EF=BC=88=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8B=E5=8F=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dataAsync/AsyncMainList.vue    |   1 +
 src/views/admin/sysconfig/SysConfig.api.ts    |  91 ++++
 src/views/admin/sysconfig/SysConfig.data.ts   |  43 ++
 src/views/admin/sysconfig/SysConfigList.vue   | 444 ++++++++++++++++++
 .../sysconfig/components/SysConfigForm.vue    | 180 +++++++
 .../sysconfig/components/SysConfigModal.vue   |  77 +++
 src/views/synchronization/directive/index.vue |  19 +-
 src/views/system/dict/index.vue               |   3 +-
 8 files changed, 854 insertions(+), 4 deletions(-)
 create mode 100644 src/views/admin/sysconfig/SysConfig.api.ts
 create mode 100644 src/views/admin/sysconfig/SysConfig.data.ts
 create mode 100644 src/views/admin/sysconfig/SysConfigList.vue
 create mode 100644 src/views/admin/sysconfig/components/SysConfigForm.vue
 create mode 100644 src/views/admin/sysconfig/components/SysConfigModal.vue

diff --git a/src/components/dataAsync/AsyncMainList.vue b/src/components/dataAsync/AsyncMainList.vue
index 22332e8..a2564f2 100644
--- a/src/components/dataAsync/AsyncMainList.vue
+++ b/src/components/dataAsync/AsyncMainList.vue
@@ -64,6 +64,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     showTableSetting: false,
     showActionColumn: false,
     beforeFetch: async (params) => {
+      queryParam.type = 'directive'
       return Object.assign(params, queryParam);
     },
   },
diff --git a/src/views/admin/sysconfig/SysConfig.api.ts b/src/views/admin/sysconfig/SysConfig.api.ts
new file mode 100644
index 0000000..9fb96f7
--- /dev/null
+++ b/src/views/admin/sysconfig/SysConfig.api.ts
@@ -0,0 +1,91 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/sysconfig/sysConfig/list',
+  save='/sysconfig/sysConfig/add',
+  edit='/sysconfig/sysConfig/edit',
+  deleteOne = '/sysconfig/sysConfig/delete',
+  deleteBatch = '/sysconfig/sysConfig/deleteBatch',
+  importExcel = '/sysconfig/sysConfig/importExcel',
+  exportXls = '/sysconfig/sysConfig/exportXls',
+  async = '/sysconfig/sysConfig/async',
+  listByType = '/asyncmain/asyncMain/listByType',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+/**
+ * 同步数据
+ * @param params
+ */
+export const asyncData = (params) => {
+  return defHttp.post({ url: Api.async, params });
+};
+
+/**
+ * 查询同步结果
+ * @param params 
+ * @returns 
+ */
+export const listByType = (params) => {
+  return defHttp.post({ url: Api.listByType, params });
+};
\ No newline at end of file
diff --git a/src/views/admin/sysconfig/SysConfig.data.ts b/src/views/admin/sysconfig/SysConfig.data.ts
new file mode 100644
index 0000000..0590ada
--- /dev/null
+++ b/src/views/admin/sysconfig/SysConfig.data.ts
@@ -0,0 +1,43 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '参数名称',
+    align: "center",
+    dataIndex: 'name',
+  },
+  {
+    title: '键名',
+    align: "center",
+    dataIndex: 'configKey',
+  },
+  {
+    title: '键值',
+    align: "center",
+    dataIndex: 'configValue'
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'descr'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText',
+    width:100
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  name: {title: '参数名称',order: 0,view: 'text', type: 'string',},
+  configKey: {title: '键名',order: 1,view: 'text', type: 'string',},
+  configValue: {title: '键值',order: 2,view: 'textarea', type: 'string',},
+  descr: {title: '备注',order: 3,view: 'textarea', type: 'string',},
+  izEnabled: {title: '是否启用',order: 4,view: 'text', type: 'string',},
+};
diff --git a/src/views/admin/sysconfig/SysConfigList.vue b/src/views/admin/sysconfig/SysConfigList.vue
new file mode 100644
index 0000000..53e1290
--- /dev/null
+++ b/src/views/admin/sysconfig/SysConfigList.vue
@@ -0,0 +1,444 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="name">
+              <template #label><span title="参数名称">参数名称</span></template>
+              <JInput v-model:value="queryParam.name" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="configKey">
+              <template #label><span title="键名">键名</span></template>
+              <JInput v-model:value="queryParam.configKey" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="izEnabled">
+              <template #label><span title="是否启用">是否启用</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                placeholder="请选择是否启用"  allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'sysconfig:nu_sys_config:add'" @click="handleAdd"
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'sysconfig:nu_sys_config:exportXls'" preIcon="ant-design:export-outlined"
+          @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'sysconfig:nu_sys_config:importExcel'"
+          preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'sysconfig:nu_sys_config:deleteBatch'">批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <SysConfigModal ref="registerModal" @success="handleSuccess"></SysConfigModal>
+  </div>
+
+  <a-modal v-model:open="showAsyncResult" title="同步结果" @ok="showAsyncResult = false" width="70vw">
+    <a-tabs v-model:activeKey="activeTabKey" style="margin-left: 20px;margin-right: 20px;margin-bottom: 20px;">
+      <template #rightExtra>
+        <a-button type="primary" @click="AsyncResultFunc({ id: opeDictId })" size="small"
+          preIcon="ant-design:sync-outlined" style="margin-right: 10px;">刷新</a-button>
+      </template>
+      <a-tab-pane key="pending" :tab="`待同步 (${pendingList.length})`">
+        <a-table :dataSource="pendingList" :columns="resultColumns" :pagination="false" size="small" bordered
+          :scroll="{ y: '50vh' }">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-popconfirm title="确认同步？" @confirm="handleAsyncByOrgCode(record)">
+                <a href="#">同步</a>
+              </a-popconfirm>
+            </template>
+          </template>
+        </a-table>
+      </a-tab-pane>
+      <a-tab-pane key="error" :tab="`同步异常 (${errorList.length})`">
+        <a-table :dataSource="errorList" :columns="resultColumnsCT" :pagination="false" size="small" bordered
+          :scroll="{ y: '50vh' }">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-popconfirm title="确认同步？" @confirm="handleAsyncByOrgCode(record)">
+                <a href="#">同步</a>
+              </a-popconfirm>
+            </template>
+          </template>
+        </a-table>
+      </a-tab-pane>
+      <a-tab-pane key="processing" :tab="`同步中 (${processingList.length})`">
+        <a-table :dataSource="processingList" :columns="resultColumnsCT" :pagination="false" size="small" bordered
+          :scroll="{ y: '50vh' }">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-popconfirm title="确认同步？" @confirm="handleAsyncByOrgCode(record)">
+                <a href="#">同步</a>
+              </a-popconfirm>
+            </template>
+          </template>
+        </a-table>
+      </a-tab-pane>
+      <a-tab-pane key="success" :tab="`同步完成 (${successList.length})`">
+        <a-table :dataSource="successList" :columns="resultColumnsCT" :pagination="false" size="small" bordered
+          :scroll="{ y: '50vh' }">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-popconfirm title="确认同步？" @confirm="handleAsyncByOrgCode(record)">
+                <a href="#">同步</a>
+              </a-popconfirm>
+            </template>
+          </template>
+        </a-table>
+      </a-tab-pane>
+    </a-tabs>
+  </a-modal>
+</template>
+
+<script lang="ts" name="sysconfig-sysConfig" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './SysConfig.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, asyncData, listByType } from './SysConfig.api';
+import SysConfigModal from './components/SysConfigModal.vue'
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import { useMessage } from '/src/hooks/web/useMessage';
+
+const { createMessage, createConfirm } = useMessage();
+const formRef = ref();
+const queryParam = reactive<any>({});
+const registerModal = ref();
+const showAsyncResult = ref(false)
+const activeTabKey = ref('error');
+const errorList = ref<Recordable[]>([]);
+const processingList = ref<Recordable[]>([]);
+const successList = ref<Recordable[]>([]);
+const pendingList = ref<Recordable[]>([]);
+const resultColumns = [
+  {
+    title: '机构名称',
+    dataIndex: 'orgName',
+    key: 'orgName',
+  },
+  {
+    title: '机构编码',
+    dataIndex: 'orgCode',
+    key: 'orgCode',
+  },
+  {
+    title: '备注',
+    dataIndex: 'descr',
+    key: 'descr',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    key: 'action',
+    align: 'center',
+    width: '100px'
+  },
+];
+const resultColumnsCT = [
+  {
+    title: '机构名称',
+    dataIndex: 'orgName',
+    key: 'orgName',
+  },
+  {
+    title: '机构编码',
+    dataIndex: 'orgCode',
+    key: 'orgCode',
+  },
+  {
+    title: '备注',
+    dataIndex: 'descr',
+    key: 'descr',
+  },
+  {
+    title: '同步开始时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    key: 'action',
+    align: 'center',
+    width: '100px'
+  },
+];
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '系统参数配置',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 230,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "系统参数配置",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 4,
+  xl: 6,
+  xxl: 4
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+});
+
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      auth: 'sysconfig:nu_sys_config:edit'
+    },
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      auth: 'sysconfig:nu_sys_config:delete'
+    }
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '同步',
+      onClick: AsyncResultFunc.bind(null, Object.assign({}, record, { tabAction: 'pending' })),
+    },
+    {
+      label: '全部同步',
+      onClick: handleAsync.bind(null, record),
+    },
+    {
+      label: '同步结果',
+      onClick: AsyncResultFunc.bind(null, Object.assign({}, record, { tabAction: 'error' })),
+    },
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+/**
+ * 同步
+ */
+function handleAsync(record) {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认同步',
+    content: '确定要同步该字典数据吗？',
+    onOk: () => {
+      return new Promise((resolve, reject) => {
+        asyncData(record)
+          .then(res => {
+            createMessage.success("操作成功，请在同步结果中进行查看！");
+            resolve(res);
+          })
+          .catch(err => {
+            createMessage.error('同步失败: ' + err.message);
+            reject(err);
+          });
+      });
+    },
+    onCancel: () => {
+      createMessage.info('已取消同步操作');
+    }
+  });
+}
+
+const opeDictId = ref('')
+/**
+ * 同步结果
+ */
+function AsyncResultFunc(record) {
+  if (!record.id) {
+    return
+  }
+  opeDictId.value = record.id
+
+  showAsyncResult.value = true;
+  activeTabKey.value = record.tabAction
+
+  // 清空之前的数据
+  errorList.value = [];
+  processingList.value = [];
+  successList.value = [];
+  pendingList.value = [];
+  listByType({ primaryKey: record.id,type:'sys_config' }).then(res => {
+    if (res) {
+      errorList.value = res.errorList || [];
+      processingList.value = res.processingList || [];
+      successList.value = res.successList || [];
+      pendingList.value = res.pendingList || [];
+    }
+  });
+}
+
+function handleAsyncByOrgCode(record) {
+  asyncData({ id: opeDictId.value, orgCode: record.orgCode }).then(res => {
+    createMessage.success("操作成功，请稍后刷新数据查看同步结果！")
+  })
+}
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/admin/sysconfig/components/SysConfigForm.vue b/src/views/admin/sysconfig/components/SysConfigForm.vue
new file mode 100644
index 0000000..a19322a
--- /dev/null
+++ b/src/views/admin/sysconfig/components/SysConfigForm.vue
@@ -0,0 +1,180 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="SysConfigForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="参数名称" v-bind="validateInfos.name" id="SysConfigForm-name" name="name">
+                <a-input v-model:value="formData.name" placeholder="请输入参数名称" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="键名" v-bind="validateInfos.configKey" id="SysConfigForm-configKey" name="configKey">
+                <a-input v-model:value="formData.configKey" placeholder="请输入键名" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="键值" v-bind="validateInfos.configValue" id="SysConfigForm-configValue"
+                name="configValue">
+                <a-textarea v-model:value="formData.configValue" :rows="4" placeholder="请输入键值" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="备注" v-bind="validateInfos.descr" id="SysConfigForm-descr" name="descr">
+                <a-textarea v-model:value="formData.descr" :rows="4" placeholder="请输入备注" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="SysConfigForm-izEnabled" name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用"  allowClear />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../SysConfig.api';
+import { Form } from 'ant-design-vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+import { duplicateValidate } from '/@/utils/helper/validator'
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => ({}) },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  name: '',
+  configKey: '',
+  configValue: '',
+  descr: '',
+  izEnabled: '0',
+  delFlag: '0',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = reactive({
+  configKey: [{ required: true, message: '请输入键名!' }, { validator: configKeyDuplicatevalidate }],
+  izEnabled: [{ required: true, message: '请输入是否启用!' },],
+});
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    const tmpData = {};
+    Object.keys(formData).forEach((key) => {
+      if (record.hasOwnProperty(key)) {
+        tmpData[key] = record[key]
+      }
+    })
+    //赋值
+    Object.assign(formData, tmpData);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  try {
+    // 触发表单验证
+    await validate();
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+      }
+    }
+    return Promise.reject(errorFields);
+  }
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+async function configKeyDuplicatevalidate(_r, value) {
+  return duplicateValidate('nu_sys_config', 'config_key', value, formData.id || '')
+}
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  padding: 14px;
+}
+</style>
diff --git a/src/views/admin/sysconfig/components/SysConfigModal.vue b/src/views/admin/sysconfig/components/SysConfigModal.vue
new file mode 100644
index 0000000..84388fd
--- /dev/null
+++ b/src/views/admin/sysconfig/components/SysConfigModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <SysConfigForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></SysConfigForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import SysConfigForm from './SysConfigForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/synchronization/directive/index.vue b/src/views/synchronization/directive/index.vue
index 8ed8a94..38bf32c 100644
--- a/src/views/synchronization/directive/index.vue
+++ b/src/views/synchronization/directive/index.vue
@@ -442,7 +442,7 @@ const loadOrgData = async (org) => {
         initialDataIds.value = [];
 
         // 加载新机构数据
-        const res = await list({ dataSourceCode: org.orgCode });
+        const res = await list({ dataSourceCode: org.orgCode, pageNo: 1, pageSize: -1 });
 
         // 更新机构数据
         orgData.value = org;
@@ -501,7 +501,22 @@ const handleAsync = () => {
                 izInc,
                 idStr
             }
-            asyncFunc(params)
+            await asyncFunc(params)
+
+            //处理右侧列表数据移除是否可用 如果已到运营时间则禁用
+            if (!orgData.value?.operationStartTime || new Date() >= new Date(orgData.value?.operationStartTime)) {
+                // 获取当前同步的ID数组
+                const syncedIds = Array.from(selectedItems.value.keys());
+                // 只添加initialDataIds中不存在的ID
+                syncedIds.forEach(id => {
+                    if (!initialDataIds.value.includes(id)) {
+                        initialDataIds.value.push(id);
+                    }
+                });
+            }
+            
+            //刷新历史数据
+            refreshHistory()
             createMessage.success("同步结果请在同步历史中查看！");
         },
     });
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index c46c495..5e80872 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -355,7 +355,6 @@ const opeDictId = ref('')
  * 同步结果
  */
 function AsyncResultFunc(record) {
-  console.log("🌊 ~ AsyncResultFunc ~ record:", record)
   if (!record.id) {
     return
   }
@@ -369,7 +368,7 @@ function AsyncResultFunc(record) {
   processingList.value = [];
   successList.value = [];
   pendingList.value = [];
-  listByType({ primaryKey: record.id }).then(res => {
+  listByType({ primaryKey: record.id,type:'sys_dict' }).then(res => {
     if (res) {
       errorList.value = res.errorList || [];
       processingList.value = res.processingList || [];