From cfaa20bd687b0620861bf08a0da57a788e428ea5 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Tue, 26 Nov 2024 13:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E7=A7=9F=E6=96=B9=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lessor/order/detail.vue | 55 ++- src/views/lessor/order/index.vue | 27 +- src/views/tenantry/order/detail.vue | 361 ++++++++++++++++++ src/views/tenantry/order/index.vue | 561 +++++++++++++++++++++------- 4 files changed, 857 insertions(+), 147 deletions(-) create mode 100644 src/views/tenantry/order/detail.vue diff --git a/src/views/lessor/order/detail.vue b/src/views/lessor/order/detail.vue index f162e8d4..13d72186 100644 --- a/src/views/lessor/order/detail.vue +++ b/src/views/lessor/order/detail.vue @@ -17,11 +17,11 @@ - - - - - + + + + + @@ -34,13 +34,17 @@ style="margin-top: 10px; display: flex; flex-wrap: wrap;" > -
+
订单编号：
-
+
下单时间：
+
+ +
+
出租单位：
@@ -72,7 +76,7 @@
- + @@ -158,6 +162,14 @@ export default { productionTime: undefined, }, cardList:[], + //描述信息 + operationDetails: { + 1: { title: '已出库', operator: '张三', date: '2024-10-10 10:00:00' }, + 2: { title: '已收货', operator: '李四', date: '2024-10-10 11:00:00' }, + 3: { title: '租赁结束', operator: '王五', date: '2024-10-10 12:00:00' }, + 4: { title: '已退租', operator: '赵六', date: '2024-10-10 13:00:00' }, + 5: { title: '已完成', operator: '钱七', date: '2024-10-10 14:00:00' }, + } }; }, mounted() { @@ -181,26 +193,37 @@ export default { // 根据步骤的 Id 返回对应的标题 getStepTitle(stepId) { - console.log("id",this.Id) if (this.Id === 1) { - this.titleStaus= stepId === 1 ? '待出库' : ''; + this.titleStaus= '待出库' ; return stepId === 1 ? '待出库' : ''; } else if (this.Id === 2) { - this.titleStaus= stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : ''; + this.titleStaus= '待收货' ; return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : ''; } else if (this.Id === 3) { - this.titleStaus= 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : ''; + this.titleStaus= '租赁中' ; return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : ''; } else if (this.Id === 4) { - this.titleStaus= 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : stepId === 4 ? '发起费用结算' : ''; - return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : stepId === 4 ? '发起费用结算' : ''; + this.titleStaus= '发起费用结算' ; + return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '发起费用结算' : ''; } else if (this.Id === 5) { - this.titleStaus= 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : stepId === 4 ? '发起费用结算' : stepId === 5 ? '已完成' : ''; - return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : stepId === 4 ? '发起费用结算' : stepId === 5 ? '已完成' : ''; + this.titleStaus= '已完成' ; + return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : ''; } + this.titleStaus='' return ''; // 默认返回空字符串 }, + // 根据步骤的 Id 返回对应的描述 + getDescription(desId){ + const operation = this.operationDetails[desId]; + if (operation) { + return ` + 操作人：${operation.operator}
+ 操作时间：${operation.date} + `; + } + return ''; // 默认返回空描述 + }, /** 查询列表 */ getList() { diff --git a/src/views/lessor/order/index.vue b/src/views/lessor/order/index.vue index 47d003ee..2cb2e512 100644 --- a/src/views/lessor/order/index.vue +++ b/src/views/lessor/order/index.vue @@ -211,7 +211,15 @@
+
+ + \ No newline at end of file diff --git a/src/views/tenantry/order/index.vue b/src/views/tenantry/order/index.vue index df9f7cd5..00b95d09 100644 --- a/src/views/tenantry/order/index.vue +++ b/src/views/tenantry/order/index.vue @@ -1,19 +1,11 @@