Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/views/dictType/DictTypeItem.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/dictType/dictTypeItem/list',
+  save='/dictType/dictTypeItem/add',
+  edit='/dictType/dictTypeItem/edit',
+  deleteOne = '/dictType/dictTypeItem/delete',
+  deleteBatch = '/dictType/dictTypeItem/deleteBatch',
+  importExcel = '/dictType/dictTypeItem/importExcel',
+  exportXls = '/dictType/dictTypeItem/exportXls',
+}
+
+/**
+ * 导出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 });
+}

src/views/dictType/DictTypeItem.data.ts

@@ -0,0 +1,48 @@
+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: 'itemText'
+  },
+  {
+    title: '字典项值',
+    align: "center",
+    dataIndex: 'itemValue'
+  },
+  {
+    title: '描述',
+    align: "center",
+    dataIndex: 'description'
+  },
+  {
+    title: '排序',
+    align: "center",
+    dataIndex: 'sortOrder'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status',
+    format(text, record, index) {
+      return text == 1 ? '启用' : '未启用'
+    },
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  dictId: {title: '字典id',order: 0,view: 'text', type: 'string',},
+  itemText: {title: '字典项文本',order: 1,view: 'text', type: 'string',},
+  itemValue: {title: '字典项值',order: 2,view: 'text', type: 'string',},
+  description: {title: '描述',order: 3,view: 'text', type: 'string',},
+  sortOrder: {title: '排序',order: 4,view: 'number', type: 'number',},
+  status: {title: '状态（1启用 0不启用）',order: 5,view: 'number', type: 'number',},
+  createTime: {title: '创建时间',order: 6,view: 'datetime', type: 'string',},
+  updateTime: {title: '更新时间',order: 7,view: 'datetime', type: 'string',},
+};

src/views/dictType/DictTypeItemList.vue

@@ -0,0 +1,249 @@
+<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-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" 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>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DictTypeItemModal ref="registerModal" @success="handleSuccess" :dictId="dictId"></DictTypeItemModal>
+  </div>
+</template>
+
+<script lang="ts" name="dictType-dictTypeItem" setup>
+import { ref, reactive, onMounted } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './DictTypeItem.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DictTypeItem.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import DictTypeItemModal from './components/DictTypeItemModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+
+const props = defineProps({
+  dictId: { type: String, default: () => ({}) },
+});
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: 'dict_type_item',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      params.column = 'sortOrder'
+      params.order = 'asc'
+      params.dictId = props.dictId
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "dict_type_item",
+    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,
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  searchQuery();
+}
+
+/**
+ * 新增事件
+ */
+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)
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      }
+    }
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+onMounted(() => {
+  //刷新数据
+  reload();
+})
+
+</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>

src/views/dictType/DictTypeList.vue

@@ -2,25 +2,27 @@
   <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-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="dictName">
               <template #label><span title="字典名称">字典名称</span></template>
-            <JInput v-model:value="queryParam.dictName"/>
+              <JInput v-model:value="queryParam.dictName" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="dictCode">
               <template #label><span title="字典编码">字典编码</span></template>
-            <JInput v-model:value="queryParam.dictCode"/>
+              <JInput v-model:value="queryParam.dictCode" />
             </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-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
                 <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -35,9 +37,12 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'dictType:dict_type:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'dictType:dict_type:add'" @click="handleAdd"
-        <a-button  type="primary" v-auth="'dictType:dict_type:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <j-upload-button  type="primary" v-auth="'dictType:dict_type:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" v-auth="'dictType:dict_type:exportXls'" preIcon="ant-design:export-outlined"
+          @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'dictType:dict_type:importExcel'" preIcon="ant-design:import-outlined"
+          @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -56,7 +61,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -64,34 +69,44 @@
     <!-- 表单区域 -->
     <DictTypeModal ref="registerModal" @success="handleSuccess"></DictTypeModal>
   </div>
+
+  <a-drawer title="字典项" width="60vw" :open="itemOpen" @close="onItemClose">
+    <template #footer>
+      <a-button type="primary" @click="onItemClose" style="float: right;">关闭</a-button>
+    </template>
+    <DictTypeItemList v-if="itemOpen" :dictId="dictId"></DictTypeItemList>
+  </a-drawer>
 </template>
 
 <script lang="ts" name="dictType-dictType" setup>
