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 758d893c..4048ed93 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
@@ -3,7 +3,8 @@
-
+
@@ -31,7 +32,7 @@
-
+
@@ -184,7 +185,8 @@
复制 -->
-
+
删除
@@ -206,9 +208,8 @@
+ :show-file-list="false" :auto-upload="false" :data="matUploadData" :on-change="matUploadChange"
+ class="upload-file-uploader">
上传
@@ -227,7 +228,8 @@
+ @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)"
+ v-bind:disabled="isShowBtnOther">
删除
{
const dataUpdate = formData.value as unknown as StorageApi.StorageVO
- if(num==2){
+ if (num == 2) {
dataUpdate.keeper = useUserStore().getUser.id
- }else{
+ } else {
dataUpdate.cancel = useUserStore().getUser.id
}
@@ -395,6 +397,12 @@ const handleStatus = (async (num) => {
default:
break
}
+ //查看页面不可以编辑
+ if (query.type === 'review') {
+ isShowBtnGroup.value = false;
+ isShowBtnCancel.value = false;
+ isShowBtnOther.value = true;
+ }
reload();
})
const userList = ref([]) // 用户列表
@@ -481,7 +489,7 @@ const submitForm = async () => {
await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
//附件信息保存
- matUploadData.value.businessId = storageid
+ matUploadData.value.businessId = storageid
matUploadRef.value!.submit()
message.success(t(commonResult))
@@ -606,6 +614,8 @@ const handleMatCode = async (scope, matid) => {
const isShowBtnGroup = ref(true)
const isShowBtnCancel = ref(false)
+const isShowBtnOther = ref(false)
+const btnWhClickable = ref(false)
/** 初始化 **/
onMounted(async () => {
@@ -622,6 +632,8 @@ onMounted(async () => {
dialogTitle.value = t('action.' + query.type)
+ dialogTitle.value = query.type === 'review'?'查看':dialogTitle.value
+
isShow.value = query.type == "create" ? false : true
//-------------------仓库全数据
@@ -648,6 +660,12 @@ onMounted(async () => {
default:
break
}
+ //查看页面不可以编辑
+ if (query.type === 'review') {
+ isShowBtnGroup.value = false;
+ isShowBtnCancel.value = false;
+ isShowBtnOther.value = true;
+ }
//获得库区列表
const queryParamsRg = reactive({
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 1d1d0611..de5e974f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -126,7 +126,8 @@
-
+
@@ -188,9 +189,8 @@
+ :show-file-list="false" :auto-upload="false" :data="matUploadData" :on-change="matUploadChange"
+ class="upload-file-uploader">
上传
@@ -350,9 +350,9 @@ const handleStatus = (async (num) => {
formData.value.status = num
const dataUpdate = formData.value as unknown as StorageApi.StorageVO
- if(num==2){
+ if (num == 2) {
dataUpdate.outbound = useUserStore().getUser.id
- }else{
+ } else {
dataUpdate.cancel = useUserStore().getUser.id
}
await StorageApi.updateStorageStatus(dataUpdate)
@@ -375,6 +375,12 @@ const handleStatus = (async (num) => {
default:
break
}
+ //查看页面不可以编辑
+ if (query.type === 'review') {
+ isShowBtnGroup.value = false;
+ isShowBtnCancel.value = false;
+ isShowBtnOther.value = true;
+ }
reload()
})
const userList = ref([]) // 用户列表
@@ -396,8 +402,8 @@ const refreshAttachments = (files, type) => {
file.createTime = new Date();
formData.value.attachments.push(file);
}
- // 排序
- formData.value.attachments.sort((v1, v2) => {
+ // 排序
+ formData.value.attachments.sort((v1, v2) => {
return (v1.createTime - v2.createTime) > 0
})
}
@@ -441,14 +447,13 @@ const submitForm = async () => {
//获取最新库存信息
const matCurrentData = await StorageMatApi.getStorageMatList()
var hasRestNum = true
- formData.value.matItemDOList.forEach( (rest) =>{
+ formData.value.matItemDOList.forEach((rest) => {
- if(matCurrentData.find((mat)=>{ mat.matId == rest.matId && mat.pnId == rest.pnId && mat.matRest mat.matId == rest.matId && mat.pnId == rest.pnId && mat.matRest < Number(rest.storageOkQty))) {
+ hasRestNum = false
}
})
- if(!hasRestNum){
+ if (!hasRestNum) {
message.alertWarning('物料库存不足')
return
}
@@ -478,7 +483,7 @@ const submitForm = async () => {
await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
//附件信息保存
- matUploadData.value.businessId = storageid
+ matUploadData.value.businessId = storageid
matUploadRef.value!.submit()
message.success(t(commonResult))
@@ -652,6 +657,7 @@ onMounted(async () => {
dialogTitle.value = t('action.' + query.type)
+ dialogTitle.value = query.type === 'review'?'查看':dialogTitle.value
isShow.value = query.type == "create" ? false : true
@@ -734,7 +740,7 @@ onMounted(async () => {
item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
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 = item.matRest == undefined?0:item.matRest
+ item.matRest = item.matRest == undefined ? 0 : item.matRest
matCount = matCount + 1