增加单据完结

sgzb-ui/src/api/claimAndRefund/return.js

@@ -253,3 +253,11 @@ export function endBack(data) {
   })
 }
 
+// 单据完结
+export function endBackOver(data) {
+  return request({
+    url: 'base/backReceive/endBackOver',
+    method: 'post',
+    data
+  })
+}

sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue

@@ -78,6 +78,9 @@
                 <el-button type="primary" size="mini" @click="completeBack"
                     >完成退料</el-button
                 >
+                <el-button type="primary" size="mini" @click="invoicesEnd"
+                    >单据完结</el-button
+                >
             </el-col>
         </el-row>
 
@@ -244,7 +247,7 @@
                         v-if="
                             !isView &&
                             scope.row.manageType == '0' &&
-                            scope.row.num > 0
+                            scope.row.backStatus == 0
                         "
                     >
                         编码退料
@@ -257,7 +260,7 @@
                             !isView &&
                             (scope.row.manageType == '1' ||
                                 scope.row.manageType == '2') &&
-                            scope.row.num > 0
+                            scope.row.backStatus == 0
                         "
                     >
                         数量退料
@@ -740,6 +743,7 @@ import {
     endBack,
     revoke,
     endBackBeforeQueryApi,
+    endBackOver,
 } from '@/api/claimAndRefund/return'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
@@ -959,7 +963,7 @@ export default {
             this.$tab.closeOpenPage({ path: '/claimAndRefund/returnIn' })
         },
         //完成退料接收
-        async completeBack() {
+        completeBack() {
             // let param1 = {
             //     parentId: this.queryParams.id,
             // }
@@ -969,7 +973,12 @@ export default {
                 this.$message.error('请勾选需要退料的数据！')
                 return
             }
-
+            // 二次确认
+            this.$confirm('是否确定要完成退料？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
                 let typeId = ''
                 let badId = ''
                 this.selChangeList.map((e) => {
@@ -1006,6 +1015,34 @@ export default {
                         this.getList()
                     }
                 })
+            })
+        },
+        // 单据完结
+        invoicesEnd() {
+            if (this.selChangeList.length < 1) {
+                this.$message.error('请勾选需要退料的数据！')
+                return
+            }
+            // 二次确认
+            this.$confirm('是否确定要单据完结？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                const params = this.selChangeList.map(item => {
+                    return {
+                        id: item.id,
+                        typeId: item.typeId,
+                    }
+                })
+                
+                try {
+                    const res = await endBackOver(params)
+                    this.getList()
+                } catch (error) {
+                    console.log('🚀 ~ invoicesEnd ~ error:', error)
+                }
+            })
         },
         //查看数据
         handleViewCode(row) {
@@ -1132,6 +1169,12 @@ export default {
         //
         handleBackup(row) {
             // console.log(row)
+            // 二次确认
+            this.$confirm('是否确定要撤回？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
                 let param = {
                     parentId: row.id,
                     typeId: row.modelId,
@@ -1150,6 +1193,7 @@ export default {
                         this.handleQuery()
                     }
                 })
+            })
         },
         //编码退料查询
         handleCodeQuery() {