-  import { ref, reactive } from 'vue';
+import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
+import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './DictType.data';
+import { columns, superQuerySchema } from './DictType.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DictType.api';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DictType.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
+import { downloadFile } from '/@/utils/common/renderUtils';
-  import DictTypeModal from './components/DictTypeModal.vue'
+import DictTypeModal from './components/DictTypeModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
+import { useUserStore } from '/@/store/modules/user';
-  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import DictTypeItemList from './DictTypeItemList.vue';
 
-  const formRef = ref();
+const formRef = ref();
-  const queryParam = reactive<any>({});
+const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
+const toggleSearchStatus = ref<boolean>(false);
-  const registerModal = ref();
+const registerModal = ref();
-  const userStore = useUserStore();
+const userStore = useUserStore();
-  //注册table数据
+const itemOpen = ref(false)
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+const dictId = ref(null)
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-      title: '业务字典主表',
+    title: 'dict_type',
     api: list,
     columns,
-      canResize:false,
+    canResize: false,
     useSearchForm: false,
     actionColumn: {
-        width: 120,
+      width: 200,
       fixed: 'right',
     },
     beforeFetch: async (params) => {
@@ -99,7 +114,7 @@
     },
   },
   exportConfig: {
-      name: "业务字典主表",
+    name: "dict_type",
     url: getExportUrl,
     params: queryParam,
   },
@@ -107,126 +122,128 @@
     url: getImportUrl,
     success: handleSuccess
   },
-  });
+});
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
+const labelCol = reactive({
-    xs:24,
+  xs: 24,
-    sm:4,
+  sm: 4,
-    xl:6,
+  xl: 6,
-    xxl:4
+  xxl: 4
-  });
+});
-  const wrapperCol = reactive({
+const wrapperCol = reactive({
   xs: 24,
   sm: 20,
-  });
+});
 
-  // 高级查询配置
+// 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
+const superQueryConfig = reactive(superQuerySchema);
 
-  /**
+/**
  * 高级查询事件
  */
-  function handleSuperQuery(params) {
+function handleSuperQuery(params) {
   Object.keys(params).map((k) => {
     queryParam[k] = params[k];
   });
   searchQuery();
-  }
+}
 
-  /**
+/**
  * 新增事件
  */
-  function handleAdd() {
+function handleAdd() {
   registerModal.value.disableSubmit = false;
   registerModal.value.add();
-  }
+}
 
-  /**
+/**
  * 编辑事件
  */
-  function handleEdit(record: Recordable) {
+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) {
+async function handleDelete(record) {
   await deleteOne({ id: record.id }, handleSuccess);
-  }
+}
 
-  /**
+/**
  * 批量删除事件
  */
-  async function batchHandleDelete() {
+async function batchHandleDelete() {
   await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
+}
 
-  /**
+/**
  * 成功回调
  */
-  function handleSuccess() {
+function handleSuccess() {
   (selectedRowKeys.value = []) && reload();
-  }
+}
 
-  /**
+/**
+ * 字典配置
+ */
+function handleItem(record) {
+  dictId.value = record.id
+  itemOpen.value = true
+}
+
+/**
+ * 关闭字典配置抽屉
+ */
+function onItemClose(){
+  dictId.value = null
+  itemOpen.value = false
+}
+
+/**
  * 操作栏
  */
-  function getTableAction(record) {
+function getTableAction(record) {
   return [
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),
       auth: 'dictType:dict_type:edit'
     },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
     {
-        label: '详情',
+      label: '字典配置',
-        onClick: handleDetail.bind(null, record),
+      onClick: handleItem.bind(null, record)
     }, {
       label: '删除',
       popConfirm: {
-          title: '是否确认删除',
+        title: '是否确认删除：' + record.dictName,
         confirm: handleDelete.bind(null, record),
         placement: 'topLeft',
       },
       auth: 'dictType:dict_type:delete'
     }
-    ]
+  ];
-  }
+}
 
-  /**
+
+/**
  * 查询
  */
-  function searchQuery() {
+function searchQuery() {
   reload();
-  }
+}
 
-  /**
+/**
  * 重置
  */
