diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index c0e71898..8011d0f4 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -1,6 +1,3 @@
-
-
-
 <template>
   <div class="head_top">
     <div>
@@ -130,7 +127,13 @@
     <div class="disbox">
       <div class="headtopscan">
         <div>
-          <el-select filterable v-model="checkindex" class="" placeholder="请选择仓库">
+          <el-select
+            @change="searchbuts"
+            filterable
+            v-model="checkindex"
+            class=""
+            placeholder="请选择仓库"
+          >
             <el-option
               v-for="(item, index) in arrlist"
               :key="item.id"
@@ -139,14 +142,14 @@
             />
           </el-select>
           <div class="inptx">
-            <div>服务号：</div>
+            <div>{{ isshowupt == 1 ? '服务号' : isshowupt == 2 ? '订单号' : '' }}：</div>
             <el-input style="flex: 1" v-model="inputtxts" placeholder="请输入服务号" />
           </div>
         </div>
         <div>
           <el-button type="primary" @click="searchbuts">搜索</el-button>
           <el-button type="primary">重置</el-button>
-          <el-button type="primary">批量上架</el-button>
+          <el-button type="primary" @click="allup">批量上架</el-button>
         </div>
       </div>
       <div class="tabberbox">
@@ -219,9 +222,9 @@ let details = reactive({
   isshowupt: false,
   checkite: {},
   loading: false,
-  currentPage:1,
-  pageSize:10,
-  total:'',
+  currentPage: 1,
+  pageSize: 10,
+  total: '',
   data: [
     {
       serviceNumber: '104202103180256',
@@ -238,7 +241,7 @@ let details = reactive({
   ],
   countnumber: {},
   inputtxts: '',
-  checkselectchangearr:[],
+  checkselectchangearr: [],
 });
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@@ -266,12 +269,12 @@ function initpage() {
   // let warehousearr=
 }
 function currentChange(currentPage) {
-  details.currentPage=currentPage
-  searchbuts()
+  details.currentPage = currentPage;
+  searchbuts();
 }
 function sizeChange(pageSize) {
-  details.pageSize=pageSize
-  searchbuts()
+  details.pageSize = pageSize;
+  searchbuts();
 }
 async function searchbuts() {
   let url = '';
@@ -284,12 +287,22 @@ async function searchbuts() {
       data = {
         warehouseId: details.arrlist[details.checkindex]?.id || '',
         serviceNumber: details.inputtxts,
-        current:details.currentPage,
-        size:details.pageSize
+        current: details.currentPage,
+        size: details.pageSize,
       };
 
       break;
+    case 2:
+      url = 'order';
+      data = {
+        warehouseId: details.arrlist[details.checkindex]?.id || '',
+        orderCode: details.inputtxts,
+        // serviceNumber: details.inputtxts,
+        current: details.currentPage,
+        size: details.pageSize,
+      };
 
+      break;
     default:
       break;
   }
@@ -297,7 +310,7 @@ async function searchbuts() {
   if (response.data.code == 200) {
     console.log(response.data);
     details.tablistarr = response.data.data.records;
-    details.total=response.data.data.total
+    details.total = response.data.data.total;
   } else {
     proxy.$message({
       type: 'error',
@@ -325,6 +338,7 @@ async function upgood() {
     });
   }
 }
+
 const checkcso = () => {
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
@@ -456,6 +470,85 @@ const showupt = value => {
         },
       ];
 
+      break;
+    case 2:
+      details.columnList = [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '240',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '190',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ];
+
       break;
 
     default:
@@ -465,16 +558,19 @@ const showupt = value => {
 };
 const addhuoj = async scope => {
   console.log(scope.row);
-  let data={
-    allocationId:details.checkite.id
-  }
-  let url=''
+  let data = {
+    allocationId: details.checkite.id,
+  };
+  let url = '';
   switch (details.isshowupt) {
     case 1:
-    url='upService'
-    data.upShelfOrderList=[scope.row]
+      url = 'upService';
+      data.upShelfOrderList = [scope.row];
+      break;
+    case 2:
+      url = 'upOrder';
+      data.upShelfOrderList = [scope.row];
       break;
-
     default:
       break;
   }
@@ -482,7 +578,7 @@ const addhuoj = async scope => {
   if (response.data.code == 200) {
     console.log(response.data);
     details.tablistarr = response.data.data.records;
-    details.total=response.data.data.total
+    details.total = response.data.data.total;
   } else {
     proxy.$message({
       type: 'error',
@@ -490,6 +586,36 @@ const addhuoj = async scope => {
     });
   }
 };
+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;
+    default:
+      break;
+  }
+  let response = await posturl(url, data);
+  if (response.data.code == 200) {
+    console.log(response.data);
+    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);
 };
@@ -504,7 +630,7 @@ const selectsc = scope => {
 };
 const selectionChange = scope => {
   console.log(scope);
-  details.checkselectchangearr=scope
+  details.checkselectchangearr = scope;
 };
 const checkitem = ite => {
   switch (Number(ite.allocationStatus)) {