From 695703c27ad32d5070f01b3da53ad78bfdf72a7a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 9 Aug 2024 12:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataGoodsAllocation.js | 119 +--
 .../basicdata/basicdataGoodsAllocation.js     | 452 +++------
 .../basicdata/basicdataGoodsAllocation1.js    | 331 +++++++
 src/page/index/index.vue                      |  21 +-
 src/views/basicdata/brand/basicClient.vue     |  48 +-
 .../BasicdataGoodsAllocation copy.vue         | 377 --------
 .../BasicdataGoodsAllocation.vue              | 913 ++++++++----------
 .../BasicdataGoodsAllocation1.vue             | 572 +++++++++++
 .../BasicdataGoodsAllocationtt.vue            |   2 +-
 src/views/waybill/TemporaryStorageList.vue    | 550 ++++++-----
 10 files changed, 1828 insertions(+), 1557 deletions(-)
 create mode 100644 src/option/basicdata/basicdataGoodsAllocation1.js
 delete mode 100644 src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation copy.vue
 create mode 100644 src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue

diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index 5c93352a..f142e96a 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -1,113 +1,118 @@
 import request from '@/axios';
 
-export const getList = (current, size, params) => {
+/** 列表数据 */
+export const getList = params => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/list',
     method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
-}
+    params,
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+/** 移除 */
+export const remove = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const disable = (ids) => {
+    },
+  });
+};
+
+/** 禁用 */
+export const disable = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/disable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const enable = (ids) => {
+    },
+  });
+};
+
+/** 启用 */
+export const enable = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/enable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const downAllocation = (ids) => {
+    },
+  });
+};
+
+/** 批量下架 */
+export const downAllocation = ids => {
   return request({
     url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const shelf = (ids) => {
+    },
+  });
+};
+
+export const shelf = ids => {
   return request({
     url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/save',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-warehouse/warehouseGoodsAllocation/update',
     method: 'post',
-    data: row
-  })
-}
-export const getPrintTemplate = (params) => {
+    data: row,
+  });
+};
+
+/** 获取库位码 */
+export const getPrintTemplate = params => {
   return request({
     url: '/logpm-basicdata/goodsAllocation/getPrintTemplate',
     method: 'get',
-    params
-  })
-}
-export const getTemplate = (row) => {
+    params,
+  });
+};
+export const getTemplate = row => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/getTemplate',
     method: 'post',
     responseType: 'blob',
-    data: row
-  })
-}
-
+    data: row,
+  });
+};
 
