diff --git a/src/api/distribution/orderLogs.js b/src/api/distribution/orderLogs.js
new file mode 100644
index 00000000..c1a194f3
--- /dev/null
+++ b/src/api/distribution/orderLogs.js
@@ -0,0 +1,23 @@
+import request from '@/axios';
+
+/**
+ * 初始化获取配载信息
+ */
+export const postFindPageList = (data = {}) => {
+  return request({
+    url: '/api/logpm-aftersales/abnormal/findPageList',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 初始化获取配载信息
+ */
+export const postDealAbnormal = (data = {}) => {
+  return request({
+    url: '/api/logpm-aftersales/abnormal/dealAbnormal',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 99c18be6..bdc97b32 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -407,7 +407,7 @@ onMounted(() => {
   handleCheckSelect(_checkSelect);
 });
 /** 勾选 */
-function handleCheckSelect(select: []) {
+function handleCheckSelect(select: any[]) {
   console.log('select :>> ', select);
   if (select.length !== 0) {
     for (const item of select) {
diff --git a/src/option/distribution/orderLogs.js b/src/option/distribution/orderLogs.js
new file mode 100644
index 00000000..436bf496
--- /dev/null
+++ b/src/option/distribution/orderLogs.js
@@ -0,0 +1,192 @@
+/** 自提详情内表格 */
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'typeName',
+    label: '类型',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { value: 1, label: '入库' },
+      { value: 2, label: '出库' },
+    ],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'abnormalTypeName',
+    label: '异常类型',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { value: 1, label: '无系统编码' },
+      { value: 2, label: '无装车计划' },
+      { value: 2, label: '无装车记录' },
+      { value: 2, label: '无卸车记录' },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carTypeName',
+    label: '车类型',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [{ value: 1, label: '干线' }],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'upWarehouseName',
+    label: '上报仓库',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carsNo',
+    label: '车次号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillNo',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  // {
+  //   prop: 'orderPackageCode',
+  //   label: '装车异常',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: true,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'orderPackageCode',
+  //   label: '卸车异常',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: true,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'upUserName',
+    label: '上报人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'abnormalStatusName',
+    label: '异常状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { value: 0, label: '待处理' },
+      { value: 1, label: '完结' },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'upTime',
+    label: '上报时间',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'dealTime',
+    label: '处理时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+  },
+];
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 3a50f872..3a31f9b2 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -348,6 +348,17 @@ export default [
         component: () =>
           import(/* webpackChunkName: "views" */ '@/views/distribution/inventory/CreateOrder.vue'),
       },
+      {
+        path: 'delivery/orderLogs',
+        name: '订单日志',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(
+            /* webpackChunkName: "views" */ '@/views/distribution/inventory/delivery/orderLogs.vue'
+          ),
+      },
     ],
   },
   {
@@ -693,7 +704,6 @@ export default [
       },
     ],
   },
-
   {
     path: '/distribution/reservation/atlas',
     component: Layout,
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 442db85d..9265ed38 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -912,6 +912,11 @@ export default {
           break;
         case '3':
           console.log('客户信息！！！', this.formCustomer);
+          for (const key in this.formCustomer) {
+            const value = this.formCustomer[key];
+            if (!value) return this.$message.warning('请完善客户信息再提交');
+          }
+
           if (!this.dialogFormCustomerOwn) {
             this.formCustomer.stockArticleId = this.ids;
           }
diff --git a/src/views/distribution/inventory/delivery/orderLogs.vue b/src/views/distribution/inventory/delivery/orderLogs.vue
new file mode 100644
index 00000000..79337d78
--- /dev/null
+++ b/src/views/distribution/inventory/delivery/orderLogs.vue
@@ -0,0 +1,492 @@
+<template>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search">
+          <el-form-item label="有效状态">
+            <el-select class="w100" v-model="query.value" clearable placeholder="有效状态">
+              <el-option label="有效" value="item.value" />
+              <el-option label="作废" value="item.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="运单号:" class="el-times">
+            <el-input v-model="query.stockupArea" clearable placeholder="请输入运单号"></el-input>
+          </el-form-item>
+          <el-form-item label="制单时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="创建时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="送货时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="签收时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <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>
+
+      <!-- 控件模块 -->
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left"></div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :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 === '操作'">
+            <el-text
+              v-if="Number(slotProps.scope.row.abnormalStatus) === 0"
+              @click="handleAnException(slotProps.scope)"
+            >
+              处理
+            </el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</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>
+    </div>
+  </basic-container>
+
+  <!-- 处理异常 -->
+  <el-dialog
+    title="异常处理"
+    :visible.sync="details.popUpShow.abnormalVisited"
+    width="780px"
+    :align-center="true"
+    v-model="details.popUpShow.abnormalVisited"
+  >
+    <div class="flex-c-c fwb">
+      包条码 （{{ details.abnormalInfo.orderPackageCode }}） 无系统编号
+    </div>
+    <div class="flex-c-c mt20">
+      <el-button @click="details.popUpShow.abnormalVisited = false">取 消</el-button>
+      <el-button type="primary" icon="Delete" @click="handleDeleteOrder">无效包条</el-button>
+      <el-button type="primary" icon="el-icon-search" @click="handleSynchronization"
+        >同步数据</el-button
+      >
+    </div>
+  </el-dialog>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters } from 'vuex';
+/** 获取字典 */
+import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { columnList } from '@/option/distribution/orderLogs';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { postFindPageList, postDealAbnormal } from '@/api/distribution/orderLogs';
+
+// 获取路由实例
+const $router = useRouter();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  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,
+    /** 页面loading */
+    pageLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    abnormalVisited: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+  /** 处理的异常信息 */
+  abnormalInfo: {},
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  popUpShow,
+} = toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = async (page?: any, params = {}) => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    if (page) _page = page;
+    // 获取暂存单列表
+    const res = await postFindPageList({ ..._page, ...details.query, ...params });
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    const valueArr = details.columnList.filter(val => val.type === 3);
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      for (let index = 0; index < valueArr.length; index++) {
+        const item = valueArr[index];
+        const label = item.prop.replace('Name', '');
+        value[item.prop] =
+          (item.checkarr.find(val => Number(val.value) === Number(value[label])) || {}).label ||
+          value[label];
+      }
+    }
+
+    details.page.total = data.total;
+  } catch (error) {
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+onLoad();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad(details.page);
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.currentPage = 1;
+  onLoad(details.page);
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(details.listNode, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.query[row.prop] = index;
+  onLoad(details.page);
+};
+
+/** 表格表头时间选择 */
+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];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  details.query[row.prop] = index;
+  if (!index) delete details.query[row.prop];
+  if (row.prop === 'certificateTypeName') {
+    details.query['certificateType'] = index;
+    if (!index) delete details.query['certificateType'];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  onLoad(details.page);
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.pageNum = current;
+  onLoad();
+};
+
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  } else if (type == 2) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'flexList', headarr);
+  } else if (type == 3) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'sortlist', headarr);
+  }
+};
+
+/** 弹出层开启前清除数据 */
+const beforeClose = done => {
+  done();
+  details.form = {};
+  details.selectionList = [];
+  details.view = false;
+};
+
+/** 处理异常 */
+const handleAnException = ({ row }) => {
+  details.abnormalInfo = row;
+  details.popUpShow.abnormalVisited = true;
+};
+
+/** 删除包条 */
+const handleDeleteOrder = () => {
+  ElMessageBox.confirm('是否删除该条数据?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      details.popUpShow.abnormalVisited = false;
+      try {
+        details.loadingObj.pageLoading = true;
+        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType: 1 };
+        const res = await postDealAbnormal(submitData);
+
+        const { code, msg } = res.data;
+        if (code !== 200) return;
+
+        ElMessage.success(msg);
+        details.page.pageNum = 1;
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 数据同步 */
+const handleSynchronization = () => {
+  ElMessageBox.confirm('是否数据同步?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      details.popUpShow.abnormalVisited = false;
+      try {
+        details.loadingObj.pageLoading = true;
+        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType: 2 };
+        const res = await postDealAbnormal(submitData);
+
+        const { code, msg } = res.data;
+        if (code !== 200) return;
+
+        ElMessage.success(msg);
+        details.page.pageNum = 1;
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+</script>
+
+<style scoped lang="scss">
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.fwb {
+  font-weight: bold;
+}
+</style>
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index b20c191a..5119c3ca 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -125,6 +125,7 @@
         </div>
         <!-- 列表模块 -->
         <tablecmt
+          ref="tableNode"
           :columnList="columnList"
           :tableData="dataPare"
           :loading="loadingObj.tableLoading"
@@ -192,7 +193,7 @@
       <el-dialog
         :title="titleMaterial"
         v-model="materialBox"
-        width="70%"
+        width="780px"
         :before-close="beforeClose"
         append-to-body
       >
@@ -263,6 +264,7 @@
           </span>
         </template>
       </el-dialog>
+
       <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
         <el-form :model="formCustomer">
           <el-form-item label="姓名" :label-width="formLabelWidth">
@@ -375,6 +377,7 @@ import print from '@/utils/print';
 import { ElMessage } from 'element-plus';
 import { hanleTextLineFeed } from '@/utils/util';
 export default {
+  name: '/distribution/inventory/distributionStockArticleDetails',
   data() {
     return {
       height: 0,
@@ -675,6 +678,7 @@ export default {
         pageLoading: false,
         tableLoading: false,
       },
+      pageId: '',
     };
   },
   mounted() {
@@ -759,8 +763,11 @@ export default {
   watch: {
     '$route.query.id': {
       handler(newVal, oldVal) {
-        // console.log(newVal, oldVal);
+        if (this.$route.path !== '/distribution/inventory/distributionStockArticleDetails') return;
         if (!!this.$route.query.id) {
+          if (this.pageId === this.$route.query.id) return;
+          this.page.currentPage = 1;
+          this.pageId = this.$route.query.id;
           this.onLoad(this.page);
           this.onLoadOwn(this.page);
         }
@@ -1341,29 +1348,30 @@ export default {
 
       this.dialogVisible = true;
     },
-    handleQRCode(row) {
-      // this.title = '查看'
-      // this.view = true;
-      // this.box = true;
-      this.materialQRCode = row;
-      console.log('11213 :>> ', 11213);
-
-      let qr = {
-        ids: row.id,
-      };
-      this.html = '';
-      showOrderPackgeCode(qr).then(async res => {
-        // this.orderPackageCode = res.data
-        // console.log(res.data);
-        console.log('res :>> ', res);
-        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+    async handleQRCode(row) {
+      try {
+        this.loadingObj.pageLoading = true;
+        let qr = {
+          ids: row.id,
+        };
+        this.html = '';
+        const res = await showOrderPackgeCode(qr);
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
         this.dialogVisible = true;
 
         await this.$nextTick();
 
-        hanleTextLineFeed('category', 15);
+        hanleTextLineFeed('category', 14);
+        hanleTextLineFeed('materialName', 14);
+        hanleTextLineFeed('qrCode', 18);
         hanleTextLineFeed('customer', 45);
-      });
+      } catch (err) {
+        console.log('err :>> ', err);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     handleTrajectory(row) {
       console.log('>>>>', row);
@@ -1419,7 +1427,6 @@ export default {
       this.view = false;
     },
     selectionChange(list) {
-      // console.log("添加阿斯顿发生",list);
       this.selectionList = list;
     },
     selectionClear() {
@@ -1501,6 +1508,11 @@ export default {
       }
     },
   },
+  async activated() {
+    if (this.pageId !== this.$route.query.id) return;
+    await this.$nextTick();
+    this.$refs.tableNode.handleCheckSelect(this.selectionList);
+  },
 };
 </script>
 
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index f7e66555..fbf807a4 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -372,13 +372,12 @@
             @selection="selectionInventoryChange"
           >
             <template #default="slotProps">
-              <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockList(slotProps.scope.row)"
-                >移除
-              </el-text>
+              <el-input-number
+                v-model="slotProps.scope.row.reservationNum"
+                :controls="false"
+                :min="0"
+                :precision="0"
+              />
             </template>
           </tablecmt>
           <!-- 分页行 -->
@@ -1548,7 +1547,7 @@ export default {
         {
           prop: 'reservationNum',
           label: '预约数量',
-          type: 10,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -2158,7 +2157,10 @@ export default {
             const value = _inventoryInfo[i];
             // 循环获取符合条件的库存品组成数组
             const _index = ids.indexOf(value.id);
-            if (_index !== -1) _chooseArr.splice(_index, 1, value);
+            if (_index !== -1) {
+              value.reservationNum = _chooseArr[_index].reservationNum;
+              _chooseArr.splice(_index, 1, value);
+            }
           }
         }
 
@@ -2541,13 +2543,13 @@ export default {
         if (valid) {
           console.log('submit!');
           try {
-            if (this.renderInventoryData.length) {
-              const allQuantitiesAreFalsy = this.renderInventoryData.every(
+            if (this.inventoryData.length) {
+              const allQuantitiesAreFalsy = this.inventoryData.every(
                 item => item.reservationNum != '0'
               );
               if (!allQuantitiesAreFalsy) {
                 ElMessage({
-                  message: '请移预约加数量为0的订单',
+                  message: '请移除预约加数量为0的库存品订单',
                   type: 'warning',
                 });
                 return;
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index be6d1e47..b9ac67de 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -138,7 +138,7 @@
             @size-change="sizeChange"
             @current-change="currentChange"
             :current-page="page.pageNum"
-            :page-sizes="[30, 50, 80, 120]"
+            :page-sizes="[30, 50, 100, 200, 500, 1000]"
             :page-size="page.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"