|
|
@@ -39,7 +39,10 @@
|
|
|
<template v-if="item.peopleConfirmStatus == 0">
|
|
|
<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view>
|
|
|
</template>
|
|
|
- <template v-if="item.peopleConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
|
|
|
+ <template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
|
|
|
+ <view class="an" style="color: #f44336" @click.stop="applyOrder(item.id)">进口申报确认</view>
|
|
|
+ </template>
|
|
|
+ <template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
|
|
|
<view class="an" style="color: #f44336" @click.stop="resale(item)">订单转售</view>
|
|
|
</template>
|
|
|
<!-- <template v-if="item.peopleConfirmStatus == 0">
|
|
|
@@ -64,13 +67,23 @@ export default {
|
|
|
{
|
|
|
name: '全部',
|
|
|
peopleConfirmStatus: '', //边民确认状态
|
|
|
+ applyConfirmStatus: '', //进口申报确认状态
|
|
|
apply: '', //订单申报状态
|
|
|
finishStatus: '', //订单完成状态
|
|
|
resaleStatus: '' //订单转售状态
|
|
|
},
|
|
|
{
|
|
|
- name: '待确认',
|
|
|
+ name: '边民确认',
|
|
|
peopleConfirmStatus: 0,
|
|
|
+ applyConfirmStatus: 0,
|
|
|
+ apply: 0,
|
|
|
+ finishStatus: 0,
|
|
|
+ resaleStatus: 0
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '申报确认',
|
|
|
+ peopleConfirmStatus: 1,
|
|
|
+ applyConfirmStatus: 0,
|
|
|
apply: 0,
|
|
|
finishStatus: 0,
|
|
|
resaleStatus: 0
|
|
|
@@ -78,6 +91,7 @@ export default {
|
|
|
{
|
|
|
name: '申报中',
|
|
|
peopleConfirmStatus: 1,
|
|
|
+ applyConfirmStatus: 1,
|
|
|
apply: 0,
|
|
|
finishStatus: 0,
|
|
|
resaleStatus: 0
|
|
|
@@ -85,6 +99,7 @@ export default {
|
|
|
{
|
|
|
name: '已完成',
|
|
|
peopleConfirmStatus: 1,
|
|
|
+ applyConfirmStatus: 1,
|
|
|
apply: 1,
|
|
|
finishStatus: 1,
|
|
|
resaleStatus: 0
|
|
|
@@ -92,6 +107,7 @@ export default {
|
|
|
{
|
|
|
name: '已转售',
|
|
|
peopleConfirmStatus: 1,
|
|
|
+ applyConfirmStatus: 1,
|
|
|
apply: 1,
|
|
|
finishStatus: 1,
|
|
|
resaleStatus: 1
|
|
|
@@ -111,11 +127,13 @@ export default {
|
|
|
user:this.getUser(),
|
|
|
list: [],
|
|
|
loadMore: true,
|
|
|
- user: this.getUser()
|
|
|
+ user: this.getUser(),
|
|
|
+ confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
|
|
|
};
|
|
|
},
|
|
|
onLoad() {
|
|
|
this.getData();
|
|
|
+ console.log("111111",this.list)
|
|
|
},
|
|
|
methods: {
|
|
|
getData() {
|
|
|
@@ -139,7 +157,8 @@ export default {
|
|
|
// 点击tab切换
|
|
|
click(e) {
|
|
|
console.log(e);
|
|
|
- this.param.peopleConfirmStatus = e.appeopleConfirmStatusply;
|
|
|
+ this.param.peopleConfirmStatus = e.peopleConfirmStatus;
|
|
|
+ this.param.applyConfirmStatus = e.applyConfirmStatus;
|
|
|
this.param.apply = e.apply;
|
|
|
this.param.finishStatus = e.finishStatus;
|
|
|
this.param.resaleStatus = e.resaleStatus;
|
|
|
@@ -161,7 +180,18 @@ export default {
|
|
|
//边民确认订单
|
|
|
confirmOrder(id) {
|
|
|
this.http.request({
|
|
|
- url: '/level-one-server/app/TbPeople/confirmOrder',
|
|
|
+ url: '/level-one-server/app/TbOrder/confirmOrder',
|
|
|
+ data: { orderId: id , confirmType: this.confirmType},
|
|
|
+ success: resp => {
|
|
|
+ uni.showToast({ title: '操作成功' });
|
|
|
+ this.refresh();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //边民进口申报确认
|
|
|
+ applyOrder(id) {
|
|
|
+ this.http.request({
|
|
|
+ url: '/level-one-server/app/TbOrder/applyOrder',
|
|
|
data: { orderId: id },
|
|
|
success: resp => {
|
|
|
uni.showToast({ title: '操作成功' });
|
