货位基础信息

src/option/basicdata/basicdataGoodsAllocation.js

@@ -117,56 +117,133 @@ export default {
     //   type: "input",
     // },
     {
-      label: "货区编号",
-      prop: "goodsAreaId",
+      label: "仓库名称",
+      prop: "warehouseName",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      align:'center',
+      labelWidth:'100',
     },
     {
-      label: "货位名称",
-      prop: "goodsAllocationName",
+      label: "货区名称",
+      prop: "goodsAreaName",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      align:'center',
+      labelWidth:'100',
     },
     {
-      label: "仓库编号",
-      prop: "warehouseId",
+      label: "货架名称",
+      prop: "goodsShelfName",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      align:'center',
+      labelWidth:'100',
     },
     {
-      label: "货架编号",
-      prop: "goodsShelfId",
+      label: '货架',
+      prop: 'nodeInfo',
+      type: "cascader",
+      search: true,
+      labelWidth:'100',
+      clearable:true,
+      placeholder:'仓库/货区/货架',
+      dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
+      // dicData:dicData ,
+      props: {
+        label:'label',
+        value:'value',
+        children:'children',
+        leaf:'leaf',
+      },
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: false,
+      hide: true,
+      showAllLevels:false
+    },
+    {
+      label: "货位名称",
+      prop: "goodsAllocationName",
       type: "input",
+      addDisplay: true,
+      editDisplay: true,
+      align:'center',
+      labelWidth:'100',
+
     },
     {
       label: "列编码",
       prop: "rowNum",
       type: "input",
+      align:'center',
+      labelWidth:'100',
+
     },
     {
       label: "层编码",
       prop: "storeyNum",
       type: "input",
+      align:'center',
+      labelWidth:'100',
     },
     {
       label: "启用状态",
       prop: "enableStatus",
       type: "select",
       search: true,
+      labelWidth:'100',
       dicUrl: '/api/blade-system/dict-biz/dictionary?code=enable_status',
       props: {
         label: 'dictValue',
         value: 'dictKey',
-      }
+      },
+      addDisplay: false,
+      align:'center',
+
     },
     {
       label: "货位状态",
       prop: "allocationStatuc",
       type: "select",
       search: true,
+      labelWidth:'100',
       dicUrl: '/api/blade-system/dict-biz/dictionary?code=allocation_status',
       props: {
         label: 'dictValue',
         value: 'dictKey',
-      }
+      },
+      addDisplay: false,
+      align:'center',
+
     },
+    {
+      label: "二维码图片",
+      prop: "qrCodeUrl",
+      type: "upload",
+      dataType: 'string',
+      listType: 'picture-img',
+      hide: true,
+      labelWidth:'100',
+      span:11,
+      multiple:false,
+      width:"200px",
+      align:'left',
+      action: '/blade-resource/oss/endpoint/put-file',
+      propsHttp: {
+        res: 'data',
+        url: 'link',
+      },
+    },
+    {
+      label: "二维码",
+      prop: "qrCode",
+      type: "input",
+      align:'center',
+      labelWidth:'100',
+    }
   ]
 }

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -210,9 +210,22 @@
       onLoad(page, params = {}) {
         this.loading = true;
         const {
+          nodeInfo,
+          enableStatus,
+          allocationStatus,
         } = this.query;
-        let values = {
-        };
+
+          let values = {
+
+            enableStatus:enableStatus,
+            allocationStatus:allocationStatus
+          };
+          if (!!this.query.nodeInfo){
+            values.warehouseId=nodeInfo[0];
+            values.goodsAreaId=nodeInfo[1];
+            values.goodsShelfId=nodeInfo[2];
+          }
+        console.log(">>>>>>>",values);
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;