订单对接

src/components/GlobalComponents/OrderDetail.vue

@@ -11,7 +11,7 @@
       class="dialog-info"
       v-if="orderData"
     >
-      <el-tabs>
+      <el-tabs v-model="activeTab" type="card">
         <el-tab-pane class="block-title" label="基本信息" name="baseInfo">
           <el-form-item label="创建时间">
             {{ orderData.createTime | formatTime }}
@@ -391,7 +391,7 @@ export default {
       visible: false,
       detailVisible: false,
       record: {},
-      activeNames: ['baseInfo', 'payInfo']
+      activeTab: 'baseInfo'
     }
   },
   methods: {

src/pages/queryReport/salesQuery.vue

@@ -480,6 +480,26 @@
               @click="$refs.orderDetail.show(scope.row)">
               详情
             </el-link>
+            <el-link
+              type="primary"
+              @click="$refs.orderDetail.show(scope.row)">
+              核销
+            </el-link>
+            <el-link
+              type="primary"
+              @click="$refs.orderDetail.show(scope.row)">
+              撤销核销
+            </el-link>
+            <el-link
+              type="primary"
+              @click="$refs.orderDetail.show(scope.row)">
+              退单
+            </el-link>
+            <el-link
+              type="primary"
+              @click="$refs.orderDetail.show(scope.row)">
+              有效期
+            </el-link>
             <!--
             <el-link
               type="primary"