dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
Showing only changes of commit 26bbc770cb - Show all commits

View File

@ -112,20 +112,30 @@
methods: {
__,
formatStateId(row) {
return row.order_state_id === 2011
return row.order_state_id === 2010
? this.__('待付款')
: row.order_state_id === 2011
? this.__('待订单审核')
: row.order_state_id === 2012
? this.__('待发货')
: row.order_state_id === 2013
? this.__('待财务审核')
: row.order_state_id === 2014
? this.__('待配货')
: row.order_state_id === 2020
? this.__('待配货/待出库审核')
: row.order_state_id === 2030
? this.__('待发货')
: row.order_state_id === 2030
? this.__('待发货/待收货确认')
: row.order_state_id === 2040
? this.__('已发货/待收货确认')
: row.order_state_id === 2050
? this.__('已签收')
: row.order_state_id === 2060
? this.__('已完成/已签收;')
: row.order_state_id === 2010
? this.__('待付款')
: row.order_state_id === 2070
? this.__('已取消/已作废')
: row.order_state_id === 2080
? this.__('自提')
: this.__('已取消/已作废')
},
showTable(row) {