diff --git a/src/api/basicdata/basicdataGoodsShelfView.ts b/src/api/basicdata/basicdataGoodsShelfView.ts
index 10e2fcc2..20a9080a 100644
--- a/src/api/basicdata/basicdataGoodsShelfView.ts
+++ b/src/api/basicdata/basicdataGoodsShelfView.ts
@@ -1,5 +1,5 @@
 import request from '@/axios';
-import { AxiosResponse } from 'axios'; // 假设使用Axios发送HTTP请求
+import { AxiosResponse,AxiosRequestConfig } from 'axios'; // 假设使用Axios发送HTTP请求
 
 interface VisualizationResponseData {
   data: any; // 根据实际返回数据结构进行定义
diff --git a/src/axios.js b/src/axios.js
index 6b05cbf4..bc627fa2 100644
--- a/src/axios.js
+++ b/src/axios.js
@@ -18,7 +18,7 @@ import 'nprogress/nprogress.css'; // progress bar style
 import { Base64 } from 'js-base64';
 import { baseUrl } from '@/config/env';
 
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 60000;
 //返回其他状态吗
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500; // 默认的
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index ab95b55b..67e30fbb 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -634,4 +634,8 @@ function copyContent(content: string) {
   display: flex;
   align-items: center;
 }
+
+.el-popper{
+  max-width:20% !important;
+}
 </style>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 454ca95f..d336e472 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -85,6 +85,12 @@
                         {{ it.serviceNumber }}
                       </div>
                     </div>
+                    <div class="fwhserveNub">
+                      <div>库存品：</div>
+                      <div v-for="it in ite.inventoryName || []">
+                        {{ it.name + '--' + it.productCode }}
+                      </div>
+                    </div>
                   </div>
                 </div>
               </template>
@@ -101,7 +107,11 @@
                     : 'itembox'
                 "
               >
-                <div>{{ ite.goodsAllocationName }}</div>
+                <div class="titls">{{ ite.layerNum + '层' + '-' + ite.columnNum + '列' }}</div>
+                <div>{{ '包件数:' + ite.packageNum }}</div>
+                <div>{{ '订单数:' + ite.orderNum }}</div>
+                <div>{{ '零担数:' + ite.lessNum }}</div>
+                <div>{{ '库存品数:' + ite.inventoryNum }}</div>
               </div>
             </el-tooltip>
           </div>
@@ -109,9 +119,22 @@
       </div>
     </el-scrollbar>
   </div>
-  <el-dialog v-model="isshowcon" title="请选择上架类型" width="50%" center>
-    <span> 请选择上架类型 </span>
-    <template #footer>
+  <el-dialog
+    v-model="isshowcon"
+    :title="
+      isshowcon == 1
+        ? '请选择上架类型'
+        : isshowcon == 2
+        ? '请选择上架还是下架'
+        : isshowcon == 3
+        ? '请选择下架类型'
+        : ''
+    "
+    width="50%"
+    center
+  >
+    <span v-if="isshowcon == 1"> 请选择上架类型 </span>
+    <template #footer v-if="isshowcon == 1">
       <span class="buts">
         <el-button type="primary" @click="showupt(1)">按服务号</el-button>
         <el-button type="primary" @click="showupt(2)">按自编号</el-button>
@@ -122,26 +145,52 @@
         <el-button type="danger" @click="upgood">禁用</el-button>
       </span>
     </template>
+    <span v-if="isshowcon == 2"> 请选择上架还是下架 </span>
+    <template #footer v-if="isshowcon == 2">
+      <span class="buts">
+        <el-button type="primary" @click="isshowcon = 1">上架</el-button>
+        <el-button type="primary" @click="isshowcon = 3">下架</el-button>
+      </span>
+    </template>
+    <span v-if="isshowcon == 3"> 请选择下架类型 </span>
+    <template #footer v-if="isshowcon == 3">
+      <span class="buts">
+        <el-button type="primary" @click="showdown(1)">按包件</el-button>
+        <el-button type="primary" @click="showdown(2)">按零担</el-button>
+        <el-button type="primary" @click="showdown(3)">按库存品</el-button>
+        <el-button type="primary" @click="showdown(4)">按托盘</el-button>
+        <el-button type="primary" @click="showdown(5)">下架整个库位</el-button>
+      </span>
+    </template>
   </el-dialog>
-  <!-- 有货架的情况 -->
-  
-  <el-dialog v-model="isshowupt" :title="'请选择'+(isshowupt == 1
-                  ? '服务号'
-                  : isshowupt == 2
-                  ? '订单号'
-                  : isshowupt == 3
-                  ? '包件'
-                  : isshowupt == 4
-                  ? '托盘'
-                  : isshowupt == 5
-                  ? '库存品'
-                  : isshowupt == 6
-                  ? '零担'
-                  : '')+''" width="80%" center>
+  <!-- 上架 -->
+
+  <el-dialog
+    v-model="isshowupt"
+    :title="
+      '请选择' +
+      (isshowupt == 1
+        ? '服务号'
+        : isshowupt == 2
+        ? '订单号'
+        : isshowupt == 3
+        ? '包件'
+        : isshowupt == 4
+        ? '托盘'
+        : isshowupt == 5
+        ? '库存品'
+        : isshowupt == 6
+        ? '零担订单号'
+        : '') +
+      '上架'
+    "
+    width="80%"
+    center
+  >
     <div class="disbox">
       <div class="headtopscan">
         <div>
