|
|
|
@ -12,6 +12,9 @@
|
|
|
|
|
<el-tab-pane name="1"> |
|
|
|
|
<span slot="label"><i class="el-icon-refrigerator"></i> 未发货</span> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane name="5"> |
|
|
|
|
<span slot="label"><i class="el-icon-refrigerator"></i> 拣货中</span> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane name="2"> |
|
|
|
|
<span slot="label"><i class="el-icon-truck"></i> 待收货</span> |
|
|
|
|
</el-tab-pane> |
|
|
|
@ -36,7 +39,7 @@
|
|
|
|
|
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px"> |
|
|
|
|
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" /> |
|
|
|
|
</el-select> |
|
|
|
|
<el-select v-model="orderType" |
|
|
|
|
<el-select v-model="orderType" multiple |
|
|
|
|
clearable placeholder="订单类型" class="filter-item" style="width: 130px"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in typeOptions" |
|
|
|
@ -179,6 +182,14 @@
|
|
|
|
|
v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']" |
|
|
|
|
size="mini" |
|
|
|
|
type="primary" |
|
|
|
|
@click="check(scope.row)" |
|
|
|
|
> |
|
|
|
|
通过审核</el-button> |
|
|
|
|
<el-button |
|
|
|
|
v-if="scope.row._status == 8" |
|
|
|
|
v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']" |
|
|
|
|
size="mini" |
|
|
|
|
type="primary" |
|
|
|
|
@click="edit(scope.row)" |
|
|
|
|
> |
|
|
|
|
去发货</el-button> |
|
|
|
@ -268,7 +279,7 @@
|
|
|
|
|
<script> |
|
|
|
|
import checkPermission from '@/utils/permission' |
|
|
|
|
import initData from '@/mixins/crud' |
|
|
|
|
import { del } from '@/api/bxg/yxStoreOrder' |
|
|
|
|
import {check, del, edit} from '@/api/bxg/yxStoreOrder' |
|
|
|
|
import eForm from './form' |
|
|
|
|
import eDetail from './detail1' |
|
|
|
|
import eRefund from './refund' |
|
|
|
@ -285,7 +296,7 @@
|
|
|
|
|
return { |
|
|
|
|
delLoading: false, |
|
|
|
|
status: '-9', |
|
|
|
|
orderType: 0, |
|
|
|
|
orderType: ['0'], |
|
|
|
|
createTime: '', |
|
|
|
|
checkList: [], |
|
|
|
|
printChecked: false, |
|
|
|
@ -354,12 +365,13 @@
|
|
|
|
|
beforeInit() { |
|
|
|
|
this.url = 'bxg/api/yxStoreOrder' |
|
|
|
|
const sort = 'id,desc' |
|
|
|
|
console.log('this.orderType',this.orderType) |
|
|
|
|
this.params = { |
|
|
|
|
page: this.page, |
|
|
|
|
size: this.size, |
|
|
|
|
sort: sort, |
|
|
|
|
orderStatus: this.status, |
|
|
|
|
orderType: this.orderType, |
|
|
|
|
orderType: this.orderType.length==0?[0]:this.orderType, |
|
|
|
|
createTime: this.createTime, |
|
|
|
|
listContent: this.listContent |
|
|
|
|
} |
|
|
|
@ -391,6 +403,21 @@
|
|
|
|
|
this.isAdd = true |
|
|
|
|
this.$refs.form.dialog = true |
|
|
|
|
}, |
|
|
|
|
check(data){ |
|
|
|
|
this.loading=true |
|
|
|
|
check(data).then(res => { |
|
|
|
|
this.$notify({ |
|
|
|
|
title: '操作成功', |
|
|
|
|
type: 'success', |
|
|
|
|
duration: 2500 |
|
|
|
|
}) |
|
|
|
|
this.loading = false |
|
|
|
|
this.handleOrder() |
|
|
|
|
}).catch(err => { |
|
|
|
|
this.loading = false |
|
|
|
|
console.log(err.response.data.message) |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
edit(data) { |
|
|
|
|
this.isAdd = false |
|
|
|
|
const _this = this.$refs.form |
|
|
|
|