Commit d39b6e47 authored by tanghao's avatar tanghao

全码对照信息显示

parent 935dd10c
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<!-- <vxe-button @click="allAlign = 'left'">居左</vxe-button> --> <!-- <vxe-button @click="allAlign = 'left'">居左</vxe-button> -->
<el-button type="primary" @click="showEdit = true">新增</el-button> <el-button type="primary" @click="showEdit = true">新增</el-button>
<el-button type="danger" @click="removeRows">删除</el-button> <el-button type="danger" @click="removeRows">删除</el-button>
<el-button type="info" @click="showHelp">帮助</el-button> <el-button type="info" @click="showHelp" >帮助</el-button>
</template> </template>
</vxe-toolbar> </vxe-toolbar>
<vxe-table <vxe-table
...@@ -248,7 +248,9 @@ const removeRows = async () => { ...@@ -248,7 +248,9 @@ const removeRows = async () => {
} }
} }
const showHelp = () => { const showHelp = () => {
router.push('/order/scripts-help') // router.push('/order/scripts-help')
window.open('/order/scripts-help', '_blank');
} }
// 表单提交 // 表单提交
......
...@@ -39,12 +39,49 @@ ...@@ -39,12 +39,49 @@
<vxe-column type="expand" title="尺码" width="120"> <vxe-column type="expand" title="尺码" width="120">
<template #default>尺码信息</template> <template #default>尺码信息</template>
<template #content="{ row }"> <template #content="{ row }">
<div style="width: 1024px">
<el-row>
<el-col :span="24">
<p class="font-bold text-lg leading-10 border-b-2">全码对照信息</p>
<el-table
:data="[{}]" size="small"
border
style="width: 100%">
<el-table-column
v-for="(value,key) in row.sizeListDto.referNameJson"
:prop="key"
:label="key"
>
<template #default="{ row }">
{{ value }}
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div style="padding: 10px"> <div style="padding: 10px">
<vxe-table :data="row.sizeList" size="mini" max-height="300px" style="width: 300px"> <vxe-table :data="row.sizeListDto.sizeList" size="mini" max-height="300px" align="center">
<vxe-column field="size" title="尺码"></vxe-column> <vxe-column field="size" title="尺码" width="100"></vxe-column>
<vxe-column field="num" title="尺码数量"></vxe-column> <vxe-column field="num" title="尺码数量" width="100"></vxe-column>
<vxe-colgroup title="全码对照" v-if="row.sizeListDto.referTitles.length>0">
<vxe-column v-for="(title) in row.sizeListDto.referTitles" :title="title">
<template #default="{ row }">
{{ row.sizeRefer[title] }}
</template>
</vxe-column>
</vxe-colgroup>
</vxe-table> </vxe-table>
</div> </div>
</el-col>
</el-row>
</div>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="orderNo" title="订单编码" width="120"></vxe-column> <vxe-column field="orderNo" title="订单编码" width="120"></vxe-column>
...@@ -169,6 +206,7 @@ import { ElLoading, ElMessage } from 'element-plus' ...@@ -169,6 +206,7 @@ import { ElLoading, ElMessage } from 'element-plus'
import { exportExcel } from '@/utils/export-excel' import { exportExcel } from '@/utils/export-excel'
import type { BookType } from 'xlsx' import type { BookType } from 'xlsx'
import CheckOrder from './components/CheckOrder.vue' import CheckOrder from './components/CheckOrder.vue'
import { spawn } from 'child_process'
const loading = ref(false) const loading = ref(false)
const formState = reactive({ const formState = reactive({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment