From 6ea3fc22c5397be81f1844abceb48a14803676a2 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 28 Aug 2024 17:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6=E6=97=B6,?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BB=93=E7=AE=97=E8=A1=A8=E6=8B=BF=E5=88=B0?=
 =?UTF-8?q?=E5=BE=85=E9=80=80=E6=96=99=E6=95=B0=E9=87=8F,=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E5=A4=9A=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/receive/component/handlePage.vue   | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue
index 5b2ad0f..522e2ee 100644
--- a/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -151,12 +151,24 @@
                 prop="typeCode"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+              label="退料人员"
+              align="center"
+              prop="backPerson"
+              show-overflow-tooltip
+            />
             <el-table-column
                 label="申请数量"
                 align="center"
                 prop="preNum"
                 :show-overflow-tooltip="true"
             />
+<!--            <el-table-column-->
+<!--              label="最大退料数"-->
+<!--              align="center"-->
+<!--              prop="maxBackNum"-->
+<!--              :show-overflow-tooltip="true"-->
+<!--            />-->
             <el-table-column
               label="已完成退料数量"
               align="center"
@@ -164,7 +176,7 @@
               :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="待退料数量"
+                label="最大退料数量"
                 align="center"
                 :show-overflow-tooltip="true"
             >
@@ -174,7 +186,7 @@
                             (scope.row.partNum =
                                 scope.row.manageType == 0 ||
                                 scope.row.manageType == 1
-                                    ? scope.row.num
+                                    ? scope.row.maxBackNum
                                     : scope.row.partNum)
                         }}
                     </span>
@@ -210,7 +222,7 @@
                         v-if="
                             !isView &&
                             scope.row.manageType == '0' &&
-                            scope.row.num > 0 &&
+                            scope.row.maxBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -224,7 +236,7 @@
                             !isView &&
                             (scope.row.manageType == '1' ||
                                 scope.row.manageType == '2') &&
-                            scope.row.num > 0 &&
+                            scope.row.maxBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -236,7 +248,7 @@
                         @click="handleBackup(scope.row)"
                         v-if="
                             !isView &&
-                            scope.row.num < scope.row.preNum - scope.row.finishedBackNum &&
+                            scope.row.inCompletedBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -542,7 +554,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="退料数量"
+                        label="最大退料数量"
                         align="center"
                         prop="backNum"
                         :show-overflow-tooltip="true"
@@ -870,7 +882,7 @@ export default {
                 this.codeQuery.parentId = row.id
                 this.codeQuery.typeId = row.modelId
                 this.dialogIsView = true
-                this.returnNum = Number(row.num)
+                this.returnNum = Number(row.maxBackNum)
                 this.handleCodeQuery()
             } else if (row.manageType == '2') {
                 this.handleNumReturn(row)
@@ -920,7 +932,7 @@ export default {
             this.codeQuery.typeId = row.modelId
             this.codeQuery.agreementId = row.agreementId
             this.dialogIsView = false
-            this.returnNum = Number(row.num)
+            this.returnNum = Number(row.maxBackNum)
             this.handleCodeQuery()
         },
         //数量退料
@@ -928,8 +940,8 @@ export default {
             this.title = '数量退料'
             this.openNum = true
             this.dialogIsView = false
-            this.$set(row, 'backNum', row.num) //退料数量
-            this.returnNum = Number(row.num)
+            this.$set(row, 'backNum', row.maxBackNum) //退料数量
+            this.returnNum = Number(row.maxBackNum)
             this.dialogData.typeMange = row.manageType
             this.dialogData.typeName = row.typeName
             this.dialogData.typeCode = row.typeCode