diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
index cfa0190..27ed968 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
@@ -94,6 +94,7 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
 
 		 QueryWrapper<InnovationVoucher> queryWrapper = QueryGenerator.initQueryWrapper(innovationVoucher, req.getParameterMap());
 		 queryWrapper.eq("state","3");
+		 queryWrapper.orderByDesc("create_time");
 		 Page<InnovationVoucher> page = new Page<InnovationVoucher>(pageNo, pageSize);
 		 IPage<InnovationVoucher> pageList = innovationVoucherService.page(page, queryWrapper);
 		 return Result.OK(pageList);
@@ -296,9 +297,13 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody InnovationVoucher innovationVoucher) {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SysDepart sysDepart = sysDepartService.getById(loginUser.getOrgId());
+		if(sysDepart.getStatus().equals("0")){
+			return Result.error("该用户单位冻结,无法申请");
+		}
 		innovationVoucher.setProDept(loginUser.getOrgId());
 		String uuid = IdUtil.randomUUID().replaceAll("-", "");
-		if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){
+		if(sysDepart.getOrgCategory().equals("3")){
 			innovationVoucher.setFlag("1");
 			String cxqCode = "XQ";
 			cxqCode += uuid.substring(0, 18);
@@ -484,6 +489,33 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
 		 return Result.OK("提交兑现审核成功!");
 	 }
 
+	 /**
+	  *  编辑
+	  *
+	  * @param innovationVoucher
+	  * @return
+	  */
+	 @AutoLog(value = "仪器信息表-编辑")
+	 @ApiOperation(value="仪器信息表-编辑", notes="仪器信息表-编辑")
+//@RequiresPermissions("instrument:instrument:edit")
+	 @RequestMapping(value = "/edit4", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> edit4(@RequestBody InnovationVoucher innovationVoucher) {
+		 InnovationVoucher innovationVouchervo = innovationVoucherService.getById(innovationVoucher.getId());
+		 if(innovationVouchervo==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 if(innovationVouchervo.getDxshFlag().equals("0")){
+			 innovationVoucher.setDxshSta("2");
+		 }else {
+			 innovationVoucher.setDxshSta("1");
+		 }
+		 innovationVoucher.setSfSqdxSta("1");
+		 innovationVoucher.setDxReject("");
+
+		 innovationVoucherService.updateById(innovationVoucher);
+		 return Result.OK("提交兑现审核成功!");
+	 }
+
 	 /**
 	  * 审核通过
 	  *
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
index bbc9433..31d4c67 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
@@ -133,4 +133,12 @@ public class InnovationVoucher implements Serializable {
 	@Excel(name = "兑现驳回原因", width = 15)
     @ApiModelProperty(value = "兑现驳回原因")
     private java.lang.String dxReject;
+	/**兑现理由*/
+	@Excel(name = "兑现理由", width = 15)
+	@ApiModelProperty(value = "兑现理由")
+	private java.lang.String dxReason;
+	/**合同*/
+	@Excel(name = "合同", width = 15)
+	@ApiModelProperty(value = "合同")
+	private java.lang.String dxContract;
 }
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
index 96eebeb..1a615d5 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
@@ -15,6 +15,7 @@ enum Api {
   edit1='/innovationvoucher/innovationVoucher/edit1',
   edit2='/innovationvoucher/innovationVoucher/edit2',
   edit3='/innovationvoucher/innovationVoucher/edit3',
+  edit4='/innovationvoucher/innovationVoucher/edit4',
   deleteOne = '/innovationvoucher/innovationVoucher/delete',
   deleteBatch = '/innovationvoucher/innovationVoucher/deleteBatch',
   importExcel = '/innovationvoucher/innovationVoucher/importExcel',
@@ -65,6 +66,11 @@ export const saveOrUpdate3 = (params, isUpdate) => {
   return defHttp.post({ url: url, params }, { isTransformResponse: false });
 }
 
+export const saveOrUpdate4 = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit4 : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
 
 /**
  * 导出api
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data4.ts b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data4.ts
index 9ccf40c..b7b98ae 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data4.ts
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data4.ts
@@ -70,6 +70,16 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'dxshSta_dictText'
   },
+  {
+    title: '兑现理由',
+    align: "center",
+    dataIndex: 'dxReason',
+  },
+  {
+    title: '合同',
+    align: "center",
+    dataIndex: 'dxContract',
+  },
   {
     title: '兑现驳回原因',
     align: "center",
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList4.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList4.vue
index 5dc1d48..4c1aae2 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList4.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList4.vue
@@ -72,10 +72,24 @@
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
           <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
         </template>
+        <template v-if="column.dataIndex==='applicationReason'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='dxReason'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='dxContract'">
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <InnovationVoucherModal ref="registerModal" @success="handleSuccess"></InnovationVoucherModal>
+    <InnovationVoucherModal4 ref="registerModal4" @success="handleSuccess"></InnovationVoucherModal4>
   </div>
 </template>
 
@@ -84,9 +98,10 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { columns, superQuerySchema } from './InnovationVoucher.data4';
-  import { list4, deleteOne, batchDelete, getImportUrl, getExportUrl,tjdxsh } from './InnovationVoucher.api';
+  import { list4, deleteOne, batchDelete, getImportUrl, getExportUrl } from './InnovationVoucher.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import InnovationVoucherModal from './components/InnovationVoucherModal.vue'
+  import InnovationVoucherModal4 from './components/InnovationVoucherModal4.vue'
   import { useUserStore } from '/@/store/modules/user';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
@@ -97,6 +112,7 @@
   const queryParam = reactive<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
+  const registerModal4 = ref();
   const userStore = useUserStore();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -190,8 +206,16 @@
   /**
    * 提交兑现审核事件
    */
-  async function tjdxshcz(record) {
+/*  async function tjdxshcz(record) {
     await tjdxsh({id: record.id}, handleSuccess);
+  }*/
+
+  /**
+   *  驳回
+   */
+  function tjdxshcz(record: Recordable) {
+    registerModal4.value.disableSubmit = false;
+    registerModal4.value.edit(record);
   }
 
   /**
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
index bc1f0bb..2ae3b3f 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
@@ -72,6 +72,19 @@
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
           <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
         </template>
+        <template v-if="column.dataIndex==='applicationReason'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='dxReason'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='dxContract'">
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm4.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm4.vue
new file mode 100644
index 0000000..cca88f9
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm4.vue
@@ -0,0 +1,187 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="InnovationVoucherForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="申报项目名称" v-bind="validateInfos.proName" id="InnovationVoucherForm-proName" name="proName">
+								<a-input v-model:value="formData.proName" placeholder="请输入申报项目名称"  allow-clear :disabled="true"></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="申报类别" v-bind="validateInfos.proType" id="InnovationVoucherForm-proType" name="proType">
+								<j-dict-select-tag v-model:value="formData.proType" dictCode="cxq_type" placeholder="请选择申报类别"  allow-clear :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="申领金额" v-bind="validateInfos.proMoney" id="InnovationVoucherForm-proMoney" name="proMoney">
+								<a-input-number v-model:value="formData.proMoney" placeholder="请输入申领金额" style="width: 100%" :disabled="true" />
+							</a-form-item>
+						</a-col>
+            <a-col :span="24">
+              <a-form-item label="申请理由" v-bind="validateInfos.applicationReason" id="InnovationVoucherForm-applicationReason" name="applicationReason">
+                <j-editor v-model:value="formData.applicationReason"  :autoFocus="false" :disabled="true"/>
+              </a-form-item>
+            </a-col>
+						<a-col :span="24">
+							<a-form-item label="附件" v-bind="validateInfos.attachment" id="InnovationVoucherForm-attachment" name="attachment">
+								<j-upload v-model:value="formData.attachment"  :disabled="true" ></j-upload>
+							</a-form-item>
+						</a-col>
+            <a-col :span="24">
+              <a-form-item label="兑现理由" v-bind="validateInfos.dxReason" id="InnovationVoucherForm-dxReason" name="dxReason">
+                <j-editor v-model:value="formData.dxReason"  :autoFocus="false"/>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="合同" v-bind="validateInfos.dxContract" id="InnovationVoucherForm-dxContract" name="dxContract">
+                <j-upload v-model:value="formData.dxContract"   ></j-upload>
+              </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 JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate4 } from '../InnovationVoucher.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: '',
+    proName: '',
+    proType: '',
+    proMoney: undefined,
+    attachment: '',
+    applicationReason: '',
+    dxReason: '',
+    dxContract: '',
+  });
+  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({
+    proName: [{ required: true, message: '请输入申报项目名称!'},],
+    proType: [{ required: true, message: '请输入申报类别!'},],
+    proMoney: [{ required: true, message: '请输入申领金额!'}, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, 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 saveOrUpdate4(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>
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal4.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal4.vue
new file mode 100644
index 0000000..30a302b
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal4.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <InnovationVoucherForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></InnovationVoucherForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import InnovationVoucherForm from './InnovationVoucherForm4.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/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue b/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
index 619a538..906a665 100644
--- a/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
+++ b/jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue
@@ -39,10 +39,10 @@
           <span class="gray-75 item-label">性别</span>
           <span class="gray-3">{{ userInfo.sexText }}</span>
         </div>
-        <div class="margin-bottom-10 nowarp font-size-13">
-          <span class="gray-75 item-label">职位</span>
-          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>
-        </div>
+        <!--        <div class="margin-bottom-10 nowarp font-size-13">-->
+        <!--          <span class="gray-75 item-label">职位</span>-->
+        <!--          <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>-->
+        <!--        </div>-->
         <div class="font-size-13">
           <span class="item-label"></span>
           <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>
@@ -65,159 +65,159 @@
   <UserAccountModal @register="registerModal" @success="getUserDetail"></UserAccountModal>
 </template>
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import { CollapseContainer } from '/@/components/Container';
-import { CropperAvatar } from '/@/components/Cropper';
-import { useMessage } from '/@/hooks/web/useMessage';
-import headerImg from '/@/assets/images/header.jpg';
-import { defHttp } from '/@/utils/http/axios';
-import { useUserStore } from '/@/store/modules/user';
-import { uploadImg } from '/@/api/sys/upload';
-import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-import dayjs from 'dayjs';
-import { ajaxGetDictItems, getDictItemsByCode, initDictOptions } from '/@/utils/dict';
-import { userEdit, getUserData, queryNameByCodes } from './UserSetting.api';
-import UserAccountModal from './commponents/UserAccountModal.vue';
-import { useModal } from '/@/components/Modal';
-import { cloneDeep } from 'lodash-es';
-import { useDesign } from '/@/hooks/web/useDesign';
-//TODO 当字典租户隔离时，数据会查不到，默认一个
-const sexOption = getDictItemsByCode("sex") || [{text:'男',value:'1'},{text:'女',value:'2'}];
-const { createMessage } = useMessage();
-const userStore = useUserStore();
+  import { computed, onMounted, ref } from 'vue';
+  import { CollapseContainer } from '/@/components/Container';
+  import { CropperAvatar } from '/@/components/Cropper';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import headerImg from '/@/assets/images/header.jpg';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useUserStore } from '/@/store/modules/user';
+  import { uploadImg } from '/@/api/sys/upload';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import dayjs from 'dayjs';
+  import { ajaxGetDictItems, getDictItemsByCode, initDictOptions } from '/@/utils/dict';
+  import { userEdit, getUserData, queryNameByCodes } from './UserSetting.api';
+  import UserAccountModal from './commponents/UserAccountModal.vue';
+  import { useModal } from '/@/components/Modal';
+  import { cloneDeep } from 'lodash-es';
+  import { useDesign } from '/@/hooks/web/useDesign';
+  //TODO 当字典租户隔离时，数据会查不到，默认一个
+  const sexOption = getDictItemsByCode("sex") || [{text:'男',value:'1'},{text:'女',value:'2'}];
+  const { createMessage } = useMessage();
+  const userStore = useUserStore();
   const { prefixCls } = useDesign('j-base-setting-container');
-//是否编辑
-const isEdit = ref<boolean>(false);
-//用户信息
-const userInfo = ref<any>({});
-//编辑时input触发事件
-const accountNameEdit = ref();
-const [registerModal, { openModal }] = useModal();
-//头像动态计算
-const avatar = computed(() => {
-  return getFileAccessHttpUrl(userInfo.value.avatar) || headerImg;
-});
+  //是否编辑
+  const isEdit = ref<boolean>(false);
+  //用户信息
+  const userInfo = ref<any>({});
+  //编辑时input触发事件
+  const accountNameEdit = ref();
+  const [registerModal, { openModal }] = useModal();
+  //头像动态计算
+  const avatar = computed(() => {
+    return getFileAccessHttpUrl(userInfo.value.avatar) || headerImg;
+  });
 
-/**
- * 更新用户头像
- */
-function updateAvatar(src: string, data: string) {
-  const userinfo = userStore.getUserInfo;
-  userinfo.avatar = data;
-  userStore.setUserInfo(userinfo);
-  if (data) {
-    updateUserInfo({ avatar: data, id: userinfo.id });
+  /**
+   * 更新用户头像
+   */
+  function updateAvatar(src: string, data: string) {
+    const userinfo = userStore.getUserInfo;
+    userinfo.avatar = data;
+    userStore.setUserInfo(userinfo);
+    if (data) {
+      updateUserInfo({ avatar: data, id: userinfo.id });
+    }
   }
-}
 
-/**
- * 更新用户信息
- * @params 参数
- */
-function updateUserInfo(params) {
-  userEdit(params).then((res) => {
-    if (!res.success) {
-      createMessage.warn(res.message);
-    }
-  });
-}
+  /**
+   * 更新用户信息
+   * @params 参数
+   */
+  function updateUserInfo(params) {
+    userEdit(params).then((res) => {
+      if (!res.success) {
+        createMessage.warn(res.message);
+      }
+    });
+  }
 
-/**
- * 编辑按钮点击事件
- */
-function editHandleClick() {
-  isEdit.value = true;
-  setTimeout(() => {
-    accountNameEdit.value.focus();
-  }, 100);
-}
+  /**
+   * 编辑按钮点击事件
+   */
+  function editHandleClick() {
+    isEdit.value = true;
+    setTimeout(() => {
+      accountNameEdit.value.focus();
+    }, 100);
+  }
 
-/**
- * 修改真实姓名
- */
-function editRealName() {
-  if (userInfo.value.realname) {
-    updateUserInfo({ realname: userInfo.value.realname, id: userInfo.value.id });
-    userStore.setUserInfo(userInfo.value);
-  } else {
-    createMessage.warn("请输入姓名");
+  /**
+   * 修改真实姓名
+   */
+  function editRealName() {
+    if (userInfo.value.realname) {
+      updateUserInfo({ realname: userInfo.value.realname, id: userInfo.value.id });
+      userStore.setUserInfo(userInfo.value);
+    } else {
+      createMessage.warn("请输入姓名");
+    }
+    isEdit.value = false;
   }
-  isEdit.value = false;
-}
 
-/**
- * 获取生日信息
- */
-function getBirthDay(val) {
-  if (val) {
-    return dayjs(val).format("YYYY-MM-DD");
-  } else {
-    return "未填写";
+  /**
+   * 获取生日信息
+   */
+  function getBirthDay(val) {
+    if (val) {
+      return dayjs(val).format("YYYY-MM-DD");
+    } else {
+      return "未填写";
+    }
   }
-}
 
-/**
- * 获取性别
- * @param val
- */
-function getSex(val) {
-  let findOption = sexOption.find(item => parseInt(item.value) === val);
-  let sex = "未填写";
-  if (findOption) {
-    sex = findOption.text;
+  /**
+   * 获取性别
+   * @param val
+   */
+  function getSex(val) {
+    let findOption = sexOption.find(item => parseInt(item.value) === val);
+    let sex = "未填写";
+    if (findOption) {
+      sex = findOption.text;
+    }
+    return sex;
   }
-  return sex;
-}
 
-/**
- * 打开编辑弹窗
- */
-function openEditModal() {
-  let value = cloneDeep(userInfo.value);
-  openModal(true, {
-    record: value
-  });
-}
+  /**
+   * 打开编辑弹窗
+   */
+  function openEditModal() {
+    let value = cloneDeep(userInfo.value);
+    openModal(true, {
+      record: value
+    });
+  }
 
-/**
- * 获取用户信息
- */
-function getUserDetail() {
-  getUserData().then((async res => {
-    if (res.success) {
-      if (res.result) {
-        res.result.sexText = getSex(res.result.sex);
-        res.result.birthday = getBirthDay(res.result.birthday);
-        res.result.createTimeText = getDiffDay(res.result.createTime);
-        userInfo.value = res.result;
-      } else {
-        userInfo.value = {};
+  /**
+   * 获取用户信息
+   */
+  function getUserDetail() {
+    getUserData().then((async res => {
+      if (res.success) {
+        if (res.result) {
+          res.result.sexText = getSex(res.result.sex);
+          res.result.birthday = getBirthDay(res.result.birthday);
+          res.result.createTimeText = getDiffDay(res.result.createTime);
+          userInfo.value = res.result;
+        } else {
+          userInfo.value = {};
+        }
       }
-    }
-  }));
-}
+    }));
+  }
 
-/**
- * 获取使用时间
- * @param date
- */
-function getDiffDay(date) {
-  // 计算两个日期之间的天数差值
-  let totalDays, diffDate
-  let createDate = Date.parse(date);
-  let nowDate = new Date().getTime();
-  // 将两个日期都转换为毫秒格式，然后做差
-  diffDate = Math.abs(nowDate - createDate) // 取相差毫秒数的绝对值
-  totalDays = Math.floor(diffDate / (1000 * 3600 * 24)) // 向下取整
-  return totalDays+" 天";
-}
-onMounted(async () => {
-  getUserDetail();
-});
+  /**
+   * 获取使用时间
+   * @param date
+   */
+  function getDiffDay(date) {
+    // 计算两个日期之间的天数差值
+    let totalDays, diffDate
+    let createDate = Date.parse(date);
+    let nowDate = new Date().getTime();
+    // 将两个日期都转换为毫秒格式，然后做差
+    diffDate = Math.abs(nowDate - createDate) // 取相差毫秒数的绝对值
+    totalDays = Math.floor(diffDate / (1000 * 3600 * 24)) // 向下取整
+    return totalDays+" 天";
+  }
+  onMounted(async () => {
+    getUserDetail();
+  });
 </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-base-setting-container';
 
   .@{prefix-cls}{