diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue index 743dc7de..9eb78008 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue @@ -317,7 +317,7 @@ const openDispatching = () => { fuid.value = [] multipleSelection.value.filter((item) => { - fuid.value.push(item.dispatchId) + fuid.value.push(item.id) }) ElMessageBox.confirm('是否批量删除?', '提示', { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue index 838b3241..a428351c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue @@ -202,12 +202,7 @@ v-loading="subFormLoading" label-width="0" > - + @@ -438,10 +433,6 @@ :rules="subFormRules.storageOkQty" class="mb-0px!" > - { (listItem) => listItem.projectSubCode === item.projectSubCode ) if (!exists) { + item.storageOkQty = undefined + formData.value.matItemDOList.push(item) } }) @@ -825,6 +818,7 @@ const getList2 = async (arrMat) => { (listItem) => listItem.projectSubCode === item.projectSubCode ) if (!exists) { + item.storageOkQty = undefined formData.value.matItemDOList.push(item) } }) @@ -979,7 +973,20 @@ const deleteFormData = async () => { /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 +const stockamount = ref(false) const saveFormData = async (active, status, type) => { + stockamount.value = false + if (formData.value.matItemDOList.length > 0) { + formData.value.matItemDOList.forEach((item) => { + if (item.stockQuantity < item.storageOkQty) { + stockamount.value = true + } + }) + } + if (stockamount.value) { + message.alertWarning('领料数量不能大于库存数量') + return + } if (active === 'SUBMIT') { //提示 if (formData.value.matItemDOList.length === 0) {