-export const getQRCode = (qrCode) => {
+export const getQRCode = qrCode => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/QRCodeImg',
     method: 'get',
     responseType: 'blob',
-    params:{
-      qrCode
-    }
-  })
-}
-
+    params: {
+      qrCode,
+    },
+  });
+};
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 1a0a751d..b4d719b7 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -1,331 +1,121 @@
-export default {
-  height: 'auto',
-  calcHeight: 30,
-  tip: false,
-  searchShow: false, //搜索展开
-  searchMenuSpan: 6,
-  border: true,
-  index: true,
-  viewBtn: false,
-  selection: true,
-  editBtn: false,
-  delBtn: false,
-  addBtn: false,
-  indexWidth: '100',
-  indexLabel: '序号',
-  dialogClickModal: false,
-  column: [
-    {
-      label: '租户号',
-      prop: 'tenantId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '创建人',
-      prop: 'createUser',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '创建时间',
-      prop: 'createTime',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '更新人',
-      prop: 'updateUser',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '状态',
-      prop: 'status',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '是否已删除;1-未删除，2-已删除',
-      prop: 'isDeleted',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '创建部门',
-      prop: 'createDept',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '主键',
-      prop: 'id',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    // {
-    //   label: "预留1",
-    //   prop: "reserve1",
-    //   type: "input",
-    // },
-    // {
-    //   label: "预留2",
-    //   prop: "reserve2",
-    //   type: "input",
-    // },
-    // {
-    //   label: "预留3",
-    //   prop: "reserve3",
-    //   type: "input",
-    // },
-    // {
-    //   label: "预留4",
-    //   prop: "reserve4",
-    //   type: "input",
-    // },
-    // {
-    //   label: "预留5",
-    //   prop: "reserve5",
-    //   type: "input",
-    // },
-    {
-      label: '仓库名称',
-      prop: 'warehouseName',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      align: 'center',
-      labelWidth: '100',
-      width: 'fit-content',
-    },
-    {
-      label: '货区名称',
-      prop: 'goodsAreaName',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      align: 'center',
-      labelWidth: '100',
-      width: 'fit-content',
-    },
-    {
-      label: '货架名称',
-      prop: 'goodsShelfName',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      align: 'center',
-      labelWidth: '100',
-      width: 'fit-content',
-    },
-    {
-      label: '货架',
-      prop: 'nodeInfo',
-      type: 'cascader',
-      width: 'fit-content',
-      search: true,
-      labelWidth: '100',
-      clearable: true,
-      placeholder: '仓库/货区/货架',
-      dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
-      // dicData:dicData ,
-      props: {
-        label: 'label',
-        value: 'value',
-        children: 'children',
-        leaf: 'leaf',
-      },
-      addDisplay: true,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '货位名称',
-      prop: 'goodsAllocationName',
-      type: 'input',
-      addDisplay: true,
-      editDisplay: true,
-      align: 'center',
-      labelWidth: '100',
-      width: 'fit-content',
-      rules: [
-        {
-          required: true,
-          message: '请输入货位名称',
-          trigger: 'blur',
-        },
-      ],
-    },
-    {
-      label: '所在层',
-      prop: 'layerNum',
-      type: 'input',
-      align: 'center',
-      labelWidth: '100',
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      hide: false,
-      search: true,
-      width: 'fit-content',
-    },
-    {
-      label: '所在列',
-      prop: 'columnNum',
-      type: 'input',
-      align: 'center',
-      labelWidth: '100',
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      hide: false,
-      search: true,
-      width: 'fit-content',
-    },
-    {
-      label: '启用状态',
-      prop: 'enableStatus',
-      type: 'select',
-      search: false,
-      labelWidth: '100',
-      dicUrl: '/api/blade-system/dict-biz/dictionary?code=enable_status',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
-      addDisplay: false,
-      align: 'center',
-      editDisplay: false,
-      viewDisplay: false,
-      hide: false,
-      width: 'fit-content',
-    },
-    {
-      label: '货位状态',
-      prop: 'allocationStatus',
-      type: 'select',
-      search: true,
-      labelWidth: '100',
-      dicUrl: '/api/blade-system/dict-biz/dictionary?code=allocation_status',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
-      addDisplay: false,
-      align: 'center',
-      width: 'fit-content',
-    },
-    {
-      label: '货位码',
-      prop: 'qrCode',
-      type: 'input',
-      align: 'center',
-      labelWidth: '100',
-      viewDisplay: true,
-      addDisplay: false,
-      editDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '旧ID',
-      prop: 'oldId',
-      type: 'input',
-      align: 'center',
-      labelWidth: '100',
-      viewDisplay: true,
-      addDisplay: false,
-      editDisplay: false,
-      hide: true,
-      width: 'fit-content',
-    },
-    {
-      label: '旧货位码',
-      prop: 'oldQrCode',
-      type: 'input',
-      align: 'center',
-      labelWidth: '100',
-      viewDisplay: true,
-      addDisplay: false,
-      editDisplay: true,
-      width: 'fit-content',
-    },
-    {
-      label: '模 板',
-      prop: 'templateId',
-      type: 'select',
-      align: 'center',
-      labelWidth: '100',
-      dicUrl: '/api/logpm-basic/printTemplate/getTemplate?templateType=8',
-      props: {
-        label: 'templateName',
-        value: 'id',
-      },
-      viewDisplay: true,
-      addDisplay: true,
-      editDisplay: false,
-      width: 'fit-content',
-      hide: true,
-    },
-    // {
-    //   label: "二维码图片",
-    //   prop: "qrCodeUrl",
-    //   type: "upload",
-    //   dataType: 'string',
-    //   listType: 'picture-img',
-    //   hide: true,
-    //   labelWidth:'100',
-    //   span:11,
-    //   multiple:false,
-    //   width:"200px",
-    //   align:'left',
-    //
-    //   viewDisplay: true,
-    //   addDisplay: false,
-    //   editDisplay: false,
-    // },
-  ],
-};
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '仓库名称',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'goodsAreaName',
+    label: '货区名称',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'goodsShelfName',
+    label: '货架名称',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'goodsAllocationName',
+    label: '货位名称',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'layerNum',
+    label: '所在层',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'columnNum',
+    label: '所在列',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'enableStatus',
+    label: '启用状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { label: '启用', value: '1' },
+      { label: '禁用', value: '2' },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'allocationStatus',
+    label: '货位状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'oldQrCode',
+    label: '旧货位码',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+  },
+];
diff --git a/src/option/basicdata/basicdataGoodsAllocation1.js b/src/option/basicdata/basicdataGoodsAllocation1.js
new file mode 100644
index 00000000..1a0a751d
--- /dev/null
+++ b/src/option/basicdata/basicdataGoodsAllocation1.js
@@ -0,0 +1,331 @@
+export default {
+  height: 'auto',
+  calcHeight: 30,
+  tip: false,
+  searchShow: false, //搜索展开
+  searchMenuSpan: 6,
+  border: true,
+  index: true,
+  viewBtn: false,
+  selection: true,
+  editBtn: false,
+  delBtn: false,
+  addBtn: false,
+  indexWidth: '100',
+  indexLabel: '序号',
+  dialogClickModal: false,
+  column: [
+    {
+      label: '租户号',
+      prop: 'tenantId',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '创建人',
+      prop: 'createUser',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '更新人',
+      prop: 'updateUser',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '状态',
+      prop: 'status',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '是否已删除;1-未删除，2-已删除',
+      prop: 'isDeleted',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '创建部门',
+      prop: 'createDept',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '主键',
+      prop: 'id',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    // {
+    //   label: "预留1",
+    //   prop: "reserve1",
+    //   type: "input",
+    // },
+    // {
+    //   label: "预留2",
+    //   prop: "reserve2",
+    //   type: "input",
+    // },
+    // {
+    //   label: "预留3",
+    //   prop: "reserve3",
+    //   type: "input",
+    // },
+    // {
+    //   label: "预留4",
+    //   prop: "reserve4",
+    //   type: "input",
+    // },
+    // {
+    //   label: "预留5",
+    //   prop: "reserve5",
+    //   type: "input",
+    // },
+    {
+      label: '仓库名称',
+      prop: 'warehouseName',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      align: 'center',
+      labelWidth: '100',
+      width: 'fit-content',
+    },
+    {
+      label: '货区名称',
+      prop: 'goodsAreaName',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      align: 'center',
+      labelWidth: '100',
+      width: 'fit-content',
+    },
+    {
+      label: '货架名称',
+      prop: 'goodsShelfName',
+      type: 'input',
+      addDisplay: false,
+      editDisplay: false,
+      align: 'center',
+      labelWidth: '100',
+      width: 'fit-content',
+    },
+    {
+      label: '货架',
+      prop: 'nodeInfo',
+      type: 'cascader',
+      width: 'fit-content',
+      search: true,
+      labelWidth: '100',
+      clearable: true,
+      placeholder: '仓库/货区/货架',
+      dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
+      // dicData:dicData ,
+      props: {
+        label: 'label',
+        value: 'value',
+        children: 'children',
+        leaf: 'leaf',
+      },
+      addDisplay: true,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: '货位名称',
+      prop: 'goodsAllocationName',
+      type: 'input',
+      addDisplay: true,
+      editDisplay: true,
+      align: 'center',
+      labelWidth: '100',
+      width: 'fit-content',
+      rules: [
+        {
+          required: true,
+          message: '请输入货位名称',
+          trigger: 'blur',
+        },
+      ],
+    },
+    {
+      label: '所在层',
+      prop: 'layerNum',
+      type: 'input',
+      align: 'center',
+      labelWidth: '100',
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      hide: false,
+      search: true,
+      width: 'fit-content',
+    },
+    {
+      label: '所在列',
+      prop: 'columnNum',
+      type: 'input',
+      align: 'center',
+      labelWidth: '100',
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      hide: false,
+      search: true,
+      width: 'fit-content',
+    },
+    {
+      label: '启用状态',
+      prop: 'enableStatus',
+      type: 'select',
+      search: false,
+      labelWidth: '100',
+      dicUrl: '/api/blade-system/dict-biz/dictionary?code=enable_status',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      addDisplay: false,
+      align: 'center',
+      editDisplay: false,
+      viewDisplay: false,
+      hide: false,
+      width: 'fit-content',
+    },
+    {
+      label: '货位状态',
+      prop: 'allocationStatus',
+      type: 'select',
+      search: true,
+      labelWidth: '100',
+      dicUrl: '/api/blade-system/dict-biz/dictionary?code=allocation_status',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      addDisplay: false,
+      align: 'center',
+      width: 'fit-content',
+    },
+    {
+      label: '货位码',
+      prop: 'qrCode',
+      type: 'input',
+      align: 'center',
+      labelWidth: '100',
+      viewDisplay: true,
+      addDisplay: false,
+      editDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '旧ID',
+      prop: 'oldId',
+      type: 'input',
+      align: 'center',
+      labelWidth: '100',
+      viewDisplay: true,
+      addDisplay: false,
+      editDisplay: false,
+      hide: true,
+      width: 'fit-content',
+    },
+    {
+      label: '旧货位码',
+      prop: 'oldQrCode',
+      type: 'input',
+      align: 'center',
+      labelWidth: '100',
+      viewDisplay: true,
+      addDisplay: false,
+      editDisplay: true,
+      width: 'fit-content',
+    },
+    {
+      label: '模 板',
+      prop: 'templateId',
+      type: 'select',
+      align: 'center',
+      labelWidth: '100',
+      dicUrl: '/api/logpm-basic/printTemplate/getTemplate?templateType=8',
+      props: {
+        label: 'templateName',
+        value: 'id',
+      },
+      viewDisplay: true,
+      addDisplay: true,
+      editDisplay: false,
+      width: 'fit-content',
+      hide: true,
+    },
+    // {
+    //   label: "二维码图片",
+    //   prop: "qrCodeUrl",
+    //   type: "upload",
+    //   dataType: 'string',
+    //   listType: 'picture-img',
+    //   hide: true,
+    //   labelWidth:'100',
+    //   span:11,
+    //   multiple:false,
+    //   width:"200px",
+    //   align:'left',
+    //
+    //   viewDisplay: true,
+    //   addDisplay: false,
+    //   editDisplay: false,
+    // },
+  ],
+};
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 443882cc..89d9df49 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -30,7 +30,6 @@
   </div>
 </template>
 
-
 <script>
 import index from '@/mixins/index';
 import wechat from './wechat.vue';
@@ -81,12 +80,10 @@ export default {
   data() {
     return {
       TabName: null,
-      templateInfo:false,
+      templateInfo: false,
     };
   },
-  created() {
-
-  },
+  created() {},
   mounted() {
     if (this.userInfo.tenant_id == '000000') {
       let obj = JSON.parse(JSON.stringify(this.setting));
@@ -104,12 +101,12 @@ export default {
   props: [],
   methods: {
     // 打开AI
-    AiClick(){
-      this.templateInfo=!this.templateInfo
+    AiClick() {
+      this.templateInfo = !this.templateInfo;
     },
     // 关闭弹窗
-    provideData(data){
-    this.templateInfo=data.ai;//关闭弹窗
+    provideData(data) {
+      this.templateInfo = data.ai; //关闭弹窗
     },
     //打开菜单
     openMenu(item = {}) {
@@ -145,7 +142,7 @@ export default {
 </script>
 
 <style lang="scss">
-.ai_box{
+.ai_box {
   position: fixed;
   right: 10px;
   top: 70%;
@@ -205,4 +202,8 @@ export default {
     text-decoration: underline;
   }
 }
+
+#avue-view {
+  position: relative;
+}
 </style>
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index a3d8e421..4bf69634 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -168,7 +168,14 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog title="客户导入" append-to-body v-model="excelBox" width="555px">
+      <el-dialog
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        title="客户导入"
+        append-to-body
+        v-model="excelBox"
+        width="555px"
+      >
         <!-- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
           <template #excelTemplate>
             <a
@@ -215,7 +222,14 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="文件校验" append-to-body v-model="Fileverification" width="555px">
+      <el-dialog
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        title="文件校验"
+        append-to-body
+        v-model="Fileverification"
+        width="555px"
+      >
         <div>
           <el-divider content-position="left">文件校验</el-divider>
         </div>
@@ -239,12 +253,17 @@
 
       <!-- 表单模块 -->
       <el-dialog
+        destroy-on-close
+        :modal-append-to-body="false"
+        :append-to-body="false"
         :title="title"
         v-model="box"
         width="40%"
+        align-center
         :before-close="beforeClose"
         :close-on-click-modal="false"
         append-to-body
+        draggable
       >
         <div v-loading="loadingObj.submitLoading">
           <el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
@@ -456,7 +475,12 @@
       <!-- 账号绑定弹出框页面
       1、显示登录账号
       2、显示账号的名称 -->
-      <el-dialog title="开通账号" v-model="openAcountStatus">
+      <el-dialog
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        title="开通账号"
+        v-model="openAcountStatus"
+      >
         <el-form
           :disabled="view"
           ref="openAcountorm"
@@ -521,7 +545,14 @@
     </div>
 
     <!-- 日志 -->
-    <el-dialog title="客户日志" width="70%" :align-center="true" v-model="popUpShow.logVisted">
+    <el-dialog
+      :modal-append-to-body="false"
+      :append-to-body="false"
+      title="客户日志"
+      width="70%"
+      :align-center="true"
+      v-model="popUpShow.logVisted"
+    >
       <tablecmt ref="tableLogNode" class="mt10" :columnList="columnLogList" :tableData="logData">
         <template #default="{ scope }"> </template>
       </tablecmt>
@@ -1939,4 +1970,13 @@ export default {
     }
   }
 }
+
+// 弹窗
+:deep(.el-overlay) {
+  position: absolute;
+}
+
+:deep(.el-overlay-dialog) {
+  position: absolute;
+}
 </style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation copy.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation copy.vue
deleted file mode 100644
index 41bb13b4..00000000
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation copy.vue	
+++ /dev/null
@@ -1,377 +0,0 @@
-<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.abnormalStatus" clearable placeholder="异常状态">
-              <el-option label="待处理" :value="0" />
-              <el-option label="完结" :value="1" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="所在层" class="el-times">
-            <el-input v-model="query.waybillNo" clearable placeholder="请输入运单号"></el-input>
-          </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">
-          <!-- 禁用 -->
-          <el-button type="primary" icon="Delete" @click="handleAdd">禁 用</el-button>
-          <el-button type="primary" icon="CircleCheck" @click="handleAdd">启 用</el-button>
-          <el-button type="primary" icon="Refresh" @click="handleAdd">一键下架</el-button>
-          <el-button type="primary" icon="Printer" @click="handleAdd">查看二维码</el-button>
-        </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="details.loadingObj.list"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
-      >
-        <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <el-text>查看</el-text>
-            <el-text>禁用</el-text>
-            <el-text>一键下架</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.pageNum"
-          :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>
-
-  <!-- 列表配置显示 -->
-  <edittablehead
-    @closce="showdrawer"
-    :drawerShow="drawerShow"
-    v-model="details.columnList"
-    :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 { getDictionaryBiz } from '@/api/system/dict';
-import {
-  downloadXls,
-  setNodeHeight,
-  getHtmls,
-  deepClone,
-  handleClearTableQuery,
-  getObjType,
-  handleSelectQuery,
-  handleInputQuery,
-  handleTranslationDataSeclect,
-} from '@/utils/util';
-import { columnList } from '@/option/basicdata/basicdataVehicleInfo';
-import { useRouter } from 'vue-router';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import { getToken } from '@/utils/auth';
-import { postFindPageList, postDealAbnormal } from '@/api/distribution/abnormalList';
-
-// 获取路由实例
-const $router = useRouter();
-
-// 组件实例
-const formRef = ref();
-
-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: deepClone(columnList),
-  /** 列表数据 */
-  data: [],
-  /** 页面loading */
-  loadingObj: {
-    /** 列表加载loading */
-    list: false,
-    packageListLoading: false,
-    /** 页面loading */
-    pageLoading: false,
-  },
-  /** 列表复选框选中的数据 */
-  selectionList: [],
-  /** 是否显示设置表格 */
-  drawerShow: false,
-  /** 分页参数 */
-  page: {
-    pageNum: 1,
-    pageSize: 30,
-    total: 0,
-  },
-  /** 弹出层显示 */
-  popUpShow: {
-    /** 图片预览 */
-    vehicleInfoVisited: false,
-  },
-  /** 列表Dom节点 */
-  listNode: '',
-  form: {},
-  /** 全屏 */
-  fullscreenObj: {
-    /** 查看 */
-    view: false,
-  },
-});
-
-const { search, query, data, loadingObj, selectionList, drawerShow, page } = toRefs(details);
-
-/** vuex */
-const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-
-const initData = async () => {
-  try {
-    const res = await getDictionaryBiz('basic_car_type');
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.vehicleModelOption = data;
-    for (let i = 0; i < details.columnList.length; i++) {
-      const value = details.columnList[i];
-
-      if (value.label !== '车辆类型') continue;
-      value.checkarr = data.map(val => {
-        return { label: val.dictValue, value: val.dictKey };
-      });
-      break;
-    }
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-  }
-};
-
-initData();
-
-/** 请求页面数据 */
-const onLoad = async (page?: any, params = {}) => {
-  try {
-    details.loadingObj.list = true;
-    let _page = details.page;
-    if (page) _page = page;
-    // 获取暂存单列表
-
-    const submitData = { ..._page, ...details.query, ...params };
-
-    const res = await postFindPageList(submitData);
-    console.log('res :>> ', res);
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.data = data.records;
-
-    handleTranslationDataSeclect(details.data, details.columnList);
-
-    details.page.total = data.total;
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.list = false;
-  }
-};
-
-onLoad();
-
-/** 搜索 */
-const searchChange = () => {
-  onLoad(details.page);
-};
-
-/** 清空表单 */
-const searchReset = () => {
-  details.query = {};
-  details.stockupDate = [];
-  details.page.pageNum = 1;
-  handleClearTableQuery(details.columnList);
-  onLoad(details.page);
-};
-
-/** 展开列表控件 */
-const showdrawer = (_flag?: boolean) => {
-  details.drawerShow = _flag;
-};
-
-/** 是否开启搜索区 */
-const searchHide = () => {
-  details.search = !details.search;
-
-  setNodeHeight(details.listNode, '', true);
-};
-
-/** 表格表头输入框搜索 */
-const inputsc = (index, row) => {
-  handleInputQuery(index, row, details.query);
-  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) => {
-  handleSelectQuery(index, row, details.query);
-  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();
-};
-
-/** 弹出层开启前清除数据 */
-const beforeClose = done => {
-  done();
-  details.form = {};
-  details.selectionList = [];
-  details.view = false;
-};
-
-/** 新增 */
-const handleAdd = () => {
-  details.popUpShow.vehicleInfoVisited = true;
-
-  details.form = {};
-  for (let i = 0; i < details.formOption.length; i++) {
-    const value = details.formOption[i];
-    if (value.label === '车辆类型') continue;
-    details.form[value.prop] = 0;
-  }
-};
-</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;
-}
-
-:deep(.el-tag) {
-  border: none;
-
-  &.blue {
-    background: var(--el-color-primary);
-  }
-}
-
-:deep(.el-input-number .el-input__inner) {
-  text-align: left !important;
-}
-
-.text-right {
-  text-align: right;
-}
-</style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index e4abd3fb..21f567a9 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -1,100 +1,129 @@
 <template>
-  <basic-container v-loading="loadingObj.pageLoading">
-    <avue-crud
-      :option="option"
-      v-model:search="search"
-      v-model:page="page"
-      v-model="form"
-      :table-loading="loading"
-      :data="data"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left>
-        <el-button type="danger" icon="el-icon-delete" plain @click="handleDisable"
-          >禁 用
-        </el-button>
-        <el-button type="danger" icon="el-icon-check" plain @click="handleEnable">启 用 </el-button>
-        <el-button type="danger" icon="el-icon-minus" plain @click="downAllocation"
-          >一 键 下 架
-        </el-button>
-        <!--        <el-button type="warning"-->
-        <!--                   plain-->
-        <!--                   icon="el-icon-download"-->
-        <!--                   @click="handleExport">导 出-->
-        <!--        </el-button>-->
-        <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
-          >查看二维码
-        </el-button>
-      </template>
-
-      <template #menu="{ size, row, index }">
-        <el-button type="primary" text icon="el-icon-view" @click="handleView(row)"
-          >查 看</el-button
-        >
-        <el-button
-          type="primary"
-          text
-          icon="el-icon-view"
-          v-if="row.enableStatus == 1"
-          @click="losses(row, 2)"
-          >禁 用</el-button
-        >
-        <el-button
-          type="primary"
-          text
-          icon="el-icon-view"
-          v-if="row.allocationStatus !== '1'"
-          @click="Offshelf(row)"
-          >一 键 下 架</el-button
-        >
-        <el-button
-          type="primary"
-          text
-          icon="el-icon-view"
-          v-if="row.enableStatus == 2"
-          @click="losses(row, 1)"
-          >启 用</el-button
+  <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.abnormalStatus" clearable placeholder="异常状态">
+              <el-option label="待处理" :value="0" />
+              <el-option label="完结" :value="1" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="所在层" class="el-times">
+            <el-input v-model="query.waybillNo" clearable placeholder="请输入运单号"></el-input>
+          </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">
+          <!-- 禁用 -->
+          <el-button type="primary" icon="Delete" @click="handleAdd">禁 用</el-button>
+          <el-button type="primary" icon="CircleCheck" @click="handleAdd">启 用</el-button>
+          <el-button type="primary" icon="Refresh" @click="handleAdd">一键下架</el-button>
+          <el-button type="primary" icon="Printer" @click="handleGetPrint">查看二维码</el-button>
+        </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
+        ref="tableNodeRef"
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="details.loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text>查看</el-text>
+
+            <el-text @click="() => handleDisabledItem(slotProps.scope)">禁用</el-text>
+
+            <el-text>一键下架</el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb mt20">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.current"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
         >
-      </template>
-    </avue-crud>
-    <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
-      <div class="print_QRCode">
-        <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
-        <!--          <el-divider></el-divider>-->
-
-        <!--          <el-row>-->
-        <!--            <el-col :span="24" >-->
-        <!--              <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>-->
-        <!--            </el-col>-->
-        <!--          </el-row>-->
-        <!--        </div>-->
-        <!--startprint1-->
-        <div v-html="html"></div>
-        <!--endprint1-->
+        </el-pagination>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-        <el-button type="primary" @click="printTemplate">打 印</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </span>
-    </el-dialog>
+    </div>
   </basic-container>
+
+  <!-- 二维码 -->
+  <MyPrint
+    v-model="details.popUpShow.htmlVisited"
+    :html="details.html"
+    :isShowExport="false"
+    width="780px"
+  />
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    v-model="details.columnList"
+    :columnList="details.columnList"
+  ></edittablehead>
 </template>
 
-<script>
+<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 { getDictionaryBiz } from '@/api/system/dict';
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  handleClearTableQuery,
+  getObjType,
+  handleSelectQuery,
+  handleInputQuery,
+  handleTranslationDataSeclect,
+} from '@/utils/util';
+import { columnList } from '@/option/basicdata/basicdataGoodsAllocation';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { getToken } from '@/utils/auth';
 import {
   getList,
   getDetail,
@@ -107,466 +136,292 @@ import {
   enable,
   downAllocation,
 } from '@/api/basicdata/basicdataGoodsAllocation';
-import option from '@/option/basicdata/basicdataGoodsAllocation';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { downloadXls } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import print from '@/utils/print';
-import { getLodop } from '@/utils/LodopFuncs';
-import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      search: {},
-      loading: true,
-      page: {
-        pageSize: 30,
-        currentPage: 1,
-        total: 0,
+
+// 获取路由实例
+const $router = useRouter();
+
+// 组件实例
+const formRef = ref();
+const tableNodeRef = ref();
+
+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];
       },
-      selectionList: [],
-      option: option,
-      data: [],
-      imgUrl: '',
-      qrCodeObj: [],
-      dialogVisible: false,
-      html: '', // 页面包条码内容
-      /** 页面loading */
-      loadingObj: {
-        pageLoading: false,
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
       },
-    };
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
-        viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
-        delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
-        editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false),
-      };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
     },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList: deepClone(columnList),
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+    /** 页面loading */
+    pageLoading: false,
   },
