From fb7bd7d7524723a9ca6f892ad31cc59e6f4d0ac3 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 21 Apr 2025 16:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/home.vue             | 11 ++++++-----
 .../views/claimAndreturn/picking/apply/index.vue |  5 ++++-
 .../claimAndreturn/picking/outbound/index.vue    |  8 ++++++++
 .../return/apply/component/home.vue              |  3 ++-
 .../views/claimAndreturn/return/apply/index.vue  | 16 +++++++++-------
 5 files changed, 29 insertions(+), 14 deletions(-)

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 6e346d1a..24010735 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -544,6 +544,7 @@ export default {
         return {
             open: false,
             leaseApplyData: {}, // 领料单数据
+            leaseApplyDetails: [],
             // 遮罩层
             loading: false,
             // 选中数组
@@ -704,7 +705,7 @@ export default {
             // })
 
             // this.$emit('addPicking')
-            this.$emit('handlePicking', 1)
+            this.$emit('handlePicking', 1, '' , this.queryParams)
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
@@ -725,7 +726,7 @@ export default {
             //         this.$tab.refreshPage()
             //     })
             // this.$emit('viewPicking', row.taskId, this.queryParams)
-            this.$emit('handlePicking', 3, row.taskId)
+            this.$emit('handlePicking', 3, row.taskId, this.queryParams)
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
@@ -737,7 +738,7 @@ export default {
             //     },
             // })
             // this.$emit('editPicking', row.taskId, this.queryParams)
-            this.$emit('handlePicking', 2, row.taskId)
+            this.$emit('handlePicking', 2, row.taskId, this.queryParams)
         },
         /** 驳回按钮操作 */
         handleUpdate2(row) {
@@ -755,7 +756,7 @@ export default {
             //     this.queryParams,
             //     row.taskStatus,
             // )
-            this.$emit('handlePicking', 2, row.taskId)
+            this.$emit('handlePicking', 2, row.taskId, this.queryParams)
         },
         /** 删除按钮操作 */
         async handleDelete(row) {
@@ -798,7 +799,7 @@ export default {
 
             const res = await getLeaseListAll({ taskId: row.taskId })
 
-            this.leaseApplyDetails = res.rows[0].leaseApplyDetails
+            this.leaseApplyDetails = res.rows[0].leaseApplyDetails || []
             this.leaseApplyData = res.rows[0]
 
             console.log('this.leaseApplyData ============', this.leaseApplyData)
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
index 74909f54..cb9b3573 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
@@ -79,25 +79,28 @@ export default {
         },
 
         // 新增 查看 编辑 驳回提交等操作
-        handlePicking(type, taskId) {
+        handlePicking(type, taskId, routerParams) {
             switch (type) {
                 case 1:
                     this.pageContent = '新增领料任务'
                     this.isAdd = true
                     this.isEdit = false
                     this.viewTaskId = ''
+                    this.routerParams = routerParams
                     break
                 case 2:
                     this.pageContent = '领料任务编辑'
                     this.isAdd = false
                     this.isEdit = true
                     this.viewTaskId = taskId
+                    this.routerParams = routerParams
                     break
                 case 3:
                     this.pageContent = '领料任务详情'
                     this.isAdd = false
                     this.isEdit = false
                     this.viewTaskId = taskId
+                    this.routerParams = routerParams
                     break
             }
 
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 9abf0754..2d94edb9 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -359,6 +359,7 @@
             append-to-body
         >
             <el-form
+                v-if="openCode"
                 :model="codeOutForm"
                 ref="codeOutForm"
                 size="small"
@@ -488,6 +489,7 @@
             append-to-body
         >
             <el-form
+                v-if="openNum"
                 :model="numOutForm"
                 ref="numOutForm"
                 size="small"
@@ -1018,6 +1020,9 @@ export default {
             this.outNum = row.outNum
             this.outQuery.typeId = row.typeId
             this.outObj = row
+            this.noCarCode = true
+            this.codeOutForm.carCode = ''
+            this.outQuery.maCode = ''
             this.handleOutQuery()
         },
         //数量出库
@@ -1043,6 +1048,8 @@ export default {
             this.$set(obj, 'num', row.num) //库存
             this.$set(obj, 'createBy', sessionStorage.getItem('userId')) // 当前用户Id
             this.outNumList = [obj]
+            this.noCarCode = true
+            this.numOutForm.carCode = ''
         },
         // 手动操作
         manualOperation(row) {
@@ -1224,6 +1231,7 @@ export default {
             this.proName = proName
             this.unitName = unitName
             this.outboundParams.parentId = row.id
+            this.outboundParams.carCode = ''
             this.getCarCodeList()
             this.queryOutBoundList()
             this.dialogConfig.outerVisible = true
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
index 9c685c61..5b2a33ce 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
@@ -76,7 +76,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    type="date"
+                    type="daterange"
                     value-format="yyyy-MM-dd"
                     placeholder="请选择时间"
                     style="width: 240px"
@@ -716,6 +716,7 @@ export default {
                     // companyId: this.companyId,
                     ...this.queryParams,
                 }
+                delete params.time
                 const res = await ApiGetBackApplyList(params)
                 this.typeList = res.data.rows
                 this.total = res.data.total
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
index 8ec1e349..a865f953 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
@@ -6,13 +6,15 @@
             :pageContent="pageContent"
             @goBack="goBack"
         />
-        <component
-            :is="isShowComponent"
-            :rejectId="rejectId"
-            @returnApply="returnApply"
-            @rejectSubmit="rejectSubmit"
-            @goBackPage="goBack"
-        />
+        <keep-alive include="Home">
+            <component
+                :is="isShowComponent"
+                :rejectId="rejectId"
+                @returnApply="returnApply"
+                @rejectSubmit="rejectSubmit"
+                @goBackPage="goBack"
+            />
+        </keep-alive>
     </div>
 </template>