From cd71e1cb7a7080a014f33d14fa8930a82d439dd5 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 15 Jul 2024 11:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/claimAndreturn/picking/apply/component/home.vue    | 1 +
 .../claimAndreturn/picking/auditing/component/home1.vue      | 1 +
 sgzb-ui/src/views/claimAndreturn/picking/query/index.vue     | 5 +++--
 .../src/views/claimAndreturn/return/apply/component/home.vue | 1 +
 sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue   | 3 ++-
 sgzb-ui/src/views/claimAndreturn/return/query/index.vue      | 1 +
 6 files changed, 9 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 d108407a..70bcf3fb 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -206,6 +206,7 @@
                 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 fa024ee9..240653e1 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -201,6 +201,7 @@
                 align="center"
                 prop="createTimes"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="任务状态"
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/query/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/query/index.vue
index df84d7f5..ad0093b2 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/query/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/query/index.vue
@@ -159,13 +159,13 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="领料数量"
+                label="出库数量"
                 align="center"
                 prop="preNum"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="领料人"
+                label="申请人"
                 align="center"
                 prop="leasePerson"
                 :show-overflow-tooltip="true"
@@ -187,6 +187,7 @@
                 align="center"
                 prop="createTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="领料单位"
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 6df5fdf7..16f95676 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
@@ -213,6 +213,7 @@
                 align="center"
                 prop="backTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="协议号"
diff --git a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
index 7c0c6166..5b2a88af 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
@@ -212,6 +212,7 @@
                 label="申请时间"
                 align="center"
                 prop="backTime"
+                sortable
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -226,7 +227,7 @@
                 prop="dictName"
                 :show-overflow-tooltip="true"
             >
-                <template slot-scope="scope">
+                <template>
                     <div>
                         <!-- 暂时全部未否 -->
                         否
diff --git a/sgzb-ui/src/views/claimAndreturn/return/query/index.vue b/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
index be41f595..cb028141 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
@@ -179,6 +179,7 @@
                 align="center"
                 prop="createTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="退料单位"