-          <el-select
+          <!-- <el-select
             @change="searchbuts"
             filterable
             v-model="checkindex"
@@ -154,7 +203,7 @@
               :label="item.name"
               :value="index"
             />
-          </el-select>
+          </el-select> -->
           <div class="inptx">
             <div>
               {{
@@ -169,11 +218,16 @@
                   : isshowupt == 5
                   ? '库存品'
                   : isshowupt == 6
-                  ? '零担'
+                  ? '零担订单号'
                   : ''
               }}
             </div>
-            <el-input style="flex: 1" v-model="inputtxts" :placeholder="'请输入'+(isshowupt == 1
+            <el-input
+              style="flex: 1"
+              v-model="inputtxts"
+              :placeholder="
+                '请输入' +
+                (isshowupt == 1
                   ? '服务号'
                   : isshowupt == 2
                   ? '订单号'
@@ -184,13 +238,15 @@
                   : isshowupt == 5
                   ? '库存品'
                   : isshowupt == 6
-                  ? '零担'
-                  : '')" />
+                  ? '零担订单号'
+                  : '')
+              "
+            />
           </div>
         </div>
         <div>
           <el-button type="primary" @click="searchbuts">搜索</el-button>
-          <el-button type="primary">重置</el-button>
+          <el-button type="primary" @click="removeinputup">重置</el-button>
           <el-button type="primary" @click="allup">批量上架</el-button>
         </div>
       </div>
@@ -235,6 +291,153 @@
       </span>
     </template> -->
   </el-dialog>
