|
|
@@ -60,6 +60,17 @@
|
|
|
<el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
|
|
|
<el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" plain>发货</el-button>
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
+ <el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-'+scope.row.id">
|
|
|
+ <p>确认已自取？</p>
|
|
|
+ <div style="text-align: right; margin: 0">
|
|
|
+ <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
|
|
|
+ </div>
|
|
|
+ <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
|
|
|
+ </el-popover>
|
|
|
+ <el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
|
|
|
+=======
|
|
|
<el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-' + scope.row.id">
|
|
|
<p>确认已自取？</p>
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
@@ -70,6 +81,7 @@
|
|
|
</el-popover>
|
|
|
|
|
|
<el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
|
|
|
+>>>>>>> c152898eff6c05dd8e94bfbce1875015c3e46726
|
|
|
|
|
|
<el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
|
|
|
<el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" plain style="margin-left:14px;">打印</el-button>
|
|
|
@@ -230,10 +242,10 @@ export default {
|
|
|
},
|
|
|
//取消自取
|
|
|
selfGetCancel(id) {
|
|
|
- this.$refs[`popover-` + id].doClose();
|
|
|
+ this.$refs[`popover-` + id][1].doClose();
|
|
|
},
|
|
|
noSendShipFn(item) {
|
|
|
- this.$refs[`popover-` + item.id].doClose();
|
|
|
+ this.$refs[`popover-` + item.id][1].doClose();
|
|
|
|
|
|
this.$service.order.freeShipping({ id: item.id }).then(res => {
|
|
|
this.$message.success('操作成功！');
|
|
|
@@ -275,6 +287,12 @@ export default {
|
|
|
align: 'center',
|
|
|
width: '160'
|
|
|
},
|
|
|
+ {
|
|
|
+ prop: 'sendCost',
|
|
|
+ label: '运费',
|
|
|
+ align: 'center',
|
|
|
+ width: '80'
|
|
|
+ },
|
|
|
{
|
|
|
prop: 'prePrice',
|
|
|
label: '总价',
|
|
|
@@ -292,25 +310,25 @@ export default {
|
|
|
prop: 'customName',
|
|
|
label: '客户',
|
|
|
align: 'center',
|
|
|
- width: '150'
|
|
|
+ width: '160'
|
|
|
},
|
|
|
{
|
|
|
prop: 'customMobile',
|
|
|
label: '手机号',
|
|
|
align: 'center',
|
|
|
- width: '120'
|
|
|
+ width: '130'
|
|
|
},
|
|
|
{
|
|
|
prop: 'bigNum',
|
|
|
label: '数量',
|
|
|
align: 'center',
|
|
|
- width: '150'
|
|
|
+ width: '90'
|
|
|
},
|
|
|
{
|
|
|
prop: 'sendTypeName',
|
|
|
label: '配送方式',
|
|
|
align: 'center',
|
|
|
- width: '150'
|
|
|
+ width: '90'
|
|
|
},
|
|
|
{
|
|
|
prop: 'reachTime',
|
wangn