From 6d213775d14a63d18d9eb17b44ba14bd3bb220da Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 07 十二月 2023 10:35:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/detail-ifslocation-form.vue | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/views/warehouse/pallettransports/detail-ifslocation-form.vue b/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
index fa59ea8..879c1a7 100644
--- a/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
+++ b/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
@@ -23,7 +23,7 @@
</div>
<div style="display:flex;align-items:center;margin-left:10px;">
<div>
- <span>搴撲綅鎻忚堪锛�</span>
+ <span>搴撲綅鍚嶇О锛�</span>
</div>
<div>
<el-input
@@ -56,25 +56,32 @@
</template>
</el-table-column>
<el-table-column type="index" width="50" label="搴忓彿"> </el-table-column>
- <el-table-column prop="locationNo" label="搴撲綅鍙�" align="center">
+ <el-table-column prop="locNo" label="搴撲綅鍙�" align="center">
</el-table-column>
<el-table-column
- prop="locationDesc"
- label="搴撲綅鎻忚堪"
+ prop="locName"
+ label="搴撲綅鍚嶇О"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="locationGroupDesc"
- label="搴撲綅缁勬弿杩�"
+ prop="locType"
+ label="搴撲綅绫诲瀷"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="locationTypeDesc"
- label="搴撲綅绫诲瀷鎻忚堪"
+ prop="ifsLocation"
+ label="ifs搴撲綅"
+ align="center"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="ifsLocationGroup"
+ label="ifs搴撲綅缁�"
align="center"
show-overflow-tooltip
>
@@ -92,7 +99,7 @@
</el-dialog>
</template>
<script>
-import { getIfsLocationByGroup } from '@/api/warehouse/location'
+import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
components: {},
@@ -124,19 +131,20 @@
// 鏌ヨifs搴撲綅鍒楄〃
queryLocation() {
this.ifsLocationData = []
- getIfsLocationByGroup({
+ getIfsLocationByGroupCopyAll({
locationNo: this.dataForm.locationNo,
locationDesc: this.dataForm.locationDesc
}).then((response) => {
- if (response.data.code === 0) {
+ if (response.data.code == 0) {
const _data = response.data.data
this.ifsLocationData = _data.map((item, index) => {
return {
id: index + 1,
- locationNo: item.LOCATION_NO,
- locationDesc: item.LOCATION_DESC,
- locationGroupDesc: item.LOCATION_GROUP_DESC,
- locationTypeDesc: item.LOCATION_TYPE_DESC,
+ locNo: item.locNo,
+ locName: item.locName,
+ locType: item.locType,
+ ifsLocation: item.ifsLocation,
+ ifsLocationGroup: item.ifsLocationGroup,
commonChecked: false
}
})
@@ -168,8 +176,8 @@
this.detailList.forEach((item) => {
transportsDetails.push({
id: item.id,
- toIfsLocationName: this.currLocationRow.locationDesc,
- toIfsLocationNo: this.currLocationRow.locationNo
+ toIfsLocationName: this.currLocationRow.locName,
+ toIfsLocationNo: this.currLocationRow.locNo
})
})
updateBatchPalletTransportsDetail(transportsDetails)
--
Gitblit v1.9.3