Browse Source

fix tid1553

tid1731
刘嘉炜 5 months ago
parent
commit
ff3ad6308f
  1. 2
      src/components/order_refund/modal.vue
  2. 2
      src/components/order_refund/permission_btn.vue
  3. 2
      src/subpackage/order/pages/order_manage/order_manage.vue
  4. 3
      src/subpackage/order/pages/timekeeping/order_list.vue

2
src/components/order_refund/modal.vue

@ -94,7 +94,7 @@ export default {
methods: {
show(initData){
let { brandInfo } = this;
if(!brandInfo?.permission?.['1018']){
if(brandInfo?.permission?.['1018']){
this.isShow = true;
this.init(initData);
}else{

2
src/components/order_refund/permission_btn.vue

@ -34,7 +34,7 @@ export default {
if(
payAmount - refundAmount > 0
&&[0, 1].includes(refund_times)
// &&brandInfo?.permission?.['1018'] // 退
&&brandInfo?.permission?.['1018'] // 退
){
return true
}

2
src/subpackage/order/pages/order_manage/order_manage.vue

@ -36,7 +36,7 @@ export default {
// 20240813 tid1553
if([22, 23].includes(ele.key)){
let _qryStr = `order_type=${ele.orderType}&brand_id=${brandInfo?.brand?.id || ''}`;
util.routeTo(`/subpackage/order/pages/timekeeping/order_list?${_qryStr}`, 'nT');
return util.routeTo(`/subpackage/order/pages/timekeeping/order_list?${_qryStr}`, 'nT');
}
if(ele.orderType === 3){ // &

3
src/subpackage/order/pages/timekeeping/order_list.vue

@ -235,7 +235,8 @@ export default {
url: ORDER_API.billingOrderList,
data: {
brand_id, stadium_id, status,
start, end, order_type: this.getReqOrderType(order_type), page, page_size,
start: start + ' 00:00:00', end: end + ' 23:59:59',
order_type: this.getReqOrderType(order_type), page, page_size,
status_text: status_text === '押金' ? '' : status_text
},
failMsg: '加载失败!'

Loading…
Cancel
Save