From 34f21bf5901ed3c4e956fd9d7561adde93c8b012 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 29 Oct 2024 22:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=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/api/aftersales/aftersalesWorkOrder.js     |   2 +-
 .../distribution/distributionStockArticle.js  |  24 +-
 src/option/distribution/Unstoreddetails.js    | 187 +++++++
 .../distributionStockArticleSelf.js           |   2 +-
 src/router/views/index.js                     |  21 +
 src/views/Pricesystem/ListOfPriceSystems.vue  |  42 +-
 .../aftersales/aftersalesWorkOrderTemp.vue    | 180 +++++--
 .../inventory/delivery/Unstoreddetails.vue    | 492 ++++++++++++++++++
 .../delivery/distributionStockArticle.vue     |  23 +-
 9 files changed, 899 insertions(+), 74 deletions(-)
 create mode 100644 src/option/distribution/Unstoreddetails.js
 create mode 100644 src/views/distribution/inventory/delivery/Unstoreddetails.vue

diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js
index b0dd300b..e8630911 100644
--- a/src/api/aftersales/aftersalesWorkOrder.js
+++ b/src/api/aftersales/aftersalesWorkOrder.js
@@ -467,7 +467,7 @@ export const $_updateArbitrateStatu = (data) => {
 // 导出报表
 export const $_exportAftersalesWorkOrder = (params) => {
   return request({
-    url: '/api/logpm-aftersales/aftersalesWorkOrder/export-aftersalesWorkOrder',
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder',
     method: 'get',
     params,
     responseType: 'blob',
diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index bc5c2c70..8c1e75e3 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -123,7 +123,13 @@ export const getDetail = (current, size, params) => {
     },
   });
 };
-
+export const $_getDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/detail',
+    method: 'get',
+    params
+  });
+};
 export const getQueryQRCode = params => {
   return request({
     url: '/api/logpm-distribution/distributionStockArticle/getShowTemplate',
@@ -456,4 +462,18 @@ export const $_splitOrder = (row) => {
     method: 'post',
     data: row
   })
-}
\ No newline at end of file
+}
+export const $_getOrderWarehouseDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/getOrderWarehouseDetail',
+    method: 'get',
+    params
+  })
+}
+
+export const $_orderPackageCode = orderPackageCode => {
+  return request({
+    url: `/api/logpm-warehouse/api/orderInfo/orderPackageCode/${orderPackageCode}`,
+    method: 'get',
+  });
+};
\ No newline at end of file
diff --git a/src/option/distribution/Unstoreddetails.js b/src/option/distribution/Unstoreddetails.js
new file mode 100644
index 00000000..ebf4df37
--- /dev/null
+++ b/src/option/distribution/Unstoreddetails.js
@@ -0,0 +1,187 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '序号',
+    type: 0,
+    values: '',
+    width: 55,
+    checkarr: [],
+    fixed: true,
+  },
+
+  {
+    prop: 'waybillNumber',
+    label: '运单号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'warehouse',
+    label: '仓库',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderPackageStatusName',
+    label: '包件状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'goodsAllocation',
+    label: '货位信息',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'pallet',
+    label: '所在托盘',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'firsts',
+    label: '一级品',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'second',
+    label: '二级品',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'thirdProduct',
+    label: '三级品',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'materialCode',
+    label: '物料编码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+
+  {
+    prop: 'quantity',
+    label: '数量',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouseEntryTimeEnd',
+    label: '入库时间',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'trainNumber',
+    label: '客户车次号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'sendWarehouseName',
+    label: '发站仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '230',
+    checkarr: [],
+    fixed: 'right',
+    hide: true,
+  },
+];
diff --git a/src/option/distribution/distributionStockArticleSelf.js b/src/option/distribution/distributionStockArticleSelf.js
index eb6a5570..6abeab29 100644
--- a/src/option/distribution/distributionStockArticleSelf.js
+++ b/src/option/distribution/distributionStockArticleSelf.js
@@ -84,7 +84,7 @@ export const columnList = [
   {
     prop: 'notReceived',
     label: '未入库数量',
-    type: 1,
+    type: 13,
     values: '',
     width: '100',
     checkarr: [],
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 14fa626b..62fae612 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1174,6 +1174,27 @@ export default [
       },
     ],
   },
