diff --git a/components.d.ts b/components.d.ts index 048a798..06def7a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -14,6 +14,7 @@ declare module 'vue' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] @@ -28,6 +29,7 @@ declare module 'vue' { ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -35,6 +37,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/src/http/api/usercenter/seekorder.ts b/src/http/api/usercenter/seekorder.ts index ffb91df..4769ca4 100644 --- a/src/http/api/usercenter/seekorder.ts +++ b/src/http/api/usercenter/seekorder.ts @@ -29,4 +29,10 @@ export const confirmPriceApi = (data: any) => { //获取租赁协议详情 export const getContractDetailApi = (data: any) => { return get('/material-mall/order/leaseAgreement', data) -} \ No newline at end of file +} + +//获取取件码 +export const getOrderCodeApi = (data: any) => { + return get('/material-mall/order/getOrderCode',data) +} + diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue index c7bd1d4..2f504a0 100644 --- a/src/views/equip/list.vue +++ b/src/views/equip/list.vue @@ -6,7 +6,7 @@ {{ item.title }}{{ currentIndex == 1 @@ -35,7 +35,7 @@ active: val.isChecked, }" > - {{ val.name }} + {{ val.name }} + + 查看取件码 + + 确认收货 { 取消订单 @@ -1194,9 +1255,9 @@ const costSubmit = () => { @@ -1400,6 +1461,74 @@ const costSubmit = () => {
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + 关闭 + + + 收货 + +
+ diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue index b492bee..8cdcde9 100644 --- a/src/views/user/orderManagementCz/components/order-home.vue +++ b/src/views/user/orderManagementCz/components/order-home.vue @@ -10,6 +10,7 @@ import { passApi, failApi, getContractDetailApi, + getOrderCodeApi, } from 'http/api/usercenter/seekorder' import uploadComponent from 'components/uploadComponent/index.vue' import previewImg from './previewImg/index.vue' @@ -94,8 +95,8 @@ const getList = async () => { queryParams.value.endTime = undefined } const res: any = await getOrderListApi(queryParams.value) - cardList.value = res.rows - total.value = res.total + cardList.value = res.data.rows + total.value = res.data.total } const emit = defineEmits(['onOpenOrderDetails']) @@ -157,25 +158,52 @@ const onAcceptOrders = (item: any) => { cancelButtonText: '取消', type: 'warning', }) - .then(() => { - return passApi({ orderId: item.orderId, orderStatus: 2 }) - // return removeDeviceApi([row.maId]) - }) - .then((res) => { - if (res.code === 200) { - ElMessage({ - type: 'success', - message: '接单成功', - duration: 1000, - }) - numberTemp.value = numberTemp.value + 1 - getList() + .then(async() => { + const passApiRes = await passApi({ orderId: item.orderId, orderStatus: 2 }); + // 检查 passApi 是否成功 + if (passApiRes && passApiRes.code === 200) { + // 如果 passApi 成功，调用 passApi（原代码中的 passApiTwo 可能是拼写错误） + const passApiTwoRes = await passApi({ orderId: item.orderId, orderStatus: 3 }); + if (passApiTwoRes && passApiTwoRes.code === 200) { + ElMessage({ + type: 'success', + message: '接单成功', + duration: 1000, + }); + numberTemp.value = numberTemp.value + 1; + getList(); + } } }) .catch(() => {}) } -// 出库按钮 + +//出库弹窗参数 +const dialogVisiblePickUpCodeOut = ref(false); +// 新增变量来存储取件码 +const pickUpCodeOut = ref(''); +const pickUpViewOut = (index: Number) => { + pickUpCodeForm.pickUpCode = ''; + dialogVisiblePickUpCodeOut.value = true; +}; +const pickUpCodeFormRef = ref() +//取件码表单校验规则 +const pickUpCodeRules = ref({ + pickUpCode: [ + { + required: true, + message: '请输入取件码', + trigger: 'blur', + }, + ], +}) +const pickUpCodeForm = reactive({ + pickUpCode: '', +}) + + +//出库按钮 const confirmPass = async (index: number) => { ElMessageBox.confirm('是否确定出库？', { confirmButtonText: '确定', @@ -200,17 +228,18 @@ const confirmPass = async (index: number) => { } // 驳回按钮 -const confirmFail = async (index: number) => { +const confirmFail = async (item: any) => { + // console.log(item.orderId, '-->>>') ElMessageBox.confirm('是否确定取消？', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', }) .then(() => { - return failApi({ orderId: cardList.value[index].orderId, orderStatus: 99 }) + return failApi({ orderId: item.orderId, orderStatus: 99 }) // return removeDeviceApi([row.maId]) }) - .then((res) => { + .then((res: any) => { if (res.code === 200) { ElMessage({ type: 'success', @@ -703,6 +732,19 @@ const downloadContract = () => { } const wordUrl = ref('') + +//取件码弹窗参数 +const dialogVisiblePickUpCode = ref(false); +// 新增变量来存储取件码 +const pickUpCode = ref(''); +const pickUpView = async(item: any) => { + console.log('item',item) + const res: any = await getOrderCodeApi({orderId:item.orderId}) + console.log('res',res) + pickUpCode.value = res.data + dialogVisiblePickUpCode.value = true; +}; +