|
|
@ -116,7 +116,7 @@ |
|
|
|
<el-link slot="reference" type="primary" :underline="false">订单锁定</el-link> |
|
|
|
<el-link slot="reference" type="primary" :underline="false">订单锁定</el-link> |
|
|
|
</el-popconfirm> |
|
|
|
</el-popconfirm> |
|
|
|
|
|
|
|
|
|
|
|
<el-link v-else type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link> |
|
|
|
<el-link v-if="row.orderStatus == 'ORDER_LOCKED'" type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link> |
|
|
|
|
|
|
|
|
|
|
|
<el-popconfirm |
|
|
|
<el-popconfirm |
|
|
|
:title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单?' : '是否确认退款?'" |
|
|
|
:title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单?' : '是否确认退款?'" |
|
|
@ -156,8 +156,8 @@ |
|
|
|
</general-details> |
|
|
|
</general-details> |
|
|
|
</el-drawer> |
|
|
|
</el-drawer> |
|
|
|
<!-- 提货单 --> |
|
|
|
<!-- 提货单 --> |
|
|
|
<billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" /> |
|
|
|
<billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="search" /> |
|
|
|
<confirmSubmit :controlWindows="controlWindows" @closeWindow="() => {}" /> |
|
|
|
<confirmSubmit :controlWindows="controlWindows" @closeWindow="search" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
@ -319,6 +319,10 @@ export default { |
|
|
|
this.parameter.pageSize = size |
|
|
|
this.parameter.pageSize = size |
|
|
|
this.getByPage() |
|
|
|
this.getByPage() |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
search() { |
|
|
|
|
|
|
|
this.parameter.currentPage = 1 |
|
|
|
|
|
|
|
getByPage() |
|
|
|
|
|
|
|
}, |
|
|
|
//table list |
|
|
|
//table list |
|
|
|
getByPage() { |
|
|
|
getByPage() { |
|
|
|
order.getByPage(this.parameter).then(res => { |
|
|
|
order.getByPage(this.parameter).then(res => { |
|
|
|