页面优化

wms/qd/package.json

@@ -102,7 +102,7 @@
     "lint-staged": "8.1.5",
     "plop": "2.3.0",
     "runjs": "^4.3.2",
-    "sass": "^1.26.10",
+    "sass": "~1.26.5",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",

wms/qd/src/api/wms/sch/point.js

@@ -45,4 +45,12 @@ export function changeIs_active(data) {
   })
 }
 
-export default { add, edit, del, syncStruct, changeIs_active, findPoints }
+export function lock(data) {
+  return request({
+    url: 'api/point/lock',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, syncStruct, changeIs_active, findPoints, lock}

wms/qd/src/api/wms/st/dis.js

@@ -45,6 +45,13 @@ export function queryStructStatus(data) {
     data
   })
 }
+export function queryMaterial(data) {
+  return request({
+    url: 'api/dis/queryMaterial',
+    method: 'post',
+    data
+  })
+}
 
 export function queryInfoByCode(data) {
   return request({
@@ -54,4 +61,4 @@ export function queryInfoByCode(data) {
   })
 }
 
-export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus }
+export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus, queryMaterial }

wms/qd/src/views/wms/sch/point/index.vue

@@ -123,6 +123,17 @@
         >
           仓位同步
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="info"
+          :loading="syncLoading"
+          icon="el-icon-position"
+          size="mini"
+          @click="lockpoint()"
+        >
+          批量锁定
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -276,6 +287,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import ioStoreCrud from '@/api/wms/st/core/IOStore'
 
 const defaultForm = {
   point_uuid: null,
@@ -384,6 +396,8 @@ export default {
       })
     },
     sync() {
+      debugger
+      alert("测试")
       this.syncLoading = true
       crudPoint.syncStruct().then(() => {
         this.crud.toQuery()
@@ -392,6 +406,24 @@ export default {
       }).catch(err => {
         console.log(err.response.data.message)
       })
+    },
+
+
+    lockpoint() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      const param1 ={
+        data:_selectData
+      }
+      crudPoint.lock(param1).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
     }
 
   }

wms/qd/src/views/wms/st/visable/index2.vue

@@ -21,10 +21,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;font-size: 10px "
               :style="'background:'+arr['0101-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              1排</br>{{ count }}列</br>2层
