From 7f39194cc4ca6362ccd19a25b131fda0f042191e Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Tue, 30 Jul 2024 13:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/home.vue          |  3 +--
 .../picking/auditing/component/home1.vue      | 25 +++++++++++++++++++
 .../return/receive/component/handlePage.vue   |  2 +-
 3 files changed, 27 insertions(+), 3 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 be47467b..299a1756 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -75,7 +75,7 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="排序管理" prop="taskStatus">
+            <el-form-item label="排序管理" prop="orderStatus">
                 <el-select
                     v-model="queryParams.orderStatus"
                     filterable
@@ -230,7 +230,6 @@
                 align="center"
                 prop="createTimes"
                 show-overflow-tooltip
-                sortable
             />
             <el-table-column
                 label="任务状态"
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
index 98e2e6de..61e3cccc 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -73,6 +73,24 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="排序管理" prop="orderStatus">
+                <el-select
+                    v-model="queryParams.orderStatus"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in orderStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="申请日期" prop="time">
                 <el-date-picker
                     v-model="queryParams.time"
@@ -587,6 +605,12 @@ export default {
                 { name: '出库进行中', id: 34 },
                 { name: '完成', id: 35 },
             ],
+            orderStatusList: [
+                { name: '申请时间-升序', id: 0 },
+                { name: '申请时间-降序', id: 1 },
+                { name: '任务状态-升序', id: 2 },
+                { name: '任务状态-降序', id: 3 },
+            ],
         }
     },
     created() {
@@ -620,6 +644,7 @@ export default {
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
+                orderStatus: this.queryParams.orderStatus,
             }
 
             const res = await getLeaseManageListAll(params)
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index a0690ed0..7b994328 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -90,7 +90,7 @@
                 type="selection"
                 width="55"
                 align="center"
-                :selectable="(row) => row.backStatus == 1"
+                :selectable="(row) => row.backStatus == 0"
             />
             <el-table-column
                 label="序号"