解决合并冲突

openhis-ui-vue3/src/main.js

@@ -3,6 +3,7 @@ import { createApp } from 'vue'
 import Cookies from 'js-cookie'
 
 import ElementPlus from 'element-plus'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import 'element-plus/dist/index.css'
 import locale from 'element-plus/es/locale/lang/zh-cn'
 
@@ -15,7 +16,7 @@ import directive from './directive' // directive
 
 // 注册指令
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import { download, downloadGet } from '@/utils/request'
 
 // svg图标
 import 'virtual:svg-icons-register'
@@ -27,6 +28,8 @@ import './permission' // permission control
 import { useDict } from '@/utils/dict'
 import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels} from '@/utils/openhis'
 
+import { formatDateStr } from '@/utils/index';
+
 // 分页组件
 import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
@@ -61,12 +64,14 @@ if(chrome.webview !== undefined) {
 // 全局方法挂载
 app.config.globalProperties.useDict = useDict
 app.config.globalProperties.download = download
+app.config.globalProperties.downloadGet = downloadGet
 app.config.globalProperties.parseTime = parseTime
 app.config.globalProperties.resetForm = resetForm
 app.config.globalProperties.handleTree = handleTree
 app.config.globalProperties.addDateRange = addDateRange
 app.config.globalProperties.selectDictLabel = selectDictLabel
 app.config.globalProperties.selectDictLabels = selectDictLabels
+app.config.globalProperties.formatDateStr = formatDateStr
 
 // 全局挂载请求实例
 app.config.globalProperties.$http = request
@@ -91,7 +96,7 @@ directive(app)
 ElDialog.props.closeOnClickModal.default = false;
 // 使用element-plus 并且设置全局的大小
 app.use(ElementPlus, {
-  locale: locale,
+  locale: zhCn,
   // 支持 large、default、small
   size: Cookies.get('size') || 'default'
 })