Skip to content

F
factory_front
Commit 06246c16 by wuqian
Options

订单驳回去掉Loading

parent 70fa47ef
Showing with 46 additions and 31 deletions
src/views/order/podCN/index.vue
...@@ -1487,13 +1487,15 @@ ...@@ -1487,13 +1487,15 @@
</div> </div>
</div> </div>
<div class="goods-item-info">
<div class="goods-item-info">
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label" <span class="goods-item-info-item-label"
>英文报关名称:</span >英文报关名称:</span
> >
<span :title="item.customsNameEnglish" class="goods-item-info-item-value"> <span
:title="item.customsNameEnglish"
class="goods-item-info-item-value"
>
{{ item.customsNameEnglish }} {{ item.customsNameEnglish }}
</span> </span>
</div> </div>
...@@ -1501,7 +1503,10 @@ ...@@ -1501,7 +1503,10 @@
<span class="goods-item-info-item-label" <span class="goods-item-info-item-label"
>中文报关名称:</span >中文报关名称:</span
> >
<span :title="item.customsNameChinese" class="goods-item-info-item-value"> <span
:title="item.customsNameChinese"
class="goods-item-info-item-value"
>
{{ item.customsNameChinese }} {{ item.customsNameChinese }}
</span> </span>
</div> </div>
...@@ -1509,20 +1514,25 @@ ...@@ -1509,20 +1514,25 @@
<span class="goods-item-info-item-label" <span class="goods-item-info-item-label"
>申报重量(g):</span >申报重量(g):</span
> >
<span :title="item.customsWeight" class="goods-item-info-item-value"> <span
{{ item.customsWeight }} :title="item.customsWeight"
class="goods-item-info-item-value"
>
{{ item.customsWeight }}
</span> </span>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label" <span class="goods-item-info-item-label"
>申报价值($):</span >申报价值($):</span
> >
<span :title="item.customsValue" class="goods-item-info-item-value"> <span
{{ item.customsValue }} :title="item.customsValue"
class="goods-item-info-item-value"
>
{{ item.customsValue }}
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -3619,11 +3629,11 @@ const rejectOrder = async (type: string) => { ...@@ -3619,11 +3629,11 @@ const rejectOrder = async (type: string) => {
if (selection.value.length === 0 && cardSelection.value.length === 0) { if (selection.value.length === 0 && cardSelection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
const loading = ElLoading.service({ // const loading = ElLoading.service({
fullscreen: true, // fullscreen: true,
text: '操作中...', // text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)', // background: 'rgba(0, 0, 0, 0.3)',
}) // })
try { try {
const { value } = await ElMessageBox.prompt('驳回确认', { const { value } = await ElMessageBox.prompt('驳回确认', {
...@@ -3657,9 +3667,10 @@ const rejectOrder = async (type: string) => { ...@@ -3657,9 +3667,10 @@ const rejectOrder = async (type: string) => {
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e)
} finally {
loading.close()
} }
// finally {
// loading.close()
// }
} }
// 拦截分页 // 拦截分页
const handleInterceptionCommand = (current: number, command: number) => { const handleInterceptionCommand = (current: number, command: number) => {
...@@ -5117,7 +5128,6 @@ const getOrderByIdApi = async (type: string) => { ...@@ -5117,7 +5128,6 @@ const getOrderByIdApi = async (type: string) => {
Fn: (orderIds: (string | number)[]) => Promise<BaseRespData<never>> Fn: (orderIds: (string | number)[]) => Promise<BaseRespData<never>>
} }
} = { } = {
getTrackingNumber: { getTrackingNumber: {
message: '获取跟踪号', message: '获取跟踪号',
Fn: getTrackingNumberApi, Fn: getTrackingNumberApi,
...@@ -5578,7 +5588,9 @@ const getRowStyle = ({ row }: { row: PodCnOrderListData }) => { ...@@ -5578,7 +5588,9 @@ const getRowStyle = ({ row }: { row: PodCnOrderListData }) => {
// 获取行类名方法 // 获取行类名方法
const getRowClassName = ({ row }: { row: PodCnOrderListData }) => { const getRowClassName = ({ row }: { row: PodCnOrderListData }) => {
return selection.value.some((item) => item.id === row.id) ? 'row-selected' : '' return selection.value.some((item) => item.id === row.id)
? 'row-selected'
: ''
} }
const warehouseList = ref<WarehouseListData[]>([]) const warehouseList = ref<WarehouseListData[]>([])
const loadWarehouseList = async () => { const loadWarehouseList = async () => {
...@@ -6082,12 +6094,14 @@ const handleCreateLogistic = () => { ...@@ -6082,12 +6094,14 @@ const handleCreateLogistic = () => {
}) })
} }
const handleShowResult = (data: Array<{ const handleShowResult = (
id: string | number data: Array<{
status: boolean id: string | number
factoryOrderNumber?: string status: boolean
message: string factoryOrderNumber?: string
}>) => { message: string
}>,
) => {
resultInfo.value = data || [] resultInfo.value = data || []
if (resultInfo.value.length > 0) { if (resultInfo.value.length > 0) {
resultRefs.value?.showDialog() resultRefs.value?.showDialog()
......
src/views/order/podUs/index.vue
...@@ -5596,11 +5596,11 @@ const rejectOrder = async (type: string) => { ...@@ -5596,11 +5596,11 @@ const rejectOrder = async (type: string) => {
if (selection.value.length === 0 && cardSelection.value.length === 0) { if (selection.value.length === 0 && cardSelection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
const loading = ElLoading.service({ // const loading = ElLoading.service({
fullscreen: true, // fullscreen: true,
text: '操作中...', // text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)', // background: 'rgba(0, 0, 0, 0.3)',
}) // })
try { try {
const { value } = await ElMessageBox.prompt('驳回确认', { const { value } = await ElMessageBox.prompt('驳回确认', {
...@@ -5634,9 +5634,10 @@ const rejectOrder = async (type: string) => { ...@@ -5634,9 +5634,10 @@ const rejectOrder = async (type: string) => {
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e)
} finally {
loading.close()
} }
// finally {
// loading.close()
// }
} }
const handleStockOut = async (row: PodUsOrderListData) => { const handleStockOut = async (row: PodUsOrderListData) => {
......
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