-  function searchReset() {
+function searchReset() {
   formRef.value.resetFields();
   selectedRowKeys.value = [];
   //刷新数据
   reload();
-  }
+}
 
 
 
@@ -234,27 +251,33 @@
 </script>
 
 <style lang="less" scoped>
-  .jeecg-basic-table-form-container {
+.jeecg-basic-table-form-container {
   padding: 0;
+
   .table-page-search-submitButtons {
     display: block;
     margin-bottom: 24px;
     white-space: nowrap;
   }
-    .query-group-cust{
+
+  .query-group-cust {
     min-width: 100px !important;
   }
-    .query-group-split-cust{
+
+  .query-group-split-cust {
     width: 30px;
     display: inline-block;
     text-align: center
   }
-    .ant-form-item:not(.ant-form-item-with-help){
+
+  .ant-form-item:not(.ant-form-item-with-help) {
     margin-bottom: 16px;
     height: 32px;
   }
-    :deep(.ant-picker),:deep(.ant-input-number){
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
     width: 100%;
   }
-  }
+}
 </style>

src/views/dictType/components/DictTypeForm.vue

@@ -11,7 +11,7 @@
 						</a-col>
 						<a-col :span="24">
 							<a-form-item label="字典编码" v-bind="validateInfos.dictCode" id="DictTypeForm-dictCode" name="dictCode">
-								<a-input v-model:value="formData.dictCode" placeholder="请输入字典编码"  allow-clear ></a-input>
+								<a-input v-model:value="formData.dictCode" placeholder="请输入字典编码" :readonly="!!formData.id" allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">

src/views/dictType/components/DictTypeItemForm.vue

@@ -0,0 +1,197 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="DictTypeItemForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="字典项名称" v-bind="validateInfos.itemText" id="DictTypeItemForm-itemText" name="itemText">
+                <a-input v-model:value="formData.itemText" placeholder="请输入字典项文本" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="字典项值" v-bind="validateInfos.itemValue" id="DictTypeItemForm-itemValue"
+                name="itemValue">
+                <a-input v-model:value="formData.itemValue" placeholder="请输入字典项值" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="描述" v-bind="validateInfos.description" id="DictTypeItemForm-description"
+                name="description">
+                <a-input v-model:value="formData.description" placeholder="请输入描述" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="排序" v-bind="validateInfos.sortOrder" id="DictTypeItemForm-sortOrder" name="sortOrder">
+                <a-input-number v-model:value="formData.sortOrder" placeholder="请输入排序" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="状态" v-bind="validateInfos.status" id="DictTypeItemForm-status" name="status">
+                <a-radio-group v-model:value="formData.status" style="width: 100%">
+                  <a-radio :value="1">启用</a-radio>
+                  <a-radio :value="0">不启用</a-radio>
+                </a-radio-group>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="创建时间" v-bind="validateInfos.createTime" id="DictTypeItemForm-createTime"
+                name="createTime">
+                <a-date-picker placeholder="请选择创建时间" v-model:value="formData.createTime" showTime
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="更新时间" v-bind="validateInfos.updateTime" id="DictTypeItemForm-updateTime"
+                name="updateTime">
+                <a-date-picker placeholder="请选择更新时间" v-model:value="formData.updateTime" showTime
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
+              </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 { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../DictTypeItem.api';
+import { Form } from 'ant-design-vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => ({}) },
+  formBpm: { type: Boolean, default: true },
+  dictId: { type: Object, default: () => ({}) },
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  dictId: '',
+  itemText: '',
+  itemValue: '',
+  description: '',
+  sortOrder: undefined,
+  status: 1,
+  createTime: '',
+  updateTime: '',
+});
+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({
+  itemText: [{ required: true, message: '请输入字典项文本!' },],
+  itemValue: [{ required: true, message: '请输入字典项值!' },],
+  sortOrder: [{ 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);
+  }
+  formData.dictId = props.dictId
+  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;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  padding: 14px;
+}
+</style>

src/views/dictType/components/DictTypeItemModal.vue

@@ -0,0 +1,80 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DictTypeItemForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false" :dictId="dictId"></DictTypeItemForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import DictTypeItemForm from './DictTypeItemForm.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']);
+  const props = defineProps({
+    dictId:{ type: Object, default: () => ({})},
+  });
+
+  /**
+   * 新增
+   */
+  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>