Merge remote-tracking branch 'origin/dev' into dev

src/App.vue

@@ -14,4 +14,8 @@ body,
   width: 100%;
   height: 100%;
 }
+.BMap_cpyCtrl,
+  .anchorBL {
+    display: none !important;
+   }
 </style>

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -77,7 +77,7 @@
                     <div>货位：{{ ite.goodsAllocationName }}</div>
                     <div class="fwhserveNub">
                       <div>服务号：</div>
-                      <div v-for="it in (ite.serveNub||[])">
+                      <div v-for="it in ite.serveNub || []">
                         {{ it }}
                       </div>
                     </div>
@@ -113,7 +113,9 @@
         <el-button type="primary" @click="showupt(2)">按自编号</el-button>
         <el-button type="primary">按包件</el-button>
         <el-button type="primary">按托盘</el-button>
-        <el-button type="danger">禁用</el-button>
+        <el-button type="primary">按库存品</el-button>
+        <el-button type="primary">按零担</el-button>
+        <el-button type="danger" @click="upgood">禁用</el-button>
       </span>
     </template>
   </el-dialog>
@@ -166,9 +168,14 @@
   </el-dialog>
 </template>
 <script setup>
-import { getVisualization, getstoreCargo } from '@/api/basicdata/basicdataGoodsShelfView';
+import {
+  getVisualization,
+  getstoreCargo,
+  updategood,
+} from '@/api/basicdata/basicdataGoodsShelfView';
+import { useMessage } from 'element-plus';
 import { reactive, toRefs, onMounted } from 'vue';
