weipengfei
/
ERP-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/weipengfei/ERP-admin

This commit is contained in:
weipengfei 2024-05-17 18:24:11 +08:00
parent 937359ad4e ba57aae0fc
commit 05ef31fdbe
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/translationOrder/detail.vue
View File

@ -4,6 +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>
<el-button type="primary">Operation</el-button>
</template> -->
=======
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
<el-descriptions-item :span="4" label="单据编号"> <el-descriptions-item :span="4" label="单据编号">
{{ form.number }} {{ form.number }}
</el-descriptions-item> </el-descriptions-item>
@ -53,6 +59,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";
=======
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
import { import {
apiOpurchaseclassLists, apiOpurchaseclassLists,
apiOpurchaseclassDelete, apiOpurchaseclassDelete,

4
src/views/translationOrder/index.vue
View File

@ -133,7 +133,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: 'transDetail', path: 'transDetail',
>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
query: { query: {
id: data.id id: data.id
} }