diff --git a/src/http/api/usercenter/seekorder.ts b/src/http/api/usercenter/seekorder.ts index 78e6ff0..c4de3dd 100644 --- a/src/http/api/usercenter/seekorder.ts +++ b/src/http/api/usercenter/seekorder.ts @@ -26,3 +26,4 @@ export const confirmPriceApi = (data: any) => { return post('/material-mall/lease-repair/confirmPrice', data) } + diff --git a/src/views/user/lessor/repair-manage/index.vue b/src/views/user/lessor/repair-manage/index.vue new file mode 100644 index 0000000..9b914dd --- /dev/null +++ b/src/views/user/lessor/repair-manage/index.vue @@ -0,0 +1,712 @@ + + + + + diff --git a/src/views/user/orderManagement/components/order-details.vue b/src/views/user/orderManagement/components/order-details.vue index b807c1b..c837306 100644 --- a/src/views/user/orderManagement/components/order-details.vue +++ b/src/views/user/orderManagement/components/order-details.vue @@ -175,16 +175,16 @@ const stepList = ref([ description: '', }, { - title: '退租待结算', + title: '已退租待检修', description: '', }, { - title: '结算待确认', + title: '已检修待结算', description: '', }, { - title: '已完成', + title: '订单完成', description: '', }, ]) @@ -213,21 +213,30 @@ if (props.orderStatus == 5) { stepList.value[2].title = '已收货' currentActive.value = 4 } -if (props.orderStatus == 6) { +if (props.orderStatus == 10) { stepList.value[0].title = '已接单' stepList.value[1].title = '已出库' stepList.value[2].title = '已收货' stepList.value[3].title = '租赁结束' - stepList.value[4].title = '退租已结算' + stepList.value[4].title = '退租已检修' currentActive.value = 5 } -if (props.orderStatus == 7) { +if (props.orderStatus == 15) { stepList.value[0].title = '已接单' stepList.value[1].title = '已出库' stepList.value[2].title = '已收货' stepList.value[3].title = '租赁结束' - stepList.value[4].title = '退租已结算' - stepList.value[5].title = '结算已确认' + stepList.value[4].title = '退租已检修' + stepList.value[5].title = '已结算待确认' + currentActive.value = 5 +} +if (props.orderStatus == 20) { + stepList.value[0].title = '已接单' + stepList.value[1].title = '已出库' + stepList.value[2].title = '已收货' + stepList.value[3].title = '租赁结束' + stepList.value[4].title = '退租已检修' + stepList.value[5].title = '结算完成' currentActive.value = 7 } diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index 4e62867..9cbb543 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -51,10 +51,13 @@ const statusList: any = [ { id: '2', name: '待出库' }, { id: '3', name: '待收货' }, { id: '4', name: '租赁中' }, - { id: '5', name: '已退租待结算' }, - { id: '6', name: '结算待确认' }, + { id: '5', name: '已退租' }, + { id: '6', name: '已退租' }, + { id: '15', name: '结算待确认' }, { id: '7', name: '已完成' }, { id: '8', name: '已驳回' }, + { id: '10', name: '已检修待结算' }, + { id: '20', name: '已完成' }, ] const orderText = (status: any) => { @@ -150,7 +153,7 @@ const onChangeGoods = (index: number) => { // 确认收获按钮 const confirmReceipt = async (index: number) => { - ElMessageBox.confirm('是否确定收获?', { + ElMessageBox.confirm('是否确定收货?', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -400,6 +403,7 @@ const costSubmit = () => { .then(async () => { const res: any = await confirmPriceApi({ orderId: currentOrderId.value, + orderStatus: 20, }) if (res.code == 200) { ElMessage({ @@ -718,15 +722,7 @@ const costSubmit = () => { - 费用清单 - - { 检修详情 + 费用清单 + + { 装备套数: {{ overhaulDetails.maNumber }} -
- 退租时间: - {{ overhaulDetails.rentEndTime }} -
- -
结算单位: {{ overhaulDetails.leaseCompany }}
-
- 租赁天数: - {{ overhaulDetails.rentDay }} -
-
- 租赁天数: - 999 -
@@ -1160,6 +1143,7 @@ const costSubmit = () => { + { +