From fa74b08c768c7320c6774e174b4f157bbd3fd470 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 11:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A2=86=E6=96=99=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking.vue     | 13 ++++++++++++-
 .../picking/apply/component/home.vue           | 18 +++++++++++++-----
 .../warehousing/newTools/index.vue             | 11 ++++++++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 1cef75dc..26e182a4 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -333,6 +333,7 @@ export default {
                 agreementCode: null, //协议code
                 companyId: '', //登录信息中取
                 createBy: '', //用户名
+                userId: '',
                 taskType: 29,
                 taskStatus: 30,
                 //领料人信息
@@ -678,6 +679,7 @@ export default {
                     }
                     this.queryParams.createBy = this.user.userName
                     this.queryParams.companyId = this.user.companyId
+                    this.queryParams.userId = this.user.userId
                     let res
 
                     if (this.taskId) {
@@ -698,7 +700,11 @@ export default {
                             taskId: this.taskId,
                             leaseApplyInfoList: this.leaseApplyInfoList,
                         }
-
+                        console.log(
+                            '驳回提交--------------保存',
+                            params,
+                            '参数----------',
+                        )
                         res = await editLeaseApply(params)
                     } else {
                         // console.log(this.queryParams)
@@ -711,6 +717,11 @@ export default {
                             return
                         }
                         res = await submitLeaseApply(this.queryParams)
+                        console.log(
+                            '正常申请提交--------------保存',
+                            this.queryParams,
+                            '参数--------------',
+                        )
                     }
                     if (res.code == 200) {
                         this.$message({
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index e2800a0a..9e297ea7 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -209,7 +209,8 @@
                             scope.row.taskStatus == 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0].companyAuditRemark
+                            scope.row.leaseApplyInfoList[0]
+                                .companyAuditRemark || ''
                         }}
                     </span>
                     <span
@@ -217,14 +218,20 @@
                             scope.row.taskStatus == 32 ||
                             scope.row.taskStatus == 99
                         "
-                        >{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }}
+                        >{{
+                            scope.row.leaseApplyInfoList[0].deptAuditRemark ||
+                            ''
+                        }}
                     </span>
                     <span
                         v-if="
                             scope.row.taskStatus == 33 ||
                             scope.row.taskStatus == 100
                         "
-                        >{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}
+                        >{{
+                            scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            ''
+                        }}
                     </span>
                     <span
                         v-if="
@@ -232,11 +239,12 @@
                             scope.row.taskStatus < 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0].directAuditRemark
+                            scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            ''
                         }}</span
                     >
                     <span v-if="scope.row.taskStatus > 100">{{
-                        scope.row.leaseApplyInfoList[0].directAuditRemark
+                        scope.row.leaseApplyInfoList[0].directAuditRemark || ''
                     }}</span>
                     <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
                 </template>
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 24dc26de..6ca48ea1 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -279,7 +279,6 @@
             <el-table
                 v-loading="loading"
                 :data="detailTableList"
-                height="600"
                 @selection-change="handleSelectionChange"
                 border
             >
@@ -363,14 +362,20 @@
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)"
+                            v-if="
+                                scope.row.status == '0' &&
+                                scope.row.userIds.includes(userId)
+                            "
                             @click="pass(scope.row)"
                             >通过</el-button
                         >
                         <el-button
                             size="mini"
                             type="text"
-                            v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)"
+                            v-if="
+                                scope.row.status == '0' &&
+                                scope.row.userIds.includes(userId)
+                            "
                             @click="refused(scope.row)"
                             >不通过</el-button
                         >