-  methods: {
-    rowSave(row, done, loading) {
-      //该仓库未设置货区、货架概念，货位直接和仓库进行绑定
-      console.log(this.form);
-      if (this.form.nodeInfo.length === 1) {
-        this.$message({
-          type: 'warning',
-          message: '请先为该仓库添加货区',
-        });
-      }
-      if (this.form.nodeInfo.length === 2) {
-        console.log('>>>>>>', this.form.nodeInfo);
-        row.warehouseId = this.form.nodeInfo[0];
-        row.goodsAreaId = this.form.nodeInfo[1];
-        row.nodeInfo = null;
-      }
-      if (this.form.nodeInfo.length === 3) {
-        row.warehouseId = this.form.nodeInfo[0];
-        row.goodsAreaId = this.form.nodeInfo[1];
-        row.goodsShelfId = this.form.nodeInfo[2];
-        row.nodeInfo = null;
-      } else {
-        done();
-        this.$message({
-          type: 'warning',
-          message: '请先完善货架信息!!!',
-        });
-        return;
-      }
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          window.console.log(error);
-        }
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          console.log(error);
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(res => {
-          if (res.success) {
-            this.onLoad(this.page);
-            this.$message({
-              type: 'success',
-              message: '操作成功!',
-            });
-          } else {
-            this.$message({
-              type: 'error',
-              message: '操作成功!',
-            });
-          }
-        });
-    },
-    handleEdit(row) {
-      console.log('>>>>>>', row);
-    },
-    losses(row, mub) {
-      if (mub == 2) {
-        this.$confirm('确认禁用？')
-          .then(_ => {
-            row.enableStatus = mub;
-            let id = row.id;
-            disable(id).then(
-              () => {
-                this.onLoad(this.page);
-                this.$message({
-                  type: 'success',
-                  message: '操作成功!',
-                });
-              },
-              error => {
-                loading();
-                console.log(error);
-              }
-            );
-          })
-          .catch(_ => {});
-      } else {
-        this.$confirm('确认启用？')
-          .then(_ => {
-            row.enableStatus = mub;
-            let id = row.id;
-            enable(id).then(
-              () => {
-                this.onLoad(this.page);
-                this.$message({
-                  type: 'success',
-                  message: '操作成功!',
-                });
-              },
-              error => {
-                loading();
-                console.log(error);
-              }
-            );
-          })
-          .catch(_ => {});
-      }
-    },
-    Offshelf(row) {
-      this.$confirm('确认下架？')
-        .then(_ => {
-          shelf(row.id).then(
-            () => {
-              this.onLoad(this.page);
-              this.$message({
-                type: 'success',
-                message: '操作成功!',
-              });
-            },
-            error => {
-              loading();
-              console.log(error);
-            }
-          );
-        })
-        .catch(_ => {});
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    handleDisable() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据禁用?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return disable(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    handleEnable() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据启用?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return enable(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    downAllocation() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择库位下架?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        downAllocation(this.ids).then(response => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: response.data.msg,
-          });
-        });
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    current: 1,
+    size: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    htmlVisited: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+  html: '',
+});
+
+const { search, query, data, loadingObj, selectionList, drawerShow, page } = toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+const initData = async () => {
+  try {
+    details.loadingObj.pageLoading = true;
+    const res = await getDictionaryBiz('allocation_status');
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.vehicleModelOption = data;
+    for (let i = 0; i < details.columnList.length; i++) {
+      const value = details.columnList[i];
+
+      if (value.label !== '货位状态') continue;
+      value.checkarr = data.map(val => {
+        return { label: val.dictValue, value: val.dictKey };
       });
-    },
-    //批量打印数据处理代码
-    printTemplate() {
-      const printNode = document.querySelectorAll('.print_QRCode>div>div');
-      console.log('printNode :>> ', printNode);
-      print(printNode, 'titlePrint');
-    },
-    async handleqr() {
+      break;
+    }
+    onLoad();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+initData();
+
+/** 请求页面数据 */
+const onLoad = async (params = {}) => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    // 获取暂存单列表
+
+    const submitData = { ..._page, ...details.query, ...params };
+
+    const res = await getList(submitData);
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+
+    details.page.total = data.total;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.current = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(tableNodeRef.value.$el, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  handleInputQuery(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头时间选择 */
+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();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (size: number) => {
+  details.page.size = size;
+  onLoad();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.current = current;
+  onLoad();
+};
+
+/** 禁用 */
+const handleDisabledItem = ({ row }) => {
+  ElMessageBox.confirm(`确认禁用 [${row.goodsAllocationName}] 货位`, '', {
+    type: 'warning',
+  })
+    .then(async () => {
       try {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-
-        let checkcode = [];
-        this.selectionList.map(item => {
-          checkcode.push(item.id);
-          // checkcode.push(item.orderPackageCode)
-        });
-
-        let qr = checkcode.join(',');
-        console.log(qr);
-        this.html = '';
-        this.loadingObj.pageLoading = true;
-        const res = await getPrintTemplate({
-          ids: qr,
-        });
-
-        const { code, data } = res.data;
-        if (code !== 200) return;
+        details.loadingObj.pageLoading = true;
 
-        this.html = this.getHtmls(data.dataList, data.templateHtml);
-        this.dialogVisible = true;
+        const res = await disable(row.id);
+        const { code, msg } = res.data;
+        if (code !== 200) return;
+        ElMessage.success(`${row.goodsAllocationName} -- 禁用成功`);
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
-        this.loadingObj.pageLoading = false;
+        details.loadingObj.pageLoading = false;
       }
-    },
-    handleExport() {
-      let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      const {} = this.query;
-      let values = {};
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `货位${dateNow()}.xlsx`);
-          NProgress.done();
-        });
-      });
-    },
-    async beforeOpen(done, type) {
-      // if (["edit", "view"].includes(type)) {
-      // await  getDetail(this.form.id).then(async res => {
-      //     // 这里还需要进行二维码图片显示
-      //    await getQRCode(this.form.qrCode).then(res=>{
-      //       let url = window.URL.createObjectURL(res.data);
-      //      console.log("url>>>>>>>",url);
-      //       this.form.qrCodeUrl = url;
-      //       console.log(res);
-      //     })
-      //     console.log(this.form);
-      //     this.form = res.data.data;
-      //   });
-      // }
-      // done();
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      const { nodeInfo, enableStatus, allocationStatus, layerNum, columnNum } = this.query;
-
-      let values = {
-        enableStatus: enableStatus,
-        allocationStatus: allocationStatus,
-        layerNum: layerNum,
-        columnNum: columnNum,
-      };
-      if (!!this.query.nodeInfo) {
-        values.warehouseId = nodeInfo[0];
-        values.goodsAreaId = nodeInfo[1];
-        values.goodsShelfId = nodeInfo[2];
-      }
-      getList(page.currentPage, page.pageSize, values).then(res => {
-        const data = res.data.data;
-        console.log(res, 'res================================================================>');
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
+    })
+    .catch(() => {});
+};
 
-    // 查看
-    handleView(row) {
-      console.log('row :>> ', row);
-      this.$router.push({
-        path: '/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
-        query: {
-          name: '详情+-+' + row.goodsAllocationName,
-          info: JSON.stringify(row),
-        },
-      });
-    },
-  },
+/** 查看库位码 */
+const handleGetPrint = async () => {
+  try {
+    details.loadingObj.pageLoading = true;
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要查看的货位数据');
+
+    details.html = '';
+    details.loadingObj.pageLoading = true;
+    const res = await getPrintTemplate({
+      ids: details.selectionList.map(val => val.id).join(','),
+    });
+
+    const { code, data } = res.data;
+    if (code !== 200) return;
+
+    details.html = getHtmls(data.dataList, data.templateHtml);
+    details.popUpShow.htmlVisited = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
 };
 </script>
 
 <style scoped lang="scss">
-:deep(.no-print) {
-  margin-right: 0;
-}
-:deep(.avue-form__row) {
-  margin-left: 10px;
-  max-width: 300px !important;
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
 }
-.avue-form__group--flex {
-  justify-content: space-between;
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
 }
-:deep(.avue-form__row) {
-  margin-left: 0;
+
+.mt20 {
+  margin-top: 20px;
 }
-:deep(.el-form-item__label) {
-  width: auto !important;
+
+.fwb {
+  font-weight: bold;
 }
-:deep(.no-print) {
-  margin-left: auto;
-  .el-button {
-    margin-right: 0;
+
+:deep(.el-tag) {
+  border: none;
+
+  &.blue {
+    background: var(--el-color-primary);
   }
 }
-:deep(.el-card) {
-  height: 100%;
-  .el-card__body {
-    height: 100%;
-  }
+
+:deep(.el-input-number .el-input__inner) {
+  text-align: left !important;
+}
+
+.text-right {
+  text-align: right;
 }
 </style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue
new file mode 100644
index 00000000..0d7cc219
--- /dev/null
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue
@@ -0,0 +1,572 @@
+<template>
+  <basic-container v-loading="loadingObj.pageLoading">
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="danger" icon="el-icon-delete" plain @click="handleDisable"
+          >禁 用
+        </el-button>
+        <el-button type="danger" icon="el-icon-check" plain @click="handleEnable">启 用 </el-button>
+        <el-button type="danger" icon="el-icon-minus" plain @click="downAllocation"
+          >一 键 下 架
+        </el-button>
+        <!--        <el-button type="warning"-->
+        <!--                   plain-->
+        <!--                   icon="el-icon-download"-->
+        <!--                   @click="handleExport">导 出-->
+        <!--        </el-button>-->
+        <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
+          >查看二维码
+        </el-button>
+      </template>
+
+      <template #menu="{ size, row, index }">
+        <el-button type="primary" text icon="el-icon-view" @click="handleView(row)"
+          >查 看</el-button
+        >
+        <el-button
+          type="primary"
+          text
+          icon="el-icon-view"
+          v-if="row.enableStatus == 1"
+          @click="losses(row, 2)"
+          >禁 用</el-button
+        >
+        <el-button
+          type="primary"
+          text
+          icon="el-icon-view"
+          v-if="row.allocationStatus !== '1'"
+          @click="Offshelf(row)"
+          >一 键 下 架</el-button
+        >
+        <el-button
+          type="primary"
+          text
+          icon="el-icon-view"
+          v-if="row.enableStatus == 2"
+          @click="losses(row, 1)"
+          >启 用</el-button
+        >
+      </template>
+    </avue-crud>
+    <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
+      <div class="print_QRCode">
+        <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
+        <!--          <el-divider></el-divider>-->
+
+        <!--          <el-row>-->
+        <!--            <el-col :span="24" >-->
+        <!--              <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>-->
+        <!--            </el-col>-->
+        <!--          </el-row>-->
+        <!--        </div>-->
+        <!--startprint1-->
+        <div v-html="html"></div>
+        <!--endprint1-->
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+        <el-button type="primary" @click="printTemplate">打 印</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPrintTemplate,
+  shelf,
+  disable,
+  enable,
+  downAllocation,
+} from '@/api/basicdata/basicdataGoodsAllocation';
+import option from '@/option/basicdata/basicdataGoodsAllocation11';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import print from '@/utils/print';
+import { getLodop } from '@/utils/LodopFuncs';
+import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+      imgUrl: '',
+      qrCodeObj: [],
+      dialogVisible: false,
+      html: '', // 页面包条码内容
+      /** 页面loading */
+      loadingObj: {
+        pageLoading: false,
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
+        viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
+        delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
+        editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      //该仓库未设置货区、货架概念，货位直接和仓库进行绑定
+      console.log(this.form);
+      if (this.form.nodeInfo.length === 1) {
+        this.$message({
+          type: 'warning',
+          message: '请先为该仓库添加货区',
+        });
+      }
+      if (this.form.nodeInfo.length === 2) {
+        console.log('>>>>>>', this.form.nodeInfo);
+        row.warehouseId = this.form.nodeInfo[0];
+        row.goodsAreaId = this.form.nodeInfo[1];
+        row.nodeInfo = null;
+      }
+      if (this.form.nodeInfo.length === 3) {
+        row.warehouseId = this.form.nodeInfo[0];
+        row.goodsAreaId = this.form.nodeInfo[1];
+        row.goodsShelfId = this.form.nodeInfo[2];
+        row.nodeInfo = null;
+      } else {
+        done();
+        this.$message({
+          type: 'warning',
+          message: '请先完善货架信息!!!',
+        });
+        return;
+      }
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(res => {
+          if (res.success) {
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
+          } else {
+            this.$message({
+              type: 'error',
+              message: '操作成功!',
+            });
+          }
+        });
+    },
+    handleEdit(row) {
+      console.log('>>>>>>', row);
+    },
+    losses(row, mub) {
+      if (mub == 2) {
+        this.$confirm('确认禁用？')
+          .then(_ => {
+            row.enableStatus = mub;
+            let id = row.id;
+            disable(id).then(
+              () => {
+                this.onLoad(this.page);
+                this.$message({
+                  type: 'success',
+                  message: '操作成功!',
+                });
+              },
+              error => {
+                loading();
+                console.log(error);
+              }
+            );
+          })
+          .catch(_ => {});
+      } else {
+        this.$confirm('确认启用？')
+          .then(_ => {
+            row.enableStatus = mub;
+            let id = row.id;
+            enable(id).then(
+              () => {
+                this.onLoad(this.page);
+                this.$message({
+                  type: 'success',
+                  message: '操作成功!',
+                });
+              },
+              error => {
+                loading();
+                console.log(error);
+              }
+            );
+          })
+          .catch(_ => {});
+      }
+    },
+    Offshelf(row) {
+      this.$confirm('确认下架？')
+        .then(_ => {
+          shelf(row.id).then(
+            () => {
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!',
+              });
+            },
+            error => {
+              loading();
+              console.log(error);
+            }
+          );
+        })
+        .catch(_ => {});
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleDisable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据禁用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleEnable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据启用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return enable(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    downAllocation() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择库位下架?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        downAllocation(this.ids).then(response => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: response.data.msg,
+          });
+        });
+      });
+    },
+    //批量打印数据处理代码
+    printTemplate() {
+      const printNode = document.querySelectorAll('.print_QRCode>div>div');
+      console.log('printNode :>> ', printNode);
+      print(printNode, 'titlePrint');
+    },
+    async handleqr() {
+      try {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+
+        let checkcode = [];
+        this.selectionList.map(item => {
+          checkcode.push(item.id);
+          // checkcode.push(item.orderPackageCode)
+        });
+
+        let qr = checkcode.join(',');
+        console.log(qr);
+        this.html = '';
+        this.loadingObj.pageLoading = true;
+        const res = await getPrintTemplate({
+          ids: qr,
+        });
+
+        const { code, data } = res.data;
+        if (code !== 200) return;
+
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
+        this.dialogVisible = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+    },
+    handleExport() {
+      let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `货位${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    async beforeOpen(done, type) {
+      // if (["edit", "view"].includes(type)) {
+      // await  getDetail(this.form.id).then(async res => {
+      //     // 这里还需要进行二维码图片显示
+      //    await getQRCode(this.form.qrCode).then(res=>{
+      //       let url = window.URL.createObjectURL(res.data);
+      //      console.log("url>>>>>>>",url);
+      //       this.form.qrCodeUrl = url;
+      //       console.log(res);
+      //     })
+      //     console.log(this.form);
+      //     this.form = res.data.data;
+      //   });
+      // }
+      // done();
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const { nodeInfo, enableStatus, allocationStatus, layerNum, columnNum } = this.query;
+
+      let values = {
+        enableStatus: enableStatus,
+        allocationStatus: allocationStatus,
+        layerNum: layerNum,
+        columnNum: columnNum,
+      };
+      if (!!this.query.nodeInfo) {
+        values.warehouseId = nodeInfo[0];
+        values.goodsAreaId = nodeInfo[1];
+        values.goodsShelfId = nodeInfo[2];
+      }
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        console.log(res, 'res================================================================>');
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+
+    // 查看
+    handleView(row) {
+      console.log('row :>> ', row);
+      this.$router.push({
+        path: '/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
+        query: {
+          name: '详情+-+' + row.goodsAllocationName,
+          info: JSON.stringify(row),
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+:deep(.no-print) {
+  margin-right: 0;
+}
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 300px !important;
+}
+.avue-form__group--flex {
+  justify-content: space-between;
+}
+:deep(.avue-form__row) {
+  margin-left: 0;
+}
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.no-print) {
+  margin-left: auto;
+  .el-button {
+    margin-right: 0;
+  }
+}
+:deep(.el-card) {
+  height: 100%;
+  .el-card__body {
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue
index 5fe88fc5..9b9219f8 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue
@@ -263,7 +263,7 @@ import {
   enable,
   downAllocation,
 } from '@/api/basicdata/basicdataGoodsAllocation';
-import option from '@/option/basicdata/basicdataGoodsAllocation';
+import option from '@/option/basicdata/basicdataGoodsAllocation2';
 import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index d7a50145..529af755 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -183,266 +183,304 @@
           </el-pagination>
         </div>
       </el-row>
-    </div>
-  </basic-container>
 
-  <!-- 开标签 -->
-  <el-dialog
-    class="el-dialog-addTagVisited"
-    title="开标签"
-    :visible.sync="details.popUpShow.addTagVisited"
-    width="80%"
-    v-model="details.popUpShow.addTagVisited"
-  >
-    <div v-loading="details.loadingObj.addTagLoading">
-      <el-form
-        ref="ruleFormRef"
-        :model="details.addTagForm"
-        :rules="details.addTagFormRules"
-        :inline="true"
-        label-width="100px"
+      <!-- 开标签 -->
+      <el-dialog
+        destroy-on-close
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        class="el-dialog-addTagVisited"
+        width="80%"
+        v-model="details.popUpShow.addTagVisited"
+        :fullscreen="details.fullscreenObj.addTagVisited"
+        :show-close="false"
+        draggable
       >
-        <!-- 货品信息 -->
-        <el-divider style="font-size: 28px">货品信息</el-divider>
-        <el-form-item
-          v-for="(item, index) in details.addTagInfo.cargoInfo"
-          :key="item.label"
-          :label="item.label"
-          :prop="item.prop"
-        >
-          <template v-if="item.type === 'text'">
-            <el-input
-              :placeholder="`请输入${item.label}`"
-              v-model="details.addTagForm[item.prop]"
-              style="width: 200px"
-              clearable
-            />
-          </template>
-
-          <template v-if="item.type === 'number'">
-            <el-input-number
-              v-model="details.addTagForm[item.prop]"
-              style="width: 200px"
-              :precision="item.precision"
-              :min="0"
-              controls-position="right"
-              :placeholder="`请输入${item.label}`"
-              clearable
-            />
-          </template>
-
-          <template v-if="item.type === 'cascader'">
-            <el-cascader
-              :placeholder="`请选择${item.label}`"
-              :options="item.checkArr"
-              style="width: 200px"
-              v-model="details.addTagForm[item.prop]"
-              :props="{
-                checkStrictly: true,
-              }"
-              filterable
-              clearable
-            >
-              <template #default="{ node, data }">
-                <span>{{ data.label }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-              </template>
-            </el-cascader>
-          </template>
-
-          <template v-if="item.type === 'select'">
-            <el-select
-              v-model="details.addTagForm[item.prop]"
-              clearable
-              filterable
-              style="width: 200px"
-              :placeholder="`请选择${item.label}`"
-            >
-              <el-option
-                v-for="val in item.checkArr"
-                :key="val.brandName"
-                :label="val.brandName"
-                :value="val.brandName"
-              />
-            </el-select>
-          </template>
-        </el-form-item>
-
-        <div class="addTagRow">
-          <!-- 寄货人信息 -->
-          <div>
-            <el-divider style="font-size: 28px">寄货人信息</el-divider>
-
+        <!-- 标题 -- 头部控件区 -->
+        <template #header="{ close, titleId, titleClass }">
+          <div class="my-header flex-c-sb" draggable>
+            <div class="fwb" :id="titleId" :class="titleClass">开标签</div>
+            <div class="flex-c-c">
+              <!-- 全屏显示按钮 -->
+              <el-button type="text" v-if="!details.fullscreenObj.addTagVisited">
+                <el-icon class="" @click="handleFullScrean('open', 'addTagVisited')"
+                  ><FullScreen
+                /></el-icon>
+              </el-button>
+              <el-button type="text" v-else>
+                <el-icon class="" @click="handleFullScrean('close', 'addTagVisited')"
+                  ><CopyDocument
+                /></el-icon>
+              </el-button>
+
+              <!-- 弹窗关闭按钮 -->
+              <el-button type="text">
+                <el-icon class="" @click="close"><Close /></el-icon>
+              </el-button>
+            </div>
+          </div>
+        </template>
+
+        <div v-loading="details.loadingObj.addTagLoading">
+          <el-form
+            ref="ruleFormRef"
+            :model="details.addTagForm"
+            :rules="details.addTagFormRules"
+            :inline="true"
+            label-width="100px"
+          >
+            <!-- 货品信息 -->
+            <el-divider style="font-size: 28px">货品信息</el-divider>
             <el-form-item
-              v-for="(item, index) in details.addTagInfo.SenderInfo"
+              v-for="(item, index) in details.addTagInfo.cargoInfo"
               :key="item.label"
               :label="item.label"
               :prop="item.prop"
             >
-              <el-input
-                style="width: 200px"
-                :placeholder="`请输入${item.label}`"
-                v-model="details.addTagForm[item.prop]"
-                clearable
-              />
-            </el-form-item>
-          </div>
+              <template v-if="item.type === 'text'">
+                <el-input
+                  :placeholder="`请输入${item.label}`"
+                  v-model="details.addTagForm[item.prop]"
+                  style="width: 200px"
+                  clearable
+                />
+              </template>
 
-          <!-- 收货人信息 -->
-          <div>
-            <el-divider style="font-size: 28px">收货人信息</el-divider>
+              <template v-if="item.type === 'number'">
+                <el-input-number
+                  v-model="details.addTagForm[item.prop]"
+                  style="width: 200px"
+                  :precision="item.precision"
+                  :min="0"
+                  controls-position="right"
+                  :placeholder="`请输入${item.label}`"
+                  clearable
+                />
+              </template>
 
-            <el-form-item
-              v-for="(item, index) in details.addTagInfo.consigneeInfo"
-              :key="item.label"
-              :label="item.label"
-              :prop="item.prop"
-              clearable
-            >
-              <el-input
-                style="width: 200px"
-                :placeholder="`请输入${item.label}`"
-                v-model="details.addTagForm[item.prop]"
-                clearable
-              />
+              <template v-if="item.type === 'cascader'">
+                <el-cascader
+                  :placeholder="`请选择${item.label}`"
+                  :options="item.checkArr"
+                  style="width: 200px"
+                  v-model="details.addTagForm[item.prop]"
+                  :props="{
+                    checkStrictly: true,
+                  }"
+                  filterable
+                  clearable
+                >
+                  <template #default="{ node, data }">
+                    <span>{{ data.label }}</span>
+                    <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                  </template>
+                </el-cascader>
+              </template>
+
+              <template v-if="item.type === 'select'">
+                <el-select
+                  v-model="details.addTagForm[item.prop]"
+                  clearable
+                  filterable
+                  style="width: 200px"
+                  :placeholder="`请选择${item.label}`"
+                >
+                  <el-option
+                    v-for="val in item.checkArr"
+                    :key="val.brandName"
+                    :label="val.brandName"
+                    :value="val.brandName"
+                  />
+                </el-select>
+              </template>
             </el-form-item>
-          </div>
-        </div>
-      </el-form>
-    </div>
 
-    <div class="flex-c-c dialog-footer">
-      <el-button icon="Close" @click="details.popUpShow.addTagVisited = false"> 取 消 </el-button>
-      <el-button
-        icon="Refresh"
-        type="primary"
-        :loading="details.loadingObj.addTagLoading"
-        @click="() => handleRefreshAddTag(ruleFormRef)"
-      >
-        重 置
-      </el-button>
-      <el-button
-        icon="Position"
-        type="primary"
-        :loading="details.loadingObj.addTagLoading"
-        @click="() => handleSubmitAddTag(ruleFormRef)"
-      >
-        提 交
-      </el-button>
-    </div>
-  </el-dialog>
-
-  <!-- 导入 -- 批量开标签 -->
-  <el-dialog
-    class="el-dialog-UploadBatch"
-    title="批量开标签导入"
-    :visible.sync="details.popUpShow.UploadBatch"
-    :width="details.orderStatus !== 'haveData' || details.ouPaiChooseType !== 0 ? '70%' : '40%'"
-    v-model="details.popUpShow.UploadBatch"
-  >
-    <!-- 选择导入类型 -->
-    <div v-loading="details.loadingObj.UploadLoadong" element-loading-text="数据处理中...">
-      <template v-if="details.ouPaiChooseType === 0 && details.orderStatus === 'haveData'">
-        <div style="text-align: center">
-          <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 1">
-            有数据导入
-          </el-button>
-          <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 2">
-            无数据导入
-          </el-button>
-        </div>
-      </template>
+            <div class="addTagRow">
+              <!-- 寄货人信息 -->
+              <div>
+                <el-divider style="font-size: 28px">寄货人信息</el-divider>
+
+                <el-form-item
+                  v-for="(item, index) in details.addTagInfo.SenderInfo"
+                  :key="item.label"
+                  :label="item.label"
+                  :prop="item.prop"
+                >
+                  <el-input
+                    style="width: 200px"
+                    :placeholder="`请输入${item.label}`"
+                    v-model="details.addTagForm[item.prop]"
+                    clearable
+                  />
+                </el-form-item>
+              </div>
+
+              <!-- 收货人信息 -->
+              <div>
+                <el-divider style="font-size: 28px">收货人信息</el-divider>
 
-      <template v-else-if="details.orderStatus !== 'haveData' || details.ouPaiChooseType !== 0">
-        <div>
-          <el-divider content-position="left">{{
-            details.ouPaiChooseType === 1 ? '有数据导入' : '无数据导入'
-          }}</el-divider>
+                <el-form-item
+                  v-for="(item, index) in details.addTagInfo.consigneeInfo"
+                  :key="item.label"
+                  :label="item.label"
+                  :prop="item.prop"
+                  clearable
+                >
+                  <el-input
+                    style="width: 200px"
+                    :placeholder="`请输入${item.label}`"
+                    v-model="details.addTagForm[item.prop]"
+                    clearable
+                  />
+                </el-form-item>
+              </div>
+            </div>
+          </el-form>
         </div>
 
-        <P>请确认传入的文件为Excel文件格式</P>
-
-        <el-button type="primary" icon="Download" @click="handleDownLoadFile">
-          {{ details.ouPaiChooseType === 1 ? '包条码导入模板' : '无包条码导入模板' }}
-        </el-button>
-
-        <div v-loading="details.loadingObj.UploadLoadong" class="mt10">
-          <el-upload
-            class="upload-demo"
-            drag
-            :headers="details.header"
-            :action="
-              details.orderStatus === 'notHaveData'
-                ? '/api/logpm-trunkline/openOrder/importOrderNoPackage'
-                : details.ouPaiChooseType === 1
-                ? '/api/logpm-trunkline/openOrder/openLabelHasPacakage'
-                : '/api/logpm-trunkline/openOrder/batchOpenLabel'
-            "
-            :before-upload="handleBeforeUpload"
-            :on-success="handleSuccess"
-            :on-error="handleClose"
-            multiple
+        <div class="flex-c-c dialog-footer">
+          <el-button icon="Close" @click="details.popUpShow.addTagVisited = false">
+            取 消
+          </el-button>
+          <!-- 重置 -->
+          <el-button
+            icon="Refresh"
+            type="primary"
+            :loading="details.loadingObj.addTagLoading"
+            @click="() => handleRefreshAddTag(ruleFormRef)"
           >
-            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-            <div class="el-upload__text">拖拽文件或 <em>点击上传</em></div>
-          </el-upload>
-        </div>
-      </template>
-    </div>
-  </el-dialog>
-
-  <!-- 导入 -- 欧派 -->
-  <el-dialog
-    class="el-dialog-UploadPackageDelivery"
-    title="欧派数据导入"
-    :visible.sync="details.popUpShow.UploadPackageDelivery"
-    :width="details.ouPaiChooseType === 0 ? '40%' : '70%'"
-    v-model="details.popUpShow.UploadPackageDelivery"
-  >
-    <!-- 选择导入类型 -->
-    <div v-loading="details.loadingObj.UploadLoadong" element-loading-text="数据处理中...">
-      <template v-if="details.ouPaiChooseType === 0">
-        <div style="text-align: center">
-          <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 1">
-            标准品导入
+            重 置
           </el-button>
-          <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 2">
-            定制品导入
+
+          <!-- 提交 -->
+          <el-button
+            icon="Position"
+            type="primary"
+            :loading="details.loadingObj.addTagLoading"
+            @click="() => handleSubmitAddTag(ruleFormRef)"
+          >
+            提 交
           </el-button>
         </div>
-      </template>
+      </el-dialog>
+
+      <!-- 导入 -- 批量开标签 -->
+      <el-dialog
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        class="el-dialog-UploadBatch"
+        title="批量开标签导入"
+        :visible.sync="details.popUpShow.UploadBatch"
+        :width="details.orderStatus !== 'haveData' || details.ouPaiChooseType !== 0 ? '70%' : '40%'"
+        v-model="details.popUpShow.UploadBatch"
+      >
+        <!-- 选择导入类型 -->
+        <div v-loading="details.loadingObj.UploadLoadong" element-loading-text="数据处理中...">
+          <template v-if="details.ouPaiChooseType === 0 && details.orderStatus === 'haveData'">
+            <div style="text-align: center">
+              <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 1">
+                有数据导入
+              </el-button>
+              <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 2">
+                无数据导入
+              </el-button>
+            </div>
+          </template>
 
-      <template v-else>
-        <div>
-          <el-divider content-position="left">{{
-            details.ouPaiChooseType === 1 ? '标准品导入' : '定制品导入'
-          }}</el-divider>
+          <template v-else-if="details.orderStatus !== 'haveData' || details.ouPaiChooseType !== 0">
+            <div>
+              <el-divider content-position="left">{{
+                details.ouPaiChooseType === 1 ? '有数据导入' : '无数据导入'
+              }}</el-divider>
+            </div>
+
+            <P>请确认传入的文件为Excel文件格式</P>
+
+            <el-button type="primary" icon="Download" @click="handleDownLoadFile">
+              {{ details.ouPaiChooseType === 1 ? '包条码导入模板' : '无包条码导入模板' }}
+            </el-button>
+
+            <div v-loading="details.loadingObj.UploadLoadong" class="mt10">
+              <el-upload
+                class="upload-demo"
+                drag
+                :headers="details.header"
+                :action="
+                  details.orderStatus === 'notHaveData'
+                    ? '/api/logpm-trunkline/openOrder/importOrderNoPackage'
+                    : details.ouPaiChooseType === 1
+                    ? '/api/logpm-trunkline/openOrder/openLabelHasPacakage'
+                    : '/api/logpm-trunkline/openOrder/batchOpenLabel'
+                "
+                :before-upload="handleBeforeUpload"
+                :on-success="handleSuccess"
+                :on-error="handleClose"
+                multiple
+              >
+                <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                <div class="el-upload__text">拖拽文件或 <em>点击上传</em></div>
+              </el-upload>
+            </div>
+          </template>
         </div>
+      </el-dialog>
+
+      <!-- 导入 -- 欧派 -->
+      <el-dialog
+        :modal-append-to-body="false"
+        :append-to-body="false"
+        class="el-dialog-UploadPackageDelivery"
+        title="欧派数据导入"
+        :visible.sync="details.popUpShow.UploadPackageDelivery"
+        :width="details.ouPaiChooseType === 0 ? '40%' : '70%'"
+        v-model="details.popUpShow.UploadPackageDelivery"
+      >
+        <!-- 选择导入类型 -->
+        <div v-loading="details.loadingObj.UploadLoadong" element-loading-text="数据处理中...">
+          <template v-if="details.ouPaiChooseType === 0">
+            <div style="text-align: center">
+              <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 1">
+                标准品导入
+              </el-button>
+              <el-button type="primary" icon="Upload" @click="details.ouPaiChooseType = 2">
+                定制品导入
+              </el-button>
+            </div>
+          </template>
 
-        <P>请确认传入的文件为Excel文件格式</P>
-
-        <div v-loading="details.loadingObj.UploadLoadong">
-          <el-upload
-            class="upload-demo"
-            drag
-            :headers="details.header"
-            :action="
-              details.ouPaiChooseType === 1
-                ? '/api/logpm-trunkline/openOrder/importStandardOuPai'
-                : '/api/logpm-trunkline/openOrder/importCustomizedOuPai'
-            "
-            :before-upload="handleBeforeUpload"
-            :on-success="handleSuccess"
-            :on-error="handleClose"
-            multiple
-          >
-            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-            <div class="el-upload__text">拖拽文件或 <em>点击上传</em></div>
-          </el-upload>
+          <template v-else>
+            <div>
+              <el-divider content-position="left">{{
+                details.ouPaiChooseType === 1 ? '标准品导入' : '定制品导入'
+              }}</el-divider>
+            </div>
+
+            <P>请确认传入的文件为Excel文件格式</P>
+
+            <div v-loading="details.loadingObj.UploadLoadong">
+              <el-upload
+                class="upload-demo"
+                drag
+                :headers="details.header"
+                :action="
+                  details.ouPaiChooseType === 1
+                    ? '/api/logpm-trunkline/openOrder/importStandardOuPai'
+                    : '/api/logpm-trunkline/openOrder/importCustomizedOuPai'
+                "
+                :before-upload="handleBeforeUpload"
+                :on-success="handleSuccess"
+                :on-error="handleClose"
+                multiple
+              >
+                <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+                <div class="el-upload__text">拖拽文件或 <em>点击上传</em></div>
+              </el-upload>
+            </div>
+          </template>
         </div>
-      </template>
+      </el-dialog>
     </div>
-  </el-dialog>
+  </basic-container>
 
   <!-- 列表配置显示 -->
   <edittablehead
@@ -594,6 +632,8 @@ const details = reactive<any>({
   fullscreenObj: {
     /** 包明细 */
     packageOrderListlVisited: false,
+    /** 开标签 */
+    addTagVisited: false,
   },
   /** 打印的html */
   html: '',
@@ -1247,6 +1287,7 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
       break;
 
     default:
+      details.fullscreenObj[_name] = !details.fullscreenObj[_name];
       break;
   }
 };
@@ -1293,13 +1334,13 @@ const handleClose = res => {
 /** 开标签提交 */
 const handleSubmitAddTag = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  formEl.validate((valid, fields) => {
-    ElMessageBox.confirm('确认提交吗?', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(async () => {
-      if (valid) {
+  if (valid) {
+    formEl.validate((valid, fields) => {
+      ElMessageBox.confirm('确认提交吗?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(async () => {
         console.log('submit!');
 
         console.log('details.addTagForm :>> ', details.addTagForm);
@@ -1323,11 +1364,11 @@ const handleSubmitAddTag = (formEl: FormInstance | undefined) => {
         } finally {
           details.loadingObj.addTagLoading = false;
         }
-      } else {
-        console.log('error submit!', fields);
-      }
+      });
     });
-  });
+  } else {
+    console.log('error submit!', fields);
+  }
 };
 
 /** 开标签重置 */
@@ -1386,6 +1427,10 @@ onActivated(() => {
 </script>
 
 <style scoped lang="scss">
+// .avue-crud {
+//   position: relative;
+// }
+
 .fo-fl {
   display: flex;
   flex-wrap: wrap;
@@ -1514,4 +1559,13 @@ onActivated(() => {
 :deep(.el-tabs__active-bar) {
   background: #d38729;
 }
+
+// 弹窗
+:deep(.el-overlay) {
+  position: absolute;
+}
+
+:deep(.el-overlay-dialog) {
+  position: absolute;
+}
 </style>