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'"
                       >
                         删除
@@ -976,16 +976,16 @@ const saveFormData = async (active, status, type) => {
 
       //通过异步执行送审
       // setTimeout(async () => {
-        // console.log('------');
+      // console.log('------');
-        
+
-        formData.value.active === 'SUBMIT'
+      formData.value.active === 'SUBMIT'
-        data.outbound = useUserStore().getUser.id
+      data.outbound = useUserStore().getUser.id
-        const nowStr = formatDate(new Date(), 'YYYY-MM-DD HH:mm')
+      const nowStr = formatDate(new Date(), 'YYYY-MM-DD HH:mm')
-        const now = new Date(nowStr).getTime()
+      const now = new Date(nowStr).getTime()
-        data.outboundTime = now
+      data.outboundTime = now
-        await StorageApi.updateStorage(data)
+      await StorageApi.updateStorage(data)
-        commonStore.setStore('active', 'review')
+      commonStore.setStore('active', 'review')
-        // reload()
+      // reload()
       // }, 500)
 
       // commonStore.setStore('id', formData.value.id)
@@ -997,6 +997,7 @@ const saveFormData = async (active, status, type) => {
       reload()
     } else {
       await StorageApi.updateStorage(data)
+      // reload()
     }
     var repeatItem = []
     formData.value.matItemDOList.forEach((item) => {
@@ -1015,7 +1016,7 @@ const saveFormData = async (active, status, type) => {
     }
     if (active !== 'INVALID') {
       // console.log('保存物料-------');
-      
+
       formData.value.matItemDOList.forEach((item) => {
         item.stockId = formData.value.id
         item.whId = formData.value.whId
@@ -1063,11 +1064,10 @@ const saveFormDataSUBMIT = (active, status) => {
   }, 1000)
 }
 //删除新增物料信息
-const handleDelete2 = async (index: number, id: number) => {
+const handleDelete2 = async (index: number) => {
-  // console.log(id, index)
+  let deletedItems = formData.value.matItemDOList.splice(index, 1)
-  await StorageMatApi.deleteStorageMat(id)
+  let id = deletedItems[0].id
-  // deleteStorageMat
+  if (id) await StorageMatApi.deleteStorageMat(id)
-  formData.value.matItemDOList.splice(index, 1)
 }
 
 //仓库全数据