From 931429dd692f30dd7735cba76f53368548423caa Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 13:44:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84=EF=BC=8CindexOld.vue=20?= =?UTF-8?q?=E4=B8=BA=E5=8E=9F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lessor/equipment/equipType/index.vue | 919 ++++++++---------- .../lessor/equipment/equipType/indexOld.vue | 635 ++++++++++++ 2 files changed, 1033 insertions(+), 521 deletions(-) create mode 100644 src/views/lessor/equipment/equipType/indexOld.vue diff --git a/src/views/lessor/equipment/equipType/index.vue b/src/views/lessor/equipment/equipType/index.vue index 59932a39..d39adf8c 100644 --- a/src/views/lessor/equipment/equipType/index.vue +++ b/src/views/lessor/equipment/equipType/index.vue @@ -1,585 +1,462 @@ diff --git a/src/views/lessor/equipment/equipType/indexOld.vue b/src/views/lessor/equipment/equipType/indexOld.vue new file mode 100644 index 00000000..394e6e84 --- /dev/null +++ b/src/views/lessor/equipment/equipType/indexOld.vue @@ -0,0 +1,635 @@ + + + + + From f912dc80164fd918d3e3849eab5983848f2da5b6 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 13:54:22 +0800 Subject: [PATCH 2/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 --- src/views/lessor/equipment/equipType/index.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/views/lessor/equipment/equipType/index.vue b/src/views/lessor/equipment/equipType/index.vue index d39adf8c..e778bb9a 100644 --- a/src/views/lessor/equipment/equipType/index.vue +++ b/src/views/lessor/equipment/equipType/index.vue @@ -70,7 +70,7 @@ - + - 批量修改租赁价 + + 批量修改租赁价 - + From 71bbf49885246e730d8c312f0d6a7c8f2b6fb3b5 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 15:01:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A3=85=E5=A4=87=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E6=9E=B6=20=E5=92=8C=20=E5=B7=A5=E5=85=B7=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E6=9E=B6=E5=A2=9E=E5=8A=A0=E7=A7=9F=E8=B5=81=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentUpOrDown/equipment/index.vue | 1297 +++++----- src/views/EquipmentUpOrDown/tool/index.vue | 2174 +++++++++-------- 2 files changed, 1855 insertions(+), 1616 deletions(-) diff --git a/src/views/EquipmentUpOrDown/equipment/index.vue b/src/views/EquipmentUpOrDown/equipment/index.vue index 774c0151..d321119d 100644 --- a/src/views/EquipmentUpOrDown/equipment/index.vue +++ b/src/views/EquipmentUpOrDown/equipment/index.vue @@ -1,683 +1,812 @@ diff --git a/src/views/EquipmentUpOrDown/tool/index.vue b/src/views/EquipmentUpOrDown/tool/index.vue index 160190ab..8dd29d99 100644 --- a/src/views/EquipmentUpOrDown/tool/index.vue +++ b/src/views/EquipmentUpOrDown/tool/index.vue @@ -1,881 +1,1203 @@ - - - - From ad01758eea1695956242ef5476b81aeeacc91bcc Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 15:05:33 +0800 Subject: [PATCH 4/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 --- src/views/EquipmentUpOrDown/tool/index.vue | 143 +++++++++++---------- 1 file changed, 77 insertions(+), 66 deletions(-) diff --git a/src/views/EquipmentUpOrDown/tool/index.vue b/src/views/EquipmentUpOrDown/tool/index.vue index 8dd29d99..4d0b88b8 100644 --- a/src/views/EquipmentUpOrDown/tool/index.vue +++ b/src/views/EquipmentUpOrDown/tool/index.vue @@ -91,53 +91,64 @@ 上架编码工具 - - - - - - - - - - - - +
+ + + + + + + + + + + + - - - - + + + + +
- +
+ +
@@ -1001,30 +1012,30 @@ export default { } .content-box { - // height: calc(100vh - 220px); - // border-radius: 8px; - // display: flex; - // flex-direction: column; - // overflow: hidden; + height: calc(100vh - 220px); + border-radius: 8px; + display: flex; + flex-direction: column; + overflow: hidden; - // ::v-deep .el-card__body { - // display: flex !important; - // flex-direction: column !important; - // height: 100% !important; - // padding: 20px; - // } + ::v-deep .el-card__body { + display: flex !important; + flex-direction: column !important; + height: 100% !important; + padding: 20px; + } - // .el-row:first-child { - // margin-bottom: 16px; - // flex-shrink: 0; + .el-row:first-child { + margin-bottom: 16px; + flex-shrink: 0; - // .el-col { - // display: flex; - // justify-content: flex-end; - // align-items: center; - // gap: 12px; - // } - // } + .el-col { + display: flex; + justify-content: flex-end; + align-items: center; + gap: 12px; + } + } .table-container { overflow: hidden; From f0ae9790ac4ae58faa6fa5eeee7f82eafbbae348 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Dec 2025 15:44:39 +0800 Subject: [PATCH 5/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 --- src/views/EquipmentUpOrDown/tool/index.vue | 317 +++++++++++++-------- 1 file changed, 200 insertions(+), 117 deletions(-) diff --git a/src/views/EquipmentUpOrDown/tool/index.vue b/src/views/EquipmentUpOrDown/tool/index.vue index 4d0b88b8..2778ba8f 100644 --- a/src/views/EquipmentUpOrDown/tool/index.vue +++ b/src/views/EquipmentUpOrDown/tool/index.vue @@ -110,7 +110,19 @@ - + + +