Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/distribution/distributionStockArticleDetails.js

@@ -186,7 +186,7 @@ export const columnList = [
   {
     prop: 'materialCodeMaintainStatus',
     label: '物料维护状态',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],

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

@@ -911,12 +911,13 @@ async function checkshelves() {
    * goodsAreaId 货区ID
    * goodsShelfId 货架ID
    */
-  let goodsAreaarr =
-    details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
+  console.log(details,'details');
+  
+  let goodsAreaarr =  details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
   let goodsShelfarr = goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele];
   let data = {
-    goodsAreaId: goodsAreaarr.id,
-    goodsShelfId: goodsShelfarr.id,
+    goodsAreaId: goodsAreaarr?.id,
+    goodsShelfId: goodsShelfarr?.id,
   };
   const res = await getVisualization(data); // 调用异步函数获取可视化数据
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');