diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 90f8be39..efdb01a6 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -109,7 +109,7 @@
                     : 'itembox'
                 "
               >
-                <div class="titls">{{ ite.layerNum + '层' + '-' + ite.columnNum + '列' }}</div>
+                <div class="titls">{{ (arrlist[checkselect]?.warehouseGoodsAreaVOList[checkregionselect].headline)+'-'+ite.layerNum + '层' + '-' + ite.columnNum + '列' }}</div>
                 <div>{{ '包件数:' + ite.packageNum }}</div>
                 <div>{{ '订单数:' + ite.orderNum }}</div>
                 <div>{{ '零担数:' + ite.lessNum }}</div>
@@ -329,7 +329,7 @@
               :value="index"
             />
           </el-select> -->
-          <div class="inptx">
+          <div class="inptx" v-if="isshowdow != 4">
             <div>
               {{
                 isshowdow == 1
@@ -360,7 +360,7 @@
               "
             />
           </div>
-          <div class="inptx">
+          <div class="inptx" v-if="isshowdow == 1">
             <div>
               {{
                 isshowdow == 1
@@ -376,7 +376,7 @@
             </div>
             <el-input
               style="flex: 1"
-              v-if="isshowdow == 1"
+             
               v-model="inputtxts1"
               :placeholder="
                 '请输入' +
@@ -395,7 +395,7 @@
         </div>
         <div>
           <el-button type="primary" @click="searchbutdown">搜索</el-button>
-          <el-button type="primary">重置</el-button>
+          <el-button type="primary" @click="removeinputdown">重置</el-button>
           <el-button type="primary" @click="alldown">批量下架</el-button>
         </div>
       </div>
@@ -1417,7 +1417,7 @@ const searchbutdown = async () => {
       data = {
         // warehouseId: details.arrlist[details.checkindex]?.id || '',
         id: details.checkite.id,
-        orderCode: details.inputtxts,
+        materialCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
         size: details.pageSize,
@@ -1430,7 +1430,7 @@ const searchbutdown = async () => {
       data = {
         // warehouseId: details.arrlist[details.checkindex]?.id || '',
         id: details.checkite.id,
-        orderCode: details.inputtxts,
+        trayCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
         size: details.pageSize,
@@ -2045,6 +2045,11 @@ const removeinputup = () => {
   details.inputtxts1 = '';
   searchbuts();
 };
+const removeinputdown=()=>{
+  details.inputtxts = '';
+  details.inputtxts1 = '';
+  searchbutdown();
+}
 const btnsc = scope => {
   console.log(scope);
 };
@@ -2062,6 +2067,8 @@ const selectionChange = scope => {
   details.checkselectchangearr = scope;
 };
 const checkitem = ite => {
+  details.inputtxts=''
+  details.inputtxts1=''
   if (Number(ite.allocationStatus) == 2) {
     details.isshowcon = 2;
     details.checkite = ite;
diff --git a/src/views/distribution/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue
index d8753a7d..72f01a64 100644
--- a/src/views/distribution/reservation/atlas.vue
+++ b/src/views/distribution/reservation/atlas.vue
@@ -122,11 +122,11 @@ export default {
       geocoder.getLocation(item.deliveryAddress, (status, result) => {
         if (status === 'complete' && result.info === 'OK') {
           // result中对应详细地理坐标信息
-          console.log(result.geocodes);
+          console.log(result.geocodes[0].location);
           var marker = new AMap.Marker({
             map: details.mapLoc,
-            position: item.pontion,
-            offset: new AMap.Pixel(-13, -30),
+            position: result.geocodes[0].location,
+            offset: new AMap.Pixel(0, 0),
           });
           marker.setMap(details.mapLoc);
           marker.setLabel({