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 5b3a1faf..ad2caeee 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
@@ -39,7 +39,7 @@
clearable
style="width: 100%"
@change="handleStockType"
- v-bind:disabled="ctrView || ctrSave || query.type !== 'create'"
+ v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetypetype !== 'create'"
>
-->
-
+
物料信息
@@ -214,7 +214,7 @@
@@ -365,7 +365,7 @@
@@ -459,7 +459,7 @@
-
+
附件信息
@@ -539,7 +539,7 @@
-
+
系统信息
@@ -590,7 +590,7 @@
提 交
@@ -636,9 +636,13 @@ import materials from './materials.vue'
import materials2 from './materials2.vue'
import projects from './subproject.vue'
import taskdispatchselect from './taskdispatchselect.vue'
+import { useCommonStore } from '@/store/modules/common'
const reload: any = inject('reload')
+const commonStore = useCommonStore()
+const activetype = toRef(commonStore.getStore('active'))
+const activeId = toRef(commonStore.getStore('id'))
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const { query } = useRoute()
@@ -862,16 +866,19 @@ const saveFormData = async (active, status, type) => {
await formRef.value.validate()
formData.value.active = active
formData.value.status = status
+ await initStatus(formData.value.status)
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as StorageApi.StorageVO
- if (query.type === 'create') {
+ if (activetype.value === 'create') {
//库存信息保存
formData.value.id = await StorageApi.createStorage(data)
- commonResult = 'common.createSuccess'
- query.type = 'update'
+ commonStore.setStore('active', 'update')
+ commonStore.setStore('id', formData.value.id)
+ reload()
} else {
+
await StorageApi.updateStorage(data)
}
var repeatItem = []
@@ -902,7 +909,7 @@ const saveFormData = async (active, status, type) => {
matUploadData.value.businessId = formData.value.id
await matUploadRef.value!.submit()
}
- await initStatus(formData.value.status)
+
if (type == 'suc') {
commonResult = 'common.updateSuccess'
message.success(t(commonResult))
@@ -1000,7 +1007,7 @@ const initStatus = async (status) => {
break
}
// 查看页面时可操作控件禁用
- if (query.type === 'review') {
+ if (activetype === 'review') {
ctrView.value = true
ctrSave.value = true
ctrCancel.value = true
@@ -1018,7 +1025,7 @@ const matSimpVirtualList = ref([]) // 物料基本信息列表
/** 初始化 **/
onMounted(async () => {
// 页面标题展示
- dialogTitle.value = query.type === 'review' ? '查看' : t('action.' + query.type)
+ dialogTitle.value = activetype.value === 'review' ? '查看' : t('action.' + activetype.value)
//- 获取仓库全数据
whList.value = await WarehouseApi.getWarehouseSimpList()
@@ -1030,7 +1037,7 @@ onMounted(async () => {
matLastData.value = await StorageMatApi.getStorageMatList(0)
// 编辑时获取入库单据信息,包括基础信息、物料信息、附件信息
- if (query.id) {
+ if (activeId.value) {
// 获取原始物料信息
matSimpList.value = await MaterialApi.getSimpList()
matSimpVirtualList.value = await MaterialApi.getSimpVirtualList()
@@ -1038,7 +1045,7 @@ onMounted(async () => {
matEditList.value = matSimpList.value //matSimpList.value.filter( mat => matLastData.value.filter( row => row.matId == mat.id).length>0)
// 获取库存信息
- formData.value = await StorageApi.getStorage(query.id)
+ formData.value = await StorageApi.getStorage(activeId.value)
if (formData.value.vmatName) {
matEditList.value = matSimpVirtualList.value
}
@@ -1050,7 +1057,7 @@ onMounted(async () => {
const queryParamsMat = reactive({
pageNo: 1,
pageSize: 99,
- stockId: query.id,
+ stockId: activeId.value,
whId: formData.value.whId
})
const dataMats = await StorageMatApi.getStorageMatPage(queryParamsMat)
@@ -1060,7 +1067,7 @@ onMounted(async () => {
let attParams = {
pageNo: 1,
pageSize: 99,
- businessId: query.id,
+ businessId: activeId.value,
businessType: 'STORAGE'
}
formData.value.attachments = (await getFilePage(attParams)).list
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
index 5b6d24fe..a318f64b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
@@ -208,11 +208,11 @@ import * as WarehouseApi from '@/api/biz/warehouse'
import * as UserApi from '@/api/system/user'
defineOptions({ name: 'Storage' })
-
+import { useCommonStateWithOut } from '@/store/modules/common'
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const router = useRouter() // 路由
-
+const commonStore = useCommonStateWithOut()
const loading = ref(true) // 列表的加载中
const list = ref([]) // 列表的数据
const total = ref(0) // 列表的总页数
@@ -276,6 +276,8 @@ const openForm = (type: string, id?: number) => {
}
/** 详情操作 新增/查看 */
const openDetail = (active: string, id?: number) => {
+ commonStore.setStore('active', active)
+ commonStore.setStore('id', id)
router.push({ path: '/inventory/storageoutdetail', query: { type: active, id: id } })
}