Commit 0fa79ed3 authored by tanghao's avatar tanghao

订单转换

parent d303cc21
......@@ -558,7 +558,9 @@ const confirmChange = async (row) => {
cancelButtonText: '取消',
type: 'warning'
})
loading.value = true
const { data } = await convertExcelFileOrder(row.excelOrderId)
loading.value = false
if (data.code == 200) {
ElMessage.success(data.message || '转换成功!')
detailVisible.value = false
......@@ -597,6 +599,7 @@ const toDetail = async (row: any) => {
const toSaleOrderDetail = async (row: any) => {
loading.value = true
const titles: string[] = []
const { data } = await listSaleOrdersByExcelId(row.excelOrderId)
let flatdatas: any = null
......@@ -626,6 +629,7 @@ const toSaleOrderDetail = async (row: any) => {
...flatdatas
}
})
loading.value = false
// 打开弹窗
convertVisible.value = true
}
......
......@@ -101,7 +101,7 @@
<vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
<vxe-column field="updateTime" title="修改时间" width="180"></vxe-column>
<vxe-column field="action" title="操作" width="80" fixed="right">
<vxe-column field="action" title="操作" width="150" fixed="right">
<template #default="{ row }">
<el-link
type="primary"
......@@ -110,6 +110,9 @@
target="_blank"
>查看</el-link
>
<el-divider direction="vertical"></el-divider>
<el-link type="primary" style="font-size: 12px" @click="toRun(row)">执行解析</el-link
>
</template>
</vxe-column>
</vxe-table>
......@@ -141,6 +144,11 @@ import { queryParamsFilter } from '@/utils/query'
import { MoreFilled } from '@element-plus/icons-vue'
import UserModal from '@/components/UserModal/UserModal.vue'
import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
import {
excelMarkRun
} from '@/api/excel'
const router = useRouter()
const loading = ref(false)
......@@ -211,6 +219,19 @@ const onQuery = async () => {
loading.value = false
}
const toRun = async (row) => {
loading.value = true
const { data } = await excelMarkRun(row.orderFileId)
if (data?.code != 200) {
ElMessage.error(data?.message || '操作失败!')
}
loading.value = false
}
onMounted(() => {
onQuery()
})
......
......@@ -75,11 +75,12 @@
@click="showDetail(row, 'old')"
>转换前</el-link
>
<el-divider direction="vertical"></el-divider>
<el-divider direction="vertical" v-if="row.status == 'converted' || row.status == 'confirm'"></el-divider>
<el-link
class="ml-1"
style="font-size: 12px"
type="primary"
v-if="row.status == 'converted' || row.status == 'confirm'"
@click="showDetail(row, 'new')"
>转换后</el-link
>
......@@ -479,10 +480,12 @@ const confirmChange = async (row) => {
cancelButtonText: '取消',
type: 'warning'
})
loading.value = true
const { data } = await apiVarTemplateConvert(row.varTemplateDetailId)
if (data.code == 200) {
ElMessage.success(data.message || '转换成功!')
detailVisible.value = false
loading.value = false
onQuery()
return
}
......@@ -534,6 +537,7 @@ const details = ref({
titles: []
})
const showDetail = async (row: any, type = 'old') => {
loading.value = true
const { data } =
type == 'old'
? await apiVarTemplateGetVars(row.varTemplateDetailId)
......@@ -543,7 +547,7 @@ const showDetail = async (row: any, type = 'old') => {
details.value.title = type == 'old' ? '转换前的变量' : '转换后变量'
details.value.data = res
details.value.titles = titles
loading.value = false
tempVisible.value = true
}
......
......@@ -247,6 +247,7 @@ const detailVariable = ref({
})
const currentRow = ref()
const handleShowVarRun = async (row: any) => {
loading.value = true
currentRow.value = row
const { data } = await apiOrderVarGetOrderNewVars(row.orderItemId)
if (data?.code === 500) {
......@@ -258,7 +259,9 @@ const handleShowVarRun = async (row: any) => {
detailVariable.value.data = res as any
detailVariable.value.errors = data.result?.errors || []
nextTick(() => {
loading.value = false
tempVisible.value = true
})
}
......
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