mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
zmj 2024-03-18 18:10:49 +08:00
parent 2da457bed3
commit c352b14f64
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/supervision_test_blocks_specimens/index.vue
View File

@ -102,13 +102,8 @@
<script lang="ts" setup name="supervisionTestBlocksSpecimensLists"> <script lang="ts" setup name="supervisionTestBlocksSpecimensLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
<<<<<<< HEAD
import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete, apiSupervisionTestBlocksSpecimensDetail } from '@/api/supervision_test_blocks_specimens'
import { timeFormat } from '@/utils/util'
=======
import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens' import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
import { apiSupervisionProjectSearch } from '@/api/supervision_project' import { apiSupervisionProjectSearch } from '@/api/supervision_project'
>>>>>>> 346a5866d2c73a11f9e463e241a4b2183785356f
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import EditPopup from './edit.vue' import EditPopup from './edit.vue'
import detailConfig from './detail' import detailConfig from './detail'