From aa9aac7459333c394177d05a3d775f9bc360344a Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Tue, 9 Jul 2024 17:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/outbound/component/DialogPush.vue            | 9 +++++++++
 .../pushAndAccept/pushAndAcceptDetail.vue                | 2 +-
 .../warehouseManage/rentalEquipmentManagement/index.vue  | 8 +-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue
index 9c09ad00..5a3bcdf4 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue
@@ -3,6 +3,7 @@
     <!-- 弹框: 内容是transfer -->
     <el-dialog title="请选择接收人员" :visible.sync="open" width="40%" @close="handleClose" append-to-body>
       <el-transfer
+        v-if="open"
         class="centered-transfer"
         :titles="titles"
         :button-texts="['移除', '添加']"
@@ -52,6 +53,7 @@ export default {
           disabled: false,
         },
       ],
+      leftDefault: [], // 默认选中的人员
     }
   },
   methods: {
@@ -64,6 +66,8 @@ export default {
     // 显隐列初始默认隐藏列
     handleClose() {
       this.open = false
+      // 清空已选中的人员
+      this.value = []
       this.$emit('getList')
     },
     // 获取人员列表
@@ -81,6 +85,11 @@ export default {
     dataChange() {
       console.log('🚀 ~ dataChange ~ dataChange:', this.value)
     },
+    clearQuery(left, right) {
+      console.log('🚀 ~ clearQuery ~ 清空搜索:', )
+      // 'left' / 'right'， 清空两边的搜索框
+      
+    },
     submit() {
       console.log('🚀 ~ submit ~ submit:', this.value)
 
diff --git a/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue b/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
index 20b2a34e..e52d049b 100644
--- a/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
+++ b/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
@@ -274,7 +274,7 @@ export default {
     // 接收
     accept() {
       console.log('🚀 ~ accept ~ 接收:')
-      this.loading = true
+      // this.loading = true
       // 接口().then(res => {
       //   this.getList()
       // }).catch(err => {
diff --git a/sgzb-ui/src/views/warehouseManage/rentalEquipmentManagement/index.vue b/sgzb-ui/src/views/warehouseManage/rentalEquipmentManagement/index.vue
index b2a50fd9..31103315 100644
--- a/sgzb-ui/src/views/warehouseManage/rentalEquipmentManagement/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/rentalEquipmentManagement/index.vue
@@ -127,7 +127,7 @@ export default {
   methods: {
     // 搜索
     handleQuery() {
-      console.log('🚀 ~ handleQuery ~ 搜索:', params)
+      console.log('🚀 ~ handleQuery ~ 搜索:',)
       this.getList()
     },
     // 重置
@@ -159,31 +159,25 @@ export default {
     },
     // 预警 当前日期到租赁到期日期小于等于10天开始预警提醒，字体变为红色 当前日期到下次检验日期小于等于30天开始预警,字体变为红色
     warning() {
-      console.log('🚀 ~ warning ~ 预警:')
       // 获取当前日期
       const nowDate = new Date()
-      console.log('🚀 ~ warning ~ nowDate:', nowDate)
       // 循环列表
       this.tableData.forEach((item) => {
         // 获取租赁日期
         const rentalDate = new Date(item.rentalDate)
-        console.log('🚀 ~ this.tableData.forEach ~ rentalDate:', rentalDate)
         // 获取下次检验日期
         const nextInspectionDate = new Date(item.nextInspectionDate)
         // 计算租赁日期到期时间差 单位：天: 租赁日期 - 当前日期 <= 10 天  开始预警
         const leaseTime = (rentalDate - nowDate) / (1000 * 60 * 60 * 24)
-        console.log('🚀 ~ this.tableData.forEach ~ leaseTime:', leaseTime)
         if (leaseTime <= 10) {
           item.activeLease = true
         }
         // 计算下次检验日期时间差 单位：天: 下次检验日期 - 当前日期 <= 30 天  开始预警
         const checkTime = (nextInspectionDate - nowDate) / (1000 * 60 * 60 * 24)
-        console.log('🚀 ~ this.tableData.forEach ~ checkTime:', checkTime)
         if (checkTime <= 30) {
           item.activeCheck = true
         }
       })
-      console.log('🚀 ~ this.tableData.forEach ~ 添加预警值:', this.tableData)
     },
   },
 }