|
@@ -38,15 +38,20 @@
|
|
|
<a-input id="shopOrder-orderSn" allowClear :maxLength="30" v-model="queryParam.orderSn" placeholder="请输入订单编号" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="6">
|
|
|
- <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
+ <a-col :span="18">
|
|
|
+ <a-button class="handle-btn btn-right" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
|
+ <a-button class="handle-btn btn-right" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
|
|
|
<a-button
|
|
|
v-if="$hasPermissions('B_orderManage_export')"
|
|
|
class="export-btn"
|
|
|
id="shopOrder-btn-export"
|
|
|
:loading="loading"
|
|
|
- @click="handleExport">导出</a-button>
|
|
|
- <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
|
|
|
+ @click="handleExport">导出订单</a-button>
|
|
|
+ <a-button
|
|
|
+ class="export-btn"
|
|
|
+ id="shopOrder-btn-exportDetail"
|
|
|
+ :loading="loadingDetail"
|
|
|
+ @click="handleExport">导出订单明细</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
@@ -95,6 +100,7 @@ export default {
|
|
|
orderState: null // 订单状态
|
|
|
},
|
|
|
loading: false, // 导出loading
|
|
|
+ loadingDetail: false, // 导出订单明细loading
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
@@ -217,7 +223,7 @@ export default {
|
|
|
.handle-btn{
|
|
|
margin-top: 4px;
|
|
|
}
|
|
|
- .serach-btn{
|
|
|
+ .btn-right{
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
}
|