+              1排</br>{{ count }}列</br>2层</br>{{arr3['0101-0'+count+'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -43,10 +43,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0101-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              1排</br>{{ count }}列</br>1层
+              1排</br>{{ count }}列</br>1层</br>{{arr3['0101-0'+count+'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -74,10 +74,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0102-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              2排</br>{{ count }}列</br>2层
+              2排</br>{{ count }}列</br>2层</br>{{arr3['0101-0'+count+'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -96,10 +96,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0102-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              2排</br>{{ count }}列</br>1层
+              2排</br>{{ count }}列</br>1层</br>{{arr3['0102-0'+count+'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -127,10 +127,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0103-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              3排</br>{{ count }}列</br>2层
+              3排</br>{{ count }}列</br>2层</br>{{arr3['0103-0'+count+'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -147,10 +147,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              3排</br>{{ (count + 6) }}列</br>2层
+              3排</br>{{ (count + 6) }}列</br>2层</br>{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -169,10 +169,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0103-0'+count+'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              3排</br>{{ count }}列</br>1层
+              3排</br>{{ count }}列</br>1层</br>{{arr3['0103-0'+count+'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -196,10 +196,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              3排</br>{{ (count + 6) }}列</br>1层
+              3排</br>{{ (count + 6) }}列</br>1层</br>{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -220,10 +220,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0104-0'+count+'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              4排</br>{{ count }}列</br>2层
+              4排</br>{{ count }}列</br>2层</br>{{arr3['0104-0'+count+'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -240,10 +240,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              4排</br>{{ (count + 6) }}列</br>2层
+              4排</br>{{ (count + 6) }}列</br>2层</br>{{arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -262,10 +262,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              4排</br>{{ count }}列</br>1层
+              4排</br>{{ count }}列</br>1层</br>{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -289,10 +289,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              4排</br>{{ (count + 6) }}列</br>1层
+              4排</br>{{ (count + 6) }}列</br>1层</br>{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -313,10 +313,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              5排</br>{{ count }}列</br>2层
+              5排</br>{{ count }}列</br>2层</br>{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -333,10 +333,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              5排</br>{{ (count + 12) }}列</br>2层
+              5排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -355,10 +355,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              5排</br>{{ count }}列</br>1层
+              5排</br>{{ count }}列</br>1层</br>{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -382,10 +382,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              5排</br>{{ (count + 12) }}列</br>1层
+              5排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -406,10 +406,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              6排</br>{{ count }}列</br>2层
+              6排</br>{{ count }}列</br>2层</br>{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -426,10 +426,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              6排</br>{{ (count + 12) }}列</br>2层
+              6排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -448,10 +448,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              6排</br>{{ count }}列</br>1层
+              6排</br>{{ count }}列</br>1层</br>{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -475,10 +475,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              6排</br>{{ (count + 12) }}列</br>1层
+              6排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -499,10 +499,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              7排</br>{{ count }}列</br>2层
+              7排</br>{{ count }}列</br>2层</br>{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -519,10 +519,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              7排</br>{{ (count + 12) }}列</br>2层
+              7排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -541,10 +541,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              7排</br>{{ count }}列</br>1层
+              7排</br>{{ count }}列</br>1层</br>{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -568,10 +568,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              7排</br>{{ (count + 12) }}列</br>1层
+              7排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -592,10 +592,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              8排</br>{{ count }}列</br>2层
+              8排</br>{{ count }}列</br>2层</br>{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -612,10 +612,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              8排</br>{{ (count + 12) }}列</br>2层
+              8排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -634,10 +634,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              8排</br>{{ count }}列</br>1层
+              8排</br>{{ count }}列</br>1层</br>{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -661,10 +661,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              8排</br>{{ (count + 12) }}列</br>1层
+              8排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -685,16 +685,16 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              9排</br>{{ count }}列</br>2层
+              9排</br>{{ count }}列</br>2层</br>{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
         <el-col :span="12" :offset="2">
           <el-popover
-            v-for="count in 14"
+            v-for="count in 13"
             placement="bottom"
             title="货位详情"
             trigger="hover"
@@ -705,10 +705,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              9排</br>{{ (count + 12) }}列</br>2层
+              9排</br>{{ (count + 12) }}列</br>2层</br>{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
             </div>
           </el-popover>
         </el-col>
@@ -727,10 +727,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              9排</br>{{ count }}列</br>1层
+              9排</br>{{ count }}列</br>1层</br>{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -743,7 +743,7 @@
         </el-col>
         <el-col :span="12">
           <el-popover
-            v-for="count in 14"
+            v-for="count in 13"
             placement="bottom"
             title="货位详情"
             trigger="hover"
@@ -754,10 +754,10 @@
             <div
               slot="reference"
               class="grid-content bg-purple-dark"
-              style="border: 1px solid #d3dce6;display: inline-block;text-align: center;"
+              style="border: 1px solid #d3dce6;display: inline-block;text-align: center; font-size: 10px;"
               :style="'background:'+arr['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']+';width: '+div_width+'px;height: '+div_height+'px;'"
             >
-              9排</br>{{ (count + 12) }}列</br>1层
+              9排</br>{{ (count + 12) }}列</br>1层</br>{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
             </div>
           </el-popover>
         </el-col>
@@ -767,16 +767,17 @@
 </template>
 
 <script>
-import dis from '@/api/wms/st/dis'
+import dis, { queryMaterial } from '@/api/wms/st/dis'
 export default {
   name: 'Test',
   data() {
     return {
       arr: {},
       arr2: {},
+      arr3:{},
       width: '2500',
-      div_width: '43',
-      div_height: '60',
+      div_width: '35',
+      div_height: '58',
       row_color: '#0d3fad'
     }
   },
@@ -784,9 +785,14 @@ export default {
   },
   mounted() {
     const timer = setInterval(() => {
+      debugger
       dis.queryStructStatus().then(res => {
         this.arr = res
       })
+      dis.queryMaterial().then(res => {
+        debugger
+        this.arr3 = res
+      })
       dis.queryInfoByCode().then(res => {
         this.arr2 = res
       })