From ec4b79578cfa177995a06577a5348c5c39eb72ac Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 13 Dec 2024 11:37:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=AD=BE=E5=8C=85=E4=BB=B6=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLading.vue          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index a1d31bb7..7fb8ed4a 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2536,7 +2536,13 @@ export default {
         if (_check.length) {
           this.$refs.orderChooseTable.handleCheckSelect(_check);
         } else {
-          this.$refs.orderChooseTable.handleCheckSelect(data.records);
+          console.log(data.records, 'data.records');
+          let _list = data.records.filter(item => {
+            return item.orderPackageStatusName !== '已签收';
+          });
+          console.log(_list, '_lsit');
+
+          this.$refs.orderChooseTable.handleCheckSelect(_list);
         }
         console.log(this.order.selectList, '已经回显的值');
         this.selectionClear();
@@ -3530,10 +3536,10 @@ export default {
         console.log('执行了二次操作');
         const data = res.data.data;
         this.dataList = data.records;
-        if(this.dataList?.length){
+        if (this.dataList?.length) {
           this.dataList.forEach(i => {
-          i.reservationNum = i.handQuantity;
-        })
+            i.reservationNum = i.handQuantity;
+          });
         }
 
         this.loading = false;

From 11ad2a6051dea6a85a05a130e85728f784113093 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 13 Dec 2024 15:22:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/top/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 02aeb291..c62dfd55 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -13,7 +13,7 @@
       <top-menu ref="topMenu" v-if="setting.menu"></top-menu>
     </div>
     <div class="top-bar__right">
-      <!-- <top-search class="top-bar__item" v-if="setting.search"></top-search> -->
+      <top-search class="top-bar__item" v-if="setting.search"></top-search>
       <div v-if="setting.lock" class="top-bar__item">
         <top-lock></top-lock>
       </div>

From 5dcf1b1971af8d15e4083572273941872f4b6420 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 13 Dec 2024 15:25:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/desk/notice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index ddcec6f4..8f671c9c 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -27,7 +27,7 @@
           plain
           v-if="permission.notice_delete"
           @click="handleDelete"
-          >删 除
+          >批 量 删 除
         </el-button>
       </template>
       <template #="{ row }">

From e47c4fedc97aa343eb65e526e57863e7c080e0c8 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 13 Dec 2024 15:30:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/basicdataTray1.js               | 11 +++++++++++
 src/views/basicdata/warehouse/tray/basicdataTray.vue |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/option/basicdata/basicdataTray1.js b/src/option/basicdata/basicdataTray1.js
index 011b9eac..88e556d2 100644
--- a/src/option/basicdata/basicdataTray1.js
+++ b/src/option/basicdata/basicdataTray1.js
@@ -102,6 +102,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: '',
     label: '操作',
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index e1f318ba..3c91263b 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -148,7 +148,7 @@
           @size-change="sizeChange"
           @current-change="currentChange"
           :current-page="page.pageNum"
-          :page-sizes="[30, 50, 80, 120]"
+          :page-sizes="[30, 50, 80, 120, 500]"
           :page-size="page.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"