From b8efa56a30a6c6675777a7d1b284f1213abc1ae6 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 30 May 2025 16:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9C=81=E5=B8=82=E5=8C=BA=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/components/modal/NuSelectModal.vue  |   2 +-
 src/views/biz/nuBaseInfo/NuBaseInfo.data.ts   |   5 +
 .../nuBaseInfo/components/NuBaseInfoForm.vue  | 275 +++++++++---------
 src/views/system/category/category.api.ts     |   2 +-
 src/views/system/category/category.data.ts    |   6 +
 .../category/components/CategoryModal.vue     |   6 +-
 src/views/system/category/index.vue           |   3 +
 .../depart/components/DepartFormModal.vue     | 219 ++++++++------
 .../depart/components/DepartFormTab.vue       | 259 ++++++++++-------
 src/views/system/depart/depart.data.ts        |  32 +-
 10 files changed, 477 insertions(+), 332 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue
index 4ca1771..f9d8f55 100644
--- a/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue
@@ -122,7 +122,7 @@
       //定义表格列
       const columns = [
         {
-          title: '护理单元ID',
+          title: '护理单元编码',
           dataIndex: 'nuId',
           width: 180,
           align: 'left',
diff --git a/src/views/biz/nuBaseInfo/NuBaseInfo.data.ts b/src/views/biz/nuBaseInfo/NuBaseInfo.data.ts
index 43f1605..a0cd64e 100644
--- a/src/views/biz/nuBaseInfo/NuBaseInfo.data.ts
+++ b/src/views/biz/nuBaseInfo/NuBaseInfo.data.ts
@@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'nuName'
   },
+  {
+    title: '护理单元编码',
+    align: "center",
+    dataIndex: 'code'
+  },
   {
     title: '区域标签',
     align: "center",
diff --git a/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue b/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue
index ec896fb..c53b456 100644
--- a/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue
+++ b/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue
@@ -2,19 +2,27 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuBaseInfoForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="NuBaseInfoForm">
           <a-row>
-						<a-col :span="24">
-							<a-form-item label="护理单元名称" v-bind="validateInfos.nuName" id="NuBaseInfoForm-nuName" name="nuName">
-								<a-input v-model:value="formData.nuName" placeholder="请输入护理单元名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
-								<j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域标签ID"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<!-- <a-col :span="24">
+            <a-col :span="24">
+              <a-form-item label="护理单元名称" v-bind="validateInfos.nuName" id="NuBaseInfoForm-nuName" name="nuName">
+                <a-input v-model:value="formData.nuName" placeholder="请输入护理单元名称" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="护理单元编码" v-bind="validateInfos.code" id="NuBaseInfoForm-code" name="code">
+                <a-input v-model:value="formData.code" placeholder="编码自动生成" allow-clear :disabled="!formData.code"
+                  :readonly="formData.code"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
+                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域标签ID"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :span="24">
 							<a-form-item label="使用状态 0未使用 1占用 2入住 3退住 4留床" v-bind="validateInfos.status" id="NuBaseInfoForm-status" name="status">
 								<j-dict-select-tag v-model:value="formData.status" dictCode="nu_status" placeholder="请选择使用状态 0未使用 1占用 2入住 3退住 4留床"  allow-clear />
 							</a-form-item>
@@ -27,135 +35,136 @@
 </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 JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../NuBaseInfo.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 }
-  });
-  const formRef = ref();
-  const useForm = Form.useForm;
-  const emit = defineEmits(['register', 'ok']);
-  const formData = reactive<Record<string, any>>({
-    id: '',
-    nuName: '',   
-    areaFlag: '',   
-    status: '',   
-  });
-  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({
-  });
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../NuBaseInfo.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 }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  nuName: '',
+  code: '',
+  areaFlag: '',
+  status: '',
+});
+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({
+});
+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;
+// 表单禁用
+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 props.formDisabled;
-  });
-
-  
-  /**
-   * 新增
-   */
-  function add() {
-    edit({});
+    return Promise.reject(errorFields);
   }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      const tmpData = {};
