|
|
@@ -17,7 +17,6 @@
|
|
|
<template #table-column-orderSn="{scope}">
|
|
|
<el-link
|
|
|
:underline="true"
|
|
|
- @click="detailShowFn(scope.row)"
|
|
|
style="font-size:12px;display:inline-block;"
|
|
|
>{{ scope.row.orderSn }}</el-link>
|
|
|
</template>
|
|
|
@@ -57,20 +56,20 @@
|
|
|
<el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">该花材</el-button>
|
|
|
<el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>该花材</el-button>
|
|
|
|
|
|
- <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==0" @click.stop="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" type="primary" plain >发货</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">
|
|
|
- <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>
|
|
|
+ <el-button size="mini" type="text" @click.stop="selfGetCancel(scope.row.id)">取消</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click.stop="noSendShipFn(scope.row)">确定</el-button>
|
|
|
</div>
|
|
|
- <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
|
|
|
+ <el-button slot="reference" size="mini" type="primary" plain @click.stop="">自取</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-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==0" @click.stop="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" type="primary" plain style="margin-left:14px;">打印</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -340,6 +339,12 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
|
|
|
+ on: {
|
|
|
+ 'row-click': (row, column) => {
|
|
|
+ this.detailShowFn(row)
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
props: {
|
|
|
'default-sort': {
|
|
|
prop: 'createTime',
|