From 67f5edce916d4cb8b13a0aafa637af1ad0c7161f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:55:37 +0800
Subject: [PATCH] 2
---
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue | 100 +++++++++++++++++++++++---------------------------
1 files changed, 46 insertions(+), 54 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
index 4652b77..db71e2e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <!-- <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="formModel" ref="queryForm" labelWidth="90">
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
@@ -36,39 +36,6 @@
</el-form-item>
</el-col>
- <!-- 闅愯棌鐨勭瓫閫夋潯浠� -->
- <!-- <template>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
- <el-form-item label="閿佸畾鐘舵��:">
- <el-select v-model="formModel.isLocked" clearable placeholder="璇烽�夋嫨閿佸畾鐘舵��">
- <el-option v-for="item in isAutoEnum" :key="item.value" :label="item.title" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
-
- <el-form-item label="宸烽亾:">
- <el-select v-model="formModel.Lane" clearable placeholder="璇烽�夋嫨宸烽亾">
- <el-option v-for="item in LangEnum" :key="item.value" :label="item.title" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
- <el-form-item label="鎵�灞炴帓:">
- <el-select v-model="formModel.Row" clearable placeholder="璇烽�夋嫨鎵�灞炴帓">
- <el-option v-for="(item, index) in strorageRowEnum" :key="item" :label="`绗�${index + 1}鎺抈"
- :value="index + 1" />
- </el-select>
- </el-form-item>
- </el-col>
- </template> -->
- <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
- <el-form-item label-width="20px">
- <el-button type="primary" icon="el-icon-search" @click="getLocationPage(2)">鏌ヨ</el-button>
- <el-button icon="ele-Refresh" @click="() => formModel = {}"> 閲嶇疆 </el-button>
- </el-form-item>
- </el-col> -->
-
<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center">
@@ -81,7 +48,7 @@
</el-col>
</el-row>
</el-form>
- </el-card>
+ </el-card> -->
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<div class="msi-content" style="height: calc(100vh - 200px)">
@@ -91,25 +58,29 @@
<div class="storage-grid">
<div class="row rowMy0">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
- <span class="textK"
-
- :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }"
- >
- {{ cell.laneNo }}{{ cell.layerNo }}{{ cell.columnNo }}
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
+ <!-- {{ cell.laneNo }} -->
+ <!-- PlaceCode: -->
+ {{ cell.placeCode }}
+ <!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
</span>
</div>
</div>
<div class="row rowMy1">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 20 && cellIndex < 40">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
- {{ cell.laneNo }}{{ cell.layerNo }}{{ cell.columnNo }}
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
+ <!-- {{ cell.laneNo }} -->
+ {{ cell.placeCode }}
+ <!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
</span>
</div>
</div>
<div class="row rowMy2">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
- {{ cell.laneNo }}{{ cell.layerNo }}{{ cell.columnNo }}
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }" @click="handleClick(cell)">
+ <!-- {{ cell.laneNo }} -->
+ {{ cell.placeCode }}
+ <!-- {{ cell.layerNo }}{{ cell.columnNo }} -->
</span>
</div>
</div>
@@ -131,15 +102,18 @@
</div> -->
<!-- 缁熻鍖哄煙 -->
- <!-- <count-view :countData="countList"></count-view> -->
+ <!-- <count-view :countData="countList"></count-view> -->
<!-- 搴撲綅灞曠ず -->
<!-- <content-view :contentData="dataList"></content-view> -->
</div>
</el-card>
+
+ <!-- 璇︽儏寮规 -->
+ <prop-detail ref="propDetailRef"></prop-detail>
</div>
</template>
<script lang="ts" setup>
-import { nextTick, onMounted, ref } from 'vue';
+import { getCurrentInstance, nextTick, onMounted, ref } from 'vue';
//import SearchBar from '@/components/SearchBar.vue'
import { getStorageView } from '/@/api/main/ReportCenter/storageView';
@@ -147,6 +121,8 @@
import ContentView from './component/ContentView.vue';
import { ElMessage } from 'element-plus';
import { handleSlectDataWmsArea } from '/@/utils/selectData';
+import PropDetail from './component/propDetail.vue';
+const { proxy} :any = getCurrentInstance();// 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
const showAdvanceQueryUIWmsStockQuan = ref(false);
// 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
@@ -158,7 +134,7 @@
let color = '';
switch (type) {
case 1:
- color = '#F18201'; //姗樿壊 姝ｅ父
+ color = '#F6C285'; //姗樿壊 姝ｅ父#F18201
break;
case 2:
color = '#2BA6FF'; //钃濊壊 灏佸瓨
@@ -305,7 +281,7 @@
// return
// }
//璁剧疆鑳屾櫙
-
+
var res = await getStorageView(Object.assign(formModel.value, {}));
if (res.data.code == 200) {
const { data } = res;
@@ -424,6 +400,20 @@
console.log(66666666);
console.log(storageList.value);
+
+const dialogVisible = ref(false); // 寮规鍙鎬�
+
+const handleClick = (row: any) => {
+ proxy.$refs['propDetailRef'].openDialog(row);
+};
+
+const openDialog = () => {
+ dialogVisible.value = true; // 鎵撳紑寮规
+};
+
+const handleClose = () => {
+ dialogVisible.value = false; // 鍏抽棴寮规
+};
</script>
<style lang="less" scoped>
.msi-content {
@@ -433,7 +423,7 @@
.storage-grid {
display: flex;
flex-direction: column; /* 鍨傜洿鎺掑垪姣忎竴鎺� */
- width: 610px;
+ width: 510px;
// border: 1px solid red;
}
@@ -442,12 +432,12 @@
}
.cell {
- border: 1px solid gray; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
+ border: 1px solid #c1c1c1; /* 姣忎釜鏍煎瓙鐨勯粦绾� */
height: 50px; /* 姣忎釜鏍煎瓙鐨勯珮搴� */
display: inline-block;
justify-content: center;
align-items: center; /* 灞呬腑鏄剧ず鍐呭 */
- width: 30px;
+ width: 49px;
}
.rowMy0 {
@@ -479,14 +469,16 @@
}
.t1 {
margin: 10px 0 2px 0;
+ font-size: 16px !important;
+ padding-bottom: 10px;
}
.textK {
display: flex; /* 浣跨敤 Flexbox 甯冨眬 */
flex-direction: column;
font-size: 12px;
text-align: center;
- width: 100%;
- height: 100%;
- color: white;
+ width: 100%;
+ height: 100%;
+ color: white;
}
</style>
--
Gitblit v1.9.3