+  <!-- 下架 -->
+  <el-dialog
+    v-model="isshowdow"
+    :title="
+      '请选择' +
+      (isshowdow == 1
+        ? '包件'
+        : isshowdow == 2
+        ? '零担'
+        : isshowdow == 3
+        ? '库存品'
+        : isshowdow == 4
+        ? '托盘'
+        : '') +
+      '下架'
+    "
+    width="80%"
+    center
+  >
+    <div class="disbox">
+      <div class="headtopscan">
+        <div>
+          <!-- <el-select
+            @change="searchbuts"
+            filterable
+            v-model="checkindex"
+            class=""
+            placeholder="请选择仓库"
+          >
+            <el-option
+              v-for="(item, index) in arrlist"
+              :key="item.id"
+              :label="item.name"
+              :value="index"
+            />
+          </el-select> -->
+          <div class="inptx">
+            <div>
+              {{
+                isshowdow == 1
+                  ? '包件'
+                  : isshowdow == 2
+                  ? '零担'
+                  : isshowdow == 3
+                  ? '物料编码'
+                  : isshowdow == 4
+                  ? '托盘'
+                  : ''
+              }}
+            </div>
+            <el-input
+              style="flex: 1"
+              v-model="inputtxts"
+              :placeholder="
+                '请输入' +
+                (isshowdow == 1
+                  ? '包件'
+                  : isshowdow == 2
+                  ? '零担'
+                  : isshowdow == 3
+                  ? '物料编码'
+                  : isshowdow == 4
+                  ? '托盘'
+                  : '')
+              "
+            />
+          </div>
+          <div class="inptx">
+            <div>
+              {{
+                isshowdow == 1
+                  ? '订单自编号'
+                  : isshowdow == 2
+                  ? '零担'
+                  : isshowdow == 3
+                  ? '物料名称'
+                  : isshowdow == 4
+                  ? '托盘'
+                  : ''
+              }}
+            </div>
+            <el-input
+              style="flex: 1"
+              v-if="isshowdow == 1 || isshowdow == 2 || isshowdow == 3 || isshowdow == 4"
+              v-model="inputtxts1"
+              :placeholder="
+                '请输入' +
+                (isshowdow == 1
+                  ? '订单自编号'
+                  : isshowdow == 2
+                  ? '零担'
+                  : isshowdow == 3
+                  ? '物料名称'
+                  : isshowdow == 4
+                  ? '托盘'
+                  : '')
+              "
+            />
+          </div>
+        </div>
+        <div>
+          <el-button type="primary" @click="searchbutdown">搜索</el-button>
+          <el-button type="primary">重置</el-button>
+          <el-button type="primary" @click="alldown">批量下架</el-button>
+        </div>
+      </div>
+      <div class="tabberbox">
+        <tablecmt
+          :columnList="columnList"
+          :tableData="tablistarr"
+          :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="downhj(slotProps.scope)"
+              >下架</el-text
+            >
+          </template>
+        </tablecmt>
+        <div class="avue-crud__pagination" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <!-- <template #footer>
+      <span class="buts">
+        <el-button type="primary">取消</el-button>
+        <el-button type="primary">确认</el-button>
+      </span>
+    </template> -->
+  </el-dialog>
 </template>
 <script setup>
 import {
@@ -284,6 +487,8 @@ let details = reactive({
   countnumber: {},
   inputtxts: '',
   checkselectchangearr: [],
+  isshowdow: false,
+  inputtxts1: '',
 });
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@@ -327,7 +532,7 @@ async function searchbuts() {
     case 1:
       url = 'servicenub';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         serviceNumber: details.inputtxts,
         current: details.currentPage,
         size: details.pageSize,
@@ -337,7 +542,7 @@ async function searchbuts() {
     case 2:
       url = 'order';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         orderCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
@@ -348,7 +553,7 @@ async function searchbuts() {
     case 3:
       url = 'selectWrap';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         orderCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
@@ -360,7 +565,7 @@ async function searchbuts() {
     case 4:
       url = 'tray';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         orderCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
@@ -371,7 +576,7 @@ async function searchbuts() {
     case 5:
       url = 'Inventory';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         orderCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
@@ -382,7 +587,7 @@ async function searchbuts() {
     case 6:
       url = 'ZeroOrder';
       data = {
-        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
         orderCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
@@ -463,9 +668,28 @@ async function checkshelves() {
   };
   const res = await getVisualization(data); // 调用异步函数获取可视化数据
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');
-
-  details.contenarr = res.data.data.reverse();
-  details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
+  let arrs = [];
+  let maxlength = 0;
+  res.data.data.map(item => {
+    if (item.columnNum > maxlength) {
+      maxlength = item.columnNum;
+    }
+  });
+  for (let i = 1; i <= maxlength; i++) {
+    arrs.push([]);
+  }
+  console.log(arrs, 'arrsarrsarrs');
+  res.data.data.map(item => {
+    arrs[item.columnNum - 1]?.push(item);
+  });
+  arrs.map(item => {
+    return item.sort((a, b) => {
+      return b.layerNum - a.layerNum;
+    });
+  });
+  console.log(arrs, 'arrsarrsarrs');
+  details.contenarr = arrs;
+  details.contenbxsty['--length'] = maxlength;
 }
 // checkshelves();
 // const checkshelves = async () => {
@@ -495,7 +719,7 @@ const showupt = value => {
         {
           prop: 'serviceNumber',
           label: '服务号',
-          type: 2,
+          type: 1,
           values: '',
           width: '240',
           checkarr: [],
@@ -506,7 +730,7 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -517,7 +741,7 @@ const showupt = value => {
         {
           prop: 'customerName',
           label: '顾客名字',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -528,7 +752,7 @@ const showupt = value => {
         {
           prop: 'customerTelephone',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -539,7 +763,7 @@ const showupt = value => {
         {
           prop: 'customerAddress',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -574,7 +798,7 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -585,7 +809,7 @@ const showupt = value => {
         {
           prop: 'serviceNumber',
           label: '服务号',
-          type: 2,
+          type: 1,
           values: '',
           width: '240',
           checkarr: [],
@@ -596,7 +820,7 @@ const showupt = value => {
         {
           prop: 'customerName',
           label: '顾客名字',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -607,7 +831,7 @@ const showupt = value => {
         {
           prop: 'customerTelephone',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -618,7 +842,7 @@ const showupt = value => {
         {
           prop: 'customerAddress',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -639,7 +863,6 @@ const showupt = value => {
       ];
 
       break;
-
     case 3:
       details.columnList = [
         {
@@ -654,7 +877,7 @@ const showupt = value => {
         {
           prop: 'serviceNumber',
           label: '服务号',
-          type: 2,
+          type: 1,
           values: '',
           width: '240',
           checkarr: [],
@@ -665,7 +888,7 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -676,7 +899,7 @@ const showupt = value => {
         {
           prop: 'customerName',
           label: '顾客名字',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -687,7 +910,7 @@ const showupt = value => {
         {
           prop: 'customerTelephone',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -698,7 +921,7 @@ const showupt = value => {
         {
           prop: 'customerAddress',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -733,7 +956,7 @@ const showupt = value => {
         {
           prop: 'serviceNumber',
           label: '服务号',
-          type: 2,
+          type: 1,
           values: '',
           width: '240',
           checkarr: [],
@@ -744,7 +967,7 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -755,7 +978,7 @@ const showupt = value => {
         {
           prop: 'customerName',
           label: '顾客名字',
-          type: 2,
+          type: 1,
           values: '',
           width: '200',
           checkarr: [],
@@ -766,7 +989,7 @@ const showupt = value => {
         {
           prop: 'customerTelephone',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -777,7 +1000,7 @@ const showupt = value => {
         {
           prop: 'customerAddress',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
           width: '260',
           checkarr: [],
@@ -812,9 +1035,9 @@ const showupt = value => {
         {
           prop: 'descriptionGoods',
           label: '物料名称',
-          type: 2,
+          type: 1,
           values: '',
-          width: '240',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -823,9 +1046,9 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
-          width: '200',
+          width: '170',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -834,9 +1057,9 @@ const showupt = value => {
         {
           prop: 'sku',
           label: 'SKU',
-          type: 2,
+          type: 1,
           values: '',
-          width: '200',
+          width: '170',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -845,14 +1068,25 @@ const showupt = value => {
         {
           prop: 'cargoUnit',
           label: '单位',
-          type: 2,
+          type: 1,
           values: '',
-          width: '200',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
           head: false,
         },
+        {
+          prop: 'enterNum',
+          label: '上架数',
+          type: 10,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: '',
           label: '操作',
@@ -880,9 +1114,20 @@ const showupt = value => {
         {
           prop: 'serviceNumber',
           label: '服务号',
-          type: 2,
+          type: 1,
           values: '',
-          width: '240',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'enterNum',
+          label: '上架数',
+          type: 10,
+          values: '',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -891,9 +1136,9 @@ const showupt = value => {
         {
           prop: 'orderCode',
           label: '订单自编号',
-          type: 2,
+          type: 1,
           values: '',
-          width: '200',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -902,9 +1147,9 @@ const showupt = value => {
         {
           prop: 'customerName',
           label: '顾客名字',
-          type: 2,
+          type: 1,
           values: '',
-          width: '200',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -913,20 +1158,21 @@ const showupt = value => {
         {
           prop: 'customerTelephone',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
-          width: '260',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
           head: false,
         },
+
         {
           prop: 'customerAddress',
           label: '顾客电话',
-          type: 2,
+          type: 1,
           values: '',
-          width: '260',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -950,37 +1196,41 @@ const showupt = value => {
   }
   searchbuts();
 };
-const addhuoj = async scope => {
+const alldown = async () => {};
+const downhj = async scope => {
   console.log(scope.row);
   let data = {
     allocationId: details.checkite.id,
   };
+  if (!scope.row.enterNum && details.isshowdow == 2) {
+    proxy.$message({
+      type: 'error',
+      message: '请输入下架数量!',
+    });
+    return;
+  }
   let url = '';
-  switch (details.isshowupt) {
+  switch (details.isshowdow) {
     case 1:
-      url = 'upService';
-      data.upShelfOrderList = [scope.row];
+      url = 'downPackage';
+      data.upShelfPackageList = [scope.row];
       break;
     case 2:
-      url = 'upOrder';
-      data.upShelfOrderList = [scope.row];
+      url = 'downZeroOrder';
+      scope.row.allocationId = details.checkite.id;
+      data.upShelfZeroOrderList = [scope.row];
+
       break;
     case 3:
-      url = 'upSelectWrap';
-      data.upShelfOrderList = [scope.row];
+      url = 'downStock';
+      scope.row.stockType=1;
+      scope.row.allocationId = details.checkite.id;
+      data.upShelfStockList = [scope.row];
       break;
     case 4:
-      url = 'upTray';
+      url = 'downTray';
       data.upShelfOrderList = [scope.row];
       break;
-    case 5:
-      url = 'upInventory';
-      data.UpShelfStockDTO = [scope.row];
-      break;
-    case 6:
-      url = 'upZeroOrder';
-      data.UpShelfStockDTO = [scope.row];
-      break;
     default:
       break;
   }
@@ -989,8 +1239,9 @@ const addhuoj = async scope => {
     console.log(response.data);
     proxy.$message({
       type: 'success',
-      message: '上架成功!',
+      message: response.data.msg,
     });
+    searchbutdown()
     // details.tablistarr = response.data.data.records;
     // details.total = response.data.data.total;
   } else {
@@ -1000,101 +1251,661 @@ const addhuoj = async scope => {
     });
   }
 };
-async function allup() {
-  // console.log(scope.row);
-  let data = {
-    allocationId: details.checkite.id,
-  };
+const searchbutdown = async () => {
   let url = '';
-  switch (details.isshowupt) {
+  let data = null;
+  // console.log(details.arrlist[details.checkindex].id);
+  // return
+  switch (details.isshowdow) {
     case 1:
-      url = 'upService';
-      data.upShelfOrderList = details.checkselectchangearr;
+      url = 'selectWrap';
+      data = {
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
+        id: details.checkite.id,
+        orderPackageCode: details.inputtxts,
+        orderCode: details.inputtxts1,
+        current: details.currentPage,
+        size: details.pageSize,
+      };
+
       break;
     case 2:
-      url = 'upOrder';
-      data.upShelfOrderList = details.checkselectchangearr;
+      url = 'selectZeroOrder';
+      data = {
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
+        orderCode: details.inputtxts,
+        // serviceNumber: details.inputtxts,
+        current: details.currentPage,
+        size: details.pageSize,
+      };
+
       break;
     case 3:
-      url = 'upSelectWrap';
-      data.upShelfOrderList = details.checkselectchangearr;
+      url = 'selectInventory';
+      data = {
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
+        orderCode: details.inputtxts,
+        // serviceNumber: details.inputtxts,
+        current: details.currentPage,
+        size: details.pageSize,
+        id: details.checkite.id,
+      };
+
       break;
     case 4:
-      url = 'upTray';
-      data.upShelfOrderList = details.checkselectchangearr;
-      break;
-    case 5:
-      url = 'upInventory';
-      data.upShelfOrderList = details.checkselectchangearr;
-      break;
-    case 6:
-      url = 'upZeroOrder';
-      data.UpShelfStockDTO = details.checkselectchangearr;
+      url = 'selectTray';
+      data = {
+        // warehouseId: details.arrlist[details.checkindex]?.id || '',
+        orderCode: details.inputtxts,
+        // serviceNumber: details.inputtxts,
+        current: details.currentPage,
+        size: details.pageSize,
+      };
+
       break;
+
     default:
       break;
   }
-  let response = await posturl(url, data);
+  let response = await geturl(url, data);
   if (response.data.code == 200) {
     console.log(response.data);
-    proxy.$message({
-      type: 'success',
-      message: '上架成功!',
-    });
-    // details.tablistarr = response.data.data.records;
-    // details.total = response.data.data.total;
+    details.tablistarr = response.data.data.records;
+    details.total = response.data.data.total;
   } else {
     proxy.$message({
       type: 'error',
       message: response.data.msg,
     });
   }
-}
-const btnsc = scope => {
-  console.log(scope);
-};
-const timesc = scope => {
-  console.log(scope);
-};
-const inputsc = scope => {
-  console.log(scope);
 };
-const selectsc = scope => {
-  console.log(scope);
-};
-const selectionChange = scope => {
-  console.log(scope);
-  details.checkselectchangearr = scope;
-};
-const checkitem = ite => {
-  switch (Number(ite.allocationStatus)) {
+const showdown = async value => {
+  if (value == 5) {
+    let url = 'upZeroOrder';
+    let data={
+      ids:[details.checkite.id]
+    }
+    let response = await posturl(url, data);
+    if (response.data.code == 200) {
+      console.log(response.data);
+      proxy.$message({
+        type: 'success',
+        message: response.data.msg,
+      });
+      // details.tablistarr = response.data.data.records;
+      // details.total = response.data.data.total;
+    } else {
+      proxy.$message({
+        type: 'error',
+        message: response.data.msg,
+      });
+    }
+    return
+  }
+  details.isshowdow = value;
+  switch (details.isshowdow) {
     case 1:
-      details.isshowcon = true;
-      details.checkite = ite;
-      break;
-    case 2:
-      details.isshowcon = true;
-      details.checkite = ite;
-      break;
-    case 3:
-      details.isshowcon = true;
-      details.checkite = ite;
-      break;
+      details.columnList = [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 1,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'firsts',
+          label: '一级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'second',
+          label: '二级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'thirdProduct',
+          label: '三级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialCode',
+          label: '物料编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '190',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ];
+
+      break;
+    case 2:
+      details.columnList = [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 1,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'enterNum',
+          label: '下架数量',
+          type: 10,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '240',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 1,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 1,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客电话',
+          type: 1,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '190',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ];
+
+      break;
+    case 3:
+      details.columnList = [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'materialCode',
+          label: '物料编码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'enterNum',
+          label: '下架数',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'sku',
+          label: 'sku',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '190',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ];
+
+      break;
     case 4:
-      details.isshowcon = true;
-      details.checkite = ite;
+      details.columnList = [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '240',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 1,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 1,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 1,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客电话',
+          type: 1,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '190',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ];
+
+      break;
+
+    default:
+      break;
+  }
+  searchbutdown();
+};
+const addhuoj = async scope => {
+  console.log(scope.row);
+  let data = {
+    allocationId: details.checkite.id,
+  };
+  let url = '';
+  switch (details.isshowupt) {
+    case 1:
+      url = 'upService';
+      data.upShelfOrderList = [scope.row];
+      break;
+    case 2:
+      url = 'upOrder';
+      data.upShelfOrderList = [scope.row];
+      break;
+    case 3:
+      url = 'upSelectWrap';
+      data.upShelfOrderList = [scope.row];
+      break;
+    case 4:
+      url = 'upTray';
+      data.upShelfOrderList = [scope.row];
       break;
     case 5:
-      details.isshowcon = true;
-      details.checkite = ite;
+      url = 'upStock';
+      scope.row.allocationId = details.checkite.id;
+      data.upShelfStockList = [scope.row];
       break;
     case 6:
-      details.isshowcon = true;
-      details.checkite = ite;
+      url = 'upZeroOrder';
+      scope.row.allocationId = details.checkite.id;
+      data.upShelfZeroOrderList = [scope.row];
+      break;
+    default:
       break;
   }
+  let response = await posturl(url, data);
+  if (response.data.code == 200) {
+    console.log(response.data);
+    proxy.$message({
+      type: 'success',
+      message: response.data.msg,
+    });
+    searchbuts()
+    // details.tablistarr = response.data.data.records;
+    // details.total = response.data.data.total;
+  } else {
+    proxy.$message({
+      type: 'error',
+      message: response.data.msg,
+    });
+  }
+};
+async function allup() {
+  // console.log(scope.row);
+  let data = {
+    allocationId: details.checkite.id,
+  };
+  let url = '';
+  switch (details.isshowupt) {
+    case 1:
+      url = 'upService';
+      data.upShelfOrderList = details.checkselectchangearr;
+      break;
+    case 2:
+      url = 'upOrder';
+      data.upShelfOrderList = details.checkselectchangearr;
+      break;
+    case 3:
+      url = 'upSelectWrap';
+      data.upShelfOrderList = details.checkselectchangearr;
+      break;
+    case 4:
+      url = 'upTray';
+      data.upShelfOrderList = details.checkselectchangearr;
+      break;
+    case 5:
+      url = 'upStock';
+      details.checkselectchangearr.map(item => {
+        item.allocationId = details.checkite.id;
+        return item;
+      });
+      data.upShelfStockList = details.checkselectchangearr;
+      break;
+    case 6:
+      url = 'upZeroOrder';
+      details.checkselectchangearr.map(item => {
+        item.allocationId = details.checkite.id;
+        return item;
+      });
+      data.upShelfZeroOrderList = details.checkselectchangearr;
+      break;
+    default:
+      break;
+  }
+  let response = await posturl(url, data);
+  if (response.data.code == 200) {
+    console.log(response.data);
+    proxy.$message({
+      type: 'success',
+      message: '上架成功!',
+    });
+    searchbuts()
+    // details.tablistarr = response.data.data.records;
+    // details.total = response.data.data.total;
+  } else {
+    proxy.$message({
+      type: 'error',
+      message: response.data.msg,
+    });
+  }
+}
+const removeinputup = () => {
+  details.inputtxts = '';
+  details.inputtxts1 = '';
+  searchbuts();
+};
+const btnsc = scope => {
+  console.log(scope);
+};
+const timesc = scope => {
+  console.log(scope);
+};
+const inputsc = scope => {
+  console.log(scope);
+};
+const selectsc = scope => {
+  console.log(scope);
+};
+const selectionChange = scope => {
+  console.log(scope);
+  details.checkselectchangearr = scope;
+};
+const checkitem = ite => {
+  if (Number(ite.allocationStatus) == 2) {
+    details.isshowcon = 2;
+    details.checkite = ite;
+  } else {
+    // #region 匹配状态，测试无用代码
+    // switch (Number(ite.allocationStatus)) {
+    //   case 1:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    //   case 2:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    //   case 3:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    //   case 4:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    //   case 5:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    //   case 6:
+    //     details.isshowcon = true;
+    //     details.checkite = ite;
+    //     break;
+    // }
+    // #endregion
+    details.isshowcon = 1;
+    details.checkite = ite;
+  }
+  console.log(details.isshowcon, 'details.isshowcondetails.isshowcon');
 };
 const {
+  isshowdow,
+  inputtxts1,
   total,
   pageSize,
   currentPage,
@@ -1161,30 +1972,50 @@ const {
   .contentbx {
     width: calc(150 * var(--length) * 1px);
     display: flex;
-    flex-direction: column;
-    align-items: center;
+    // flex-direction: column;
+    align-items: flex-end;
     border: 1.5px solid var(--boxcolor);
     background-color: #fff;
+    box-sizing: border-box;
     .headtop {
       display: flex;
       align-items: center;
     }
     .itemwbox {
-      height: 90px;
-      // border-right: 1.5px solid #adadad;
+      // height: 90px;
+      width: 150px;
+      box-sizing: border-box;
+      border-right: 1.5px solid var(--boxcolor);
+      &:nth-last-child(1) {
+        border-right: 0;
+      }
+
       &:nth-last-child(1) {
         .itemmibox {
-          border-bottom: none;
+          border-bottom: 1.5px solid var(--boxcolor);
         }
       }
+      .titls {
+        font-size: 16px !important;
+        margin-bottom: 10px;
+      }
       .itemmibox {
-        height: 90px;
+        height: 130px;
         width: 150px;
+        font-size: 12px !important;
+        // border-bottom: 1.5px solid var(--boxcolor);
+        // border-right: 1.5px solid var(--boxcolor);
         border-bottom: 1.5px solid var(--boxcolor);
-        border-right: 1.5px solid var(--boxcolor);
+        &:nth-last-child(1) {
+          border-bottom: none;
+        }
+        // margin-right: 1px;
+        // margin-bottom: 1px;
+        box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: center;
+
         box-sizing: border-box;
         color: rgba(237, 25, 25);
         &:nth-last-child(1) {
@@ -1195,6 +2026,7 @@ const {
     > div {
       display: flex;
       align-items: center;
+      flex-direction: column;
     }
   }
   .itembox {
@@ -1204,7 +2036,7 @@ const {
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    font-size: 14px;
+    // font-size: 14px;
   }
   .type1 {
     background-color: #fff !important;