Commit 8af959b1 by qinjianhui

fix: 补胚数量修改

parent e11e7f9f
...@@ -107,6 +107,7 @@ export interface ProductList { ...@@ -107,6 +107,7 @@ export interface ProductList {
isReplenishment?: boolean isReplenishment?: boolean
thirdSkuCode?: string | null thirdSkuCode?: string | null
supplierProductNo?: string | null supplierProductNo?: string | null
replenishmentSumNum?: number | null
} }
export interface cardImages { export interface cardImages {
title: string title: string
......
...@@ -647,18 +647,18 @@ ...@@ -647,18 +647,18 @@
class="goods-item-info-item" class="goods-item-info-item"
> >
<span class="goods-item-info-item-label">补胚数量:</span> <span class="goods-item-info-item-label">补胚数量:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value" :title="item.replenishmentSumNum">
{{ item.replenishmentNum || 0 }} {{ item.replenishmentSumNum || 0 }}
</span> </span>
<el-icon <el-button
v-if="status === 'WAIT_SHIPMENT'" v-if="status === 'WAIT_SHIPMENT'"
class="icon" link
style="color: #f56c6c; font-size: 24px" size="small"
title="申请补胚" type="success"
@click="applyForReplenishment(item)" @click="applyForReplenishment(item)"
>申请补胚</el-button
> >
<Edit /> <!-- f -->
</el-icon>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">克重:</span> <span class="goods-item-info-item-label">克重:</span>
...@@ -843,20 +843,17 @@ ...@@ -843,20 +843,17 @@
: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">
<div class="order-time-item"> <div class="order-time-item">
...@@ -1138,8 +1135,7 @@ ...@@ -1138,8 +1135,7 @@
:show-copy-sub-shop-number="false" :show-copy-sub-shop-number="false"
@on-change="rightChange" @on-change="rightChange"
> >
<template #default <template #default>
>
<div class="menu-item" @click="rightChange('order-number')"> <div class="menu-item" @click="rightChange('order-number')">
复制订单号 复制订单号
</div> </div>
...@@ -1420,31 +1416,54 @@ ...@@ -1420,31 +1416,54 @@
</span> </span>
</template> </template>
</ElDialog> </ElDialog>
<el-dialog v-model="logisticsVisible" :close-on-click-modal="false" width="700px" title="更新物流信息"> <el-dialog
v-model="logisticsVisible"
:close-on-click-modal="false"
width="700px"
title="更新物流信息"
>
<el-form <el-form
v-if="logisticsVisible" v-if="logisticsVisible"
ref="logisticsFormRef" label-width="100px" label-position="left" ref="logisticsFormRef"
:model="logisticsForm"> label-width="100px"
label-position="left"
:model="logisticsForm"
>
<el-form-item prop="processNumber" label="物流处理号"> <el-form-item prop="processNumber" label="物流处理号">
<el-input v-model="logisticsForm.processNumber" placeholder="请输入物流处理号" clearable></el-input> <el-input
v-model="logisticsForm.processNumber"
placeholder="请输入物流处理号"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="trackingNumber" label="物流跟踪号"> <el-form-item prop="trackingNumber" label="物流跟踪号">
<el-input v-model="logisticsForm.trackingNumber" placeholder="请输入物流跟踪号" clearable></el-input> <el-input
v-model="logisticsForm.trackingNumber"
placeholder="请输入物流跟踪号"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="logisticsForm.trackingNumber" prop="expressSheetUrl" label="物流面单"> <el-form-item
v-if="logisticsForm.trackingNumber"
prop="expressSheetUrl"
label="物流面单"
>
<el-upload accept=".pdf" action="" :before-upload="expressSheetUpload"> <el-upload accept=".pdf" action="" :before-upload="expressSheetUpload">
<el-button type="primary">点击上传</el-button> <el-button type="primary">点击上传</el-button>
</el-upload> </el-upload>
<div v-if="logisticsForm.expressSheet" class="file"> <div v-if="logisticsForm.expressSheet" class="file">
<span>{{ logisticsForm.expressSheet.name }}</span> <span>{{ logisticsForm.expressSheet.name }}</span>
<el-icon @click="logisticsForm.expressSheet=null" class="expressSheetClose"> <el-icon
@click="logisticsForm.expressSheet = null"
class="expressSheetClose"
>
<Close></Close> <Close></Close>
</el-icon> </el-icon>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="logisticsVisible=false">取消</el-button> <el-button @click="logisticsVisible = false">取消</el-button>
<el-button type="primary" @click="logisticsSubmit"> 确定</el-button> <el-button type="primary" @click="logisticsSubmit"> 确定</el-button>
</template> </template>
</el-dialog> </el-dialog>
...@@ -1455,7 +1474,7 @@ import { ...@@ -1455,7 +1474,7 @@ import {
ArrowDown, ArrowDown,
CaretBottom, CaretBottom,
CaretTop, CaretTop,
Edit, // Edit,
WarningFilled, WarningFilled,
} from '@element-plus/icons-vue' } from '@element-plus/icons-vue'
import { import {
...@@ -1515,7 +1534,8 @@ import { ...@@ -1515,7 +1534,8 @@ import {
WarehouseListData, WarehouseListData,
cardImages, cardImages,
AddressInfo, AddressInfo,
LogisticsData, LogisticsFormData, LogisticsData,
LogisticsFormData,
} from '@/types/api/podUsOrder' } from '@/types/api/podUsOrder'
import usePageList from '@/utils/hooks/usePageList' import usePageList from '@/utils/hooks/usePageList'
import { useValue } from '@/utils/hooks/useValue' import { useValue } from '@/utils/hooks/useValue'
...@@ -1537,7 +1557,7 @@ import platformJson from '../../../json/platform.json' ...@@ -1537,7 +1557,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[] }
...@@ -3084,7 +3104,7 @@ const applyForReplenishment = async (row: ProductList | undefined) => { ...@@ -3084,7 +3104,7 @@ const applyForReplenishment = async (row: ProductList | undefined) => {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
inputPattern: /.+/, inputPattern: /.+/,
inputValue: row ? String(row.replenishmentNum || '') : '', inputValue: row ? String(row.replenishmentSumNum || '') : '',
inputErrorMessage: '请输入补胚数量', inputErrorMessage: '请输入补胚数量',
inputPlaceholder: '补胚数量', inputPlaceholder: '补胚数量',
}).then(async (res) => { }).then(async (res) => {
...@@ -3265,7 +3285,6 @@ const replenishmentSuccess = async () => { ...@@ -3265,7 +3285,6 @@ const replenishmentSuccess = async () => {
overflow-y: auto; overflow-y: auto;
} }
.tabs-node_count { .tabs-node_count {
display: inline-block; display: inline-block;
min-width: 20px; min-width: 20px;
......
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