From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/ifslocation-form.vue | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/src/views/warehouse/pallettransports/ifslocation-form.vue b/src/views/warehouse/pallettransports/ifslocation-form.vue
index 8e65546..cf97028 100644
--- a/src/views/warehouse/pallettransports/ifslocation-form.vue
+++ b/src/views/warehouse/pallettransports/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,29 +56,39 @@
</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
+ >
+ <template scope="scope">
+ {{formatLocType(scope.row.locType)}}
+ </template>
+ </el-table-column>
+ <!-- <el-table-column
+ prop="ifsLocation"
+ label="ifs搴撲綅"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="locationTypeDesc"
- label="搴撲綅绫诲瀷鎻忚堪"
+ prop="ifsLocationGroup"
+ label="ifs搴撲綅缁�"
align="center"
show-overflow-tooltip
>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
@@ -92,10 +102,12 @@
</el-dialog>
</template>
<script>
-import { getIfsLocationByGroup } from '@/api/warehouse/location'
+import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsMaterial } from '@/api/warehouse/pallettransports'
+import Template from '../../quality/parts/template.vue'
+import { remote } from '../../../api/admin/dict'
export default {
- components: {},
+ components: {Template},
props: {
currshowlist: {
type: Boolean,
@@ -108,38 +120,64 @@
}
}
},
+ filters:{
+
+ },
data() {
return {
innerVisible: false,
+ locTypeOption: [],
isSubmit: false,
dataForm: {
- locationNo: null,
- locationDesc: null
+ locationNo: '',
+ locationDesc: ''
},
ifsLocationData: [],
currLocationRow: null
}
},
+ created() {
+ this.getLoc()
+ },
methods: {
+ formatLocType(val){
+ let list = this.locTypeOption
+ let index = list.findIndex(ele=>{
+ return ele.value == val
+ })
+ if(index!=null){
+ return list[index].label
+ }
+ return null
+ },
// 鏌ヨ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
}
})
+ }
+ })
+ },
+ // 鑾峰彇搴撲綅绫诲瀷鐨勬暟鎹瓧鍏�
+ getLoc() {
+ remote('warehouse_type').then((response) => {
+ if (response.data.code === 0) {
+ this.locTypeOption = response.data.data
}
})
},
@@ -168,8 +206,8 @@
this.transportsList.forEach((item) => {
transportsMaterials.push({
id: item.id,
- toIfsLocationName: this.currLocationRow.locationDesc,
- toIfsLocationNo: this.currLocationRow.locationNo
+ toIfsLocationName: this.currLocationRow.locName,
+ toIfsLocationNo: this.currLocationRow.locNo
})
})
updateBatchPalletTransportsMaterial(transportsMaterials)
--
Gitblit v1.9.3