From f8ebfc22fa79bf07768e114d42753961dbd88374 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:48:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/warehouse/pallettransports/index.vue | 4 ++--
src/views/warehouse/pallettransports/ifslocation-form.vue | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/warehouse/pallettransports/ifslocation-form.vue b/src/views/warehouse/pallettransports/ifslocation-form.vue
index b1afc35..babb2ae 100644
--- a/src/views/warehouse/pallettransports/ifslocation-form.vue
+++ b/src/views/warehouse/pallettransports/ifslocation-form.vue
@@ -142,13 +142,13 @@
methods: {
formatLocType(val){
let list = this.locTypeOption
- console.log(val,list)
- list.forEach(ele=>{
- console.log(Number(ele.value) == Number(val));
- if(Number(ele.value) == Number(val)){
- return ele.label
- }
+ let index = list.findIndex(ele=>{
+ return ele.value == val
})
+ if(index!=null){
+ return list[index].label
+ }
+ return null
},
// 鏌ヨifs搴撲綅鍒楄〃
queryLocation() {
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 88571e8..84e9616 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -125,8 +125,8 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" align="center">
</el-table-column>
- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
- </el-table-column>
+ <!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
+ </el-table-column> -->
<el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
<template slot-scope="scope">
<el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
--
Gitblit v1.9.3