From 570046df69aeffbffb3efe8ddecaf523ca492a46 Mon Sep 17 00:00:00 2001 From: zongzhibin <zongzhibin@weben-smart.com> Date: 周二, 26 11月 2024 09:15:39 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine --- LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/ContentView.vue | 88 ++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/ContentView.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/ContentView.vue index b24b17b..ad7d5ba 100644 --- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/ContentView.vue +++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/component/ContentView.vue @@ -1,61 +1,63 @@ <template> <div> - <div v-for="(itemW,indexW) in storageList" :key="indexW"> - <p> 宸烽亾锛歿{itemW.laneCode}}</p> - <div v-for="(itemIN,indexIN) in itemW.rows" :key="indexIN" > - <div class="content-view" > - <!-- 姣忎釜搴撲綅鏂瑰潡 鏌ヨ搴撲綅鍏ㄩ儴搴撳瓨 --> - <div class="mask100" v-for="(itemSmall,itemSmallIndex) in itemIN.rowLocations2" :key="itemSmallIndex"> - - <content-item v-for="item in itemSmall" :key="item.wareLocationCode" :itemData="item" - :index="item.wareLocationCode" @show="show(item,item.wareLocationCode)" - - @click="openDialog(item.wareLocationCode)" - :class="'laneCodeBox_' + (item.showInventoryType)"> - </content-item> + <!-- 搴撲綅鍒楄〃 --> - </div> - + <div v-for="(itemW, indexW) in storageList" :key="indexW"> + <p>宸烽亾锛歿{ itemW.laneCode }}</p> + <div v-for="(itemIN, indexIN) in itemW.rows" :key="indexIN"> + <div class="content-view"> + <!-- 姣忎釜搴撲綅鏂瑰潡 鏌ヨ搴撲綅鍏ㄩ儴搴撳瓨 --> + <div class="mask100" v-for="(itemSmall, itemSmallIndex) in itemIN.rowLocations2" :key="itemSmallIndex"> + <content-item + v-for="item in itemSmall" + :key="item.wareLocationCode" + :itemData="item" + :index="item.wareLocationCode" + @show="show(item, item.wareLocationCode)" + @click="openDialog(item.wareLocationCode)" + :class="'laneCodeBox_' + item.showInventoryType" + > + </content-item> </div> - <div v-if="itemW.rows.length>1" class="stripe stripeM"></div> + </div> + <div v-if="itemW.rows.length > 1" class="stripe stripeM"></div> </div> </div> <!-- 搴撲綅鎮诞灞� --> <teleport :to="'#item' + count" v-if="itemVisible"> <div class="item-detail" v-if="!detailData.isDeleted"> - <p > {{ setKwStauts(detailData.inventoryType) }} </p> + <p>{{ setKwStauts(detailData.inventoryType) }}</p> {{ containerCodeSHsow }} </div> </teleport> <!-- 璇︽儏寮规 --> <prop-detail ref="propDetailRef"></prop-detail> - </div> </template> <script lang="ts" setup> import { ElMessage } from 'element-plus'; -import { ref, defineProps, computed, getCurrentInstance } from 'vue' -import ContentItem from './ContentItem.vue' +import { ref, defineProps, computed, getCurrentInstance } from 'vue'; +import ContentItem from './ContentItem.vue'; import PropDetail from './propDetail.vue'; -const { proxy} :any = getCurrentInstance();// 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜 +const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜 //props const props = defineProps({ contentData: { type: Array, required: true, - default: [] - } -}) -const containerCodeSHsow = ref('') + default: [], + }, +}); +const containerCodeSHsow = ref(''); //搴撲綅鍒楄〃 const storageList: Record<any, any> = computed(() => props.contentData); //姣忎釜搴撲綅璇︽儏鐨勬樉绀� const itemVisible = ref(false); //璇︽儏鏁版嵁 -const detailData = ref({} as Record<string, any>) +const detailData = ref({} as Record<string, any>); //褰撳墠閫変腑鐨勫簱浣� -const count = ref(String) +const count = ref(String); //鏄剧ず 闅愯棌璇︽儏 const show = (item: any, index: any) => { // console.log('item:'+JSON.stringify(item) ) @@ -64,18 +66,18 @@ itemVisible.value = true; count.value = index; detailData.value = item; - containerCodeSHsow.value = item.wareContainerCode; + containerCodeSHsow.value = item.wareContainerCode; } else { itemVisible.value = false; count.value = index; detailData.value = {}; - containerCodeSHsow.value = ""; + containerCodeSHsow.value = ''; } -} +}; // 鏄剧ず搴撲綅鐘舵�� const setKwStauts = (type: number): string => { - let status = '' + let status = ''; switch (type) { case 0: status = '绌哄簱浣�'; @@ -87,13 +89,14 @@ status = '鏈夎揣搴撲綅锛堢墿鏂欙級'; } return status; -} +}; //鎵撳紑绐楀彛 -const openDialog = (type: string) => { //鎵樼洏鍙� +const openDialog = (type: string) => { + //鎵樼洏鍙� if (!type || type == null) { - ElMessage.warning("涓嶅瓨鍦ㄦ墭鐩樺彿锛�"); - return + ElMessage.warning('涓嶅瓨鍦ㄦ墭鐩樺彿锛�'); + return; } proxy.$refs['propDetailRef'].openDialog(type); }; @@ -135,7 +138,6 @@ margin: 5px; } } - } .stripe { @@ -150,21 +152,20 @@ /*鏂戦┈鏉$汗*/ .stripeM { - background: linear-gradient(#dbd4b4 50%, #f5be6a 50%, ); + background: linear-gradient(#dbd4b4 50%, #f5be6a 50%); background-size: 100% 40px; } -.laneCodeBox_0{ +.laneCodeBox_0 { visibility: hidden; } -.laneCodeBox_1{ +.laneCodeBox_1 { visibility: visible; } - -.mask100{ +.mask100 { height: 100%; display: flex; - flex-direction: column-reverse; + flex-direction: column-reverse; } // #item3-4-3-3,#item3-4-1-3,#item3-4-2-3,#item3-4-4-3{ // margin-bottom: 104px; @@ -173,5 +174,4 @@ // margin-bottom: 149px; // } - -</style> \ No newline at end of file +</style> -- Gitblit v1.9.3