From 3a5652e51d19894ae4933c57e01c681509c5ae66 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 25 Nov 2024 13:14:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lessor/order/index.vue | 504 ++++++++++++++++++++++++------- 1 file changed, 395 insertions(+), 109 deletions(-) diff --git a/src/views/lessor/order/index.vue b/src/views/lessor/order/index.vue index df9f7cd5..95775a4a 100644 --- a/src/views/lessor/order/index.vue +++ b/src/views/lessor/order/index.vue @@ -1,19 +1,11 @@ @@ -172,10 +243,12 @@ keyWord:undefined, status:undefined, }, + //卡片集合 + cardList:[], }; }, created() { - // this.getList(); + this.getList(); }, methods: { /** 查询列表 */ @@ -188,11 +261,119 @@ this.queryParams.startTime=undefined this.queryParams.endTime=undefined } - getPurchaseList(this.queryParams).then(response => { - this.tableList = response.data.rows; - this.total = response.data.total; - this.loading = false; - }); + this.cardList = [ + { + company_name: '安徽博诺斯有限公司', + user_name: '王先生', + user_phone: '18725632356', + isChecked: false, + good_list: [ + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 1, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + + }, + ], + }, + { + company_name: '安徽博诺斯有限公司', + user_name: '王先生', + user_phone: '18725632356', + isChecked: false, + good_list: [ + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 0, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + }, + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 0, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + }, + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 0, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + }, + ], + }, + { + company_name: '安徽博诺斯有限公司', + user_name: '王先生', + user_phone: '18725632356', + isChecked: false, + good_list: [ + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 0, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + }, + { + goods_pic: + 'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1', + goods_name: 'W190挖掘机', + goods_code: '995221_JHL', + goods_type: '挖地型号996', + lease_date: '', + lease_pic: 300, + lease_day: 0, + goods_num: 0, + totalAmount: 0, + isChecked: false, + lease_date_string: '', + }, + ], + }, + ]; + + this.loading = false; }, /** 重置按钮操作 */ resetQuery() { @@ -262,4 +443,109 @@ display: none; } } + .app-container { + + .cart-title { + margin-top: 20px; + padding: 10px 0; + display: flex; + align-items: center; + font-size: 14px; + font-weight: bold; + letter-spacing: 1px; + } + + .cart-title div:first-child { + width: 5px; + height: 20px; + background-color: #4fabfe; + } + + .cart-th { + margin: 15px 0; + div { + text-align: center; + } + } + + .cart-tbody { + background: #fff; + padding: 8px 12px; + margin: 10px; + border: 1px solid #ccc; + border-radius: 20px; + .cart-user-info { + display: flex; + align-items: center; + font-size: 13px; + + .user-name, + .user-phone { + padding: 3px 18px; + border: 1px solid #ccc; + } + + .user-name { + margin-left: 20px; + border-right: none; + } + } + + .cart-list { + margin: 15px 0; + display: flex; + align-items: center; + font-size: 13px; + div { + text-align: center; + } + + .goods-info { + display: flex; + align-content: center; + + img { + width: 160px; + height: 100px; + } + + .goods-code { + margin-left: 10px; + display: flex; + flex-direction: column; + justify-content: space-around; + + div { + text-align: left; + } + } + } + + .lease-date { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + font-size: 12px; + } + + .red-font { + color: #ff4800; + font-weight: bold; + } + } + } + + .protocol-handle { + background: #fff; + padding: 8px 12px; + margin: 10px; + font-size: 13px; + + .checkbox-container a { + color: #ff4800; + text-decoration: underline; + } + } +} \ No newline at end of file From 3aca071d401f0f064ef5ef1d2206ec03f65e4f09 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 25 Nov 2024 14:31:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=87=BA=E7=A7=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lessor/order/index.vue | 43 +++++++++----------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/src/views/lessor/order/index.vue b/src/views/lessor/order/index.vue index 95775a4a..3f187f3e 100644 --- a/src/views/lessor/order/index.vue +++ b/src/views/lessor/order/index.vue @@ -145,41 +145,22 @@
{{ goods.goods_name }}
-
租期： {{ goods.goods_code }}
-
- 租金： - {{ goods.goods_type }}{{" "+"元/天"}} -
-
- 租金： - {{ goods.goods_type }}{{" "+"元/天"}} -
+
租期： {{ goods.lease_day }}
+
租金：{{ goods.lease_pic }}{{" "+"元/天"}}
+
数量：{{ goods.goods_num }}{{" "+"台"}}
- -
-
{{ goods.lease_date_string }}
- + +
总费用
+
1500
+ + +
租期
+
+ {{ "2024-10-11"+" " }}{{"至"}}{{ " "+"2024-10-11" }}
- -
- {{ goods.lease_pic }} -
- - -
- {{ goods.lease_day }} -
- - +
Date: Mon, 25 Nov 2024 16:45:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=87=BA=E7=A7=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lessor/order/detail.vue | 124 ++++++++++++++++++ src/views/lessor/order/index.vue | 101 +++++++------- .../material/purchase/goodsAccept/detail.vue | 2 +- 3 files changed, 181 insertions(+), 46 deletions(-) create mode 100644 src/views/lessor/order/detail.vue diff --git a/src/views/lessor/order/detail.vue b/src/views/lessor/order/detail.vue new file mode 100644 index 00000000..ab8ca620 --- /dev/null +++ b/src/views/lessor/order/detail.vue @@ -0,0 +1,124 @@ + + + + \ No newline at end of file diff --git a/src/views/lessor/order/index.vue b/src/views/lessor/order/index.vue index 3f187f3e..fd7029a7 100644 --- a/src/views/lessor/order/index.vue +++ b/src/views/lessor/order/index.vue @@ -107,6 +107,12 @@ {{ item.user_phone }}
+ +
+ 出库 + 驳回 +
+ @@ -139,7 +145,7 @@
- + @@ -150,39 +156,54 @@
数量：{{ goods.goods_num }}{{" "+"台"}}
 - +
总费用
1500
 - +
租期
{{ "2024-10-11"+" " }}{{"至"}}{{ " "+"2024-10-11" }}
- -
- + +
+ {{ "待出租"}}
- -
- {{ goods.goods_num * goods.lease_pic * goods.lease_day }} -
- - +
- 删除 + 订单详情 + + + 租赁协议 + + + 退租检修 + + + 费用结算
@@ -194,7 +215,7 @@