hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-11-04 20:28:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev

Browse Source 
 Conflicts:
	src/views/bpm/oa/leave/create.vue
	src/views/bpm/oa/leave/detail.vue
This commit is contained in:
YunaiV
2023-04-15 16:06:17 +08:00
parent 4dabb710c5 5910d53d8f
commit f59e4a4622
139 changed files with 1202 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bpm/oa/leave/create.vue
View File

@@ -42,7 +42,7 @@
</el-form-item>
</el-form>
</template>
<script setup lang="ts">
<script setup name="BpmOALeaveCreate" lang="ts">
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as LeaveApi from '@/api/bpm/leave'
import { useTagsViewStore } from '@/store/modules/tagsView'

2
src/views/bpm/oa/leave/detail.vue
View File

@@ -16,7 +16,7 @@
</el-descriptions>
</ContentWrap>
</template>
<script setup lang="ts" name="OALeaveCreate">
<script lang="ts" name="BpmOALeaveDetail" setup>
import { DICT_TYPE } from '@/utils/dict'
import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes'