Skip to content

F
factory_front
Commit f7920689 by linjinhong
Options

fix:修改问题

parent 651de945
Showing with 32 additions and 8 deletions
src/views/order/podCN/index.vue
...@@ -1987,12 +1987,24 @@ ...@@ -1987,12 +1987,24 @@
> >
<template #top_left> <template #top_left>
<el-tooltip <el-tooltip
v-if="cardItem.outOfStock" v-if="
cardItem.outOfStock &&
(status === 'PICKING' || status === 'TO_BE_REPLENISHMENT')
"
effect="light" effect="light"
content="生产中缺货" content="生产中缺货"
placement="bottom" placement="bottom"
> >
<el-icon color="#bd3124"> 缺 </el-icon> <div
style="
background-color: #bd3124;
color: #fff;
padding: 2px 4px;
border-radius: 4px;
"
>
缺
</div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if=" v-if="
...@@ -5909,7 +5921,7 @@ const getNewImageFn = (img: string) => { ...@@ -5909,7 +5921,7 @@ const getNewImageFn = (img: string) => {
const labelFn = async (type: boolean) => { const labelFn = async (type: boolean) => {
try { try {
await ElMessageBox.confirm( await ElMessageBox.confirm(
`确定${type ? '添加' : '移除'}生产中缺货”标签？`, `确定${type ? '添加' : '移除'}“生产中缺货”标签？`,
'提示', '提示',
{ {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -5928,7 +5940,7 @@ const labelFn = async (type: boolean) => { ...@@ -5928,7 +5940,7 @@ const labelFn = async (type: boolean) => {
try { try {
const params = { const params = {
productIds: selection.value.map((item) => item.id), productIds: cardSelection.value.map((item) => item.id),
orderFrom: 'CN', orderFrom: 'CN',
outOfStock: type, outOfStock: type,
} }
......
src/views/order/podUs/index.vue
...@@ -2251,12 +2251,24 @@ ...@@ -2251,12 +2251,24 @@
> >
<template #top_left> <template #top_left>
<el-tooltip <el-tooltip
v-if="cardItem.outOfStock" v-if="
cardItem.outOfStock &&
(status === 'PICKING' || status === 'TO_BE_REPLENISHMENT')
"
effect="light" effect="light"
content="生产中缺货" content="生产中缺货"
placement="bottom" placement="bottom"
> >
<el-icon color="#bd3124"> 缺 </el-icon> <div
style="
background-color: #bd3124;
color: #fff;
padding: 2px;
border-radius: 4px;
"
>
缺
</div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if=" v-if="
...@@ -6896,7 +6908,7 @@ const getEmployeeList = async () => { ...@@ -6896,7 +6908,7 @@ const getEmployeeList = async () => {
const labelFn = async (type: boolean) => { const labelFn = async (type: boolean) => {
try { try {
await ElMessageBox.confirm( await ElMessageBox.confirm(
`确定${type ? '添加' : '移除'}生产中缺货”标签？`, `确定${type ? '添加' : '移除'}“生产中缺货”标签？`,
'提示', '提示',
{ {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -6915,7 +6927,7 @@ const labelFn = async (type: boolean) => { ...@@ -6915,7 +6927,7 @@ const labelFn = async (type: boolean) => {
try { try {
const params = { const params = {
productIds: selection.value.map((item) => item.id), productIds: cardSelection.value.map((item) => item.id),
orderFrom: 'US', orderFrom: 'US',
outOfStock: type, outOfStock: type,
} }
......
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