Skip to content

F
factory_front
Commit 937e619f by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !45
parents c7f5bad4 2290b3c2
Showing with 37 additions and 50 deletions
auto-imports.d.ts
...@@ -88,21 +88,6 @@ declare global { ...@@ -88,21 +88,6 @@ declare global {
// for type re-export // for type re-export
declare global { declare global {
// @ts-ignore // @ts-ignore
export type { export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
Component,
ComponentPublicInstance,
ComputedRef,
DirectiveBinding,
ExtractDefaultPropTypes,
ExtractPropTypes,
ExtractPublicPropTypes,
InjectionKey,
PropType,
Ref,
MaybeRef,
MaybeRefOrGetter,
VNode,
WritableComputedRef,
} from 'vue'
import('vue') import('vue')
} }
src/views/order/podUs/index.vue
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
blue: item.quantity && item.quantity > 0, blue: item.quantity && item.quantity > 0,
red: item.status === 'EXCEPTION_ORDER', red: item.status === 'EXCEPTION_ORDER',
}" }"
>{{ item.quantity }}</span >{{ item.quantity }}</span
> >
</div> </div>
<!-- <div <!-- <div
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
<ElButton <ElButton
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
type="warning" type="warning"
@click="downloadTif('tiff', 'tiff')" @click="downloadTif('tiff')"
> >
TIF排版 TIF排版
</ElButton> </ElButton>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<ElButton <ElButton
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
type="warning" type="warning"
@click="downloadTif('png', 'composingPNG')" @click="downloadTif('png')"
> >
PNG排版 PNG排版
</ElButton> </ElButton>
...@@ -447,19 +447,19 @@ ...@@ -447,19 +447,19 @@
<template #dropdown> <template #dropdown>
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')" <ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')"
>创建物流订单</ElDropdownItem >创建物流订单</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')" <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
>获取跟踪号</ElDropdownItem >获取跟踪号</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('getPrintOrder')" <ElDropdownItem @click="getOrderByIdApi('getPrintOrder')"
>获取打印面单</ElDropdownItem >获取打印面单</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('cancelLogisticsOrder')" <ElDropdownItem @click="getOrderByIdApi('cancelLogisticsOrder')"
>取消物流订单</ElDropdownItem >取消物流订单</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('batchChangeLogistics')" <ElDropdownItem @click="getOrderByIdApi('batchChangeLogistics')"
>更换物流</ElDropdownItem >更换物流</ElDropdownItem
> >
</ElDropdownMenu> </ElDropdownMenu>
</template> </template>
...@@ -610,7 +610,7 @@ ...@@ -610,7 +610,7 @@
</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 <span
class="goods-item-info-item-value" class="goods-item-info-item-value"
...@@ -643,7 +643,7 @@ ...@@ -643,7 +643,7 @@
> >
<!-- <span class="goods-item-info-item-label">补胚状态:</span> --> <!-- <span class="goods-item-info-item-label">补胚状态:</span> -->
<el-tag size="small" effect="dark" type="danger" <el-tag size="small" effect="dark" type="danger"
>补胚中 >补胚中
</el-tag> </el-tag>
</div> </div>
</div> </div>
...@@ -675,19 +675,20 @@ ...@@ -675,19 +675,20 @@
<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">{{
status === 'EXCEPTION_ORDER' || status === 'EXCEPTION_ORDER' ||
status === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_CONFIRMED' || status === 'TO_BE_CONFIRMED' ||
status === 'STOCK_OUT' status === 'STOCK_OUT'||
? '数量:' status === 'CREATE_LOGISTICS' ? '数量:'
: '已生产数量:' : '已生产数量:'
}}</span> }}</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ {{
status === 'EXCEPTION_ORDER' || status === 'EXCEPTION_ORDER' ||
status === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_CONFIRMED' || status === 'TO_BE_CONFIRMED' ||
status === 'STOCK_OUT' status === 'STOCK_OUT' ||
status === 'CREATE_LOGISTICS'
? item.num ? item.num
: item.passNum : item.passNum
}} }}
...@@ -710,7 +711,7 @@ ...@@ -710,7 +711,7 @@
size="small" size="small"
type="success" type="success"
@click="applyForReplenishment(item)" @click="applyForReplenishment(item)"
>申请补胚 >申请补胚
</el-button> </el-button>
<!-- f --> <!-- f -->
</div> </div>
...@@ -896,17 +897,17 @@ ...@@ -896,17 +897,17 @@
<el-timeline-item <el-timeline-item
:color="row.createTime ? '#409EFF' : ''" :color="row.createTime ? '#409EFF' : ''"
:timestamp="row.createTime" :timestamp="row.createTime"
>创建时间 >创建时间
</el-timeline-item> </el-timeline-item>
<el-timeline-item <el-timeline-item
:color="row.startStockingTime ? '#E6A23C' : ''" :color="row.startStockingTime ? '#E6A23C' : ''"
:timestamp="row.startStockingTime" :timestamp="row.startStockingTime"
>确认时间 >确认时间
</el-timeline-item> </el-timeline-item>
<el-timeline-item <el-timeline-item
:color="row.finishTime ? '#67C23A' : ''" :color="row.finishTime ? '#67C23A' : ''"
:timestamp="row.finishTime" :timestamp="row.finishTime"
>完成时间 >完成时间
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
<!-- <div class="order-time-box"> <!-- <div class="order-time-box">
...@@ -1079,7 +1080,7 @@ ...@@ -1079,7 +1080,7 @@
<div class="grid-container"> <div class="grid-container">
<div class="grid-item" title="商品名称"> <div class="grid-item" title="商品名称">
<span class="grid-item-value" <span class="grid-item-value"
>{{ cardItem?.productName }} >{{ cardItem?.productName }}
</span> </span>
</div> </div>
<div <div
...@@ -1181,7 +1182,7 @@ ...@@ -1181,7 +1182,7 @@
</div> </div>
<div v-if="cardItem.isReplenishment" class="grid-item"> <div v-if="cardItem.isReplenishment" class="grid-item">
<el-tag size="small" type="danger" effect="dark" <el-tag size="small" type="danger" effect="dark"
>补胚中 >补胚中
</el-tag> </el-tag>
</div> </div>
</div> </div>
...@@ -1636,7 +1637,7 @@ import platformJson from '../../../json/platform.json' ...@@ -1636,7 +1637,7 @@ import platformJson from '../../../json/platform.json'
declare global { declare global {
interface Window { interface Window {
ActiveXObject: { ActiveXObject: {
new (type: string): XMLHttpRequest new(type: string): XMLHttpRequest
} }
VBS_BinaryToArray: { VBS_BinaryToArray: {
(data: unknown): { toArray(): number[] } (data: unknown): { toArray(): number[] }
...@@ -1813,7 +1814,7 @@ const tableColumns = computed(() => [ ...@@ -1813,7 +1814,7 @@ const tableColumns = computed(() => [
label: '商品', label: '商品',
prop: 'goods', prop: 'goods',
slot: 'goods', slot: 'goods',
minWidth: 800, minWidth: 920,
}, },
{ {
label: '订单详情', label: '订单详情',
...@@ -1831,7 +1832,7 @@ const tableColumns = computed(() => [ ...@@ -1831,7 +1832,7 @@ const tableColumns = computed(() => [
{ {
label: '时间', label: '时间',
slot: 'time', slot: 'time',
width: 300, width: 180,
prop: 'time', prop: 'time',
align: 'left', align: 'left',
}, },
...@@ -2183,7 +2184,7 @@ const productionClientVisible = ref(false) ...@@ -2183,7 +2184,7 @@ const productionClientVisible = ref(false)
// productionClientVisible.value = true // productionClientVisible.value = true
// } // }
const downloadTif = async (type: string, dir: string) => { const downloadTif = async (type: string) => {
if (!cardSelection.value.length) { if (!cardSelection.value.length) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
...@@ -2197,18 +2198,19 @@ const downloadTif = async (type: string, dir: string) => { ...@@ -2197,18 +2198,19 @@ const downloadTif = async (type: string, dir: string) => {
cardSelection.value.map((el) => el.id), cardSelection.value.map((el) => el.id),
type, type,
) )
window.open(`https://ps.jomalls.com/${dir}/` + res.message, '_blank') const url = type === 'tiff' ? `https://ps.jomalls.com/tiff/` + res.message : filePath + res.message
window.open(url, '_blank')
if (type === 'tiff') { if (type === 'tiff') {
tifDownloadLoading.value = true tifDownloadLoading.value = false
} else { } else {
pngDownloadLoading.value = true pngDownloadLoading.value = false
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e)
if (type === 'tiff') { if (type === 'tiff') {
tifDownloadLoading.value = true tifDownloadLoading.value = false
} else { } else {
pngDownloadLoading.value = true pngDownloadLoading.value = false
} }
} }
} }
...@@ -3460,7 +3462,7 @@ const replenishmentSuccess = async () => { ...@@ -3460,7 +3462,7 @@ const replenishmentSuccess = async () => {
.goods-item { .goods-item {
display: grid; display: grid;
grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px; grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px;
gap: 20px; gap: 20px;
.goods-item-img { .goods-item-img {
......
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