|
|
@@ -51,13 +51,16 @@
|
|
|
|
|
|
<!-- 操作 -->
|
|
|
<template #slot-column-option="{scope}">
|
|
|
- <template v-if="scope.row.status == 0">
|
|
|
- <el-button type="text" size="small" disabled>自取</el-button>
|
|
|
- <el-button type="text" size="small" disabled>发货</el-button>
|
|
|
+
|
|
|
+ <template v-if="scope.row.status == 1">
|
|
|
+ <el-button size="small" disabled>打印</el-button>
|
|
|
+ <el-button size="small" disabled>自取</el-button>
|
|
|
+ <el-button size="small" disabled>发货</el-button>
|
|
|
</template>
|
|
|
<template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>
|
|
|
<template v-else>
|
|
|
<template v-if="scope.row.currentFlow == 1">
|
|
|
+
|
|
|
<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">
|
|
|
<p>确认已自取？</p>
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
@@ -74,10 +77,29 @@
|
|
|
plain
|
|
|
style="margin-left:14px;"
|
|
|
>发货</el-button>
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ @click="printOrder(scope.row)"
|
|
|
+ size="mini"
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ style="margin-left:14px;"
|
|
|
+ >打印</el-button>
|
|
|
+
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ @click="printOrder(scope.row)"
|
|
|
+ size="mini"
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ style="margin-left:14px;"
|
|
|
+ >打印</el-button>
|
|
|
+
|
|
|
</template>
|
|
|
+
|
|
|
</template>
|
|
|
</template>
|
|
|
</x-crud>
|
|
|
@@ -201,14 +223,14 @@ export default {
|
|
|
prop: 'prePrice',
|
|
|
label: '总价',
|
|
|
align: 'center',
|
|
|
- width: '130'
|
|
|
+ width: '110'
|
|
|
},
|
|
|
{
|
|
|
prop: 'actPrice',
|
|
|
label: '实付款',
|
|
|
align: 'center',
|
|
|
emptyText: '无',
|
|
|
- width: '130'
|
|
|
+ width: '110'
|
|
|
},
|
|
|
{
|
|
|
prop: 'customName',
|
|
|
@@ -220,7 +242,7 @@ export default {
|
|
|
prop: 'customMobile',
|
|
|
label: '手机号',
|
|
|
align: 'center',
|
|
|
- width: '150'
|
|
|
+ width: '120'
|
|
|
},
|
|
|
{
|
|
|
prop: 'bigNum',
|
|
|
@@ -270,7 +292,7 @@ export default {
|
|
|
visible: true, // 是否显示
|
|
|
// 同 element-ui Table-column Attributes
|
|
|
props: {
|
|
|
- width: 150,
|
|
|
+ width: 220,
|
|
|
align: 'center',
|
|
|
fixed: 'right',
|
|
|
label: '操作'
|
jf