+  {
+    path: '/distribution/inventory/delivery/Unstoreddetails',
+    component: Layout,
+    redirect: '/distribution/inventory/delivery/Unstoreddetails',
+    children: [
+      {
+        path: '/distribution/inventory/delivery/Unstoreddetails',
+        name: '未入订单库详情',
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () =>
+          import('@/views/distribution/inventory/delivery/Unstoreddetails.vue'),
+      },
+    ],
+  },
   {
     path: '/distribution/inventory/distributionStockListDetails',
     component: Layout,
diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index befb4399..fabe98ca 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -97,7 +97,13 @@
     width="60%"
     :before-close="handleClose"
   >
-    <el-form inline :model="details.form" ref="basicForm" label-width="120px" class="el_from_basicVisted">
+    <el-form
+      inline
+      :model="details.form"
+      ref="basicForm"
+      label-width="120px"
+      class="el_from_basicVisted"
+    >
       <el-form-item label="客户名称" prop="clientName">
         <el-input placeholder="客户名称" v-model="details.form.clientName" disabled />
       </el-form-item>
@@ -646,11 +652,11 @@ const deletetails = row => {
 const handleClient = async row => {
   try {
     details.loadingObj.pageLoading = true;
-    let _data={
+    let _data = {
       brandId: row.brandId,
-      current:1,
-      size:500,
-    }
+      current: 1,
+      size: 500,
+    };
     const res = await $_getpriceTemplate(_data);
 
     const { code, data } = res.data;
@@ -693,7 +699,12 @@ const addition = async () => {
   let _row = details.selectionList[0];
   console.log(_row, '_row');
   details.loadingObj.pageLoading = true;
-  const res = await $_getpriceTemplate({ brandId: _row.brandId });
+  let _data = {
+    current: 1,
+    size: 500,
+    brandId: _row.brandId,
+  };
+  const res = await $_getpriceTemplate(_data);
   details.loadingObj.pageLoading = false;
   const { code, data } = res.data;
   if (code == 200) {
@@ -774,19 +785,18 @@ const handleSubmitBasic = () => {
 }
 
 // 基础配置样式
-.el_from_basicVisted{
-.el-form-item{
-  width: 40%;
- :deep( .el-date-editor){
-    width: 100% !important;
-  }
-  :deep(.el-select){
-    width: 100% !important;
+.el_from_basicVisted {
+  .el-form-item {
+    width: 40%;
+    :deep(.el-date-editor) {
+      width: 100% !important;
+    }
+    :deep(.el-select) {
+      width: 100% !important;
+    }
   }
 }
 
-}
-
 :deep(.el-date-editor) {
   height: 100% !important;
 }
diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue
index fd2be0ef..1d1bdce2 100644
--- a/src/views/aftersales/aftersalesWorkOrderTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue
@@ -128,7 +128,7 @@
             @size-change="sizeChange"
             @current-change="currentChange"
             :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
+            :page-sizes="[1, 2, 80, 120]"
             :page-size="page.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
@@ -147,7 +147,11 @@
     :columnListName="columnListName"
   ></edittablehead>
 </template>
-
+<script>
+export default {
+  name: '/aftersales/aftersalesWorkOrderTemp',
+};
+</script>
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { useStore } from 'vuex';
@@ -269,7 +273,8 @@ const createTabItem = (name, label) => ({
   total: 0,
   request: true, //是否请求
   currentPage: 1,
-  pageSize: 50,
+  pageSize: 2,
+  query: {},
 });
 
 const TabList = ref([
@@ -530,7 +535,7 @@ const details = reactive({
   /** 分页参数 */
   page: {
     currentPage: 1,
-    pageSize: 50,
+    pageSize: 2,
     total: 0,
   },
 
@@ -576,8 +581,11 @@ const showdrawer = _flag => {
 };
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-  processRowPropertyName(index, row, details.query);
-  onLoad();
+  let _Obj = MatchCurrentMenu(); //匹配出当前菜单
+  _Obj.request = true; //更新请求状态
+  _Obj.query = deepClone(details.query);
+  processRowPropertyName(index, row, _Obj.query);
+  tabChenge(TabPermissions.value); //获取页面数据
 };
 
 /** 表格表头时间选择 */
@@ -605,22 +613,16 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  onLoad();
-};
-// 每页多少条
-const sizeChange = val => {
-  details.page.pageSize = val;
-  onLoad();
-};
-/** 页码改变执行的回调 */
-const currentChange = val => {
-  details.page.currentPage = val;
-  onLoad();
+  tabChenge();
 };
+
 // 刷新按钮
 const searchChangeS = () => {
   details.search = false; //关闭搜索
-  Publicaccessdata();
+  let _Obj = MatchCurrentMenu();
+  _Obj.request = true;
+  tabChenge(TabPermissions.value);
+
 };
 //清空
 const searchReset = () => {
@@ -730,6 +732,25 @@ const PageOnlaod = async () => {
 };
 // 页面初始化
 PageOnlaod();
+
+// 切换菜单处理分页数据
+const PagingDataProcessing = () => {
+  let _Obj = MatchCurrentMenu();
+  console.log(_Obj, '匹配出来的公共菜单');
+  // 对当前菜单进行缓存还原
+  details.data = _Obj.DataList; //数据
+  details.page.total = _Obj.total; //总页数
+  details.page.currentPage = _Obj.currentPage; //当前页码
+  details.page.pageSize = _Obj.pageSize; //每页条数
+  // 判断是否需要请求数据
+  if (_Obj.request) {
+    console.log('当前需要加载页面');
+    return true;
+  }
+  console.log('当前已经加载过了');
+  return false;
+};
+
 /**
  *  @description: 点击tabBar时，记录当前点击的tab
  *  @param {number} value  当前点击的tab的value
@@ -737,14 +758,17 @@ PageOnlaod();
  */
 const tabChenge = async value => {
   try {
-    PageLoading.value = true; // 开启loading
     TabPermissions.value = value; // 记录当前点击的菜单
-    console.log(tabValue.value, 'tabValue');
-
-    await Processingworkorderstatus(value); // 处理工单状态
     await MenuHeaderProcessing(value); // 处理头部菜单
+    await Processingworkorderstatus(value); // 处理工单状态
+    // 判断是否需要请求数据{_state}返回true表示需要false表示不需要
+    let _state = PagingDataProcessing();
+    if (!_state) {
+      return;
+    }
+    PageLoading.value = true; // 开启loading
 
-    // 定义一个异步函数映射表
+    // 定义一个异步函数映射表（数据处理函数）
     const dataProcessingMap = {
       0: Publicaccessdata,
       1: Publicaccessdata,
@@ -777,10 +801,12 @@ const tabChenge = async value => {
 const Processingworkorderstatus = value => {
   switch (value) {
     case 0: // 全部
-      workOrderStatus.value = UserPermissions.value === Useridentity.Warehouse_customer_service ? 1000 : null;
+      workOrderStatus.value =
+        UserPermissions.value === Useridentity.Warehouse_customer_service ? 1000 : null;
       break;
     case 1: // 处理中
-      workOrderStatus.value = UserPermissions.value === Useridentity.Warehouse_customer_service ? 20 : 40;
+      workOrderStatus.value =
+        UserPermissions.value === Useridentity.Warehouse_customer_service ? 20 : 40;
       break;
     case 2: // 处理完毕
       workOrderStatus.value = 30;
@@ -795,32 +821,73 @@ const Processingworkorderstatus = value => {
       workOrderStatus.value = 90;
       break;
     case 9: // 待审核
-      workOrderStatus.value = UserPermissions.value ===  Useridentity.Headquarters_Manager? 500 : null;
+      workOrderStatus.value =
+        UserPermissions.value === Useridentity.Headquarters_Manager ? 500 : null;
       break;
     default:
       workOrderStatus.value = null;
       break;
   }
 };
+// 更新分页信息
+const updatePageDetails = (pageSize, currentPage) => {
+  details.page.pageSize = pageSize;
+  details.page.currentPage = currentPage;
+};
+const MatchCurrentMenu = () => {
+  return TabList.value.find(res => res.name == TabPermissions.value);
+};
+// 每页多少条
+const sizeChange = value => {
+  let _Obj = MatchCurrentMenu(); //匹配出当前菜单
+  _Obj.request = true; //更新请求状态
+  _Obj.pageSize = value; //更新菜单每页条数
+  _Obj.currentPage = 1; //切换每页条数的时候重置页码
+  updatePageDetails(value, 1); //更新页码
+  tabChenge(TabPermissions.value);
+};
 
-// 公共菜单数据处理
-const PublicDataProcessing = data => {
-  details.data = data.records;
-  console.log(TabList.value, 'TabList');
-  let _Obj = {};
-  _Obj = TabList.value.find(res => res.name == TabPermissions.value);
-  console.log(_Obj, '匹配出来的公共菜单');
-  _Obj.DataList = data.records; //数据
-  _Obj.total = data.total; //总条数
-  _Obj.currentPage = data.current; //当前页
-  _Obj.pageSize = data.size; //每页条数
-  if (_Obj.DataList?.length) {
-    _Obj.request = true;
-  } else {
-    _Obj.request = false;
-  }
+/** 页码改变执行的回调 */
+const currentChange = value => {
+  const _Obj = MatchCurrentMenu(); // 匹配出当前菜单
+  _Obj.request = true; //更新请求状态
+  _Obj.currentPage = value; //更新当前菜单页码
+  updatePageDetails(_Obj.pageSize, value); //更新分页信息
+  tabChenge(TabPermissions.value); //请求数据
 };
 
+/**
+ * @description: 公共菜单数据处理
+ * @param {object} data 接收公共菜单数据
+ */
+ const PublicDataProcessing = data => {
+  const { records, total, size, current } = data;
+
+  // 更新 details 数据
+  details.data = records;
+  details.page = {
+    total,
+    pageSize: size,
+    currentPage: current
+  };
+
+  // 更新匹配的 TabList 项
+  const matchedTab = TabList.value.find(tab => tab.name === TabPermissions.value);
+
+  if (matchedTab) {
+    Object.assign(matchedTab, {
+      DataList: records,
+      total,
+      pageSize: size,
+      currentPage: current,
+      request: !(records?.length > 0),//如果有值状态改为false下次默认不请求，否则true下次继续请求
+    });
+
+    console.log(matchedTab, '匹配出来的公共菜单');
+  }
+
+  console.log(TabList.value, 'TabList');
+};
 /**
  *  @description: 菜单表头处理
  *  @param {number} value  当前点击的tab的value
@@ -845,7 +912,7 @@ const MenuHeaderProcessing = value => {
   const selectedKey = value >= 0 && value < keys.length ? keys[value] : 'columnList';
 
   // 使用深拷贝赋值
-  details.columnListPublic = deepClone(columnLists[selectedKey]);
+  details.columnListPublic = columnLists[selectedKey];
 
   // 将变量名字符串赋值给 columnListName.value
   columnListName.value = selectedKey;
@@ -897,6 +964,16 @@ const DataAndStateProcessing = data => {
   DataStateProcessing(data); //状态处理
 };
 
+/**
+ * @description: 获取当前菜单的查询条件
+ * @return {Object} 返回当前菜单的查询条件对象
+ */
+const getQuery = () => {
+  // 匹配当前菜单并获取其搜索条件
+  let _Obj = MatchCurrentMenu();
+  return _Obj.query;
+};
+
 /**
  *  @description: 待回复菜单数据请求
  *  @return {Object} 包含待回复菜单数据的对象
@@ -906,12 +983,11 @@ const DataAwaitingReplyData = async () => {
     let _submitData = {
       current: details.page.currentPage, //页码
       size: details.page.pageSize, //条数
+      ...getQuery(), //查询条件
     };
     let _res = await $_getProcessor(_submitData);
     console.log(_res, '待回复菜单数据请求');
     const { code, data } = _res.data;
-    console.log(data, 'data');
-    console.log(code, 'code');
     if (code !== 200) {
       return;
     }
@@ -928,15 +1004,15 @@ const DataAwaitingReplyData = async () => {
  */
 const ClaimAmountData = async () => {
   try {
+    let _Obj = MatchCurrentMenu(); //匹配当前菜单传入当前菜单搜索条件
     let _submitData = {
       current: details.page.currentPage, //页码
       size: details.page.pageSize, //条数
+      ...getQuery(), //查询条件
     };
     let _res = await $_listSettlement(_submitData);
     console.log(_res, '理赔金额未出菜单数据请求');
     const { code, data } = _res.data;
-    console.log(data, 'data');
-    console.log(code, 'code');
     if (code !== 200) {
       return;
     }
@@ -952,15 +1028,15 @@ const ClaimAmountData = async () => {
  */
 const AppealData = async () => {
   try {
+    let _Obj = MatchCurrentMenu(); //匹配当前菜单传入当前菜单搜索条件
     let _submitData = {
       current: details.page.currentPage, //页码
       size: details.page.pageSize, //条数
+      ...getQuery(), //查询条件
     };
     let _res = await $_listAppeal(_submitData);
     console.log(_res, '申诉列表菜单数据请求');
     const { code, data } = _res.data;
-    console.log(data, 'data');
-    console.log(code, 'code');
     if (code !== 200) {
       return;
     }
@@ -979,12 +1055,11 @@ const OverdueUnprocessedData = async () => {
     let _submitData = {
       current: details.page.currentPage, //页码
       size: details.page.pageSize, //条数
+      ...getQuery(), //查询条件
     };
     let _res = await $_listOwn(_submitData);
     console.log(_res, '超时未处理表菜单数据请求');
     const { code, data } = _res.data;
-    console.log(data, 'data');
-    console.log(code, 'code');
     if (code !== 200) {
       return;
     }
@@ -1003,11 +1078,10 @@ const Publicaccessdata = async () => {
       workOrderStatus: workOrderStatus.value, //工单状态
       current: details.page.currentPage, //页码
       size: details.page.pageSize, //条数
+      ...getQuery(), //查询条件
     };
     let _res = await $_getList(_submitData);
     const { code, data } = _res.data;
-    console.log(data, 'data');
-    console.log(code, 'code');
     if (code !== 200) {
       return;
     }
diff --git a/src/views/distribution/inventory/delivery/Unstoreddetails.vue b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
new file mode 100644
index 00000000..13265043
--- /dev/null
+++ b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
@@ -0,0 +1,492 @@
+<template>
+  <basic-container v-loading="loadingObj.list" element-loading-text="Loading...">
+    <el-descriptions :column="3" border>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <user />
+            </el-icon>
+            顾客名字
+          </div>
+        </template>
+        <el-tag size="small">{{ from.customerName }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <iphone />
+            </el-icon>
+            顾客电话
+          </div>
+        </template>
+        {{ from.customerTelephone }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <office-building />
+            </el-icon>
+            顾客地址
+          </div>
+        </template>
+        {{ from.customerAddress }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <user />
+            </el-icon>
+            收货人名字
+          </div>
+        </template>
+        <el-tag size="small">{{ from.consigneePerson }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <iphone />
+            </el-icon>
+            收货人电话
+          </div>
+        </template>
+        {{ from.consigneeMobile }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon>
+              <office-building />
+            </el-icon>
+            收货人地址
+          </div>
+        </template>
+        {{ from.consigneeAddress }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <!-- 首页表格 -->
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="el-fr-d">
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-tabs type="border-card" class="el_tabs" @click="tabclaick" v-model="activeName">
+        <el-tab-pane label="已入库" name="1"></el-tab-pane>
+        <el-tab-pane label="未入库" name="2"></el-tab-pane>
+      </el-tabs>
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" @click="handleBatchBarcode"> 批量查看二维码</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <!-- <el-button icon="Search" @click="searchHide" circle></el-button> -->
+          </div>
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-text @click="printOrder(slotProps.scope.row)">查看二维码</el-text>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <!-- <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row> -->
+    </div>
+  </basic-container>
+  <!-- 打印二维码 -->
+  <MyPrint
+    :html="details.html"
+    v-model="details.popUpShow.QRCodeVisible"
+    :isShowExport="false"
+    type="titlePrint"
+    width="780px"
+  ></MyPrint>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<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 { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls, handleClearTableQuery } from '@/utils/util';
+import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
+import { useStore } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import {
+  $_getDetail,
+  $_getOrderWarehouseDetail,
+  $_orderPackageCode,
+} from '@/api/distribution/distributionStockArticle';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const activeName = ref('1');
+const dialogVisible = ref(false);
+const from = ref({
+  unWarehouse: [],
+  warehouse: [],
+});
+const html = ref('');
+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'
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+  html: '',
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+  defaultTime2,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+    
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  onLoad();
+};
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+  onLoad();
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
+  onLoad();
+};
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
+  onLoad();
+};
+//清空
+const searchReset = () => {
+  details.query = {};
+  details.page.currentPage = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+      });
+    });
+  });
+}
+// 页面初始化
+const onLoad = async () => {
+  details.loadingObj.list = true;
+  let _data = {
+    orderCode: $route.query.orderCode,
+  };
+  let _res = await $_getOrderWarehouseDetail(_data);
+  console.log(_res, '表格数据');
+  const { code, data } = _res.data;
+  if (code !== 200 || !data) {
+    return;
+  }
+  console.log(_res, '基础信息');
+  from.value.warehouse = data.warehouse; //已入库
+  from.value.unWarehouse = data.unWarehouse; //未入库
+  details.data = data.warehouse;
+  details.loadingObj.list = false;
+};
+
+const getDetailaInfo = async () => {
+  let _data = {
+    id: $route.query.id,
+  };
+  let _res = await $_getDetail(_data);
+  const { code, data } = _res.data;
+  if (code !== 200) {
+    return;
+  }
+  from.value = { ...data };
+};
+
+const initPage = () => {
+  getDetailaInfo(); //获取基础数据
+  onLoad(); //表格数据
+};
+initPage();
+const tabclaick = () => {
+  if (activeName.value == 1) {
+    details.data = from.value.warehouse; //已入库
+  } else {
+    details.data = from.value.unWarehouse; //已入库
+  }
+};
+
+const printOrder = async row => {
+  try {
+    details.loadingObj.list = true;
+    details.html = '';
+    let qr = {
+      orderPackageCodes: row.orderPackageCode,
+    };
+    const res = await getShowAdvancePackgeCode(qr);
+    const { code, data } = res.data;
+    if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return;
+    if (data.moldList.length === 0) return;
+    for (const iterator of data.moldList) {
+      details.html += iterator;
+    }
+    details.popUpShow.QRCodeVisible = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+/** 批量查看二维码 */
+const handleBatchBarcode = async () => {
+  if (details.selectionList.length === 0)
+    return ElMessage.warning({ message: '请选择需要查看的数据' });
+  try {
+    details.loadingObj.list = true;
+
+    let qr = {
+      orderPackageCodes: details.selectionList.map(val => val.orderPackageCode).join(','),
+    };
+
+    const res = await getShowAdvancePackgeCode(qr);
+
+    details.html = '';
+    const { code, data } = res.data;
+    if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return;
+    if (data.moldList.length === 0) return;
+
+    for (const iterator of data.moldList) {
+      details.html += iterator;
+    }
+
+    details.popUpShow.QRCodeVisible = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+:deep(.el-card) {
+  height: 100%;
+}
+:deep(.el-card__body) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+}
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+:deep(.el_tabs) {
+  .el-tabs__content {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index dde9b721..0602bc89 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -140,7 +140,13 @@
               </el-tag>
             </div>
           </template>
-
+          <template v-if="slotProps.scope.column.label === '未入库数量'">
+            <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
+              {{
+                slotProps.scope.column.label === '未入库数量' ? slotProps.scope.row.notReceived : ''
+              }}
+            </el-text>
+          </template>
           <template v-else-if="slotProps.scope.column.label === '是否齐套'">
             <el-tag :class="Number(slotProps.scope.row.completeSet) === 2 ? 'green' : 'red'">
               {{ slotProps.scope.row.completeSetName }}
@@ -926,6 +932,18 @@ export default {
     },
   },
   methods: {
+    // 未入库数量跳转
+    InformationViewing(row) {
+      this.$router.push({
+        path: '/distribution/inventory/delivery/Unstoreddetails',
+        query: {
+          id: row.id,
+          orderCode: row.orderCode,
+          name: '未入库订单详情 - ' + row.orderCode,
+          isZero: row.isZero,
+        },
+      });
+    },
     //导出
     handleExport() {
       let row = {};
@@ -2329,4 +2347,7 @@ export default {
     height: 40px;
   }
 }
+.el_textBtn {
+  font-weight: bold;
+}
 </style>