领料模块新增排序

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="任务状态"

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)

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="序号"