|
@@ -124,7 +124,7 @@
|
|
|
</el-input>
|
|
|
</el-collapse-item> -->
|
|
|
<order-radio title="订单来源" keyName="sourceFrom" ref="searchCom11" :options="sourceFromOptions" noLimit @radioChange="onChange($event,'sourceFrom')" />
|
|
|
- <order-checkbox title="订单类型" keyName="type" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'type')" />
|
|
|
+ <order-checkbox title="订单类型" keyName="typeList" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'typeList')" />
|
|
|
<el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
|
|
|
<div class="box01">
|
|
|
<el-radio-group v-model="radio" @input="colChange">
|
|
@@ -158,7 +158,7 @@
|
|
|
@updateTag="updateTag" @addGift="addGift" @addProduct="addProduct" @updateFreight="updateFreight" />
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
- <order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle"/>
|
|
|
+ <order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle" />
|
|
|
<div class="page">
|
|
|
<el-pagination v-if="page.total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNo" :page-size="page.pageSize"
|
|
|
:layout="'total, sizes, prev, pager, next, jumper'" :total="page.total"></el-pagination>
|