-      Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
-        }
-      })
-      //赋值
-      Object.assign(formData, tmpData);
+  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(',');
+      }
+    }
+  }
+  if (!model.id) {
+    model.status = "0";
+  }
+  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 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(',');
-        }
-      }
-    }
-    if (!model.id) {
-      model.status = "0";
-    }
-    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,
-  });
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
 </script>
 
 <style lang="less" scoped>
-  .antd-modal-form {
-    padding: 14px;
-  }
+.antd-modal-form {
+  padding: 14px;
+}
 </style>
diff --git a/src/views/system/category/category.api.ts b/src/views/system/category/category.api.ts
index 9295745..18f9498 100644
--- a/src/views/system/category/category.api.ts
+++ b/src/views/system/category/category.api.ts
@@ -65,7 +65,7 @@ export const saveOrUpdateDict = (params, isUpdate) => {
  * 查询全部树形节点数据
  * @param params
  */
-export const loadTreeData = (params) => defHttp.get({ url: Api.loadTreeData, params });
+export const loadTreeData = (params) => defHttp.get({ url: Api.loadTreeData,timeout:100*1000, params });
 /**
  * 查询子节点数据
  * @param params
diff --git a/src/views/system/category/category.data.ts b/src/views/system/category/category.data.ts
index ae7b1e3..de8d3b6 100644
--- a/src/views/system/category/category.data.ts
+++ b/src/views/system/category/category.data.ts
@@ -64,4 +64,10 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'Input',
   },
+  {
+    label: '编码(非必要无需填写)',
+    field: 'code',
+    required: false,
+    component: 'Input',
+  },
 ];
diff --git a/src/views/system/category/components/CategoryModal.vue b/src/views/system/category/components/CategoryModal.vue
index e0f5835..e34c455 100644
--- a/src/views/system/category/components/CategoryModal.vue
+++ b/src/views/system/category/components/CategoryModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose width="550px" :title="getTitle" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose width="50vw" :title="getTitle" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
@@ -21,11 +21,11 @@
     showActionButtonGroup: false,
     labelCol: {
       xs: { span: 24 },
-      sm: { span: 4 },
+      sm: { span: 5 },
     },
     wrapperCol: {
       xs: { span: 24 },
-      sm: { span: 18 },
+      sm: { span: 15 },
     },
   });
   //表单赋值
diff --git a/src/views/system/category/index.vue b/src/views/system/category/index.vue
index 7373beb..5a1e5b3 100644
--- a/src/views/system/category/index.vue
+++ b/src/views/system/category/index.vue
@@ -147,6 +147,9 @@
    * 成功回调
    */
   async function handleSuccess({ isUpdate,isSubAdd, values, expandedArr }) {
+    reload();
+    return
+    //几百条数据：直接重新加载比框架写的代码要加载快得多 框架设计师不知道在寻思鸡毛🤡 新增一条数据几百个请求处理 处理半天处理不完
     if (isUpdate) {
       //编辑回调
       updateTableDataRecord(values.id, values);
diff --git a/src/views/system/depart/components/DepartFormModal.vue b/src/views/system/depart/components/DepartFormModal.vue
index ae00bef..98ee2f1 100644
--- a/src/views/system/depart/components/DepartFormModal.vue
+++ b/src/views/system/depart/components/DepartFormModal.vue
@@ -1,96 +1,153 @@
 <template>
   <BasicModal :title="title" :width="800" v-bind="$attrs" @ok="handleOk" @register="registerModal">
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <!-- 省份 -->
+      <template #province="{ model, field }">
+        <j-dict-select-tag @change="provinceChanged(model)" v-model:value="model[field]"
+          :dictCode="getProvinceDictCode()" placeholder="请选择所在省份" />
+      </template>
+      <!-- 城市 -->
+      <template #city="{ model, field }">
+        <j-dict-select-tag @change="cityChanged(model)" v-model:value="model[field]" :dictCode="getCityDictCode(model)"
+          placeholder="请选择所在城市" :disabled="!model.province" />
+      </template>
+      <!-- 区县 -->
+      <template #district="{ model, field }">
+        <j-dict-select-tag v-model:value="model[field]" :dictCode="getDistrictDictCode(model)" placeholder="请选择所在区县"
+          :disabled="!model.province || !model.city" />
+      </template>
+    </BasicForm>
   </BasicModal>
 </template>
 
 <script lang="ts" setup>
-  import { watch, computed, inject, ref, unref, onMounted } from 'vue';
+import { watch, computed, inject, ref, unref, onMounted } from 'vue';
 
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { BasicModal, useModalInner } from '/@/components/Modal';
 
-  import { saveOrUpdateDepart } from '../depart.api';
-  import { useBasicFormSchema, orgCategoryOptions } from '../depart.data';
+import { saveOrUpdateDepart } from '../depart.api';
+import { useBasicFormSchema, orgCategoryOptions } from '../depart.data';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
-  const emit = defineEmits(['success', 'register']);
-  const props = defineProps({
-    rootTreeData: { type: Array, default: () => [] },
-  });
-  const prefixCls = inject('prefixCls');
-  // 当前是否是更新模式
-  const isUpdate = ref<boolean>(false);
-  // 当前的弹窗数据
-  const model = ref<object>({});
-  const title = computed(() => (isUpdate.value ? '编辑' : '新增'));
+const emit = defineEmits(['success', 'register']);
+const props = defineProps({
+  rootTreeData: { type: Array, default: () => [] },
+});
+const prefixCls = inject('prefixCls');
+// 当前是否是更新模式
+const isUpdate = ref<boolean>(false);
+// 当前的弹窗数据
+const model = ref<object>({});
+const title = computed(() => (isUpdate.value ? '编辑' : '新增'));
 
-  //注册表单
-  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
-    schemas: useBasicFormSchema().basicFormSchema,
-    showActionButtonGroup: false,
-  });
+//注册表单
+const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+  schemas: useBasicFormSchema().basicFormSchema,
+  showActionButtonGroup: false,
+});
 
