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

This reverts commit 624c8f7e6b3e5512a0075a8ed5bb457b7a7f333a.
---
 .../return/receive/component/handlePage.vue   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue
index bec8530..5b2ad0f 100644
--- a/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -157,12 +157,6 @@
                 prop="preNum"
                 :show-overflow-tooltip="true"
             />
-<!--            <el-table-column-->
-<!--              label="最大退料数"-->
-<!--              align="center"-->
-<!--              prop="maxBackNum"-->
-<!--              :show-overflow-tooltip="true"-->
-<!--            />-->
             <el-table-column
               label="已完成退料数量"
               align="center"
@@ -170,7 +164,7 @@
               :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="最大退料数量"
+                label="待退料数量"
                 align="center"
                 :show-overflow-tooltip="true"
             >
@@ -180,7 +174,7 @@
                             (scope.row.partNum =
                                 scope.row.manageType == 0 ||
                                 scope.row.manageType == 1
-                                    ? scope.row.maxBackNum
+                                    ? scope.row.num
                                     : scope.row.partNum)
                         }}
                     </span>
@@ -242,7 +236,7 @@
                         @click="handleBackup(scope.row)"
                         v-if="
                             !isView &&
-                            scope.row.num < scope.row.maxBackNum - scope.row.finishedBackNum &&
+                            scope.row.num < scope.row.preNum - scope.row.finishedBackNum &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -926,7 +920,7 @@ export default {
             this.codeQuery.typeId = row.modelId
             this.codeQuery.agreementId = row.agreementId
             this.dialogIsView = false
-            this.returnNum = Number(row.maxBackNum)
+            this.returnNum = Number(row.num)
             this.handleCodeQuery()
         },
         //数量退料
@@ -934,8 +928,8 @@ export default {
             this.title = '数量退料'
             this.openNum = true
             this.dialogIsView = false
-            this.$set(row, 'backNum', row.maxBackNum) //退料数量
-            this.returnNum = Number(row.maxBackNum)
+            this.$set(row, 'backNum', row.num) //退料数量
+            this.returnNum = Number(row.num)
             this.dialogData.typeMange = row.manageType
             this.dialogData.typeName = row.typeName
             this.dialogData.typeCode = row.typeCode
@@ -1030,7 +1024,7 @@ export default {
                     (item.qualifiedNum || 0) +
                     (item.serviceNum || 0) +
                     (item.scrapNum || 0)
-                if (sumUnmber > item.partNum && sumUnmber > item.maxBackNum) {
+                if (sumUnmber > item.partNum && sumUnmber > item.num) {
                     this.$modal.msgError('退料总量已大于待退料数量！')
                     return
                 } else {