Skip to content

F
factory_front
Commit abc9c623 by wusiyi
Options

Merge branch 'dev'

parents 7cd30234 b8e6fad6
Showing with 134 additions and 121 deletions
src/views/order/podCN/index.vue
...@@ -128,13 +128,19 @@ ...@@ -128,13 +128,19 @@
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="类型"> <ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity" @click.stop="(e: Event) => handleRadioGroupClick(e)"> <el-radio-group
v-model="searchForm.customizedQuantity"
@click.stop="(e: Event) => handleRadioGroupClick(e)"
>
<el-radio-button value="single">单面</el-radio-button> <el-radio-button value="single">单面</el-radio-button>
<el-radio-button value="multiple">多面</el-radio-button> <el-radio-button value="multiple">多面</el-radio-button>
</el-radio-group> </el-radio-group>
</ElFormItem> </ElFormItem>
<ElFormItem label="数量"> <ElFormItem label="数量">
<el-radio-group v-model="searchForm.multi" @click.stop="(e: Event) => handleMultiRadioGroupClick(e)"> <el-radio-group
v-model="searchForm.multi"
@click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
>
<el-radio-button :value="false">单件</el-radio-button> <el-radio-button :value="false">单件</el-radio-button>
<el-radio-button :value="true">多件</el-radio-button> <el-radio-button :value="true">多件</el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -356,7 +362,7 @@ ...@@ -356,7 +362,7 @@
<ElFormItem> <ElFormItem>
<span> <span>
<ElButton link style="font-size: 12px" @click="resetSearchForm" <ElButton link style="font-size: 12px" @click="resetSearchForm"
><span title="重置查询条件">重置</span></ElButton ><span title="重置查询条件">重置</span></ElButton
> >
</span> </span>
</ElFormItem> </ElFormItem>
...@@ -384,32 +390,26 @@ ...@@ -384,32 +390,26 @@
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
@click="downloadTif('tiff', 42)" @click="downloadTif('tiff', 42)"
>TIF(40+2cm) >TIF(40+2cm)
</ElDropdownItem </ElDropdownItem>
>
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
@click="downloadTif('tiff', 60)" @click="downloadTif('tiff', 60)"
>TIF(60cm) >TIF(60cm)
</ElDropdownItem </ElDropdownItem>
>
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
@click="downloadTif('png', 42)" @click="downloadTif('png', 42)"
>PNG(40+2cm) >PNG(40+2cm)
</ElDropdownItem </ElDropdownItem>
>
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
@click="downloadTif('png', 60)" @click="downloadTif('png', 60)"
>PNG(60cm) >PNG(60cm)
</ElDropdownItem </ElDropdownItem>
>
</ElDropdownMenu> </ElDropdownMenu>
</template </template>
> </ElDropdown>
</ElDropdown
>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<!-- <span <!-- <span
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
</span> </span>
<span v-if="status === 'WAIT_SHIPMENT'" class="item"> <span v-if="status === 'WAIT_SHIPMENT'" class="item">
<ElButton type="primary" @click="completeDelivery()" <ElButton type="primary" @click="completeDelivery()"
>完成发货</ElButton >完成发货</ElButton
> >
</span> </span>
<span <span
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
selection.some((item) => item.shipmentType !== 1) selection.some((item) => item.shipmentType !== 1)
" "
@click="getOrderByIdApi('createLogisticsOrder')" @click="getOrderByIdApi('createLogisticsOrder')"
>创建物流订单</ElDropdownItem >创建物流订单</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:disabled=" :disabled="
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
selection.some((item) => item.shipmentType !== 1) selection.some((item) => item.shipmentType !== 1)
" "
@click="getOrderByIdApi('getTrackingNumber')" @click="getOrderByIdApi('getTrackingNumber')"
>获取跟踪号</ElDropdownItem >获取跟踪号</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:disabled=" :disabled="
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
selection.some((item) => item.shipmentType !== 1) selection.some((item) => item.shipmentType !== 1)
" "
@click="getOrderByIdApi('getPrintOrder')" @click="getOrderByIdApi('getPrintOrder')"
>获取打印面单</ElDropdownItem >获取打印面单</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:disabled=" :disabled="
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
selection.some((item) => item.shipmentType !== 1) selection.some((item) => item.shipmentType !== 1)
" "
@click="getOrderByIdApi('cancelLogisticsOrder')" @click="getOrderByIdApi('cancelLogisticsOrder')"
>取消物流订单</ElDropdownItem >取消物流订单</ElDropdownItem
> >
</ElDropdownMenu> </ElDropdownMenu>
</template> </template>
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
class="item" class="item"
> >
<ElButton type="primary" @click="downloadMaterial" <ElButton type="primary" @click="downloadMaterial"
>下载素材</ElButton >下载素材</ElButton
> >
</span> </span>
<span <span
...@@ -691,17 +691,8 @@ ...@@ -691,17 +691,8 @@
刷新商品信息 刷新商品信息
</ElButton> </ElButton>
</span> </span>
<span <span v-if="['WAIT_SHIPMENT'].includes(status)" class="item">
v-if=" <ElButton type="primary" @click="printNormal"> 普货拣货 </ElButton>
[
'WAIT_SHIPMENT',
].includes(status)
"
class="item"
>
<ElButton type="primary" @click="printNormal">
普货拣货
</ElButton>
</span> </span>
<span <span
v-if=" v-if="
...@@ -724,7 +715,7 @@ ...@@ -724,7 +715,7 @@
selection.length === 0 && cardSelection.length === 0 selection.length === 0 && cardSelection.length === 0
" "
@click="rejectOrder('TO_BE_CONFIRMED')" @click="rejectOrder('TO_BE_CONFIRMED')"
>待确认</ElDropdownItem >待确认</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
v-if=" v-if="
...@@ -736,7 +727,7 @@ ...@@ -736,7 +727,7 @@
selection.length === 0 && cardSelection.length === 0 selection.length === 0 && cardSelection.length === 0
" "
@click="rejectOrder('CREATE_LOGISTICS')" @click="rejectOrder('CREATE_LOGISTICS')"
>待创建物流</ElDropdownItem >待创建物流</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
v-if="status === 'PICKING' || status === 'IN_PRODUCTION'" v-if="status === 'PICKING' || status === 'IN_PRODUCTION'"
...@@ -744,7 +735,7 @@ ...@@ -744,7 +735,7 @@
selection.length === 0 && cardSelection.length === 0 selection.length === 0 && cardSelection.length === 0
" "
@click="rejectOrder('TO_BE_ARRANGE')" @click="rejectOrder('TO_BE_ARRANGE')"
>待排单</ElDropdownItem >待排单</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
v-if="status === 'IN_PRODUCTION'" v-if="status === 'IN_PRODUCTION'"
...@@ -752,7 +743,7 @@ ...@@ -752,7 +743,7 @@
selection.length === 0 && cardSelection.length === 0 selection.length === 0 && cardSelection.length === 0
" "
@click="rejectOrder('PICKING')" @click="rejectOrder('PICKING')"
>待拣胚</ElDropdownItem >待拣胚</ElDropdownItem
> >
</ElDropdownMenu> </ElDropdownMenu>
</template> </template>
...@@ -769,12 +760,12 @@ ...@@ -769,12 +760,12 @@
:loading="exportLoading" :loading="exportLoading"
type="success" type="success"
@click="exportData" @click="exportData"
>导出</ElButton >导出</ElButton
> >
</span> </span>
<span v-if="status === 'BATCH_DOWNLOAD'" class="item"> <span v-if="status === 'BATCH_DOWNLOAD'" class="item">
<ElButton type="danger" @click="handleBatchDelete('batch')" <ElButton type="danger" @click="handleBatchDelete('batch')"
>批量删除</ElButton >批量删除</ElButton
> >
</span> </span>
</ElFormItem> </ElFormItem>
...@@ -795,7 +786,7 @@ ...@@ -795,7 +786,7 @@
:class="{ :class="{
blue: true, blue: true,
}" }"
>{{ item.quantity && item.quantity > 0 ? item.quantity : 0 }}</span >{{ item.quantity && item.quantity > 0 ? item.quantity : 0 }}</span
> >
</div> </div>
</div> </div>
...@@ -850,7 +841,7 @@ ...@@ -850,7 +841,7 @@
<span <span
v-if="interceptionStatus.production['0']" v-if="interceptionStatus.production['0']"
class="tabs-node_count blue" class="tabs-node_count blue"
>{{ interceptionStatus.production['0'] }}</span >{{ interceptionStatus.production['0'] }}</span
> >
</div> </div>
<div <div
...@@ -862,7 +853,7 @@ ...@@ -862,7 +853,7 @@
<span <span
v-if="interceptionStatus.production['1']" v-if="interceptionStatus.production['1']"
class="tabs-node_count blue" class="tabs-node_count blue"
>{{ interceptionStatus.production['1'] }}</span >{{ interceptionStatus.production['1'] }}</span
> >
</div> </div>
<div <div
...@@ -874,7 +865,7 @@ ...@@ -874,7 +865,7 @@
<span <span
v-if="interceptionStatus.production['2']" v-if="interceptionStatus.production['2']"
class="tabs-node_count red" class="tabs-node_count red"
>{{ interceptionStatus.production['2'] }}</span >{{ interceptionStatus.production['2'] }}</span
> >
</div> </div>
<div <div
...@@ -886,7 +877,7 @@ ...@@ -886,7 +877,7 @@
<span <span
v-if="interceptionStatus.shipment['0']" v-if="interceptionStatus.shipment['0']"
class="tabs-node_count blue" class="tabs-node_count blue"
>{{ interceptionStatus.shipment['0'] }}</span >{{ interceptionStatus.shipment['0'] }}</span
> >
</div> </div>
<div <div
...@@ -898,7 +889,7 @@ ...@@ -898,7 +889,7 @@
<span <span
v-if="interceptionStatus.shipment['1']" v-if="interceptionStatus.shipment['1']"
class="tabs-node_count blue" class="tabs-node_count blue"
>{{ interceptionStatus.shipment['1'] }}</span >{{ interceptionStatus.shipment['1'] }}</span
> >
</div> </div>
<div <div
...@@ -910,7 +901,7 @@ ...@@ -910,7 +901,7 @@
<span <span
v-if="interceptionStatus.shipment['2']" v-if="interceptionStatus.shipment['2']"
class="tabs-node_count red" class="tabs-node_count red"
>{{ interceptionStatus.shipment['2'] }}</span >{{ interceptionStatus.shipment['2'] }}</span
> >
</div> </div>
</div> </div>
...@@ -970,7 +961,9 @@ ...@@ -970,7 +961,9 @@
style="display: flex; flex-direction: column" style="display: flex; flex-direction: column"
> >
<div <div
v-for="img in item.productMark!=='normal' ?item.previewImgs:[{url:item.variantImage}]" v-for="img in item.productMark !== 'normal'
? item.previewImgs
: [{ url: item.variantImage }]"
:key="img" :key="img"
style="text-align: center" style="text-align: center"
> >
...@@ -1087,7 +1080,7 @@ ...@@ -1087,7 +1080,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"
...@@ -1129,7 +1122,7 @@ ...@@ -1129,7 +1122,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>
...@@ -1142,7 +1135,7 @@ ...@@ -1142,7 +1135,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 class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.templatePrice }} {{ item.templatePrice }}
...@@ -1150,7 +1143,7 @@ ...@@ -1150,7 +1143,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 class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.craftPrice }} {{ item.craftPrice }}
...@@ -1158,7 +1151,7 @@ ...@@ -1158,7 +1151,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 class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ calculatedPrice(item) }} {{ calculatedPrice(item) }}
...@@ -1167,13 +1160,13 @@ ...@@ -1167,13 +1160,13 @@
<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 === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_CONFIRMED' || status === 'TO_BE_CONFIRMED' ||
status === 'STOCK_OUT' || status === 'STOCK_OUT' ||
status === 'CREATE_LOGISTICS' status === 'CREATE_LOGISTICS'
? '数量:' ? '数量:'
: '已生产数量:' : '已生产数量:'
}}</span> }}</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ {{
status === 'PICKING' || status === 'PICKING' ||
...@@ -1197,12 +1190,15 @@ ...@@ -1197,12 +1190,15 @@
{{ item.replenishmentSumNum || 0 }} {{ item.replenishmentSumNum || 0 }}
</span> </span>
<el-button <el-button
v-if="status === 'WAIT_SHIPMENT' && item.productMark!=='normal'" v-if="
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'normal'
"
link link
size="small" size="small"
type="success" type="success"
@click="applyForReplenishment(item)" @click="applyForReplenishment(item)"
>申请补胚 >申请补胚
</el-button> </el-button>
<!-- f --> <!-- f -->
</div> </div>
...@@ -1215,13 +1211,16 @@ ...@@ -1215,13 +1211,16 @@
{{ item.weight }}g {{ item.weight }}g
</span> </span>
<el-button <el-button
v-if="status === 'WAIT_SHIPMENT' && item.productMark!=='normal'" v-if="
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'normal'
"
link link
size="small" size="small"
type="warning" type="warning"
style="height: 23px; margin: 0" style="height: 23px; margin: 0"
@click="showArrange(3, item)" @click="showArrange(3, item)"
>排版 >排版
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -1443,17 +1442,17 @@ ...@@ -1443,17 +1442,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">
...@@ -1713,9 +1712,8 @@ ...@@ -1713,9 +1712,8 @@
type="primary" type="primary"
:title="item.name || ''" :title="item.name || ''"
style="margin-bottom: 2px" style="margin-bottom: 2px"
>{{ item.name || '' }} >{{ item.name || '' }}
</el-tag </el-tag>
>
</div> </div>
</template> </template>
<div <div
...@@ -1732,8 +1730,8 @@ ...@@ -1732,8 +1730,8 @@
:key="index" :key="index"
size="small" size="small"
type="primary" type="primary"
><span ><span
style=" style="
width: 50px; width: 50px;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
...@@ -1741,17 +1739,16 @@ ...@@ -1741,17 +1739,16 @@
text-overflow: ellipsis; text-overflow: ellipsis;
display: inline-block; display: inline-block;
" "
:title="item.name || ''" :title="item.name || ''"
>{{ item.name || '' }}</span >{{ item.name || '' }}</span
></el-tag ></el-tag
> >
<el-tag <el-tag
v-if="cardItem.customTagList?.slice(3)?.length" v-if="cardItem.customTagList?.slice(3)?.length"
size="small" size="small"
type="primary" type="primary"
>+{{ cardItem.customTagList.slice(3).length }} >+{{ cardItem.customTagList.slice(3).length }}
</el-tag </el-tag>
>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>
...@@ -1805,7 +1802,7 @@ ...@@ -1805,7 +1802,7 @@
</template> </template>
<template #images> <template #images>
<div class="flex-between"> <div class="flex-between">
<div v-if="cardItem.imageAry " class="images-position"> <div v-if="cardItem.imageAry" class="images-position">
<div <div
v-for="(item, index) in JSON.parse( v-for="(item, index) in JSON.parse(
cardItem.imageAry || '', cardItem.imageAry || '',
...@@ -1857,7 +1854,7 @@ ...@@ -1857,7 +1854,7 @@
:title="`商品名称:${cardItem?.productName || ''}`" :title="`商品名称:${cardItem?.productName || ''}`"
> >
<span class="grid-item-value" <span class="grid-item-value"
>{{ cardItem?.productName }} >{{ cardItem?.productName }}
</span> </span>
</div> </div>
<div <div
...@@ -1991,7 +1988,7 @@ ...@@ -1991,7 +1988,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>
...@@ -2004,10 +2001,10 @@ ...@@ -2004,10 +2001,10 @@
<div class="pagination"> <div class="pagination">
<div class="total"> <div class="total">
<span <span
>已选择 >已选择
<span style="color: red">{{ <span style="color: red">{{
selection.length || cardSelection.length selection.length || cardSelection.length
}}</span> }}</span>
条数据</span 条数据</span
> >
</div> </div>
...@@ -2024,15 +2021,15 @@ ...@@ -2024,15 +2021,15 @@
></ElPagination> ></ElPagination>
<div class="pageSize"> <div class="pageSize">
<span <span
>自定义条数 >自定义条数
<span <span
><el-input ><el-input
v-model="pageSize" v-model="pageSize"
type="number" type="number"
style="width: 100px" style="width: 100px"
clearable clearable
@blur="inputBlur" @blur="inputBlur"
></el-input ></el-input
></span> ></span>
条/页</span 条/页</span
> >
...@@ -2435,9 +2432,8 @@ ...@@ -2435,9 +2432,8 @@
typesettingVisible = false typesettingVisible = false
} }
" "
>取消 >取消
</el-button </el-button>
>
<el-button type="primary" @click="submitTypesetting">确认</el-button> <el-button type="primary" @click="submitTypesetting">确认</el-button>
</template> </template>
</ElDialog> </ElDialog>
...@@ -2503,7 +2499,8 @@ import { ...@@ -2503,7 +2499,8 @@ import {
printPickPdfByBatchNumberApi, printPickPdfByBatchNumberApi,
printProductionPdfByBatchNumberApi, printProductionPdfByBatchNumberApi,
batchDownloadRecomposingApi, batchDownloadRecomposingApi,
getCustomTagListCnApi, printNormalPdf, getCustomTagListCnApi,
printNormalPdf,
} from '@/api/podCnOrder' } from '@/api/podCnOrder'
import { BaseRespData } from '@/types/api' import { BaseRespData } from '@/types/api'
...@@ -2557,7 +2554,7 @@ import { ...@@ -2557,7 +2554,7 @@ import {
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[] }
...@@ -2679,13 +2676,16 @@ const productMarkList = [ ...@@ -2679,13 +2676,16 @@ const productMarkList = [
{ {
label: '普通商品', label: '普通商品',
value: 'normal', value: 'normal',
}, { },
{
label: 'pod商品', label: 'pod商品',
value: 'pod', value: 'pod',
}, { },
{
label: '一件定制局部印', label: '一件定制局部印',
value: 'custom_part', value: 'custom_part',
}, { },
{
label: '一件定制满印', label: '一件定制满印',
value: 'custom_full', value: 'custom_full',
}, },
...@@ -2886,8 +2886,9 @@ const printNormal = async () => { ...@@ -2886,8 +2886,9 @@ const printNormal = async () => {
if (!selection.value.length) { if (!selection.value.length) {
return ElMessage.warning('请选择订单') return ElMessage.warning('请选择订单')
} }
selection.value.forEach(s => { selection.value.forEach((s) => {
const f = s.productList && s.productList.find(p => p.productMark === 'normal') const f =
s.productList && s.productList.find((p) => p.productMark === 'normal')
if (f) arr.push(s.id) if (f) arr.push(s.id)
}) })
if (!arr.length) { if (!arr.length) {
...@@ -3064,8 +3065,8 @@ const interceptChange = async (status: boolean) => { ...@@ -3064,8 +3065,8 @@ const interceptChange = async (status: boolean) => {
? 1 ? 1
: 3 : 3
: interceptCurrent.value === 1 : interceptCurrent.value === 1
? 2 ? 2
: 4 : 4
try { try {
const res = await interceptUpdateApi({ const res = await interceptUpdateApi({
orderIds: selection.value.map((item) => item.id), orderIds: selection.value.map((item) => item.id),
...@@ -3106,8 +3107,8 @@ const rejectOrder = async (type: string) => { ...@@ -3106,8 +3107,8 @@ const rejectOrder = async (type: string) => {
orderStatus: type, orderStatus: type,
productList: selection.value.length productList: selection.value.length
? selection.value.flatMap( ? selection.value.flatMap(
(item: PodCnOrderListData) => item.productList || [], (item: PodCnOrderListData) => item.productList || [],
) )
: cardSelection.value, : cardSelection.value,
reasonStr: value, reasonStr: value,
}) })
...@@ -3818,8 +3819,8 @@ const downloadTif = async (type: string, templateWidth: number) => { ...@@ -3818,8 +3819,8 @@ const downloadTif = async (type: string, templateWidth: number) => {
a.href = window.URL.createObjectURL(blob) a.href = window.URL.createObjectURL(blob)
a.target = '_blank' a.target = '_blank'
a.download = (res.message as string).split('/')[ a.download = (res.message as string).split('/')[
(res.message as string).split('/').length - 1 (res.message as string).split('/').length - 1
] ]
a.click() a.click()
pngDownloadLoading.value = false pngDownloadLoading.value = false
}) })
...@@ -3883,8 +3884,10 @@ const downloadSingleType = async ( ...@@ -3883,8 +3884,10 @@ const downloadSingleType = async (
const res = await composingDesignImages([id], type, templateWidth) const res = await composingDesignImages([id], type, templateWidth)
const isTiff = type === 'tiff' const isTiff = type === 'tiff'
const url = isTiff const url = isTiff
? `https://ps.jomalls.com/tiff/${res.message}` ? res.message?.startsWith('/temp')
: `${filePath}${res.message}` ? `https://factory.jomalls.com/upload/factory` + res.message
: `https://ps.jomalls.com/tiff/` + res.message
: filePath + res.message
if (isTiff) { if (isTiff) {
// 对于tiff类型，直接在新窗口打开 // 对于tiff类型，直接在新窗口打开
...@@ -3903,7 +3906,9 @@ const handleRadioGroupClick = (event: Event) => { ...@@ -3903,7 +3906,9 @@ const handleRadioGroupClick = (event: Event) => {
const radioButton = target.closest('.el-radio-button') const radioButton = target.closest('.el-radio-button')
if (radioButton) { if (radioButton) {
const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement const input = radioButton.querySelector(
'input[type="radio"]',
) as HTMLInputElement
if (input) { if (input) {
const value = input.value const value = input.value
if (searchForm.value.customizedQuantity === value) { if (searchForm.value.customizedQuantity === value) {
...@@ -3920,7 +3925,9 @@ const handleMultiRadioGroupClick = (event: Event) => { ...@@ -3920,7 +3925,9 @@ const handleMultiRadioGroupClick = (event: Event) => {
const radioButton = target.closest('.el-radio-button') const radioButton = target.closest('.el-radio-button')
if (radioButton) { if (radioButton) {
const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement const input = radioButton.querySelector(
'input[type="radio"]',
) as HTMLInputElement
if (input) { if (input) {
const value = input.value === 'true' ? true : false const value = input.value === 'true' ? true : false
if (searchForm.value.multi === value) { if (searchForm.value.multi === value) {
......
src/views/order/podUs/index.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</el-radio-group> </el-radio-group>
</ElFormItem> </ElFormItem>
<ElFormItem label="数量"> <ElFormItem label="数量">
<el-radio-group <el-radio-group
v-model="searchForm.multi" v-model="searchForm.multi"
@click.stop="(e: Event) => handleMultiRadioGroupClick(e)" @click.stop="(e: Event) => handleMultiRadioGroupClick(e)"
> >
...@@ -4103,8 +4103,10 @@ const downloadSingleType = async ( ...@@ -4103,8 +4103,10 @@ const downloadSingleType = async (
const res = await composingDesignImages([id], type, templateWidth) const res = await composingDesignImages([id], type, templateWidth)
const isTiff = type === 'tiff' const isTiff = type === 'tiff'
const url = isTiff const url = isTiff
? `https://ps.jomalls.com/tiff/${res.message}` ? res.message?.startsWith('/temp')
: `${filePath}${res.message}` ? `https://factory.jomalls.com/upload/factory` + res.message
: `https://ps.jomalls.com/tiff/` + res.message
: filePath + res.message
if (isTiff) { if (isTiff) {
// 对于tiff类型，直接在新窗口打开 // 对于tiff类型，直接在新窗口打开
...@@ -4151,9 +4153,11 @@ const downloadFile = async (url: string, message: string) => { ...@@ -4151,9 +4153,11 @@ const downloadFile = async (url: string, message: string) => {
const handleRadioGroupClick = (event: Event) => { const handleRadioGroupClick = (event: Event) => {
const target = event.target as HTMLElement const target = event.target as HTMLElement
const radioButton = target.closest('.el-radio-button') const radioButton = target.closest('.el-radio-button')
if (radioButton) { if (radioButton) {
const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement const input = radioButton.querySelector(
'input[type="radio"]',
) as HTMLInputElement
if (input) { if (input) {
const value = input.value const value = input.value
if (searchForm.value.customizedQuantity === value) { if (searchForm.value.customizedQuantity === value) {
...@@ -4168,9 +4172,11 @@ const handleRadioGroupClick = (event: Event) => { ...@@ -4168,9 +4172,11 @@ const handleRadioGroupClick = (event: Event) => {
const handleMultiRadioGroupClick = (event: Event) => { const handleMultiRadioGroupClick = (event: Event) => {
const target = event.target as HTMLElement const target = event.target as HTMLElement
const radioButton = target.closest('.el-radio-button') const radioButton = target.closest('.el-radio-button')
if (radioButton) { if (radioButton) {
const input = radioButton.querySelector('input[type="radio"]') as HTMLInputElement const input = radioButton.querySelector(
'input[type="radio"]',
) as HTMLInputElement
if (input) { if (input) {
const value = input.value === 'true' ? true : false const value = input.value === 'true' ? true : false
if (searchForm.value.multi === value) { if (searchForm.value.multi === value) {
......
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