sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue

@@ -333,7 +333,6 @@ export default {
                 agreementCode: null, //协议code
                 companyId: '', //登录信息中取
                 createBy: '', //用户名
-                userId: '',
                 taskType: 29,
                 taskStatus: 30,
                 //领料人信息
@@ -679,7 +678,6 @@ 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) {
@@ -700,11 +698,7 @@ export default {
                             taskId: this.taskId,
                             leaseApplyInfoList: this.leaseApplyInfoList,
                         }
-                        console.log(
-                            '驳回提交--------------保存',
-                            params,
-                            '参数----------',
-                        )
+
                         res = await editLeaseApply(params)
                     } else {
                         // console.log(this.queryParams)
@@ -717,11 +711,6 @@ export default {
                             return
                         }
                         res = await submitLeaseApply(this.queryParams)
-                        console.log(
-                            '正常申请提交--------------保存',
-                            this.queryParams,
-                            '参数--------------',
-                        )
                     }
                     if (res.code == 200) {
                         this.$message({

sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue

@@ -209,8 +209,7 @@
                             scope.row.taskStatus == 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList[0]
-                                .companyAuditRemark || ''
+                            scope.row.leaseApplyInfoList[0].companyAuditRemark
                         }}
                     </span>
                     <span
@@ -218,20 +217,14 @@
                             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="
@@ -239,12 +232,11 @@
                             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>

sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue

@@ -279,6 +279,7 @@
             <el-table
                 v-loading="loading"
                 :data="detailTableList"
+                height="600"
                 @selection-change="handleSelectionChange"
                 border
             >
@@ -362,20 +363,14 @@
                         <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
                         >