Commit f33c81cf authored by 邓春圆's avatar 邓春圆

空运,海空连用,海运列表添加特需,并且可以二次清空

parent 6a4250c8
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
<div style="color:red;fontWeight:bold;"> <div style="color:red;fontWeight:bold;">
{{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}} {{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</div> </div>
<div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
<el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.symbol}}</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop=""> <el-table-column :label="$t('商品信息')" width="250px" align="center" prop="">
...@@ -128,7 +131,7 @@ import batchTally from "./batchTally.vue"; ...@@ -128,7 +131,7 @@ import batchTally from "./batchTally.vue";
import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea"; import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea";
import { formatDate, serviceMsg } from "../../utils"; import { formatDate, serviceMsg } from "../../utils";
import WarehouseDetail from "./warehouseDetail"; import WarehouseDetail from "./warehouseDetail";
import { getOrder } from "@/api/ecw/order"; import {getOrder, orderSpecialNeed} from "@/api/ecw/order";
import Exception from "@/views/ecw/box/components/Exception.vue"; import Exception from "@/views/ecw/box/components/Exception.vue";
export default { export default {
...@@ -190,6 +193,7 @@ export default { ...@@ -190,6 +193,7 @@ export default {
list.push({ list.push({
...oItem, ...oItem,
warehouseInInfo, warehouseInInfo,
advanceType:oItem.advanceType,
multiSpecification: oItem.multiSpecification, multiSpecification: oItem.multiSpecification,
positionNo: oItem.positionNo, positionNo: oItem.positionNo,
tallyStatus: item.tallyStatus, tallyStatus: item.tallyStatus,
...@@ -209,6 +213,26 @@ export default { ...@@ -209,6 +213,26 @@ export default {
this.tallyList = list; this.tallyList = list;
}); });
}, },
specialRendering(val){
console.log('val', val)
if(val !== undefined){
let i = val.split(',')
return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
return i.indexOf(e.value) > -1
}).map(item => {
// 打字开头的用最后一个字,否则取第一个字
item.symbol = item.label[0] == '' ? item.label[item.label.length-1]: item.label[0]
return item
})
}
},
deleteSpecial(id,orderId){
this.$confirm(this.$t('确定删除此特需么?')).then(() => {
return orderSpecialNeed({orderId:orderId,advanceType:id})
}).then(() => {
this.getList()
})
},
// 选中 // 选中
checkboxSelect(selection) { checkboxSelect(selection) {
this.selectedRows = selection; this.selectedRows = selection;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px"> <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
<el-table-column type="selection" align="center" width="55" fixed="left" /> <el-table-column type="selection" align="center" width="55" fixed="left" />
<el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" /> <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="200" >
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.orderNo}} {{scope.row.orderNo}}
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
<div style="color:red;fontWeight:bold;"> <div style="color:red;fontWeight:bold;">
{{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}} {{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</div> </div>
<div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
<el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.symbol}}</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop=""> <el-table-column :label="$t('商品信息')" width="250px" align="center" prop="">
...@@ -120,7 +123,7 @@ import batchTally from "./batchTally.vue"; ...@@ -120,7 +123,7 @@ import batchTally from "./batchTally.vue";
import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea"; import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea";
import { formatDate, serviceMsg } from "../../utils"; import { formatDate, serviceMsg } from "../../utils";
import WarehouseDetail from "./warehouseDetail"; import WarehouseDetail from "./warehouseDetail";
import { getOrder } from "@/api/ecw/order"; import {getOrder, orderSpecialNeed} from "@/api/ecw/order";
export default { export default {
name: "tally", name: "tally",
...@@ -174,10 +177,10 @@ export default { ...@@ -174,10 +177,10 @@ export default {
if (oItem.warehouseInInfo) { if (oItem.warehouseInInfo) {
warehouseInInfo = JSON.parse(oItem.warehouseInInfo ?? {}); warehouseInInfo = JSON.parse(oItem.warehouseInInfo ?? {});
} }
list.push({ list.push({
...oItem, ...oItem,
warehouseInInfo, warehouseInInfo,
advanceType:oItem.advanceType,
multiSpecification: oItem.multiSpecification, multiSpecification: oItem.multiSpecification,
positionNo: oItem.positionNo, positionNo: oItem.positionNo,
tallyStatus: item.tallyStatus, tallyStatus: item.tallyStatus,
...@@ -197,6 +200,26 @@ export default { ...@@ -197,6 +200,26 @@ export default {
this.tallyList = list; this.tallyList = list;
}); });
}, },
specialRendering(val){
console.log('val', val)
if(val !== undefined){
let i = val.split(',')
return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
return i.indexOf(e.value) > -1
}).map(item => {
// 打字开头的用最后一个字,否则取第一个字
item.symbol = item.label[0] == '' ? item.label[item.label.length-1]: item.label[0]
return item
})
}
},
deleteSpecial(id,orderId){
this.$confirm(this.$t('确定删除此特需么?')).then(() => {
return orderSpecialNeed({orderId:orderId,advanceType:id})
}).then(() => {
this.getList()
})
},
// 选中 // 选中
checkboxSelect(selection) { checkboxSelect(selection) {
this.selectedRows = selection; this.selectedRows = selection;
......
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