-  // 注册弹窗
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    await resetFields();
-    isUpdate.value = unref(data?.isUpdate);
-    // 当前是否为添加子级
-    let isChild = unref(data?.isChild);
-    let categoryOptions = isChild ? orgCategoryOptions.child : orgCategoryOptions.root;
-    // 隐藏不需要展示的字段
-    updateSchema([
-      {
-        field: 'parentId',
-        show: isChild,
-        componentProps: {
-          // 如果是添加子部门，就禁用该字段
-          disabled: isChild,
-          treeData: props.rootTreeData,
-        },
+// 注册弹窗
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  await resetFields();
+  isUpdate.value = unref(data?.isUpdate);
+  // 当前是否为添加子级
+  let isChild = unref(data?.isChild);
+  let categoryOptions = isChild ? orgCategoryOptions.child : orgCategoryOptions.root;
+  // 隐藏不需要展示的字段
+  updateSchema([
+    {
+      field: 'parentId',
+      show: isChild,
+      componentProps: {
+        // 如果是添加子部门，就禁用该字段
+        disabled: isChild,
+        treeData: props.rootTreeData,
       },
-      {
-        field: 'orgCode',
-        show: false,
-      },
-      {
-        field: 'orgCategory',
-        componentProps: { options: categoryOptions },
-      },
-      {
-        field: 'url',
-        show: !isChild,
-      },
-    ]);
+    },
+    {
+      field: 'orgCode',
+      show: false,
+    },
+    {
+      field: 'orgCategory',
+      componentProps: { options: categoryOptions },
+    },
+    {
+      field: 'url',
+      show: !isChild,
+    },
+    {
+      field: 'province',
+      show: !isChild,
+    },
+    {
+      field: 'city',
+      show: !isChild,
+    },
+    {
+      field: 'district',
+      show: !isChild,
+    },
+  ]);
 
-    let record = unref(data?.record);
-    if (typeof record !== 'object') {
-      record = {};
-    }
-    // 赋默认值
-    record = Object.assign(
-      {
-        departOrder: 0,
-        orgCategory: categoryOptions[0].value,
-      },
-      record
-    );
-    model.value = record;
-    await setFieldsValue({ ...record });
-  });
-
-  // 提交事件
-  async function handleOk() {
-    try {
-      setModalProps({ confirmLoading: true });
-      let values = await validate();
-      //提交表单
-      await saveOrUpdateDepart(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success');
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
+  let record = unref(data?.record);
+  if (typeof record !== 'object') {
+    record = {};
   }
+  // 赋默认值
+  record = Object.assign(
+    {
+      departOrder: 0,
+      orgCategory: categoryOptions[0].value,
+    },
+    record
+  );
+  model.value = record;
+  await setFieldsValue({ ...record });
+});
+
+// 提交事件
+async function handleOk() {
+  try {
+    setModalProps({ confirmLoading: true });
+    let values = await validate();
+    //提交表单
+    await saveOrUpdateDepart(values, isUpdate.value);
+    //关闭弹窗
+    closeModal();
+    //刷新列表
+    emit('success');
+  } finally {
+    setModalProps({ confirmLoading: false });
+  }
+}
+
+/**
+ * 省份字典
+ */
+function getProvinceDictCode() {
+  return 'sys_category,name,id,pid = \'xzqhdm\' order by code asc'
+}
+function provinceChanged(model) {
+  model.city = null
+  model.district = null
+}
+/**
+ * 城市字典
+ * @param v_ 
+ */
+function getCityDictCode(v_) {
+  return 'sys_category,name,id,pid = \'' + v_.province + '\' order by code asc'
+}
+function cityChanged(model) {
+  model.district = null
+}
+/**
+ * 区县字典
+ * @param v_ 
+ */
+function getDistrictDictCode(v_) {
+  return 'sys_category,name,id,pid = \'' + v_.city + '\' order by code asc'
+}
 </script>
diff --git a/src/views/system/depart/components/DepartFormTab.vue b/src/views/system/depart/components/DepartFormTab.vue
index 23cc921..1384c0d 100644
--- a/src/views/system/depart/components/DepartFormTab.vue
+++ b/src/views/system/depart/components/DepartFormTab.vue
@@ -1,6 +1,22 @@
 <template>
   <a-spin :spinning="loading">
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <!-- 省份 -->
+      <template #province="{ model, field }">
+        <j-dict-select-tag @change="provinceChanged(model)" v-model:value="model[field]"
+          :dictCode="getProvinceDictCode()" placeholder="请选择所在省份" :disabled="model.orgCategory != '1'" />
+      </template>
+      <!-- 城市 -->
+      <template #city="{ model, field }">
+        <j-dict-select-tag @change="cityChanged(model)" v-model:value="model[field]" :dictCode="getCityDictCode(model)"
+          placeholder="请选择所在城市" :disabled="model.orgCategory != '1' && !model.province" />
+      </template>
+      <!-- 区县 -->
+      <template #district="{ model, field }">
+        <j-dict-select-tag v-model:value="model[field]" :dictCode="getDistrictDictCode(model)" placeholder="请选择所在区县"
+          :disabled="model.orgCategory != '1' && (!model.province || !model.city)" />
+      </template>
+    </BasicForm>
     <div class="j-box-bottom-button offset-20" style="margin-top: 30px">
       <div class="j-box-bottom-button-float" :class="[`${prefixCls}`]">
         <a-button preIcon="ant-design:sync-outlined" @click="onReset">重置</a-button>
@@ -11,118 +27,149 @@
 </template>
 
 <script lang="ts" setup>
-  import { watch, computed, inject, ref, unref, onMounted } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { saveOrUpdateDepart } from '../depart.api';
-  import { useBasicFormSchema, orgCategoryOptions } from '../depart.data';
-  import { useDesign } from '/@/hooks/web/useDesign';
+import { watch, computed, inject, ref, unref, onMounted } from 'vue';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { saveOrUpdateDepart } from '../depart.api';
+import { useBasicFormSchema, orgCategoryOptions } from '../depart.data';
+import { useDesign } from '/@/hooks/web/useDesign';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
-  const { prefixCls } = useDesign('j-depart-form-content');
+const { prefixCls } = useDesign('j-depart-form-content');
 
-  const emit = defineEmits(['success']);
-  const props = defineProps({
-    data: { type: Object, default: () => ({}) },
-    rootTreeData: { type: Array, default: () => [] },
-  });
-  const loading = ref<boolean>(false);
-  // 当前是否是更新模式
-  const isUpdate = ref<boolean>(true);
-  // 当前的弹窗数据
-  const model = ref<object>({});
+const emit = defineEmits(['success']);
+const props = defineProps({
+  data: { type: Object, default: () => ({}) },
+  rootTreeData: { type: Array, default: () => [] },
+});
+const loading = ref<boolean>(false);
+// 当前是否是更新模式
+const isUpdate = ref<boolean>(true);
+// 当前的弹窗数据
+const model = ref<object>({});
 
-  //注册表单
-  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
-    schemas: useBasicFormSchema().basicFormSchema,
-    showActionButtonGroup: false,
-  });
+//注册表单
+const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+  schemas: useBasicFormSchema().basicFormSchema,
+  showActionButtonGroup: false,
+});
 
-  const categoryOptions = computed(() => {
-    if (!!props?.data?.parentId) {
-      return orgCategoryOptions.child;
-    } else {
-      return orgCategoryOptions.root;
-    }
-  });
-
-  onMounted(() => {
-    // 禁用字段
-    updateSchema([
-      { field: 'parentId', componentProps: { disabled: true } },
-      { field: 'orgCode', componentProps: { disabled: true } },
-    ]);
-    // data 变化，重填表单
-    watch(
-      () => props.data,
-      async () => {
-        let record = unref(props.data);
-        if (typeof record !== 'object') {
-          record = {};
-        }
-        model.value = record;
-        await resetFields();
-        await setFieldsValue({ ...record });
-      },
-      { deep: true, immediate: true }
-    );
-    // 更新 父部门 选项
-    watch(
-      () => props.rootTreeData,
-      async () => {
-        updateSchema([
-          {
-            field: 'parentId',
-            componentProps: { treeData: props.rootTreeData },
-          },
-        ]);
-      },
-      { deep: true, immediate: true }
-    );
-    // 监听并更改 orgCategory options
-    watch(
-      categoryOptions,
-      async () => {
-        updateSchema([
-          {
-            field: 'orgCategory',
-            componentProps: { options: categoryOptions.value },
-          },
-        ]);
-      },
-      { immediate: true }
-    );
-  });
-
-  // 重置表单
-  async function onReset() {
-    await resetFields();
-    await setFieldsValue({ ...model.value });
+const categoryOptions = computed(() => {
+  if (!!props?.data?.parentId) {
+    return orgCategoryOptions.child;
+  } else {
+    return orgCategoryOptions.root;
   }
+});
 
-  // 提交事件
-  async function onSubmit() {
-    try {
-      loading.value = true;
-      let values = await validate();
-      values = Object.assign({}, model.value, values);
-      //提交表单
-      await saveOrUpdateDepart(values, isUpdate.value);
-      //刷新列表
-      emit('success');
-      Object.assign(model.value, values);
-    } finally {
-      loading.value = false;
-    }
+onMounted(() => {
+  // 禁用字段
+  updateSchema([
+    { field: 'parentId', componentProps: { disabled: true } },
+    { field: 'orgCode', componentProps: { disabled: true } },
+  ]);
+  // data 变化，重填表单
+  watch(
+    () => props.data,
+    async () => {
+      let record = unref(props.data);
+      if (typeof record !== 'object') {
+        record = {};
+      }
+      model.value = record;
+      await resetFields();
+      await setFieldsValue({ ...record });
+    },
+    { deep: true, immediate: true }
+  );
+  // 更新 父部门 选项
+  watch(
+    () => props.rootTreeData,
+    async () => {
+      updateSchema([
+        {
+          field: 'parentId',
+          componentProps: { treeData: props.rootTreeData },
+        },
+      ]);
+    },
+    { deep: true, immediate: true }
+  );
+  // 监听并更改 orgCategory options
+  watch(
+    categoryOptions,
+    async () => {
+      updateSchema([
+        {
+          field: 'orgCategory',
+          componentProps: { options: categoryOptions.value },
+        },
+      ]);
+    },
+    { immediate: true }
+  );
+});
+
+// 重置表单
+async function onReset() {
+  await resetFields();
+  await setFieldsValue({ ...model.value });
+}
+
+// 提交事件
+async function onSubmit() {
+  try {
+    loading.value = true;
+    let values = await validate();
+    values = Object.assign({}, model.value, values);
+    //提交表单
+    await saveOrUpdateDepart(values, isUpdate.value);
+    //刷新列表
+    emit('success');
+    Object.assign(model.value, values);
+  } finally {
+    loading.value = false;
   }
+}
+
+/**
+ * 省份字典
+ */
+function getProvinceDictCode() {
+  return 'sys_category,name,id,pid = \'xzqhdm\' order by code asc'
+}
+function provinceChanged(model) {
+  model.city = null
+  model.district = null
+}
+/**
+ * 城市字典
+ * @param v_ 
+ */
+function getCityDictCode(v_) {
+  return 'sys_category,name,id,pid = \'' + v_.province + '\' order by code asc'
+}
+function cityChanged(model) {
+  model.district = null
+}
+/**
+ * 区县字典
+ * @param v_ 
+ */
+function getDistrictDictCode(v_) {
+  return 'sys_category,name,id,pid = \'' + v_.city + '\' order by code asc'
+}
+
 </script>
 <style lang="less">
-  // update-begin-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
+// update-begin-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
 
-  @prefix-cls: ~'@{namespace}-j-depart-form-content';
-  /*begin 兼容暗夜模式*/
-  .@{prefix-cls} {
-    background: @component-background;
-    border-top: 1px solid @border-color-base;
-  }
-  /*end 兼容暗夜模式*/
-  // update-end-author:liusq date:20230625 for: [issues/563]暗色主题部分失效
-</style>
+@prefix-cls: ~'@{namespace}-j-depart-form-content';
+
+/*begin 兼容暗夜模式*/
+.@{prefix-cls} {
+  background: @component-background;
+  border-top: 1px solid @border-color-base;
+}
+
+/*end 兼容暗夜模式*/
+// update-end-author:liusq date:20230625 for: [issues/563]暗色主题部分失效</style>
diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts
index c9ec9cc..4ea2422 100644
--- a/src/views/system/depart/depart.data.ts
+++ b/src/views/system/depart/depart.data.ts
@@ -36,23 +36,35 @@ export function useBasicFormSchema() {
       component: 'RadioButtonGroup',
       componentProps: { options: [] },
     },
-    {
-      field: 'departOrder',
-      label: '排序',
-      component: 'InputNumber',
-      componentProps: {},
-    },
     {
       field: 'url',
       label: '协议域名',
       component: 'Input',
       dynamicDisabled: ({ values }) => {
-        return values.orgCategory != '1'
+        return values.orgCategory != '1';
       },
       componentProps: {
         placeholder: '请输入协议域名',
       },
     },
+    {
+      field: 'province',
+      label: '省份',
+      component: 'Input',
+      slot: 'province',
+    },
+    {
+      field: 'city',
+      label: '城市',
+      component: 'Input',
+      slot: 'city',
+    },
+    {
+      field: 'district',
+      label: '区县',
+      component: 'Input',
+      slot: 'district',
+    },
     {
       field: 'mobile',
       label: '电话',
@@ -85,6 +97,12 @@ export function useBasicFormSchema() {
         placeholder: '请输入备注',
       },
     },
+    {
+      field: 'departOrder',
+      label: '排序',
+      component: 'InputNumber',
+      componentProps: {},
+    },
   ];
   return { basicFormSchema };
 }