Commit c9f603a8 authored by Smile's avatar Smile

需求 136后台-集运-包裹列表-操作-撤出包裹

parent f1a1da62
...@@ -252,6 +252,22 @@ ...@@ -252,6 +252,22 @@
v-hasPermi="['ecw:order:warehouse_exit']" v-hasPermi="['ecw:order:warehouse_exit']"
>{{ $t("处理退仓") }} >{{ $t("处理退仓") }}
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
@click.native="
showExit = true
consId = scope.row.id
"
v-hasPermi="['ecw:order:warehouse_exit']"
>{{ $t("撤出包裹") }}
</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
@click.native="
showAdd = true
consId = scope.row.id
"
v-hasPermi="['ecw:order:warehouse_exit']"
>{{ $t("追加包裹") }}
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -350,8 +366,9 @@ ...@@ -350,8 +366,9 @@
:consIds="consIds"></batch-sign-off> :consIds="consIds"></batch-sign-off>
<batch-cons-edit :showConsBatchEdit.sync="showConsBatchEdit" @determine="getList" <batch-cons-edit :showConsBatchEdit.sync="showConsBatchEdit" @determine="getList"
:consIds="consIds"></batch-cons-edit> :consIds="consIds"></batch-cons-edit>
<consWithdrawal v-if="show" :dialog-visible="show" :consId="consId"></consWithdrawal> <cons-withdrawal v-if="show" :dialog-visible="show" :consId="consId"></cons-withdrawal>
<cons-cons-withdrawal-deal v-if="showReturnWarehouse" :dialog-visible="showReturnWarehouse" :consId="consId" ></cons-cons-withdrawal-deal> <cons-withdrawal-exit v-if="showExit" :dialog-visible="showExit" :consId="consId"></cons-withdrawal-exit>
<cons-withdrawal-deal v-if="showReturnWarehouse" :dialog-visible="showReturnWarehouse" :consId="consId" ></cons-withdrawal-deal>
</div> </div>
</template> </template>
...@@ -371,15 +388,17 @@ import {getChannelList} from "@/api/ecw/channel"; ...@@ -371,15 +388,17 @@ import {getChannelList} from "@/api/ecw/channel";
import ConsFollowupEdit from "@/views/ecw/consFollowup/components/ConsFollowupEdit.vue" import ConsFollowupEdit from "@/views/ecw/consFollowup/components/ConsFollowupEdit.vue"
import BatchSignOff from "@/views/ecw/cons/batchSignOff.vue"; import BatchSignOff from "@/views/ecw/cons/batchSignOff.vue";
import BatchConsEdit from "@/views/ecw/cons/batchConsEdit.vue"; import BatchConsEdit from "@/views/ecw/cons/batchConsEdit.vue";
import ConsConsWithdrawal from "@/views/ecw/cons/consWithdrawal.vue"; import ConsWithdrawal from "@/views/ecw/cons/consWithdrawal.vue";
import ConsConsWithdrawalDeal from "@/views/ecw/cons/consWithdrawalDeal.vue"; import ConsWithdrawalExit from "@/views/ecw/cons/consWithdrawalExit.vue";
import ConsWithdrawalDeal from "@/views/ecw/cons/consWithdrawalDeal.vue";
import {DICT_TYPE} from "@/utils/dict"; import {DICT_TYPE} from "@/utils/dict";
import {arrryToKeyedObjectBy} from "@/utils"; import {arrryToKeyedObjectBy} from "@/utils";
export default { export default {
name: "Cons", name: "Cons",
components: { components: {
consWithdrawal: ConsConsWithdrawal, ConsWithdrawal,
ConsWithdrawalExit,
UserSelector, UserSelector,
Transmutation, Transmutation,
Template, Template,
...@@ -389,7 +408,7 @@ export default { ...@@ -389,7 +408,7 @@ export default {
SpecialNeedsCons, SpecialNeedsCons,
BatchSignOff, BatchSignOff,
BatchConsEdit, BatchConsEdit,
ConsConsWithdrawalDeal ConsWithdrawalDeal
}, },
data() { data() {
return { return {
...@@ -400,6 +419,8 @@ export default { ...@@ -400,6 +419,8 @@ export default {
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
show: false, show: false,
showExit: false,
showAdd: false,
showReturnWarehouse: false, showReturnWarehouse: false,
consId: undefined, consId: undefined,
// 总条数 // 总条数
......
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