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 85587c31..c2d77eef 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
@@ -147,7 +147,7 @@
show-word-limit
maxlength="200"
class="!w-2080px"
- v-bind:disabled="ctrView || ctrSave"
+ v-bind:disabled="activetype == 'review'"
/>
@@ -166,7 +166,7 @@
class="hl-addbutton"
type="primary"
size="large"
- v-bind:disabled="ctrView || ctrSave"
+ v-bind:disabled="activetype == 'review'"
@click="openMatForm"
>新增
@@ -251,7 +251,7 @@
>
@@ -271,7 +271,7 @@
class="mb-0px!"
>
{
@@ -286,7 +286,7 @@
@@ -298,7 +298,7 @@
type="danger"
size="small"
@click.prevent="handleDelete2(scope.$index)"
- v-bind:disabled="ctrView || ctrDelete"
+ v-bind:disabled="activetype == 'review'"
>
删除
@@ -317,8 +317,8 @@
class="hl-addbutton"
type="primary"
size="large"
- v-bind:disabled="ctrView || ctrSave"
- @click="openMatForm"
+ v-bind:disabled="activetype == 'review'"
+ @click="openMatForm2"
>新增
@@ -347,7 +347,7 @@
@@ -402,7 +402,7 @@
>
@@ -421,7 +421,7 @@
class="mb-0px!"
>
{
@@ -436,7 +436,7 @@
@@ -448,7 +448,7 @@
type="danger"
size="small"
@click.prevent="handleDelete2(scope.$index)"
- v-bind:disabled="ctrView || ctrDelete"
+ v-bind:disabled="activetype == 'review'"
>
删除
@@ -488,7 +488,7 @@
:before-upload="before"
class="upload-file-uploader"
>
-
+
上传
@@ -602,7 +602,7 @@
保 存
@@ -610,7 +610,7 @@
送 审
@@ -734,10 +734,10 @@ const proOpenFormRef = ref()
const openMatForm = () => {
matOpenFormRef.value.open(formData.value.whId)
}
-// //派工单号不为空
-// const openMatForm2 = () => {
-// matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode)
-// }
+//派工单号不为空
+const openMatForm2 = () => {
+ matOpenFormRef2.value.open(formData.value.whId, formData.value.projectSubCode)
+}
const handleHeaderNoRef = ref()
const handleHeaderNo = () => {
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 daced89b..47ccce9a 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
@@ -141,25 +141,25 @@
min-width="240"
/>
-
+
{{ userList.find((user) => user.id == scope.row.outbound)?.nickname }}
-
+
{{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
-
+
编辑
@@ -206,7 +206,6 @@ import download from '@/utils/download'
import * as StorageApi from '@/api/biz/storage'
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() // 消息弹窗
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
index 6df73285..749bcc80 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
@@ -141,25 +141,25 @@
min-width="240"
/>
-
+
{{ userList.find((user) => user.id == scope.row.outbound)?.nickname }}
-
+
{{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}