From 5b477110d9eccd5bd7b69e195285fac0285aa2c2 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 30 Oct 2024 00:46:11 +0800
Subject: [PATCH] =?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/option/distribution/Unstoreddetails.js    | 27 +++++++-------
 .../inventory/delivery/Unstoreddetails.vue    | 36 ++++++++++++++++---
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/option/distribution/Unstoreddetails.js b/src/option/distribution/Unstoreddetails.js
index ebf4df37..a9c1ca49 100644
--- a/src/option/distribution/Unstoreddetails.js
+++ b/src/option/distribution/Unstoreddetails.js
@@ -12,7 +12,7 @@ export const columnList = [
   {
     prop: 'waybillNumber',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -23,7 +23,7 @@ export const columnList = [
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 1,
+    type:2,
     values: '',
     width: '150',
     checkarr: [],
@@ -34,7 +34,7 @@ export const columnList = [
   {
     prop: 'warehouse',
     label: '仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -56,7 +56,7 @@ export const columnList = [
   {
     prop: 'orderPackageCode',
     label: '包条码',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -66,7 +66,7 @@ export const columnList = [
   {
     prop: 'goodsAllocation',
     label: '货位信息',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -76,7 +76,7 @@ export const columnList = [
   {
     prop: 'pallet',
     label: '所在托盘',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -86,7 +86,7 @@ export const columnList = [
   {
     prop: 'firsts',
     label: '一级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -96,7 +96,7 @@ export const columnList = [
   {
     prop: 'second',
     label: '二级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -106,7 +106,7 @@ export const columnList = [
   {
     prop: 'thirdProduct',
     label: '三级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -116,7 +116,7 @@ export const columnList = [
   {
     prop: 'materialName',
     label: '物料名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -126,7 +126,7 @@ export const columnList = [
   {
     prop: 'materialCode',
     label: '物料编码',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -143,6 +143,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,//开启统计
   },
   {
     prop: 'warehouseEntryTimeEnd',
@@ -157,7 +158,7 @@ export const columnList = [
   {
     prop: 'trainNumber',
     label: '客户车次号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -167,7 +168,7 @@ export const columnList = [
   {
     prop: 'sendWarehouseName',
     label: '发站仓',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/distribution/inventory/delivery/Unstoreddetails.vue b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
index 13265043..f782c3e5 100644
--- a/src/views/distribution/inventory/delivery/Unstoreddetails.vue
+++ b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
@@ -166,7 +166,7 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/distribution/Unstoreddetails.js';
-import { processRowPropertyName, setNodeHeight, getObjType } from '@/utils/util';
+import { processRowPropertyName, setNodeHeight, getObjType, deepClone } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
@@ -182,6 +182,7 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const activeName = ref('1');
+const dataCopy = ref([]); //拷贝数据
 const dialogVisible = ref(false);
 const from = ref({
   unWarehouse: [],
@@ -193,8 +194,6 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {
-    inputQuery: {},
-    selectQuery: {},
   },
   defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
@@ -292,9 +291,32 @@ const {
 const showdrawer = _flag => {
   details.drawerShow = _flag;
 };
+const filterAst = (ast, data) => {
+  // 检查 `data` 中是否所有的 `values` 都为空
+  const allValuesEmpty = data.every(item => !item.values);
+
+  // 如果所有 `values` 都为空，直接返回 `ast`
+  if (allValuesEmpty) {
+    // tabclaick();
+    return dataCopy.value;
+  }
+
+  // 否则筛选出 `values` 不为空的对象
+  const filteredData = data.filter(item => item.values);
+
+  // 根据筛选出的条件过滤 `ast`
+  return ast.filter(item => {
+    return filteredData.every(sub => {
+      const prop = sub.prop;
+      const value = sub.values;
+      return item[prop] === value;
+    });
+  });
+};
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-    
+  let _query = filterAst(dataCopy.value, columnList);
+  details.data = _query;
 };
 
 /** 表格表头时间选择 */
@@ -375,10 +397,12 @@ const onLoad = async () => {
   if (code !== 200 || !data) {
     return;
   }
+
   console.log(_res, '基础信息');
   from.value.warehouse = data.warehouse; //已入库
   from.value.unWarehouse = data.unWarehouse; //未入库
   details.data = data.warehouse;
+  dataCopy.value = deepClone(from.value.warehouse);
   details.loadingObj.list = false;
 };
 
@@ -402,8 +426,10 @@ initPage();
 const tabclaick = () => {
   if (activeName.value == 1) {
     details.data = from.value.warehouse; //已入库
+    dataCopy.value = deepClone(from.value.warehouse);
   } else {
-    details.data = from.value.unWarehouse; //已入库
+    details.data = from.value.unWarehouse; //未入库
+    dataCopy.value = deepClone(from.value.unWarehouse);
   }
 };