add
This commit is contained in:
commit
ba57aae0fc
|
@ -1,4 +1,4 @@
|
||||||
import { createRouter, createWebHistory, RouterView, type RouteRecordRaw } from 'vue-router'
|
import { createRouter, createWebHistory,createWebHashHistory, RouterView, type RouteRecordRaw } from 'vue-router'
|
||||||
import { MenuEnum } from '@/enums/appEnums'
|
import { MenuEnum } from '@/enums/appEnums'
|
||||||
import { isExternal } from '@/utils/validate'
|
import { isExternal } from '@/utils/validate'
|
||||||
import { constantRoutes, INDEX_ROUTE_NAME, LAYOUT } from './routes'
|
import { constantRoutes, INDEX_ROUTE_NAME, LAYOUT } from './routes'
|
||||||
|
@ -103,7 +103,7 @@ export function resetRouter() {
|
||||||
}
|
}
|
||||||
|
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
history: createWebHistory(import.meta.env.BASE_URL),
|
history: createWebHashHistory(import.meta.env.BASE_URL),
|
||||||
routes: constantRoutes
|
routes: constantRoutes
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,12 @@
|
||||||
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
|
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
|
||||||
<el-tab-pane label="概况" name="detail">
|
<el-tab-pane label="概况" name="detail">
|
||||||
<el-descriptions class="margin-top" :column="4" border>
|
<el-descriptions class="margin-top" :column="4" border>
|
||||||
|
<<<<<<< HEAD
|
||||||
<!-- <template #extra>
|
<!-- <template #extra>
|
||||||
<el-button type="primary">Operation</el-button>
|
<el-button type="primary">Operation</el-button>
|
||||||
</template> -->
|
</template> -->
|
||||||
|
=======
|
||||||
|
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
|
||||||
<el-descriptions-item :span="4" label="单据编号">
|
<el-descriptions-item :span="4" label="单据编号">
|
||||||
{{ form.number }}
|
{{ form.number }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
@ -62,7 +65,10 @@
|
||||||
|
|
||||||
<script lang="ts" setup name="opurchaseclassDetail">
|
<script lang="ts" setup name="opurchaseclassDetail">
|
||||||
import { usePaging } from "@/hooks/usePaging";
|
import { usePaging } from "@/hooks/usePaging";
|
||||||
|
<<<<<<< HEAD
|
||||||
import { useDictData } from "@/hooks/useDictOptions";
|
import { useDictData } from "@/hooks/useDictOptions";
|
||||||
|
=======
|
||||||
|
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
|
||||||
import {
|
import {
|
||||||
apiOpurchaseclassLists,
|
apiOpurchaseclassLists,
|
||||||
apiOpurchaseclassDelete,
|
apiOpurchaseclassDelete,
|
||||||
|
|
|
@ -128,7 +128,11 @@ const handleAdd = async () => {
|
||||||
const handleDetail = async (data: any) => {
|
const handleDetail = async (data: any) => {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
router.push({
|
router.push({
|
||||||
|
<<<<<<< HEAD
|
||||||
path: 'detail',
|
path: 'detail',
|
||||||
|
=======
|
||||||
|
path: 'transDetail',
|
||||||
|
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
|
||||||
query: {
|
query: {
|
||||||
id: data.id
|
id: data.id
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue