Commit 6de2a250 authored by tanghao's avatar tanghao

123

parent 36c64a65
...@@ -84,7 +84,12 @@ const getFilePath = async () => { ...@@ -84,7 +84,12 @@ const getFilePath = async () => {
const path = (route.query.filePath || '') as string const path = (route.query.filePath || '') as string
!!path && generateExcel(path) !!path && generateExcel(path)
} }
} catch {} }catch (e) {
// 验证文件是否存在,不存在报错
if (e?.response) {
ElMessage.error(e.response.data.message)
}
}
loading.value = false loading.value = false
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="文件状态"> <el-form-item label="订单状态">
<el-select v-model="queryParams.status" placeholder="" clearable> <el-select v-model="queryParams.status" placeholder="" clearable>
<template v-for="item in statusOptions"> <template v-for="item in statusOptions">
<el-option :value="item.value" :label="item.label"></el-option> <el-option :value="item.value" :label="item.label"></el-option>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</vxe-column> </vxe-column>
<vxe-column field="customerId_dictText" title="客户" width="300"></vxe-column> <vxe-column field="customerId_dictText" title="客户" width="300"></vxe-column>
<vxe-column field="productCode" title="产品编码" width="300"></vxe-column> <vxe-column field="productCode" title="产品编码" width="300"></vxe-column>
<vxe-column field="status_dictText" title="文件状态" width="120"></vxe-column> <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
<vxe-column field="createTime" title="创建时间" width="160"></vxe-column> <vxe-column field="createTime" title="创建时间" width="160"></vxe-column>
<vxe-column field="action" title="操作" width="200"> <vxe-column field="action" title="操作" width="200">
<template #default="{ row }"> <template #default="{ row }">
......
...@@ -2,12 +2,20 @@ ...@@ -2,12 +2,20 @@
<div class="w-full h-full bg-white p-4"> <div class="w-full h-full bg-white p-4">
<p class="font-bold text-lg leading-10 border-b-2">订单变量文件</p> <p class="font-bold text-lg leading-10 border-b-2">订单变量文件</p>
<el-form class="pt-4" :inline="true" :model="formState"> <el-form class="pt-4" :inline="true" :model="formState">
<el-form-item label="客户名称">
<el-input v-model="formState.customerName" placeholder="客户名称"></el-input>
</el-form-item>
<el-form-item label="产品编码"> <el-form-item label="产品编码">
<el-input v-model="formState.productCode" placeholder="产品编码"></el-input> <el-input v-model="formState.productCode" placeholder="产品编码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="客户名称"> <el-form-item label="订单文件ID">
<el-input v-model="formState.customerName" placeholder="客户名称"></el-input> <el-input v-model="formState.orderVarFileId" placeholder="产品编码"></el-input>
</el-form-item>
<el-form-item label="模板文件ID">
<el-input v-model="formState.templateFileId" placeholder="产品编码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单编码"> <el-form-item label="订单编码">
<el-input v-model="formState.orderCode" placeholder="订单编码"></el-input> <el-input v-model="formState.orderCode" placeholder="订单编码"></el-input>
</el-form-item> </el-form-item>
...@@ -114,7 +122,9 @@ const formState = reactive({ ...@@ -114,7 +122,9 @@ const formState = reactive({
createBy:'', createBy:'',
createby_dict:'', createby_dict:'',
orderItemNo: '', orderItemNo: '',
orderFileStatus: '' orderFileStatus: '',
templateFileId:'',
orderVarFileId:''
// column: 'createTime', // column: 'createTime',
// order: 'desc' // order: 'desc'
}) })
...@@ -140,7 +150,9 @@ const onReset = () => { ...@@ -140,7 +150,9 @@ const onReset = () => {
createBy:'', createBy:'',
createby_dict:'', createby_dict:'',
orderItemNo: '', orderItemNo: '',
orderFileStatus:'' orderFileStatus:'',
templateFileId:'',
orderVarFileId:''
}) })
} }
......
...@@ -14,6 +14,13 @@ ...@@ -14,6 +14,13 @@
<el-form-item label="订单项次"> <el-form-item label="订单项次">
<el-input v-model="formState.orderItemNo" placeholder="订单项次"></el-input> <el-input v-model="formState.orderItemNo" placeholder="订单项次"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单变量文件ID">
<el-input v-model="formState.varOrderFileId" placeholder="订单变量文件ID"></el-input>
</el-form-item>
<el-form-item label="模板文件ID">
<el-input v-model="formState.templateFileId" placeholder="模板文件ID"></el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onQuery">查询</el-button> <el-button type="primary" @click="onQuery">查询</el-button>
<el-button type="info" @click="onReset">重置</el-button> <el-button type="info" @click="onReset">重置</el-button>
...@@ -47,8 +54,31 @@ ...@@ -47,8 +54,31 @@
<vxe-column field="productType" title="产品类型" width="120"></vxe-column> <vxe-column field="productType" title="产品类型" width="120"></vxe-column>
<vxe-column field="productCode" title="产品编码" width="120"></vxe-column> <vxe-column field="productCode" title="产品编码" width="120"></vxe-column>
<vxe-column field="productName" title="产品名称" width="240"></vxe-column> <vxe-column field="productName" title="产品名称" width="240"></vxe-column>
<vxe-column field="varOrderFileId" title="订单变量文件ID" width="180"></vxe-column> <vxe-column field="varOrderFileId" title="订单变量文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?filePath=' + row.varOrderFileId_dictText+ '&type=var'">
{{ row.varOrderFileId }}
</el-link>
</template>
</vxe-column>
<vxe-column field="templateFileId" title="模板文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId">
{{ row.templateFileId }}
</el-link>
</template>
</vxe-column>
<vxe-column title="配置的模板ID" width="180">
<template #default="{ row }">
<el-link
v-for="item in row.varTemplateFileIds"
:key="item"
target="_blank"
:href="'/preview-excel?fileId=' + item"
>{{ item }}</el-link>
</template>
</vxe-column>
<vxe-column title="解析" width="100"> <vxe-column title="解析" width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-button v-if="!!row.varOrderFileId" type="text" size="small" @click="toRun(row)" <el-button v-if="!!row.varOrderFileId" type="text" size="small" @click="toRun(row)"
...@@ -148,7 +178,9 @@ const formState = reactive({ ...@@ -148,7 +178,9 @@ const formState = reactive({
productCode: '', productCode: '',
customerName: '', customerName: '',
orderCode: '', orderCode: '',
orderItemNo: '' orderItemNo: '',
varOrderFileId:'',
templateFileId:''
// column: 'createTime', // column: 'createTime',
// order: 'desc' // order: 'desc'
}) })
...@@ -279,7 +311,9 @@ const onReset = () => { ...@@ -279,7 +311,9 @@ const onReset = () => {
formState.productCode = '' formState.productCode = ''
formState.customerName = '' formState.customerName = ''
formState.orderCode = '' formState.orderCode = ''
formState.orderItemNo = '' formState.orderItemNo = '',
formState.varOrderFileId='',
formState.templateFileId=''
onQuery() onQuery()
} }
......
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