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 9c38f075..33ef3d70 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="activetype == 'review'" + v-bind:disabled="activetype == 'review'||activetype =='audit2'" /> @@ -166,7 +166,7 @@ class="hl-addbutton" type="primary" size="large" - v-bind:disabled="activetype == 'review'" + v-bind:disabled="activetype == 'review'||activetype =='audit2'" @click="openMatForm" >新增 @@ -251,7 +251,7 @@ > @@ -271,7 +271,7 @@ class="mb-0px!" > @@ -297,8 +297,8 @@ link type="danger" size="small" - @click.prevent="handleDelete2(scope.$index)" - v-bind:disabled="activetype == 'review'" + @click.prevent="handleDelete2(scope.$index,scope.row.id)" + v-bind:disabled="activetype == 'review'||activetype =='audit2'" > 删除 @@ -317,7 +317,7 @@ class="hl-addbutton" type="primary" size="large" - v-bind:disabled="activetype == 'review'" + v-bind:disabled="activetype == 'review'||activetype =='audit2'" @click="openMatForm2" >新增 @@ -402,7 +402,7 @@ > @@ -421,7 +421,7 @@ class="mb-0px!" > @@ -447,8 +447,8 @@ link type="danger" size="small" - @click.prevent="handleDelete2(scope.$index)" - v-bind:disabled="activetype == 'review'" + @click.prevent="handleDelete2(scope.$index,scope.row.id)" + v-bind:disabled="activetype == 'review'||activetype =='audit2'" > 删除 @@ -488,7 +488,7 @@ :before-upload="before" class="upload-file-uploader" > - + 上传 @@ -519,7 +519,7 @@ link type="danger" size="small" - v-bind:disabled="ctrView || ctrDelete" + v-bind:disabled="ctrView || ctrDelete||activetype == 'review'||activetype =='audit2'" @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)" > 删除 @@ -993,7 +993,10 @@ const saveFormDataSUBMIT = (active, status) => { }, 1000) } //删除新增物料信息 -const handleDelete2 = (index: number) => { +const handleDelete2 = async(index: number,id:number,) => { + console.log(id,index); + await StorageMatApi.deleteStorageMat(id) +// deleteStorageMat formData.value.matItemDOList.splice(index, 1) } 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 749bcc80..316df586 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 @@ -74,7 +74,7 @@ - + 搜索 @@ -170,9 +170,14 @@ - + +