Commit 2a6575e0 authored by dcy's avatar dcy

去掉批量调仓

parent eae3e96f
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出货渠道"> <el-table-column label="出货渠道">
<template v-slot="{row}">
{{row.channelName || '/'}}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>--> <!-- <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>-->
<el-table-column label="目的地" prop="objectiveName"></el-table-column> <el-table-column label="目的地" prop="objectiveName"></el-table-column>
...@@ -122,6 +123,8 @@ import warehouseDetails from "@/views/ecw/order/components/warehouseDetails"; ...@@ -122,6 +123,8 @@ import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
import {getOrderPage} from "@/api/ecw/order"; import {getOrderPage} from "@/api/ecw/order";
import workFlow from "@/components/WorkFlow"; import workFlow from "@/components/WorkFlow";
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {arrryToKeyedObjectBy} from "@/utils";
import {getChannelList} from "@/api/ecw/channel";
export default { export default {
name: "batchSingleApplication", name: "batchSingleApplication",
...@@ -137,6 +140,9 @@ export default { ...@@ -137,6 +140,9 @@ export default {
warehouseDetails, warehouseDetails,
workFlow workFlow
}, },
created() {
getChannelList().then(res => this.channelList = res.data)
},
watch: { watch: {
dialogVisible(val) { dialogVisible(val) {
if (val) { if (val) {
...@@ -154,6 +160,17 @@ export default { ...@@ -154,6 +160,17 @@ export default {
computed: { computed: {
adjustmentBol() { adjustmentBol() {
return this.applyStatus?.orderWarehouseAdjustBackVO?.status === 1 return this.applyStatus?.orderWarehouseAdjustBackVO?.status === 1
},
getShipChannelName() {
return shippingChannelId => {
for (let index in this.channelList) {
let channelItem = this.channelList[index];
if (channelItem.channelId == shippingChannelId) {
return channelItem.nameZh;
}
}
return '/'
}
} }
}, },
data() { data() {
...@@ -170,7 +187,8 @@ export default { ...@@ -170,7 +187,8 @@ export default {
warehouseOutId: undefined, warehouseOutId: undefined,
copyUserId: [], copyUserId: [],
}, },
applyStatus:{}//调仓-查看状态 applyStatus:{},//调仓-查看状态,
channelList:[]
} }
}, },
...@@ -217,7 +235,8 @@ export default { ...@@ -217,7 +235,8 @@ export default {
message: '取消成功' message: '取消成功'
}); });
}); });
} },
} }
} }
</script> </script>
......
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
v-hasPermi="['ecw:order:create']">{{$t('新增')}}</el-button> v-hasPermi="['ecw:order:create']">{{$t('新增')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}} <!-- <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}-->
</el-button> <!-- </el-button>-->
<el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button> <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
......
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