From 395c333ee6ab83bdb73457d8aa904c928ab5bb17 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 26 Dec 2023 10:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListedt.vue           | 22 ++---
 .../signfor/distributionSignforedt.vue        | 82 ++++++++++++++-----
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 4bddd073..d7f78db9 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1583,17 +1583,6 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'loadingTime',
-          label: '装车时间',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
         {
           prop: 'quantity',
           label: '包件数量',
@@ -1668,6 +1657,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'loadingTime',
+          label: '装车时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'signingTime',
           label: '签收扫描时间',
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index b21b624e..6248d7bb 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -380,8 +380,9 @@
                 <tablecmt
                   class="goodsTable"
                   :columnList="item.columnList"
-                  :tableData="data"
+                  :tableData="item.data"
                   :loading="false"
+                  @inputTxt="(value, row) => inputsc(value, row, item.type)"
                 >
                 </tablecmt>
 
@@ -1081,7 +1082,7 @@ const menuData2 = ref([
   {
     prop: 'waybillNumber',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -1092,7 +1093,7 @@ const menuData2 = ref([
   {
     prop: 'serviceNumber',
     label: '服务号',
-    type: 1,
+    type: 2,
     values: '',
     width: '250',
     checkarr: [],
@@ -1103,7 +1104,7 @@ const menuData2 = ref([
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 1,
+    type: 2,
     values: '',
     width: '280',
     checkarr: [],
@@ -1114,7 +1115,7 @@ const menuData2 = ref([
   {
     prop: 'orderPackageCode',
     label: '包条码',
-    type: 1,
+    type: 2,
     values: '',
     width: '200',
     checkarr: [],
@@ -1125,7 +1126,7 @@ const menuData2 = ref([
   {
     prop: 'warehouse',
     label: '仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -1136,7 +1137,7 @@ const menuData2 = ref([
   {
     prop: 'sendWarehouseName',
     label: '发站仓',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -1147,7 +1148,7 @@ const menuData2 = ref([
   {
     prop: 'acceptWarehouseName',
     label: '目的地',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -1156,17 +1157,17 @@ const menuData2 = ref([
     head: false,
   },
 
-  {
-    prop: 'waybillNumber',
-    label: '发货时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'waybillNumber',
+  //   label: '发货时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'warehouseEntryTimeEnd',
     label: '入库时间',
@@ -1666,16 +1667,25 @@ const Tabs = ref([
     label: '订单列表',
     name: '0',
     columnList: menuData1.value,
+    type: 'order',
+    query: {},
+    data: [],
   },
   {
     label: '包件列表',
     name: '1',
     columnList: menuData2.value,
+    type: 'package',
+    query: {},
+    data: [],
   },
   {
     label: '库存品列表',
     name: '2',
     columnList: menuData3.value,
+    type: 'inventory',
+    query: {},
+    data: [],
   },
 ]);
 // 增值服务标题栏
@@ -2081,8 +2091,11 @@ function PackageList() {
   editLoading.value = true; //表格加载开启
   data.value = [];
   signforPackageList(RouterId.value).then(res => {
+    const { code } = res.data;
+    if (code !== 200) return;
     console.log(res.data.data, '包件列表');
     data.value = res.data.data || [];
+    Tabs.value[1].data = res.data.data;
     editLoading.value = false; //表格加载结束
   });
 }
@@ -2093,6 +2106,7 @@ function InventoryList() {
   signforInventoryList(RouterId.value).then(res => {
     console.log(res, '库存品列表');
     data.value = res.data.data || [];
+    Tabs.value[2].data = data;
     editLoading.value = false; //表格加载结束
   });
 }
@@ -2271,6 +2285,36 @@ const ImgSuccessE = (response, uploadFile) => {
     SignForPhotos.value[SignForPhotos.value.length - 1].url = response.data.link;
   }
 };
+
+/** 输入框筛选 */
+const inputsc = (value, row, type) => {
+  console.log('value :>> ', value);
+  console.log('row :>> ', row);
+  console.log('type :>> ', type);
+  const _item = Tabs.value.find(val => val.type === type);
+
+  const reg = new RegExp(value, 'i');
+  _item.query[row.prop] = reg;
+  if (value === '') delete _item.query[row.prop];
+
+  console.log('reg :>> ', reg);
+
+  if (Object.keys(_item.query).length === 0) return (_item.data = data.value);
+
+  const _data = data.value.filter(value => {
+    let _flag = true;
+    for (let key in _item.query) {
+      console.log('_item.query[key].test(value[key]) :>> ', _item.query[key].test(value[key]));
+      if (!_item.query[key].test(value[key])) _flag = false;
+      if (!_flag) break;
+    }
+
+    return _flag;
+  });
+
+  console.log('_data :>> ', _data);
+  _item.data = _data;
+};
 </script>
 
 <style lang="scss" scoped>