|
|
@ -242,25 +242,25 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<el-row justify="center">
|
|
|
|
<el-row justify="center">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item prop="keeper" label="出库人">
|
|
|
|
<el-form-item prop="outbound" label="出库人">
|
|
|
|
{{ userList.find((user) => user.id == formData.keeper)?.nickname }}
|
|
|
|
{{ userList.find((user) => user.id == formData.outbound)?.nickname }}
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item prop="keeperTime" label="出库时间">
|
|
|
|
<el-form-item prop="outboundTime" label="出库时间">
|
|
|
|
{{ formatDate(formData.keeperTime, 'YYYY-MM-DD HH:mm') }}
|
|
|
|
{{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<el-row justify="center">
|
|
|
|
<el-row justify="center">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item prop="outbound" label="作废人">
|
|
|
|
<el-form-item prop="cancel" label="作废人">
|
|
|
|
{{ userList.find((user) => user.id == formData.outbound)?.nickname }}
|
|
|
|
{{ userList.find((user) => user.id == formData.cancel)?.nickname }}
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item prop="outboundTime" label="作废时间">
|
|
|
|
<el-form-item prop="cancelTime" label="作废时间">
|
|
|
|
{{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
|
|
|
|
{{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
@ -286,6 +286,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
|
|
|
import * as StorageApi from '@/api/heli/storage'
|
|
|
|
import * as StorageApi from '@/api/heli/storage'
|
|
|
|
import * as StorageMatApi from '@/api/heli/storagemat'
|
|
|
|
import * as StorageMatApi from '@/api/heli/storagemat'
|
|
|
|
import { getAccessToken, getTenantId } from "@/utils/auth"
|
|
|
|
import { getAccessToken, getTenantId } from "@/utils/auth"
|
|
|
|
|
|
|
|
import { useUserStore } from '@/store/modules/user'
|
|
|
|
|
|
|
|
|
|
|
|
import * as MaterialApi from '@/api/heli/material'
|
|
|
|
import * as MaterialApi from '@/api/heli/material'
|
|
|
|
import * as WarehouseApi from '@/api/heli/warehouse'
|
|
|
|
import * as WarehouseApi from '@/api/heli/warehouse'
|
|
|
@ -349,6 +350,13 @@ const handleStatus = (async (num) => {
|
|
|
|
formData.value.status = num
|
|
|
|
formData.value.status = num
|
|
|
|
|
|
|
|
|
|
|
|
const dataUpdate = formData.value as unknown as StorageApi.StorageVO
|
|
|
|
const dataUpdate = formData.value as unknown as StorageApi.StorageVO
|
|
|
|
|
|
|
|
if(num==2){
|
|
|
|
|
|
|
|
dataUpdate.outbound = useUserStore().getUser.id
|
|
|
|
|
|
|
|
dataUpdate.outboundTime = new Date().toLocaleString()
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
dataUpdate.cancel = useUserStore().getUser.id
|
|
|
|
|
|
|
|
dataUpdate.cancelTime = new Date().toLocaleString()
|
|
|
|
|
|
|
|
}
|
|
|
|
await StorageApi.updateStorage(dataUpdate)
|
|
|
|
await StorageApi.updateStorage(dataUpdate)
|
|
|
|
|
|
|
|
|
|
|
|
message.success(t('common.updateSuccess'))
|
|
|
|
message.success(t('common.updateSuccess'))
|
|
|
@ -369,6 +377,7 @@ const handleStatus = (async (num) => {
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
break
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
reload()
|
|
|
|
})
|
|
|
|
})
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
|
|
|
|
|
|
|
@ -429,6 +438,23 @@ const submitForm = async () => {
|
|
|
|
} catch (e) {
|
|
|
|
} catch (e) {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取最新库存信息
|
|
|
|
|
|
|
|
const matCurrentData = await StorageMatApi.getStorageMatList()
|
|
|
|
|
|
|
|
var hasRestNum = true
|
|
|
|
|
|
|
|
formData.value.matItemDOList.forEach( (rest) =>{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(matCurrentData.find((mat)=>{ mat.matId == rest.matId && mat.pnId == rest.pnId && mat.matRest<rest.matRest}))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
hasRestNum = fasle
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
if(!hasRestNum){
|
|
|
|
|
|
|
|
message.alertWarning('物料库存不足')
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 提交请求
|
|
|
|
// 提交请求
|
|
|
|
formLoading.value = true
|
|
|
|
formLoading.value = true
|
|
|
|
try {
|
|
|
|
try {
|
|
|
@ -709,6 +735,7 @@ onMounted(async () => {
|
|
|
|
item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
|
|
|
|
item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
|
|
|
|
item.pnlist = pnList.value.filter((pn) => pn.rgId == item.rgId)
|
|
|
|
item.pnlist = pnList.value.filter((pn) => pn.rgId == item.rgId)
|
|
|
|
item.matRest = matLastData.value.find((rest) => rest.rgId == item.rgId && rest.pnId == item.pnId)?.matRest
|
|
|
|
item.matRest = matLastData.value.find((rest) => rest.rgId == item.rgId && rest.pnId == item.pnId)?.matRest
|
|
|
|
|
|
|
|
item.matRest = item.matRest == undefined?0:item.matRest
|
|
|
|
matCount = matCount + 1
|
|
|
|
matCount = matCount + 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|