Commit b27ce66a by linjinhong

fix:修改创建物流订单物流loading问题

parent 4bd2f6ee
......@@ -679,7 +679,8 @@
status === 'PICKING' ||
status === 'TO_BE_CONFIRMED' ||
status === 'STOCK_OUT' ||
status === 'CREATE_LOGISTICS' ? '数量:'
status === 'CREATE_LOGISTICS'
? '数量:'
: '已生产数量:'
}}</span>
<span class="goods-item-info-item-value">
......@@ -1196,13 +1197,16 @@
<div class="total">
<span
>已选择
<span style="color: red">{{ selection.length || cardSelection.length }}</span> 条数据</span
<span style="color: red">{{
selection.length || cardSelection.length
}}</span>
条数据</span
>
</div>
<ElPagination
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="[50,100, 200, 300, 400, 500]"
:page-sizes="[50, 100, 200, 300, 400, 500]"
background
layout="total, sizes, prev, pager, next, jumper"
:total="total"
......@@ -1213,15 +1217,19 @@
<div class="pageSize">
<span
>自定义条数
<span><el-input
<span
><el-input
v-model="pageSize"
type="number"
style="width: 100px;" clearable
@blur="inputBlur"></el-input></span> /</span
style="width: 100px"
clearable
@blur="inputBlur"
></el-input
></span>
/</span
>
</div>
</div>
</div>
</div>
<RightClickMenu
......@@ -1656,7 +1664,7 @@ import platformJson from '../../../json/platform.json'
declare global {
interface Window {
ActiveXObject: {
new(type: string): XMLHttpRequest
new (type: string): XMLHttpRequest
}
VBS_BinaryToArray: {
(data: unknown): { toArray(): number[] }
......@@ -2219,7 +2227,10 @@ const downloadTif = async (type: string) => {
cardSelection.value.map((el) => el.id),
type,
)
const url = type === 'tiff' ? `https://ps.jomalls.com/tiff/` + res.message : filePath + res.message
const url =
type === 'tiff'
? `https://ps.jomalls.com/tiff/` + res.message
: filePath + res.message
window.open(url, '_blank')
if (type === 'tiff') {
tifDownloadLoading.value = false
......@@ -2745,7 +2756,7 @@ const getOrderByIdApi = async (type: string) => {
return
}
let loading
const operation = operationMap[type]
if (operation) {
try {
......@@ -2757,7 +2768,7 @@ const getOrderByIdApi = async (type: string) => {
const ids = selection.value.map((el) => el.id)
const loading = ElLoading.service({
loading = ElLoading.service({
fullscreen: true,
text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)',
......@@ -2781,10 +2792,11 @@ const getOrderByIdApi = async (type: string) => {
} else {
ElMessage.error(res.message)
}
loading.close()
} catch (e) {
resultInfo.value = []
console.error(e)
} finally {
loading && loading.close()
}
} else {
ElMessage.warning('未知操作类型')
......
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