Commit c3d623f4 authored by zhoutong's avatar zhoutong

修改归信息,理货储位显示去重

parent 5cf409e6
......@@ -244,6 +244,7 @@
import dayjs from "dayjs";
import supplementOrder from "./supplementOrder.vue";
import { getCabinetPage } from "@/api/ecw/cabinet";
import { getbox } from "@/api/ecw/box";
import {
loadSecGoodsList,
orderTagList,
......@@ -333,6 +334,7 @@ export default {
selectedUsers: [],
// 订单信息
boxOrderInfo: {},
newshipmentObj: {}
};
},
created() {
......@@ -341,9 +343,16 @@ export default {
getCabinetPage(null).then((response) => {
this.cabinetList = response.data.list;
});
this.getBoxInfo()
},
methods: {
getTotlContent,
getBoxInfo() {
getbox(this.shipmentObj.id).then((res) => {
const { data } = res;
this.newshipmentObj = data ?? {};
});
},
/* 装柜部分列表 */
getLoadSecGoodsList() {
loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {
......@@ -419,7 +428,8 @@ export default {
case "modifyCabinet":
this.$set(this.dialogConfig, "fullscreen", false);
this.modifyCabinetObj = {};
this.$set(this.modifyCabinetObj,'cabinetId',this.shipmentObj.cabinetId)
this.$set(this.modifyCabinetObj,'cabinetId',this.newshipmentObj.cabinetId)
this.$set(this.modifyCabinetObj,'cubNo',this.newshipmentObj.cubNo)
break;
case "splitOrder":
this.$set(this.dialogConfig, "fullscreen", true);
......@@ -535,6 +545,7 @@ export default {
};
boxUpdate(params).then((res) => {
serviceMsg(res, this);
this.getBoxInfo()
this.closeDialog2();
});
},
......
......@@ -73,7 +73,11 @@
<el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
</el-table-column>
<el-table-column :label="$t('数量(个)')" align="center" prop="quantity"></el-table-column>
<el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
<el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
<template slot-scope="scope">
{{notset(scope.row.positionNo)}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
<template slot-scope="scope">
{{scope.row.tallyStatus === 1 ? $t('已理货') : $t('未理货')}}
......@@ -150,6 +154,13 @@ export default {
methods: {
// 格式化日期
formatDate,
//去重
notset(string){
if(!string) return string
let arr = string.split(',')
arr = arr.filter((item,index)=>{return arr.indexOf(item)==index})
return arr.toString()
},
// 查询理货列表
getList() {
getTallyList({ shipmentId: this.shipmentObj.id }).then((res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment