Merge branch 'pre-production'

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: '操作',

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>

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"

src/views/desk/notice.vue

@@ -27,7 +27,7 @@
           plain
           v-if="permission.notice_delete"
           @click="handleDelete"
-          >删 除
+          >批 量 删 除
         </el-button>
       </template>
       <template #="{ row }">

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;