diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 35634d5f..2c890415 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -4,6 +4,7 @@
+
基础信息
@@ -78,7 +79,7 @@
-
+
物料信息
@@ -89,95 +90,105 @@
新增
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
-
+
附件信息
@@ -222,6 +233,7 @@
+
系统信息
@@ -299,7 +311,6 @@ const message = useMessage() // 消息弹窗
const router = useRoute();
const isShow = ref(false)
-const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
@@ -321,7 +332,7 @@ const formData = ref({
outboundTime: undefined,
cancel: undefined,
cancelTime: undefined,
- productBomItemDOList: [],
+ matItemDOList: [],
attachments: []
})
const formRules = reactive({
@@ -331,6 +342,14 @@ const formRules = reactive({
whId: [{ required: true, message: '入库仓库不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
+const matSubFormRef = ref() //子表单 Ref
+
+const subFormLoading = ref(false) // 子表单的加载中
+const subFormRules = reactive({
+ matId: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
+ rgId: [{ required: true, message: '库区不能为空', trigger: 'blur' }],
+ pnId: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
+})
const userList = ref([]) // 用户列表
@@ -388,6 +407,12 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
+ // 校验子表单
+ try {
+ await matSubFormRef.value.validate()
+ } catch (e) {
+ return
+ }
// 提交请求
formLoading.value = true
try {
@@ -404,11 +429,11 @@ const submitForm = async () => {
commonResult = 'common.updateSuccess'
}
//物料信息保存
- formData.value.productBomItemDOList.forEach(item => {
+ formData.value.matItemDOList.forEach(item => {
item.stockId = storageid.value
item.whId = formData.value.whId
})
- const dataMats = formData.value.productBomItemDOList as unknown as StorageMatApi.StorageMatVO[]
+ const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
await StorageMatApi.createStorageMatBatch(dataMats)
//附件信息保存
@@ -448,13 +473,13 @@ const onAddItem = () => {
productBomItemValueDOList: []
}
matCount = matCount + 1
- formData.value.productBomItemDOList.push(newData)
+ formData.value.matItemDOList.push(newData)
}
// 复制数据
const handlefuke = (index, item) => {
- const data: any = formData.value.productBomItemDOList[index]
+ const data: any = formData.value.matItemDOList[index]
// 复制数据
const newData: any = {
@@ -478,13 +503,13 @@ const handlefuke = (index, item) => {
}
matCount = matCount + 1
// 添加新数据
- formData.value.productBomItemDOList.splice(index + 1, 0, newData)
+ formData.value.matItemDOList.splice(index + 1, 0, newData)
}
//删除新增物料信息
const handleDelete2 = (index: number) => {
- formData.value.productBomItemDOList.splice(index, 1)
+ formData.value.matItemDOList.splice(index, 1)
}
//仓库全数据
@@ -506,7 +531,7 @@ const handleWh = (async (wid) => {
pnList.value = []
rgList.value = dataRg.list
- formData.value.productBomItemDOList.forEach(item => {
+ formData.value.matItemDOList.forEach(item => {
item.rgId = ''
item.pnId = ''
item.pnlist.value = []
@@ -564,6 +589,8 @@ const handleMatCode = async (scope, matid) => {
}
}
+const isShowBtnStatus = false
+const isShowBtnCancel = false
/** 初始化 **/
onMounted(async () => {
@@ -594,8 +621,8 @@ onMounted(async () => {
const queryParamsRg = reactive({
pageNo: 1,
pageSize: 99,
- status:1,
- whId : formData.value.whId
+ status: 1,
+ whId: formData.value.whId
})
const dataRg = await RgApi.getRgPage(queryParamsRg)
@@ -618,7 +645,7 @@ onMounted(async () => {
stockId: router.query.id
})
const dataMats = await StorageMatApi.getStorageMatPage(queryParamsMat)
- formData.value.productBomItemDOList = dataMats.list
+ formData.value.matItemDOList = dataMats.list
//获取原始物料信息
const queryParamsMat2 = reactive({
@@ -628,20 +655,18 @@ onMounted(async () => {
})
const matVos = await MaterialApi.getMaterialPage(queryParamsMat2)
- formData.value.productBomItemDOList.forEach(item => {
- item.cid = matCount
+ formData.value.matItemDOList.forEach(item => {
+ item.cid = matCount
item.matId = matVos.list.find((record) => record.id === item.matId)?.id
//item.matCode = matVos.list.find( (record) => record.id === item.matId)?.id
item.matName = matVos.list.find((record) => record.id === item.matId)?.name
item.matSpec = matVos.list.find((record) => record.id === item.matId)?.spec
item.matType = matVos.list.find((record) => record.id === item.matId)?.materialType
item.matUnit = matVos.list.find((record) => record.id === item.matId)?.unit
- item.pnlist = pnList.value.filter((pn) => pn.rgId === item.rgId)
- matCount= matCount+1
+ item.pnlist = pnList.value.filter((pn) => pn.rgId === item.rgId)
+ matCount = matCount + 1
})
- //物料编码信息初始化
-
// 附件信息
let attParams = {
@@ -653,6 +678,7 @@ onMounted(async () => {
formData.value.attachments = (await getFilePage(attParams)).list;
}
+ //用户信息
userList.value = await UserApi.getSimpleUserList()
})