From 73e45a720a99c1155bbbbaeb105a97a8009f9026 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 16:20:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/leaseholder/address-manage/index.vue | 34 ++----------- .../components/order-details.vue | 51 ++++++++++++++----- .../components/order-details.vue | 51 ++++++++++++++----- 3 files changed, 83 insertions(+), 53 deletions(-) diff --git a/src/views/user/leaseholder/address-manage/index.vue b/src/views/user/leaseholder/address-manage/index.vue index e267ede..7e1ddf8 100644 --- a/src/views/user/leaseholder/address-manage/index.vue +++ b/src/views/user/leaseholder/address-manage/index.vue @@ -82,6 +82,7 @@ isRepublish = true dialogTitle = '新增收货地址' addOrEditDialogVisible = true + delete addOrEditForm?.id } " type="primary" @@ -294,13 +295,6 @@ const areaCityList = ref([]) const areaCountyList = ref([]) const searchParams = reactive({ - leaseName: '', - leaseCode: '', - leaseStatus: '', - finishStartTime: '', - finishEndTime: '', - publishStartTime: '', - publishEndTime: '', pageSize: 10, pageNum: 1, }) @@ -321,15 +315,7 @@ const addOrEditFormRules = reactive({ // 获取列表 const getLeaseListData = async () => { - if (endTime.value.length > 0) { - searchParams.finishStartTime = endTime.value[0] - searchParams.finishEndTime = endTime.value[1] - } - if (releaseTime.value.length > 0) { - searchParams.publishStartTime = releaseTime.value[0] - searchParams.publishEndTime = releaseTime.value[1] - } - const res: any = await getAddressListApi({}) + const res: any = await getAddressListApi(searchParams) console.log(res, '地址--') leaseList.value = res.rows total.value = res.total @@ -341,18 +327,7 @@ const getAreaData = async () => { } // 重置 -const onReset = () => { - endTime.value = [] - releaseTime.value = [] - searchParams.finishStartTime = '' - searchParams.finishEndTime = '' - searchParams.publishStartTime = '' - searchParams.publishEndTime = '' - searchParams.pageNum = 1 - searchParams.pageSize = 10 - searchFormRef.value.resetFields() - getLeaseListData() -} +const onReset = () => {} // 删除 const onDelete = async (id: any) => { const res: any = await deleteLeaseInfoApi({ id }) @@ -367,12 +342,13 @@ const onDelete = async (id: any) => { // 重新发布 const onRepublish = async (row: any) => { dialogTitle.value = '编辑收货地址' - const { areaCode, address, cityCode, provinceCode } = row + const { areaCode, address, cityCode, provinceCode, id } = row Object.assign(addOrEditForm.value, { areaCode, address, cityCode, provinceCode, + id, }) Promise.all([onProvinceChange(provinceCode), onCityChange(cityCode)]).then(() => { diff --git a/src/views/user/orderManagement/components/order-details.vue b/src/views/user/orderManagement/components/order-details.vue index 54d79e7..5147391 100644 --- a/src/views/user/orderManagement/components/order-details.vue +++ b/src/views/user/orderManagement/components/order-details.vue @@ -290,6 +290,32 @@ const isOrderCompleteTwo = (goods: any) => { {{ orderDetails.address }} + + + 接单人： + + {{ orderDetails.receivingUser }} + + + + 接单时间： + + {{ orderDetails.receivingTime }} + + + + + + 出库人： + {{ orderDetails.preOutboundUser }} + + + 出库时间： + + {{ orderDetails.preOutboundTime }} + + + -
+ + +
{{ goods.deviceName }} - + 租期: @@ -412,7 +439,7 @@ const isOrderCompleteTwo = (goods: any) => { flex-direction: column; " > -
{ {{ orderDetails.address }} + + + 接单人： + + {{ orderDetails.receivingUser }} + + + + 接单时间： + + {{ orderDetails.receivingTime }} + + + + + + 出库人： + {{ orderDetails.preOutboundUser }} + + + 出库时间： + + {{ orderDetails.preOutboundTime }} + + + -
+ +
{{ goods.deviceName }} - + 租期 : @@ -416,7 +443,7 @@ const isOrderCompleteTwo = (goods: any) => { flex-direction: column; " > -
Date: Wed, 12 Mar 2025 14:51:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/index.vue | 11 +++++++++++ src/layout/header.vue | 10 ++++++++++ .../model-components/left-three-model.vue | 15 ++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/components/header/index.vue b/src/components/header/index.vue index ac0ee54..0b7cff1 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -240,6 +240,13 @@ const resetPhone = async () => { }) } +// 数据大屏 +const onJumpScreen = () => { + router.push({ + name: 'big-screen', + }) +} + onMounted(() => { // 有token才请求用户信息 if (store.token) { @@ -296,6 +303,10 @@ onMounted(() => { 消息
+
+ 数据大屏 +
+
qx4NM7xbTJ!@6z_qT6#0OF diff --git a/src/views/big-screen/model-components/center-model.vue b/src/views/big-screen/model-components/center-model.vue index e1f812a..f8bde3a 100644 --- a/src/views/big-screen/model-components/center-model.vue +++ b/src/views/big-screen/model-components/center-model.vue @@ -1,7 +1,10 @@