Explorar el Código

增加整行的点击事件

wangning hace 5 años
padre
commit
6203748ece
Se han modificado 1 ficheros con 12 adiciones y 7 borrados
  1. 12 7
      hd/src/views/order/list.vue

+ 12 - 7
hd/src/views/order/list.vue

@@ -17,7 +17,6 @@
 			<template #table-column-orderSn="{scope}">
 			<template #table-column-orderSn="{scope}">
 				<el-link
 				<el-link
 					:underline="true"
 					:underline="true"
-					@click="detailShowFn(scope.row)"
 					style="font-size:12px;display:inline-block;"
 					style="font-size:12px;display:inline-block;"
 				>{{ scope.row.orderSn }}</el-link>
 				>{{ scope.row.orderSn }}</el-link>
 			</template>
 			</template>
@@ -59,7 +58,7 @@
 
 
 			<!-- 进度 -->
 			<!-- 进度 -->
 			<template #table-column-currentFlow="{scope}">
 			<template #table-column-currentFlow="{scope}">
-				<div class="steps-wrap" @click="shipDrawFn(scope.row)" style="cursor:pointer;">
+				<div class="steps-wrap" @click.stop="shipDrawFn(scope.row)" style="cursor:pointer;">
 					<el-steps
 					<el-steps
 						:space="200"
 						:space="200"
 						:active="parseInt(scope.row.currentFlow)"
 						:active="parseInt(scope.row.currentFlow)"
@@ -101,14 +100,14 @@
 						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">
 						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">
 							<p>确认已自取?</p>
 							<p>确认已自取?</p>
 							<div style="text-align: right; margin: 0">
 							<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>
 							</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-popover>
 
 
 						<el-button
 						<el-button
-							@click="shipDrawFn(scope.row)"
+							@click.stop="shipDrawFn(scope.row)"
 							size="mini"
 							size="mini"
 							type="primary"
 							type="primary"
 							plain
 							plain
@@ -116,7 +115,7 @@
 						>发货</el-button>
 						>发货</el-button>
 					</template>
 					</template>
 					<template v-else>
 					<template v-else>
-						<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>
+						<el-button size="mini" type="primary" plain @click.stop="shipDrawFn(scope.row)">发货</el-button>
 					</template>
 					</template>
 				</template>
 				</template>
 			</template>
 			</template>
@@ -305,6 +304,12 @@ export default {
 						}
 						}
 					],
 					],
 
 
+          on: {
+						'row-click': (row, column) => {
+							this.detailShowFn(row)
+						}
+					},
+
 					props: {
 					props: {
 						'default-sort': {
 						'default-sort': {
 							prop: 'createTime',
 							prop: 'createTime',