Commit fb421ef3 by qinjianhui

fix: 快捷生产/入库完成后补充成功提示

parent a3795a70
...@@ -327,6 +327,7 @@ ...@@ -327,6 +327,7 @@
</div> </div>
<FastProduction <FastProduction
v-model:detail-visible="detailVisible" v-model:detail-visible="detailVisible"
:dialog-title="dialogTitle"
:is-new-order="true" :is-new-order="true"
:detail-data="detailData" :detail-data="detailData"
:fast-key="fastKey" :fast-key="fastKey"
...@@ -394,7 +395,6 @@ import ProductTypeFilter from '../factoryOrderNew/component/ProductTypeFilter.vu ...@@ -394,7 +395,6 @@ import ProductTypeFilter from '../factoryOrderNew/component/ProductTypeFilter.vu
import { CaretBottom, CaretTop } from '@element-plus/icons-vue' import { CaretBottom, CaretTop } from '@element-plus/icons-vue'
import { normalizeProductMarkListForQuery } from '../factoryOrderNew/utils/productMarkQuery' import { normalizeProductMarkListForQuery } from '../factoryOrderNew/utils/productMarkQuery'
import FastProduction from '../components/FastProduction.vue' import FastProduction from '../components/FastProduction.vue'
import { ResultInfoDataItem } from '@/types/api/order/common'
import { ElButton } from 'element-plus' import { ElButton } from 'element-plus'
import ReceiptProductDialog from '@/views/warehouse/components/ReceiptProductDialog.vue' import ReceiptProductDialog from '@/views/warehouse/components/ReceiptProductDialog.vue'
import { useValue } from '@/utils/hooks/useValue' import { useValue } from '@/utils/hooks/useValue'
...@@ -547,18 +547,8 @@ const completeOperationById = (_: number[], detail: Record<string, unknown>) => ...@@ -547,18 +547,8 @@ const completeOperationById = (_: number[], detail: Record<string, unknown>) =>
warehouseId: detail.warehouseId as number, warehouseId: detail.warehouseId as number,
inboundType: fastInboundType.value, inboundType: fastInboundType.value,
}) })
const handleFastProductionSuccess = (data: ResultInfoDataItem[]) => { const handleFastProductionSuccess = () => {
const result = data[0] ElMessage.success('入库成功')
if (!result.status) {
ElMessageBox.alert(
`操作单号 ${result.factoryOrderNumber} ${result.message}`,
'提示',
{
type: 'error',
},
)
return
}
} }
const fastClose = () => { const fastClose = () => {
detailVisible.value = false detailVisible.value = false
...@@ -662,6 +652,13 @@ const handleEmbryoInStock = async () => { ...@@ -662,6 +652,13 @@ const handleEmbryoInStock = async () => {
handleEmbryoInFastStock(0) handleEmbryoInFastStock(0)
} }
} }
const dialogTitle = computed(() => {
return fastKey.value === 'fastReceipt'
? fastInboundType.value === 1
? '生产完成-快捷入库'
: '胚衣-快捷入库'
: '查看详情'
})
const handleEmbryoInFastStock = (inboundType: number) => { const handleEmbryoInFastStock = (inboundType: number) => {
fastInboundType.value = inboundType fastInboundType.value = inboundType
fastKey.value = 'fastReceipt' fastKey.value = 'fastReceipt'
......
...@@ -323,7 +323,7 @@ const title = computed(() => { ...@@ -323,7 +323,7 @@ const title = computed(() => {
if (props.fastKey === 'fastProduction') { if (props.fastKey === 'fastProduction') {
return '快捷生产' return '快捷生产'
} else if (props.fastKey === 'fastReceipt') { } else if (props.fastKey === 'fastReceipt') {
return '快捷入库' return props.dialogTitle
} else { } else {
return '查看详情' return '查看详情'
} }
...@@ -388,18 +388,13 @@ const props = withDefaults( ...@@ -388,18 +388,13 @@ const props = withDefaults(
downloadApi?: ( downloadApi?: (
ids: number[], ids: number[],
) => Promise<{ code?: number; message?: string }> ) => Promise<{ code?: number; message?: string }>
/** 打开弹框时「自动完成上一单」的初始勾选;默认 false,与原有 podCN 快捷生产一致 */
defaultAutoSure?: boolean defaultAutoSure?: boolean
/** 为 true 时展示「操作单号」一行,数据字段为 `operationNo`(不影响 podCN 默认) */
showOperationNoRow?: boolean showOperationNoRow?: boolean
/** 查询无数据时的提示 */
notFoundMessage?: string notFoundMessage?: string
/** 未生产完成提醒里对单号的称呼,如「生产单号」「操作单号」 */
pendingOrderLabel?: string pendingOrderLabel?: string
/** 未扫码时的提示 */
pleaseScanTip?: string pleaseScanTip?: string
/** 扫码输入为空时音频/提示文案 */
searchInputAudioTip?: string searchInputAudioTip?: string
dialogTitle?: string
}>(), }>(),
{ {
type: 0, type: 0,
...@@ -420,6 +415,7 @@ const props = withDefaults( ...@@ -420,6 +415,7 @@ const props = withDefaults(
completeApi: (ids: number[], detailData: Record<string, unknown>) => completeApi: (ids: number[], detailData: Record<string, unknown>) =>
productionQueryApi(ids[0], Number(detailData.podJomallOrderCnId || -1)), productionQueryApi(ids[0], Number(detailData.podJomallOrderCnId || -1)),
downloadApi: (ids: number[]) => downloadMaterialApi(ids), downloadApi: (ids: number[]) => downloadMaterialApi(ids),
dialogTitle: '',
}, },
) )
const emit = defineEmits(['update:detailVisible', 'close', 'onSuccess']) const emit = defineEmits(['update:detailVisible', 'close', 'onSuccess'])
...@@ -553,7 +549,7 @@ const confirmQuery = (len: HistoryDataItem[], i: number) => { ...@@ -553,7 +549,7 @@ const confirmQuery = (len: HistoryDataItem[], i: number) => {
TrackingNumber.value = el.orderNumber TrackingNumber.value = el.orderNumber
await trackCodeInput() await trackCodeInput()
await setData(el.orderNumber) await setData(el.orderNumber)
ElMessage.success('生产完成') ElMessage.success(`${props.fastKey === 'fastProduction' ? '生产完成' : '入库完成'}`)
if (len[i + 1]) { if (len[i + 1]) {
confirmQuery(len, i + 1) confirmQuery(len, i + 1)
} }
...@@ -580,7 +576,7 @@ const changeStatus = async () => { ...@@ -580,7 +576,7 @@ const changeStatus = async () => {
if (!detail.value || Object.keys(detail.value).length <= 1) { if (!detail.value || Object.keys(detail.value).length <= 1) {
return ElMessage.warning(props.pleaseScanTip) return ElMessage.warning(props.pleaseScanTip)
} }
showConfirm('确定生产完成?', { showConfirm(`确定${props.fastKey === 'fastProduction' ? '生产完成' : '入库完成'}?`, {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: '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