Commit 27c8409e by qinjianhui

fix: 问题修改

parent 823b5c34
...@@ -22,6 +22,7 @@ export interface SearchForm { ...@@ -22,6 +22,7 @@ export interface SearchForm {
productionClient: string productionClient: string
warehouseId: string | number warehouseId: string | number
thirdSkuCode: string thirdSkuCode: string
supplierProductNo:string
} }
export interface PodUsOrderListData { export interface PodUsOrderListData {
id: number id: number
......
...@@ -41,6 +41,14 @@ ...@@ -41,6 +41,14 @@
<ElOption label="多面" value="multiple" /> <ElOption label="多面" value="multiple" />
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="供应货号">
<ElInput
v-model="searchForm.supplierProductNo"
placeholder="生产单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="生产单号"> <ElFormItem label="生产单号">
<ElInput <ElInput
v-model="searchForm.factorySubOrderNumber" v-model="searchForm.factorySubOrderNumber"
...@@ -1627,6 +1635,7 @@ const [searchForm] = useValue<SearchForm>({ ...@@ -1627,6 +1635,7 @@ const [searchForm] = useValue<SearchForm>({
productionClient: '', productionClient: '',
warehouseId: '', warehouseId: '',
thirdSkuCode: '', thirdSkuCode: '',
supplierProductNo:''
}) })
const exceptionStatus = ref(1) const exceptionStatus = ref(1)
const userMarkList = ref<string[]>([]) const userMarkList = ref<string[]>([])
...@@ -1834,6 +1843,7 @@ const changeTab = (item: Tab) => { ...@@ -1834,6 +1843,7 @@ const changeTab = (item: Tab) => {
status.value = item.status || '' status.value = item.status || ''
selection.value = [] selection.value = []
cardSelection.value = [] cardSelection.value = []
stockOutSuccessIds.value = []
search(true) search(true)
} }
const onCellStyle = ({ column }: { column: Column }) => { const onCellStyle = ({ column }: { column: Column }) => {
...@@ -1961,7 +1971,22 @@ async function confirmProduct() { ...@@ -1961,7 +1971,22 @@ async function confirmProduct() {
const { code, data } = await confirmProductApi([...ids]) const { code, data } = await confirmProductApi([...ids])
if (code === 200) { if (code === 200) {
resultInfo.value = data || [] resultInfo.value = data || []
resultInfo.value =
(data as {
id: string | number
status: boolean
factoryOrderNumber?: string
message: string
}[]) || []
if (
Array.isArray(data) &&
(data as { status: boolean }[]).some((item) => !item.status)
) {
resultRefs.value?.showDialog() resultRefs.value?.showDialog()
} else {
search()
loadTabData()
}
} }
ElMessage.success('操作成功') ElMessage.success('操作成功')
...@@ -1989,7 +2014,22 @@ async function confirmProductToRiin() { ...@@ -1989,7 +2014,22 @@ async function confirmProductToRiin() {
const { code, data } = await confirmProductToRiinApi([...ids]) const { code, data } = await confirmProductToRiinApi([...ids])
if (code === 200) { if (code === 200) {
resultInfo.value = data || [] resultInfo.value = data || []
resultInfo.value =
(data as {
id: string | number
status: boolean
factoryOrderNumber?: string
message: string
}[]) || []
if (
Array.isArray(data) &&
(data as { status: boolean }[]).some((item) => !item.status)
) {
resultRefs.value?.showDialog() resultRefs.value?.showDialog()
} else {
search()
loadTabData()
}
} }
ElMessage.success('操作成功') ElMessage.success('操作成功')
...@@ -2569,7 +2609,14 @@ const getOrderByIdApi = async (type: string) => { ...@@ -2569,7 +2609,14 @@ const getOrderByIdApi = async (type: string) => {
if (res.code === 200) { if (res.code === 200) {
if (isArray(res.data)) { if (isArray(res.data)) {
resultInfo.value = res.data || [] resultInfo.value = res.data || []
resultRefs.value?.showDialog(type) resultInfo.value =
(res.data as {
id: string | number
status: boolean
factoryOrderNumber?: string
message: string
}[]) || []
resultRefs.value?.showDialog()
} else if (isString(res.data)) { } else if (isString(res.data)) {
window.open(filePath + res.data) window.open(filePath + res.data)
} }
...@@ -2586,7 +2633,14 @@ const getOrderByIdApi = async (type: string) => { ...@@ -2586,7 +2633,14 @@ const getOrderByIdApi = async (type: string) => {
} }
} }
//展示返回结果 //展示返回结果
const resultInfo = ref([]) const resultInfo = ref<
{
id: string | number
status: boolean
factoryOrderNumber?: string
message: string
}[]
>([])
const resultConfim = () => { const resultConfim = () => {
search() search()
loadTabData() loadTabData()
...@@ -2793,8 +2847,22 @@ const logisticsToPicking = async () => { ...@@ -2793,8 +2847,22 @@ const logisticsToPicking = async () => {
ids: selection.value.map((item) => item.id).join(','), ids: selection.value.map((item) => item.id).join(','),
}) })
if (res.code !== 200) return if (res.code !== 200) return
resultInfo.value = res.data || [] resultInfo.value =
(res.data as {
id: string | number
status: boolean
factoryOrderNumber?: string
message: string
}[]) || []
if (
Array.isArray(res.data) &&
(res.data as { status: boolean }[]).some((item) => !item.status)
) {
resultRefs.value?.showDialog() resultRefs.value?.showDialog()
} else {
search()
loadTabData()
}
ElMessage.success('操作成功') ElMessage.success('操作成功')
// search() // search()
// loadTabData() // loadTabData()
......
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