diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index f142e96a..78b09d87 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -116,3 +116,12 @@ export const getQRCode = qrCode => {
     },
   });
 };
+
+/** 获取货架 */
+export const getNode = () => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/getNode',
+    method: 'get',
+    params: {},
+  });
+};
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index b4d719b7..5553d26b 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -17,7 +17,7 @@ export const columnList = [
   {
     prop: 'warehouseName',
     label: '仓库名称',
-    type: 3,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -28,7 +28,7 @@ export const columnList = [
   {
     prop: 'goodsAreaName',
     label: '货区名称',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -38,7 +38,7 @@ export const columnList = [
   {
     prop: 'goodsShelfName',
     label: '货架名称',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -76,9 +76,9 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'enableStatus',
+    prop: 'enableStatusName',
     label: '启用状态',
-    type: 3,
+    type: 14,
     values: '',
     width: '130',
     checkarr: [
@@ -89,7 +89,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'allocationStatus',
+    prop: 'allocationStatusName',
     label: '货位状态',
     type: 3,
     values: '',
@@ -101,7 +101,7 @@ export const columnList = [
   {
     prop: 'oldQrCode',
     label: '旧货位码',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/option/basicdata/basicdataGoodsAllocation1.js b/src/option/basicdata/basicdataGoodsAllocation1.js
deleted file mode 100644
index 1a0a751d..00000000
--- a/src/option/basicdata/basicdataGoodsAllocation1.js
+++ /dev/null
@@ -1,331 +0,0 @@
-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/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 21f567a9..17690def 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -6,14 +6,37 @@
         <!-- 查询模块 -->
         <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-cascader
+              class="w100"
+              v-model="details.query.nodeInfo"
+              :options="details.nodeInfoArr"
+              clearable
+              filterable
+            />
           </el-form-item>
 
           <el-form-item label="所在层" class="el-times">
-            <el-input v-model="query.waybillNo" clearable placeholder="请输入运单号"></el-input>
+            <el-input v-model="query.layerNum" clearable placeholder="请输入所在层"></el-input>
+          </el-form-item>
+
+          <el-form-item label="所在列" class="el-times">
+            <el-input v-model="query.columnNum" clearable placeholder="请输入所在列"></el-input>
+          </el-form-item>
+
+          <el-form-item label="货位状态：">
+            <el-select
+              class="w100"
+              v-model="query.allocationStatus"
+              clearable
+              placeholder="请选择货位状态"
+            >
+              <el-option
+                v-for="item in details.allocationStatusArr"
+                :label="item.dictValue"
+                :key="item.dictKey"
+                :value="item.dictKey"
+              />
+            </el-select>
           </el-form-item>
 
           <!-- 查询按钮 -->
@@ -29,9 +52,21 @@
         <!-- 头部左侧按钮模块 -->
         <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="CircleClose" @click="() => handleDisabled(true)">
+            禁 用
+          </el-button>
+
+          <!-- 启用 -->
+          <el-button type="primary" icon="CircleCheck" @click="() => handleActive(true)">
+            启 用
+          </el-button>
+
+          <!-- 一键下架 -->
+          <el-button type="primary" icon="Refresh" @click="() => handleDownAllocation(true)"
+            >一键下架</el-button
+          >
+
+          <!-- 查看二维码 -->
           <el-button type="primary" icon="Printer" @click="handleGetPrint">查看二维码</el-button>
         </div>
 
@@ -55,12 +90,23 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <el-text>查看</el-text>
+          <template v-if="slotProps.scope.column.label === '启用状态'">
+            <el-tag
+              :class="{
+                red: Number(slotProps.scope.row.enableStatus) === 2,
+                green: Number(slotProps.scope.row.enableStatus) === 1,
+              }"
+            >
+              {{ slotProps.scope.row.enableStatusName }}
+            </el-tag>
+          </template>
 
-            <el-text @click="() => handleDisabledItem(slotProps.scope)">禁用</el-text>
+          <template v-else-if="slotProps.scope.column.label === '操作'">
+            <el-text @click="() => handleView(slotProps.scope)">查看</el-text>
 
-            <el-text>一键下架</el-text>
+            <el-text @click="() => handleDisabled(false, slotProps.scope)">禁用</el-text>
+
+            <el-text @click="() => handleDownAllocation(false, slotProps.scope)">一键下架</el-text>
           </template>
         </template>
       </tablecmt>
@@ -134,6 +180,7 @@ import {
   shelf,
   disable,
   enable,
+  getNode,
   downAllocation,
 } from '@/api/basicdata/basicdataGoodsAllocation';
 
@@ -189,7 +236,6 @@ const details = reactive<any>({
   loadingObj: {
     /** 列表加载loading */
     list: false,
-    packageListLoading: false,
     /** 页面loading */
     pageLoading: false,
   },
@@ -217,6 +263,10 @@ const details = reactive<any>({
     view: false,
   },
   html: '',
+  /** 货架 */
+  nodeInfoArr: [],
+  /** 货位状态 */
+  allocationStatusArr: [],
 });
 
 const { search, query, data, loadingObj, selectionList, drawerShow, page } = toRefs(details);
@@ -227,19 +277,30 @@ 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 };
-      });
-      break;
-    }
+    await Promise.all([
+      // 货位状态
+      getDictionaryBiz('allocation_status').then(res => {
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        details.allocationStatusArr = 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;
+        }
+      }),
+      // 货架
+      getNode().then(res => {
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        details.nodeInfoArr = data;
+      }),
+    ]);
+
     onLoad();
   } catch (error) {
     console.log('error :>> ', error);
@@ -259,6 +320,21 @@ const onLoad = async (params = {}) => {
 
     const submitData = { ..._page, ...details.query, ...params };
 
+    if (getObjType(details.query.nodeInfo) === 'array') {
+      if (details.query.nodeInfo.length === 1) {
+        return ElMessage.warning('请先为该仓库添加货区');
+      } else if (details.query.nodeInfo.length === 2) {
+        submitData.warehouseId = details.query.nodeInfo[0];
+        submitData.goodsAreaId = details.query.nodeInfo[1];
+        delete submitData.nodeInfo;
+      } else if (details.query.nodeInfo.length === 3) {
+        submitData.warehouseId = details.query.nodeInfo[0];
+        submitData.goodsAreaId = details.query.nodeInfo[1];
+        submitData.goodsShelfId = details.query.nodeInfo[2];
+        delete submitData.nodeInfo;
+      }
+    }
+
     const res = await getList(submitData);
     console.log('res :>> ', res);
     const { code, data } = res.data;
@@ -344,18 +420,104 @@ const currentChange = current => {
 };
 
 /** 禁用 */
-const handleDisabledItem = ({ row }) => {
-  ElMessageBox.confirm(`确认禁用 [${row.goodsAllocationName}] 货位`, '', {
+const handleDisabled = (isBatch, scope: any = {}) => {
+  let ids = '';
+  let content = '';
+  if (isBatch) {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要禁用的货位');
+    ids = details.selectionList.map(val => val.id).join(',');
+    content = `确认禁用货位`;
+  } else {
+    ids = scope.row.id;
+    content = `确认禁用 [${scope.row.goodsAllocationName}] 货位`;
+  }
+
+  ElMessageBox.confirm(content, '', {
     type: 'warning',
   })
     .then(async () => {
       try {
         details.loadingObj.pageLoading = true;
 
-        const res = await disable(row.id);
+        const res = await disable(ids);
         const { code, msg } = res.data;
         if (code !== 200) return;
-        ElMessage.success(`${row.goodsAllocationName} -- 禁用成功`);
+        isBatch
+          ? ElMessage.success(`批量禁用成功`)
+          : ElMessage.success(`${scope.row.goodsAllocationName} -- 禁用成功`);
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 启用 */
+const handleActive = (isBatch, scope: any = {}) => {
+  let ids = '';
+  let content = '';
+  if (isBatch) {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要启用的货位');
+    ids = details.selectionList.map(val => val.id).join(',');
+    content = `确认启用货位`;
+  } else {
+    ids = scope.row.id;
+    content = `确认启用 [${scope.row.goodsAllocationName}] 货位`;
+  }
+
+  ElMessageBox.confirm(content, '', {
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const res = await enable(ids);
+        const { code, msg } = res.data;
+        if (code !== 200) return;
+        isBatch
+          ? ElMessage.success(`批量启用成功`)
+          : ElMessage.success(`${scope.row.goodsAllocationName} -- 启用成功`);
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 一键下架 */
+const handleDownAllocation = (isBatch, scope: any = {}) => {
+  let ids = '';
+  let content = '';
+  if (isBatch) {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要下架的货位');
+    ids = details.selectionList.map(val => val.id).join(',');
+    content = `确认批量下架货位`;
+  } else {
+    ids = scope.row.id;
+    content = `确认下架 [${scope.row.goodsAllocationName}] 货位`;
+  }
+
+  ElMessageBox.confirm(content, '', {
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const res = await downAllocation(ids);
+        const { code, msg } = res.data;
+        if (code !== 200) return;
+        isBatch
+          ? ElMessage.success(`批量下架成功`)
+          : ElMessage.success(`${scope.row.goodsAllocationName} -- 下架成功`);
+        onLoad();
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
@@ -388,6 +550,18 @@ const handleGetPrint = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 查看 */
+const handleView = ({ row }) => {
+  console.log('row :>> ', row);
+  $router.push({
+    path: '/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
+    query: {
+      name: '详情+-+' + row.goodsAllocationName,
+      info: JSON.stringify(row),
+    },
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue
deleted file mode 100644
index 0d7cc219..00000000
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation1.vue
+++ /dev/null
@@ -1,572 +0,0 @@
-<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
deleted file mode 100644
index 9b9219f8..00000000
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue
+++ /dev/null
@@ -1,736 +0,0 @@
-<template>
-  <basic-container>
-    <div class="avue-crud">
-      <el-row v-if="!search">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" style="width: 100%">
-          <!-- 查询按钮 -->
-
-          <el-form-item class="fr-fo">
-            <el-col class="el-sl">
-              <div>
-                <el-form-item label="启用状态:" prop="areaStatus">
-                  <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
-                  <el-select
-                    v-model="query.enableStatus"
-                    clearable
-                    placeholder="请选择启用状态"
-                    style="width: 88%"
-                  >
-                    <el-option
-                      v-for="item in enableStatus"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictKey"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="货区类型:" prop="areaStatus">
-                  <el-select
-                    v-model="query.areaType"
-                    clearable
-                    placeholder="请选择货区类型"
-                    style="width: 88%"
-                  >
-                    <el-option
-                      v-for="item in areaTypeData"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictKey"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-              <div>
-                <el-button type="primary" icon="el-icon-search" @click="searchChange"
-                  >搜 索</el-button
-                >
-                <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
-              </div>
-            </el-col>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
-              >删 除</el-button
-            >
-            <el-button type="danger" icon="el-icon-download" @click="handleExport" plain
-              >导 出 货 区</el-button
-            >
-            <el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
-              >导 入 货 区
-            </el-button>
-            <el-button type="danger" icon="el-icon-close" @click="handleDisable" plain
-              >禁 用</el-button
-            >
-            <el-button type="danger" icon="el-icon-check" @click="handleEnable" plain
-              >启 用</el-button
-            >
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
-        </div>
-      </el-row>
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-view"
-              @click="handleView(slotProps.scope.row)"
-              >查看</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-view"
-              @click="handleExport(slotProps.scope.row)"
-              >导出数据</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleEdit(slotProps.scope.row)"
-              >编辑</el-text
-            >
-            <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
-              >删除</el-text
-            >
-          </template>
-        </tablecmt>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-          <!-- 分页模块 -->
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
-        </div>
-      </el-row>
-      <!-- 表单模块 -->
-      <el-dialog
-        :title="title"
-        v-model="box"
-        width="35%"
-        :before-close="beforeClose"
-        append-to-body
-      >
-        <el-form
-          :disabled="view"
-          ref="form"
-          :rules="validatorRules"
-          :model="form"
-          label-width="80px"
-        >
-          <!-- 表单字段 -->
-          <!--          <el-form-item label="预留1" prop="reserve1">-->
-          <!--            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="预留2" prop="reserve2">-->
-          <!--            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="预留3" prop="reserve3">-->
-          <!--            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="预留4" prop="reserve4">-->
-          <!--            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="预留5" prop="reserve5">-->
-          <!--            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>-->
-          <!--          </el-form-item>-->
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="货区名称:" prop="headline" label-width="110px">
-                <el-input v-model="form.headline" placeholder="请输入标题" style="width: 100%" />
-              </el-form-item>
-            </el-col>
-
-            <!--            <el-col :span="12">-->
-            <!--              <el-form-item label="货区状态:" v-if="aaa" prop="enableStatus" label-width="110px">-->
-            <!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
-            <!--                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 70%" >-->
-            <!--                  <el-option-->
-            <!--                          v-for="item in enableStatus"-->
-            <!--                          :key="item.dictKey"-->
-            <!--                          :label="item.dictValue"-->
-            <!--                          :value="item.dictKey">-->
-            <!--                  </el-option>-->
-            <!--                </el-select>-->
-            <!--              </el-form-item>-->
-            <!--            </el-col>-->
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="货区类型：" prop="isStrageArea" label-width="110px">
-                <el-select
-                  v-model="form.areaType"
-                  clearable
-                  placeholder="请选择货区类型"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in areaTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!--           <el-col :span="12">-->
-            <!--             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">-->
-            <!--               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >-->
-            <!--                 <el-option-->
-            <!--                         v-for="item in allWarehouse"-->
-            <!--                         :key="item.id"-->
-            <!--                         :label="item.name"-->
-            <!--                         :value="item.id">-->
-            <!--                 </el-option>-->
-            <!--               </el-select>-->
-            <!--             </el-form-item>-->
-            <!--           </el-col>-->
-          </el-row>
-        </el-form>
-        <!-- 表单按钮 -->
-        <template #footer>
-          <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
-              >提 交</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="handleClose">取 消</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-
-    <el-dialog title="货区导入" append-to-body v-model="excelBox" width="555px">
-      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
-        <template #excelTemplate>
-          <el-button type="primary" @click="handleTemplate">
-            点击下载<i class="el-icon-download el-icon--right"></i>
-          </el-button>
-        </template>
-      </avue-form>
-    </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/basicdataGoodsAllocation2';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { downloadXls, handleClearTableQuery } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-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: null, // 页面包条码内容
-    };
-  },
-  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() {
-      let that = this;
-      this.selectionList.map(item => {
-        let ids = item.id;
-        console.log(ids);
-        getPrintTemplate(ids).then(res => {
-          let pri_html = '';
-          pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-          // console.log(pri_html);
-          that.w_print(pri_html);
-        });
-        // checkcode.push(item.orderPackageCode)
-      });
-    },
-    //批量打印打印代码
-    w_print(templateData) {
-      let LODOP = getLodop();
-      // let templateData = "res.data.data";
-      // console.log(templateData);
-      LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
-      LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-      LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
-      // // 设置打印整宽且不变形
-      LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
-      // // 设置打印后自动关闭
-      LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
-      // // data就是一段html文本
-      LODOP.ADD_PRINT_HTM('20', '0%', '100%', '100%', templateData);
-      // LODOP.PREVIEW(); //预览(预览打印无脚标)
-      LODOP.PRINT(); //直接打印
-    },
-    handleqr() {
-      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);
-      getPrintTemplate({ ids: qr }).then(res => {
-        // this.orderPackageCode = res.data
-        console.log(res.data);
-        this.html = '';
-        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-      });
-      this.dialogVisible = true;
-
-      /*  this.dialogVisible = true;
-        this.qrCodeObj=[];
-        this.selectionList.forEach(item=>{
-          // console.log(">>>>>>>>>>",item);
-          //构建生成二维码条件
-         let params={}
-          getTemplate(Object.assign(params,item)).then(res=>{
-            let url = window.URL.createObjectURL(res.data);		// 获取返回参数中的需要的值data
-            console.log(">>>>>>>>>>",url);
-            this.qrCodeObj.push(url);
-          })
-
-        })*/
-    },
-    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 = {};
-      handleClearTableQuery(this.columnList);
-      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();
-      });
-    },
-  },
-};
-</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;
-  }
-}
-</style>