liutong
/
H5_QiCaiYao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

业务员端-订单列表去掉待支付-待支付订单放入到待审核中

master
liutong 1 year ago
parent
3fd5156ad3
commit
80f83dbcdb
2 changed files with 176 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 158
      page_salesman_index/index/reviewed.vue
  2. 139
      page_salesman_order/index/index.vue

158
page_salesman_index/index/reviewed.vue
View File

@ -36,6 +36,10 @@
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-time">
支付状态<span>{{item.pay_status_name}}</span>
<span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span>
</view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品， 合计{{item.goods_num}}件商品，
<span v-if="item.sales_money>0">订单金额￥{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额￥{{item.sales_money}}</span>
@ -48,6 +52,12 @@
@click.stop="increased(item,item.order_id,item.member_id,item.sales_balance,item.sales_status)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id,item.sales_balance,item.sales_status)">新增收款</div>
<div class="df aic jcsa listtwo" v-if="item.pay_type_name=='业务员额度下单'" <div class="df aic jcsa listtwo" v-if="item.pay_type_name=='业务员额度下单'"
@click.stop="affirm(item.order_id,item.member_id,item.sales_balance,item.sales_status)">确认收款</div> --> @click.stop="affirm(item.order_id,item.member_id,item.sales_balance,item.sales_status)">确认收款</div> -->
<div class="df aic jcsa listone" v-if="item.pay_type_name=='业务员额度下单'"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa listtwo" v-if="item.pay_type_name=='业务员额度下单'"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
@ -97,25 +107,37 @@
sales_status: '0' sales_status: '0'
}, },
success: res => { success: res => {
console.log(res, '待审核'); console.log(res, '待审核+待支付');
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
methods: { methods: {
getwrong(order_status,member_id, is_today, sales_status, searchText) { getwrong(order_status,member_id, is_today, sales_status, searchText,one,start_time,end_time) {
console.log('xxx',order_status,member_id, is_today, sales_status, searchText,one,start_time,end_time);
console.log(order_status,member_id, is_today, sales_status, searchText);
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText searchText,
} start_time,
if (!obj.sales_status) { end_time
obj.sales_status = '0'
} }
if (searchText) {
delete obj.sales_status
}
if (is_today) {
delete obj.sales_status
}
if (!sales_status) {
delete obj.sales_status
}
if (!obj.sales_status) {
obj.sales_status = '0'
}
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
@ -184,7 +206,8 @@
url: `/page_salesman_order/Order_details/Order_details?or=${order}&me=${member}` url: `/page_salesman_order/Order_details/Order_details?or=${order}&me=${member}`
}) })
}, },
increased(item, order, member, sales_balance, sales_status) { // increased(item, order, member, sales_balance, sales_status) {}
increased(item, order, member) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
let _this = this let _this = this
@ -213,51 +236,78 @@
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id, sales_balance, sales_status) { // affirm(order_id, member_id, sales_balance, sales_status) {
let _this = this // let _this = this
if (sales_balance == 0) { // if (sales_balance == 0) {
this.$util.showToast({ // this.$util.showToast({
title: '无收款记录' // title: '无收款记录'
}); // });
return // return
} // }
if (sales_status == 0) { // if (sales_status == 0) {
this.$util.showToast({ // this.$util.showToast({
title: '未审核' // title: '未审核'
}); // });
return // return
} // }
if (sales_status == 2) { // if (sales_status == 2) {
this.$util.showToast({ // this.$util.showToast({
title: '已驳回' // title: '已驳回'
}); // });
return // return
} // }
// event.stopPropagation(); // // event.stopPropagation();
console.log(order_id, member_id); // console.log(order_id, member_id);
this.$api.sendRequest({ // this.$api.sendRequest({
url: '/api/salasmanorder/detail', // url: '/api/salasmanorder/detail',
data: { // data: {
order_id: order_id, // order_id: order_id,
member_id: member_id // member_id: member_id
}, // },
success: res => { // success: res => {
this.data = res.data // this.data = res.data
console.log(res.data, '订单详情'); // console.log(res.data, '订单详情');
// setTimeout(()=>{ // // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // // uni.$emit('CommodityList',res.data.order_goods)
// },500) // // },500)
// uni.navigateTo({ // // uni.navigateTo({
// // url:this.list[this.current.URL] // // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // // })
uni.navigateTo({ // uni.navigateTo({
// url:this.list[this.current.URL] // // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` // url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) // })
} // }
}) // })
}, // },
affirm(order_id, member_id) {
let _this = this
// event.stopPropagation();
console.log(order_id, member_id);
this.$api.sendRequest({
url: '/api/salasmanorder/detail',
data: {
order_id: order_id,
member_id: member_id
},
success: res => {
this.data = res.data
console.log(res.data, '订单详情');
// setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods)
// },500)
// uni.navigateTo({
// // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list`
// })
uni.navigateTo({
// url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
})
}
})
},
more(item) { more(item) {
// event.stopPropagation(); // event.stopPropagation();
console.log(item); console.log(item);

139
page_salesman_order/index/index.vue
View File

@ -39,11 +39,11 @@
<undgbm ref=one></undgbm> <undgbm ref=one></undgbm>
</view> </view>
<!-- 待支付 --> <!-- 待支付 -->
<view v-if="indexa==1"> <!-- <view v-if="indexa==1">-->
<dettisl ref=two></dettisl> <!-- <dettisl ref=two></dettisl>-->
</view> <!-- </view>-->
<!-- 待审核 --> <!-- 待审核 -->
<view v-if="indexa==2"> <view v-if="indexa==1">
<reviewed ref=sui></reviewed> <reviewed ref=sui></reviewed>
</view> </view>
<!-- 待出库 --> <!-- 待出库 -->
@ -51,24 +51,24 @@
<deliveredsa></deliveredsa> <deliveredsa></deliveredsa>
</view> --> </view> -->
<!-- 待发货 --> <!-- 待发货 -->
<view v-if="indexa==3"> <view v-if="indexa==2">
<Tobeshipped ref=four></Tobeshipped> <Tobeshipped ref=four></Tobeshipped>
</view> </view>
<!-- 待收货 --> <!-- 待收货 -->
<view v-if="indexa==4"> <view v-if="indexa==3">
<Goodsto ref=five></Goodsto> <Goodsto ref=five></Goodsto>
</view> </view>
<!-- 已收货 --> <!-- 已收货 -->
<view v-if="indexa==5"> <view v-if="indexa==4">
<received ref=six></received> <received ref=six></received>
</view> </view>
<!-- 待确认收款 --> <!-- 待确认收款 -->
<view v-if="indexa==6"> <view v-if="indexa==5">
<Collectionto ref=seven></Collectionto> <Collectionto ref=seven></Collectionto>
</view> </view>
<!-- 已关闭 --> <!-- 已关闭 -->
<view v-if="indexa==7"> <view v-if="indexa==6">
<close ref=eight></close> <close ref=eight></close>
</view> </view>
</view> </view>
@ -110,31 +110,36 @@
value: '', value: '',
input: '', input: '',
show: false, show: false,
list1: [{ list1: [
name: '全部', {
}, { name: '全部',
name: '待支付', },
}, { // {
name: '待审核', // name: '待支付',
} // },
// , { {
// name: '待出库' name: '待审核',
// } },
, { //{
name: '待发货' // name: '待出库'
}, { // },
name: '已发货'
}, {
{ name: '待发货'
name: '已收货' },
}, {
{ name: '已发货'
name: '待确认收款' },
}, {
{ name: '已收货'
name: '已关闭' },
} {
], name: '待确认收款'
},
{
name: '已关闭'
}
],
dataList: [] dataList: []
}; };
}, },
@ -149,25 +154,25 @@
if (this.indexa == 0) { if (this.indexa == 0) {
this.$refs.one.getwrongtllisttwo() this.$refs.one.getwrongtllisttwo()
} }
// if (this.indexa == 1) {
// this.$refs.two.getwrongtllisttwo()
// }
if (this.indexa == 1) { if (this.indexa == 1) {
this.$refs.two.getwrongtllisttwo()
}
if (this.indexa == 2) {
this.$refs.sui.getwrongtllisttwo() this.$refs.sui.getwrongtllisttwo()
} }
if (this.indexa == 3) { if (this.indexa == 2) {
this.$refs.four.getwrongtllisttwo() this.$refs.four.getwrongtllisttwo()
} }
if (this.indexa == 4) { if (this.indexa == 3) {
this.$refs.five.getwrongtllisttwo() this.$refs.five.getwrongtllisttwo()
} }
if (this.indexa == 5) { if (this.indexa == 4) {
this.$refs.six.getwrongtllisttwo() this.$refs.six.getwrongtllisttwo()
} }
if (this.indexa == 6) { if (this.indexa == 5) {
this.$refs.seven.getwrongtllisttwo() this.$refs.seven.getwrongtllisttwo()
} }
if (this.indexa == 7) { if (this.indexa == 6) {
this.$refs.eight.getwrongtllisttwo() this.$refs.eight.getwrongtllisttwo()
} }
}, },
@ -175,25 +180,25 @@
if (this.indexa == 0) { if (this.indexa == 0) {
await this.$refs.one.getwrongtllisttwo() await this.$refs.one.getwrongtllisttwo()
} }
// if (this.indexa == 1) {
// await this.$refs.two.getwrongtllisttwo()
// }
if (this.indexa == 1) { if (this.indexa == 1) {
await this.$refs.two.getwrongtllisttwo()
}
if (this.indexa == 2) {
await this.$refs.sui.getwrongtllisttwo() await this.$refs.sui.getwrongtllisttwo()
} }
if (this.indexa == 3) { if (this.indexa == 2) {
await this.$refs.four.getwrongtllisttwo() await this.$refs.four.getwrongtllisttwo()
} }
if (this.indexa == 4) { if (this.indexa == 3) {
await this.$refs.five.getwrongtllisttwo() await this.$refs.five.getwrongtllisttwo()
} }
if (this.indexa == 5) { if (this.indexa == 4) {
await this.$refs.six.getwrongtllisttwo() await this.$refs.six.getwrongtllisttwo()
} }
if (this.indexa == 6) { if (this.indexa == 5) {
await this.$refs.seven.getwrongtllisttwo() await this.$refs.seven.getwrongtllisttwo()
} }
if (this.indexa == 7) { if (this.indexa == 6) {
await this.$refs.eight.getwrongtllisttwo() await this.$refs.eight.getwrongtllisttwo()
} }
}, },
@ -201,25 +206,25 @@
if (this.indexa == 0) { if (this.indexa == 0) {
await this.$refs.one.getwrongtllistsui() await this.$refs.one.getwrongtllistsui()
} }
// if (this.indexa == 1) {
// await this.$refs.two.getwrongtllistsui()
// }
if (this.indexa == 1) { if (this.indexa == 1) {
await this.$refs.two.getwrongtllistsui()
}
if (this.indexa == 2) {
await this.$refs.sui.getwrongtllistsui() await this.$refs.sui.getwrongtllistsui()
} }
if (this.indexa == 3) { if (this.indexa == 2) {
await this.$refs.four.getwrongtllistsui() await this.$refs.four.getwrongtllistsui()
} }
if (this.indexa == 4) { if (this.indexa == 3) {
await this.$refs.five.getwrongtllistsui() await this.$refs.five.getwrongtllistsui()
} }
if (this.indexa == 5) { if (this.indexa == 4) {
await this.$refs.six.getwrongtllistsui() await this.$refs.six.getwrongtllistsui()
} }
if (this.indexa == 6) { if (this.indexa == 5) {
await this.$refs.seven.getwrongtllistsui() await this.$refs.seven.getwrongtllistsui()
} }
if (this.indexa == 7) { if (this.indexa == 6) {
await this.$refs.eight.getwrongtllisttwo() await this.$refs.eight.getwrongtllisttwo()
} }
}, },
@ -231,31 +236,31 @@
this.$refs.one.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time, this.$refs.one.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
end_time) end_time)
} }
// if (this.indexa == 1) {
// this.$refs.two.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
// end_time)
// }
if (this.indexa == 1) { if (this.indexa == 1) {
this.$refs.two.getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
end_time)
}
if (this.indexa == 2) {
this.$refs.sui.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.sui.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }
if (this.indexa == 3) { if (this.indexa == 2) {
this.$refs.four.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.four.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }
if (this.indexa == 4) { if (this.indexa == 3) {
this.$refs.five.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.five.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }
if (this.indexa == 5) { if (this.indexa == 4) {
this.$refs.six.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.six.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }
if (this.indexa == 6) { if (this.indexa == 5) {
this.$refs.seven.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.seven.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }
if (this.indexa == 7) { if (this.indexa == 6) {
this.$refs.eight.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, this.$refs.eight.getwrong(order_status, member_id, is_today, sales_status, searchText, start_time,
end_time) end_time)
} }

Write Preview
Loading…
Cancel
Save