Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -297,7 +297,7 @@
                         link
                         type="danger"
                         size="small"
-                        @click.prevent="handleDelete2(scope.$index, scope.row.id)"
+                        @click.prevent="handleDelete2(scope.$index)"
                         v-bind:disabled="activetype == 'review' || activetype == 'Check'"
                       >
                         删除
@@ -447,7 +447,7 @@
                         link
                         type="danger"
                         size="small"
-                        @click.prevent="handleDelete2(scope.$index, scope.row.id)"
+                        @click.prevent="handleDelete2(scope.$index)"
                         v-bind:disabled="activetype == 'review' || activetype == 'Check'"
                       >
                         删除
@@ -997,6 +997,7 @@ const saveFormData = async (active, status, type) => {
       reload()
     } else {
       await StorageApi.updateStorage(data)
+      // reload()
     }
     var repeatItem = []
     formData.value.matItemDOList.forEach((item) => {
@@ -1063,11 +1064,10 @@ const saveFormDataSUBMIT = (active, status) => {
   }, 1000)
 }
 //删除新增物料信息
-const handleDelete2 = async (index: number, id: number) => {
-  // console.log(id, index)
-  await StorageMatApi.deleteStorageMat(id)
-  // deleteStorageMat
-  formData.value.matItemDOList.splice(index, 1)
+const handleDelete2 = async (index: number) => {
+  let deletedItems = formData.value.matItemDOList.splice(index, 1)
+  let id = deletedItems[0].id
+  if (id) await StorageMatApi.deleteStorageMat(id)
 }
 
 //仓库全数据