From aa6234f8cac93780accfdca0d328c3726052e4bf Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Tue, 30 Jul 2024 09:40:15 +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=E4=B8=8B=E6=8B=89=E9=80=89-?=
 =?UTF-8?q?=E5=BE=85=E9=80=80=E6=96=99=E6=95=B0=E9=87=8F=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/home.vue          | 25 +++++++++++++++++++
 .../return/receive/component/handlePage.vue   | 10 ++++----
 2 files changed, 30 insertions(+), 5 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 9b23a87e..be47467b 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -75,6 +75,24 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="排序管理" prop="taskStatus">
+                <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="申请日期">
                 <el-date-picker
                     v-model="queryParams.time"
@@ -407,6 +425,12 @@ export default {
                 { name: '出库进行中', id: 34 },
                 { name: '完成', id: 35 },
             ],
+            orderStatusList: [
+                { name: '申请时间-升序', id: 0 },
+                { name: '申请时间-降序', id: 1 },
+                { name: '任务状态-升序', id: 2 },
+                { name: '任务状态-降序', id: 3 },
+            ],
         }
     },
     created() {
@@ -433,6 +457,7 @@ export default {
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
                 taskStatus: this.queryParams.taskStatus,
+                orderStatus: this.queryParams.orderStatus,
             }
 
             const res = await getLeaseAuditListAll(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 a744d908..a0690ed0 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 == 0"
+                :selectable="(row) => row.backStatus == 1"
             />
             <el-table-column
                 label="序号"
@@ -171,7 +171,7 @@
                 align="center"
                 :show-overflow-tooltip="true"
             >
-<!--                <template slot-scope="scope">
+               <template slot-scope="scope">
                     <span>
                         {{
                             (scope.row.partNum =
@@ -181,8 +181,8 @@
                                     : scope.row.partNum)
                         }}
                     </span>
-                </template>-->
-                <template slot-scope="scope">
+                </template>
+                <!-- <template slot-scope="scope">
                   <el-input
                     v-model.number="scope.row.num"
                     placeholder="请输入待退料数量"
@@ -192,7 +192,7 @@
                     @input="checkNum(scope.row)"
                     style="width: 100%"
                   />
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="操作"