Commit d4d4bcc7 authored by dcy's avatar dcy

特需添加编号

parent 4439b1bb
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
{{scope.row.statusMsg}} {{scope.row.statusMsg}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html --> <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<!-- 恢复 --> <!-- 恢复 -->
<!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>--> <!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>-->
<!-- 费用申请 --> <!-- 费用申请 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0]) && exclude(scope.row.status, [0]) &&
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
"> ">
<el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item> <el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item>
</template> </template>
<!-- 确认提货 --> <!-- 确认提货 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0,2]) && exclude(scope.row.status, [0,2]) &&
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
"> ">
<el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item> <el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item>
</template> --> </template> -->
<!-- 调拨出仓 --> <!-- 调拨出仓 -->
<template v-if=" <template v-if="
include(scope.row.inWarehouseState, [213]) include(scope.row.inWarehouseState, [213])
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
"> ">
<el-dropdown-item @click.native="printTagOrderId=scope.row.orderId">{{$t('打印标签')}}</el-dropdown-item> <el-dropdown-item @click.native="printTagOrderId=scope.row.orderId">{{$t('打印标签')}}</el-dropdown-item>
</template> </template>
<!-- 打印入仓单 --> <!-- 打印入仓单 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0, 2]) && exclude(scope.row.status, [0, 2]) &&
...@@ -341,14 +341,14 @@ ...@@ -341,14 +341,14 @@
</el-dropdown> </el-dropdown>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" /> @pagination="getList" />
<special-needs :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs> <special-needs :orderNo="orderNo" :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs>
<print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" /> <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
<print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" /> <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
<print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" /> <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
...@@ -453,6 +453,7 @@ export default { ...@@ -453,6 +453,7 @@ export default {
multipleSelection:[], multipleSelection:[],
transportId: null, // 指定运输方式 transportId: null, // 指定运输方式
orderNo:''
}; };
}, },
computed: { computed: {
......
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