diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue index 6a56068..05666e6 100644 --- a/src/pages/order-list/index.vue +++ b/src/pages/order-list/index.vue @@ -159,7 +159,7 @@ class="primary-lease" style="margin-right: 6px" v-if=" - (item.orderStatus == 3) + (item.orderStatus == 2) " @click.stop="onViewCode(item, parseInt(item.orderStatus))" > @@ -171,12 +171,12 @@ class="primary-lease" style="margin-right: 6px" v-if=" - (item.orderStatus == 3) && - !orderQueryParams.flag + (item.orderStatus == 2) && + orderQueryParams.flag " @click.stop="onSubmitCode(item, parseInt(item.orderStatus))" > - {{ "确认收货" }} + {{ "出库" }} { if (res.code === 200) { showPickUpCodeTwo.value = false uni.showToast({ - title: '收货成功', + title: '出库成功', icon: 'none' }); orderQueryParams.value.pageNum = 1 @@ -910,10 +910,10 @@ const onEditOrderStatusTwo = (item, status) => { orderId: item.orderId, orderStatus: '2', } - const editParamsTwo = { - orderId: item.orderId, - orderStatus: '3', - } + // const editParamsTwo = { + // orderId: item.orderId, + // orderStatus: '3', + // } showConfirmDialog({ title: '提示', message: `是否确定接单`, @@ -921,11 +921,13 @@ const onEditOrderStatusTwo = (item, status) => { .then(async () => { const res = await editOrderStatusAPI(editParamsOne) if (res.code === 200) { - const resTwo = await editOrderStatusAPI(editParamsTwo) - if(resTwo.code ===200){ showToast(`接单成功`) getOrderListData() - } + // const resTwo = await editOrderStatusAPI(editParamsTwo) + // if(resTwo.code ===200){ + // showToast(`接单成功`) + // getOrderListData() + // } } })