-
+const message = useMessage();
 let details = reactive({
   columnList: [
     {
@@ -274,44 +281,63 @@ async function initconfig() {
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
     details.checksele = 0;
-    checkshelves()
+    checkshelves();
   } else {
     details.checkregionselect = '';
   }
   console.log(res.data, 'configconfigconfigconfigconfig');
-
 }
-function initpage(){
+function initpage() {
   // let warehousearr=
 }
+async function upgood() {
+  let data = {
+    id: details.checkite.id,
+    enableStatus: 2,
+  };
+  let res = await updategood(data);
+  if (res.data.code == 200) {
+    message({
+      type: 'success',
+      message: '操作成功!',
+    });
+    checkshelves();
+  } else {
+    message({
+      type: 'error',
+      message: res.msg,
+    });
+  }
+}
 const checkcso = () => {
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
     details.checksele = 0;
-    checkshelves()
+    checkshelves();
   } else {
     details.checkregionselect = '';
-    details.contenarr=[]
+    details.contenarr = [];
-    details.contenbxsty['--length'] =0
+    details.contenbxsty['--length'] = 0;
   }
 };
 const checkregion = () => {
   details.checksele = 0;
-  checkshelves()
+  checkshelves();
   console.log(details.checksele, 'details.checkseledetails.checksele');
 };
 function ckindexs(index) {
   details.checksele = index;
-  checkshelves()
+  checkshelves();
 }
 
 async function checkshelves() {
-   /**
+  /**
-    * goodsAreaId 货区ID
+   * goodsAreaId 货区ID
-    * goodsShelfId 货架ID
+   * goodsShelfId 货架ID
-    */
+   */
-  let goodsAreaarr=details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect]
+  let goodsAreaarr =
-  let goodsShelfarr=goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele]
+    details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
+  let goodsShelfarr = goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele];
   let data = {
     goodsAreaId: goodsAreaarr.id,
     goodsShelfId: goodsShelfarr.id,
@@ -332,7 +358,7 @@ async function checkshelves() {
 //     console.error(error);
 //   }
 // };
-const showupt = (value) => {
+const showupt = value => {
   console.log('112312');
   details.isshowupt = value;
 };

src/views/distribution/reservation/atlas1.vue

@@ -1,26 +1,26 @@
 <template>
-    <div class="bmap" id="container" style="float: left"></div>
+    <div class="bmap" id="container"></div>
-    <div
+    <!-- <div
             style="
       border: 1px solid pink;
       margin-left: 5px;
       height: 600px;
       box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     "
-    >
+    > -->
         <!--            @change="handleCheckedCitiesChange"-->
-        <el-checkbox-group v-model="reservationIds">
+        <!-- <el-checkbox-group v-model="reservationIds">
             <el-col v-for="(item, index) in reservationData">
                 <el-checkbox :label="item.id" :key="item.id"
-                >{{ item.consignee }}&emsp;{{ item.deliveryAddress }}&emsp;{{
+                >{{ item.customerName }}&emsp;{{ item.customerAddress }}&emsp;{{
-                    item.deliveryPhone
+                    item.customerTelephone
                     }}</el-checkbox
                 >
             </el-col>
-        </el-checkbox-group>
+        </el-checkbox-group> -->
-    </div>
+    <!-- </div> -->
 
-    <div style="margin-left: 40%; margin-top: 5%; float: bottom">
+    <div style="display: flex;align-items: center;justify-content: center;">
         <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
     </div>
 </template>
@@ -41,46 +41,44 @@
     reservationData: [],
     reservationIds: [],
     mapLoc: null,
+    // datalist:[]
   });
-  onMounted(() => {
+  onMounted(()=>{
+    initmap()
+  })
+  watchEffect(()=>{
     details.item = JSON.parse(router.currentRoute.value.query.item);
     selectStockArticleAtlasInfo(details.item.id).then(res => {
       const data = res.data.data;
       console.log('res------------->', data);
+      details.reservationData=data
       setTimeout(() => {
         init(data);
       }, 1500);
     });
-    // setTimeout(()=>{
+  })
-    //   details.mapLoc.clearOverlays();
+  function initmap(){
-
-    // },9500)
-  });
-
-  function init(data) {
     details.mapLoc = new BMapGL.Map('container'); // 创建地图实例
-
     let point = new BMapGL.Point(116.404, 39.915); // 创建点坐标
     details.mapLoc.centerAndZoom(point, 12);
     details.mapLoc.enableScrollWheelZoom(true);
+  }
+  function init(data) {
+    
     // maplabel()
-    if (details.mapLoc) {
+    if (details?.mapLoc) {
-      details.mapLoc.clearOverlays(); //清除地图的label
+      details?.mapLoc.clearOverlays(); //清除地图的label
     }
-    let a = data;
+    data.map((item,index)=>{
-    a.forEach((item,index)=>{
-      console.log('item------------->', item);
       maplabel(item.customerAddress, item.customerName+"--"+item.customerAddress+"--"+item.customerTelephone, index);
 
-      // maplabel('中国四川省成都市简阳市石桥镇简阳市石桥镇红星美凯龙雄州商场-1-26-154', '周娅', 0);
     })
-    // maplabel('四川成都龙泉驿区','展示的内容', 0);
   }
   function maplabel(address,contents, index) {
     let myGeo = new BMapGL.Geocoder();
     myGeo.getPoint(address, function (point) {
       if (point) {
-        console.log(point, '---------------');
+        // console.log(point, '---------------');
         if (index == 0) {
           details.mapLoc.centerAndZoom(point, 12);
         }
@@ -99,10 +97,10 @@
           borderRadius: '20px',
           padding: '5px 10px',
         });
-        console.log(label, '---------------');
+        // console.log(label, '---------------');
       } else {
         // alert('您选择的地址没有解析到结果！');
-        console.log(point);
+        // console.log(point);
         console.log('您选择的地址没有解析到结果！');
       }
     });
@@ -115,8 +113,9 @@
 
 <style scoped>
     .bmap {
-        width: 800px;
+        width: 100%;
-        height: 600px;
+        height: 700px;
-        border: 1px solid pink;
+        margin-bottom: 60px;
+        /* border: 1px solid pink; */
     }
 </style>