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 a4497f7e..1d9f6d03 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
@@ -1,15 +1,9 @@
- 新建
+
-
+
基础信息
@@ -19,25 +13,21 @@
-
+
-
-
-
+
+
+
-
+
@@ -54,38 +44,36 @@
-
+
-
+
-
+
+
+
-
-
+
+
-
+
-
+
@@ -99,16 +87,10 @@
- 新增
+ 新增
-
+
@@ -117,52 +99,35 @@
-
+
-
+
-
+
-
+
-
+
@@ -183,34 +148,16 @@
-
+
+
删除
@@ -229,19 +176,10 @@
-
+
上传
@@ -275,37 +213,37 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -313,15 +251,9 @@
@@ -332,18 +264,36 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import type { UploadProps, UploadUserFile } from 'element-plus'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as MouldTypeApi from '@/api/heli/mouldtype'
+import * as WarehouseApi from '@/api/heli/warehouse'
+import * as RgApi from '@/api/heli/rg'
+import * as PnApi from '@/api/heli/pn'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
+const isShow = ref(false)
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
- name: undefined,
- status: 1,
+ stockType: undefined,
+ stockInType: undefined,
+ stockOutType: undefined,
+ stockNo: undefined,
+ headerNo: undefined,
+ description: undefined,
+ status: undefined,
+ whId: undefined,
+ creator :undefined,
+ createTime :undefined,
+ keeper: undefined,
+ keeperTime: undefined,
+ outbound: undefined,
+ outboundTime: undefined,
+ cancel: undefined,
+ cancelTime: undefined,
productBomItemDOList: []
})
const formRules = reactive({
@@ -352,6 +302,7 @@ const formRules = reactive({
})
const formRef = ref() // 表单 Ref
+
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
@@ -499,8 +450,7 @@ const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
ElMessage.warning(
- `The limit is 3, you selected ${files.length} files this time, add up to ${
- files.length + uploadFiles.length
+ `The limit is 3, you selected ${files.length} files this time, add up to ${files.length + uploadFiles.length
} totally`
)
console.log('333')
@@ -512,7 +462,7 @@ const handleBeforeUpload = (file: File) => {
// 如果需要阻止默认上传行为，可以返回 false
// return false;
- // 创建新的文件对象并添加到 filelist 中
+ // 创建新的文件对象并添加到 filelist 中
const newFile: any = {
name: '',
url: '', // 这里可以是实际上传后的URL，根据实际情况填写
@@ -535,6 +485,66 @@ const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
const handleDelete = (index: number) => {
fileList.value.splice(index, 1)
}
+//仓库全数据
+const warehouseList = ref([])
+//库区全数据
+const rgList = ref([])
+//库位全数据
+const pnList = ref([])
+/** 初始化 **/
+onMounted(async () => {
+
+ const router = useRoute();
+ dialogTitle.value = t('action.' + router.query.type)
+
+ isShow.value =router.query.type == "create"?false: true
+
+ //-------------------仓库全数据
+ const queryParamsWarehouse = reactive({
+ pageNo: 1,
+ pageSize: 99,
+ whStatus :1
+ })
+ const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
+
+ data.list.forEach(element => {
+ element.label = element.whName
+ element.value = element.id
+ });
+
+ warehouseList.value = data.list
+ //-------------------
+ //-------------------库区全数据
+ const queryParamsRg = reactive({
+ pageNo: 1,
+ pageSize: 99,
+ rgStatus : 1
+ })
+ const dataRg = await RgApi.getRgPage(queryParamsRg)
+
+ dataRg.list.forEach(element => {
+ element.label = element.rgName
+ element.value = element.id
+ });
+
+ rgList.value = dataRg.list
+ //-------------------
+ //-------------------库位全数据
+ const queryParamsRPn = reactive({
+ pageNo: 1,
+ pageSize: 99,
+ pnStatus : 1
+ })
+ const dataPn = await PnApi.getPnPage(queryParamsRPn)
+
+ dataRg.list.forEach(element => {
+ element.label = element.rgName
+ element.value = element.id
+ });
+
+ pnList.value = dataPn.list
+ //-------------------
+})