From bfa5f4c771d03829fe7d311e9a5c3e8aa9c46c0f Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 09:08:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                       |  12 +-
 src/views/user/index.vue              | 226 +++++++++++++-------------
 src/views/user/sourcingNeed/index.vue |  43 +++--
 3 files changed, 138 insertions(+), 143 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 6302769..f4b46fd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -8,34 +8,30 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
     EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 2237377..a244a57 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -1,20 +1,64 @@
 <script setup lang="ts">
-    import { useRouter } from 'vue-router'
-    import { useStore } from '../../store/user'
-    import { mainStore } from '../../store/main'
-    import { useRoute } from 'vue-router'
+import { useRouter } from 'vue-router'
+import { useStore } from '../../store/user'
+import { mainStore } from '../../store/main'
+import { useRoute } from 'vue-router'
 
-    const spaceTop = ref('')
-    const store = useStore()
-    const router = useRouter()
-    const route = useRoute()
+const spaceTop = ref('')
+const store = useStore()
+const router = useRouter()
+const route = useRoute()
 
-    const userInfo: any = computed(() => {
-        return mainStore().userInfo
-    })
+const userInfo: any = computed(() => {
+    return mainStore().userInfo
+})
 
-    // 求租按钮
-    const seekingRentClick = () => {
+// 求租按钮
+const seekingRentClick = () => {
+    store.editcurrentMenuItem('baseInfo')
+    store.editCurrentMenuType(true)
+    store.editcurrentMenuList([
+        { title: '基础信息', name: 'baseInfo' },
+        { title: '订单管理', name: 'orderManagement' },
+        { title: '子账号管理', name: 'subAccount' },
+        { title: '业务开通', name: 'business' },
+        { title: '寻源需求', name: 'sourcingNeed' },
+    ])
+    router.push({ name: 'baseInfo' })
+}
+
+// 承租按钮
+const lesseeClick = () => {
+    store.editcurrentMenuItem('orderManagementCz')
+    store.editCurrentMenuType(false)
+    store.editcurrentMenuList([
+        { title: '订单管理', name: 'orderManagementCz' },
+        { title: '商品管理', name: 'goodsManagement' },
+        { title: '商品上下架', name: 'goodsUpdown' },
+        { title: '机手管理', name: 'operatorManagement' },
+        { title: '寻源竞价', name: 'sourcingBidding' },
+        { title: '专区管理', name: 'zoneManag' },
+    ])
+    router.push({ name: 'orderManagementCz' })
+}
+
+const handleSelect = (name: any, path: any) => {
+    store.editcurrentMenuItem(name)
+}
+const activeMenuItem = computed(() => {
+    return store.currentMenuItem
+})
+
+const activeseekingRent = computed(() => {
+    return store.currentMenuType
+})
+
+const menuList = computed(() => {
+    return store.menuList
+})
+
+watch(route, (newVlaue) => {
+    if (newVlaue.path.indexOf('myuser') === -1) {
         store.editcurrentMenuItem('baseInfo')
         store.editCurrentMenuType(true)
         store.editcurrentMenuList([
@@ -22,60 +66,16 @@
             { title: '订单管理', name: 'orderManagement' },
             { title: '子账号管理', name: 'subAccount' },
             { title: '业务开通', name: 'business' },
-            { title: '寻源需求', name: 'sourcingNeed' }
         ])
-        router.push({ name: 'baseInfo' })
     }
+})
 
-    // 承租按钮
-    const lesseeClick = () => {
-        store.editcurrentMenuItem('orderManagementCz')
-        store.editCurrentMenuType(false)
-        store.editcurrentMenuList([
-            { title: '订单管理', name: 'orderManagementCz' },
-            { title: '商品管理', name: 'goodsManagement' },
-            { title: '商品上下架', name: 'goodsUpdown' },
-            { title: '机手管理', name: 'operatorManagement' },
-            { title: '寻源竞价', name: 'sourcingBidding' },
-            { title: '专区管理', name: 'zoneManag' }
-        ])
-        router.push({ name: 'orderManagementCz' })
-    }
-
-    const handleSelect = (name: any, path: any) => {
-        store.editcurrentMenuItem(name)
-    }
-    const activeMenuItem = computed(() => {
-        return store.currentMenuItem
-    })
-
-    const activeseekingRent = computed(() => {
-        return store.currentMenuType
-    })
-
-    const menuList = computed(() => {
-        return store.menuList
-    })
-
-    watch(route, (newVlaue) => {
-        if (newVlaue.path.indexOf('myuser') === -1) {
-            store.editcurrentMenuItem('baseInfo')
-            store.editCurrentMenuType(true)
-            store.editcurrentMenuList([
-                { title: '基础信息', name: 'baseInfo' },
-                { title: '订单管理', name: 'orderManagement' },
-                { title: '子账号管理', name: 'subAccount' },
-                { title: '业务开通', name: 'business' }
-            ])
-        }
-    })
-
-    onMounted(() => {
-        let divElement: any = document.getElementById('user-container')
-        let rect = divElement.getBoundingClientRect()
-        let top = rect.top + 20 + 'px'
-        spaceTop.value = top
-    })
+onMounted(() => {
+    let divElement: any = document.getElementById('user-container')
+    let rect = divElement.getBoundingClientRect()
+    let top = rect.top + 20 + 'px'
+    spaceTop.value = top
+})
 </script>
 
 <template>
@@ -88,16 +88,17 @@
                 <img
                     v-else
                     src="https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/2023/12/09/815629f192564db98ac55a643b46f853gouwu.png"
-                    alt="" />
+                    alt=""
+                />
                 <span>{{ userInfo.phonenumber || '' }}</span>
             </div>
 
             <div class="btn-box">
                 <span @click="seekingRentClick">
-                    <a :class="activeseekingRent ? 'active' : ''">求租</a>
+                    <a :class="activeseekingRent ? 'active' : ''">承租</a>
                 </span>
                 <span @click="lesseeClick">
-                    <a :class="!activeseekingRent ? 'active' : ''">承租</a>
+                    <a :class="!activeseekingRent ? 'active' : ''">出租</a>
                 </span>
             </div>
 
@@ -105,7 +106,8 @@
                 :default-active="activeMenuItem"
                 class="el-menu-vertical-demo"
                 router
-                @select="handleSelect">
+                @select="handleSelect"
+            >
                 <el-menu-item v-for="(item, index) in menuList" :key="index" :index="item.name">
                     {{ item.title }}
                 </el-menu-item>
@@ -118,60 +120,60 @@
 </template>
 
 <style lang="scss">
-    .app-container {
-        background-color: #fff;
-        display: flex;
-        justify-content: space-between;
-        height: calc(100vh - v-bind('spaceTop'));
+.app-container {
+    background-color: #fff;
+    display: flex;
+    justify-content: space-between;
+    height: calc(100vh - v-bind('spaceTop'));
 
-        .left-menu {
+    .left-menu {
+        width: 260px;
+        // height: 100%;
+        background-color: #f7f9fa;
+        border-radius: 5px;
+        margin-right: 15px;
+
+        .pic-box {
             width: 260px;
-            // height: 100%;
-            background-color: #f7f9fa;
-            border-radius: 5px;
-            margin-right: 15px;
+            height: 180px;
+            text-align: center;
 
-            .pic-box {
-                width: 260px;
-                height: 180px;
-                text-align: center;
-
-                img {
-                    margin: 30px 0 10px 0;
-                    width: 90px;
-                    height: 90px;
-                    border-radius: 50%;
-                }
-
-                span {
-                    display: block;
-                }
+            img {
+                margin: 30px 0 10px 0;
+                width: 90px;
+                height: 90px;
+                border-radius: 50%;
             }
-        }
-
-        .btn-box {
-            height: 45px;
-            display: flex;
 
             span {
-                height: 100%;
-                line-height: 45px;
-                flex: 1;
-                cursor: pointer;
-                text-align: center;
-                color: #82b8ff;
+                display: block;
             }
         }
+    }
 
-        .right-content {
-            width: calc(100% - 260px);
+    .btn-box {
+        height: 45px;
+        display: flex;
+
+        span {
             height: 100%;
-        }
-
-        .active {
-            color: #2282ff;
-            border-bottom: 2px solid #2282ff;
-            font-weight: bold;
+            line-height: 45px;
+            flex: 1;
+            cursor: pointer;
+            text-align: center;
+            color: #82b8ff;
         }
     }
+
+    .right-content {
+        width: calc(100% - 260px);
+        height: 100%;
+    }
+
+    .active {
+        color: #2282ff;
+        border-bottom: 2px solid #2282ff;
+        font-weight: bold;
+    }
+}
 </style>
diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue
index 35f9156..b173584 100644
--- a/src/views/user/sourcingNeed/index.vue
+++ b/src/views/user/sourcingNeed/index.vue
@@ -1,30 +1,26 @@
-<script setup lang="ts"></script>
-
 <template>
     <!-- 寻源需求 -->
-    <el-form :inline="true" size="small" label-width="auto">
-        <el-form-item label="寻源单编码：">
-            <el-input />
+    <el-form :inline="true" size="default" label-width="auto">
+        <el-form-item>
+            <el-input placeholder="请输入需求名称" />
         </el-form-item>
-        <el-form-item label="寻源单标题：">
-            <el-input />
+        <el-form-item>
+            <el-input placeholder="请输入需求编号" />
         </el-form-item>
-        <el-form-item label="寻源模板：">
-            <el-input />
+        <el-form-item>
+            <el-input placeholder="需求状态" />
         </el-form-item>
-        <el-form-item label="外部单号：">
-            <el-input />
+        <el-form-item>
+            <el-input placeholder="截止日期" />
         </el-form-item>
-        <el-form-item label="寻源类别：">
-            <el-input />
+        <el-form-item>
+            <el-input placeholder="发布时间" />
         </el-form-item>
-        <el-form-item label="状态：">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="寻源单编码：">
+
+        <el-form-item>
             <el-button>查询</el-button>
             <el-button>重置</el-button>
-            <el-button>寻源新增</el-button>
+            <el-button style="background-color: #17907f; color: #fff">需求新建</el-button>
         </el-form-item>
     </el-form>
 
@@ -32,10 +28,11 @@
     <el-table
         show-overflow-tooltip
         :header-cell-style="{
-            background: '#3E98FF',
-            color: '#fff'
-        }">
-        <el-table-column align="center" label="序号" type="index" />
+            background: '#17907f',
+            color: '#fff',
+        }"
+    >
+        <el-table-column align="center" label="序号" type="index" width="80" />
         <el-table-column align="center" label="寻源单编码" />
         <el-table-column align="center" label="外部单号" />
         <el-table-column align="center" label="寻源单标题" />
@@ -45,4 +42,4 @@
     </el-table>
 </template>
 
-<style></style>
+<script setup lang="ts"></script>

From a7facfd975eaf2f9d4202279ba42d5de88770895 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 09:17:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                        |   2 +-
 components.d.ts                          |  11 -
 src/views/user/index.vue                 |   1 +
 src/views/user/orderManagement/index.vue | 560 ++++++++++++-----------
 4 files changed, 297 insertions(+), 277 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index a606bd4..00e05c3 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -82,6 +82,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/components.d.ts b/components.d.ts
index acc6d37..f4b46fd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,19 +9,13 @@ declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
-<<<<<<< HEAD
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-=======
->>>>>>> main
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-<<<<<<< HEAD
     ElDialog: typeof import('element-plus/es')['ElDialog']
-=======
->>>>>>> main
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
@@ -29,7 +23,6 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-<<<<<<< HEAD
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
@@ -39,10 +32,6 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElUpload: typeof import('element-plus/es')['ElUpload']
-=======
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElRow: typeof import('element-plus/es')['ElRow']
->>>>>>> main
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
     EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index a244a57..2bc777c 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -168,6 +168,7 @@ onMounted(() => {
     .right-content {
         width: calc(100% - 260px);
         height: 100%;
+        overflow-y: auto;
     }
 
     .active {
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue
index 07ffa68..4bb9314 100644
--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@@ -1,32 +1,32 @@
 <script setup lang="ts">
-    import { ref } from 'vue'
-    import PagingComponent from 'components/PagingComponent/index.vue'
-    import { useRouter } from 'vue-router'
-    import { getOrderListApi } from 'http/api/usercenter/seekorder'
-    const queryParams = ref({})
-    const router = useRouter()
-    const pageSize = 10
-    const pageNumber = 1
-    const total: any = ref(0)
-    const cardList= ref<any>([])
-    const status = 0
-    // 获取数据列表
-    // const getList = async () => {
-    //     const res: any = await getOrderListApi()
-    //     console.log('获取数据列表***', res)
-    //     tableData.value = res.rows
-    //     total.value = res.total
+import { ref } from 'vue'
+import PagingComponent from 'components/PagingComponent/index.vue'
+import { useRouter } from 'vue-router'
+import { getOrderListApi } from 'http/api/usercenter/seekorder'
+const queryParams = ref({})
+const router = useRouter()
+const pageSize = 10
+const pageNumber = 1
+const total: any = ref(0)
+const cardList = ref<any>([])
+const status = 0
+// 获取数据列表
+// const getList = async () => {
+//     const res: any = await getOrderListApi()
+//     console.log('获取数据列表***', res)
+//     tableData.value = res.rows
+//     total.value = res.total
+// }
+/** 查询列表 */
+const getList = async () => {
+    // if(this.dateRange.length>0){
+    //     this.queryParams.startTime=this.dateRange[0]
+    //     this.queryParams.endTime=this.dateRange[1]
+    // }else{
+    //     this.queryParams.startTime=undefined
+    //     this.queryParams.endTime=undefined
     // }
-        /** 查询列表 */
-     const  getList = async()=> {
-            // if(this.dateRange.length>0){
-            //     this.queryParams.startTime=this.dateRange[0]
-            //     this.queryParams.endTime=this.dateRange[1]
-            // }else{
-            //     this.queryParams.startTime=undefined
-            //     this.queryParams.endTime=undefined
-            // }  
-        cardList.value = [
+    cardList.value = [
         {
             company_name: '安徽博诺斯有限公司',
             user_name: '王先生',
@@ -46,188 +46,188 @@
                     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: '',
-                      },
-                  ],
-              },
-        ];
-            total.value = cardList.value.length;
-            console.log(total.value)
-        }
+        },
+        {
+            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: '',
+                },
+            ],
+        },
+    ]
+    total.value = cardList.value.length
+    console.log(total.value)
+}
 
-    onMounted(() => {
-        getList()
+onMounted(() => {
+    getList()
+})
+
+// 查询按钮
+const queryTableList = () => {
+    getList()
+}
+
+const tableData = ref([])
+
+/* 退租按钮 */
+const clickRentingTermination = () => {
+    router.push({ name: 'rentinTermination' })
+    console.log('退租')
+}
+
+/* 查看按钮 */
+const clickPreviewDetails = (row: any) => {
+    console.log('查看', row)
+    router.push({
+        name: 'orderDetails',
+        query: {
+            orderId: row.orderId,
+        },
     })
+}
 
-    // 查询按钮
-    const queryTableList = () => {
-        getList()
-    }
+/* 续租按钮 */
+const clickRenewalOfLease = ({ row }: any) => {
+    console.log('续租', row)
+    router.push({
+        name: 'renewalOfLease',
+        query: {
+            orderId: row.orderId,
+        },
+    })
+}
 
-    const tableData = ref([])
+/* 确认收货 */
+const clickConfirmReceipt = (row: any) => {
+    console.log('确认收货')
+    router.push({
+        name: 'orderDetails',
+        query: {
+            orderId: row.orderId,
+            confirm: 'true',
+        },
+    })
+}
 
-    /* 退租按钮 */
-    const clickRentingTermination = () => {
-        router.push({ name: 'rentinTermination' })
-        console.log('退租')
-    }
-
-    /* 查看按钮 */
-    const clickPreviewDetails = (row: any) => {
-        console.log('查看', row)
-        router.push({
-            name: 'orderDetails',
-            query: {
-                orderId: row.orderId
-            }
-        })
-    }
-
-    /* 续租按钮 */
-    const clickRenewalOfLease = ({ row }: any) => {
-        console.log('续租', row)
-        router.push({
-            name: 'renewalOfLease',
-            query: {
-                orderId: row.orderId
-            }
-        })
-    }
-
-    /* 确认收货 */
-    const clickConfirmReceipt = (row: any) => {
-        console.log('确认收货')
-        router.push({
-            name: 'orderDetails',
-            query: {
-                orderId: row.orderId,
-                confirm: 'true'
-            }
-        })
-    }
-
-    const time = ref([])
+const time = ref([])
 </script>
 
 <template>
     <!-- 订单管理 -->
-<div class="container">
-    <el-form :model="queryParams" :inline="true" size="small">
-        <el-form-item label="订单编号：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="创建时间：" prop="menuName">
-            <el-date-picker
-                v-model="time"
-                type="daterange"
-                unlink-panels
-                range-separator="-"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                style="width: 180px" />
-        </el-form-item>
-        <el-form-item label="状态：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="装备类型：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="装备名称：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" @click="queryTableList">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-    </el-form>
+    <div class="container">
+        <el-form :model="queryParams" :inline="true" size="small">
+            <el-form-item label="订单编号：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="创建时间：" prop="menuName">
+                <el-date-picker
+                    v-model="time"
+                    type="daterange"
+                    unlink-panels
+                    range-separator="-"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    style="width: 180px"
+                />
+            </el-form-item>
+            <el-form-item label="状态：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="装备类型：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="装备名称：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="queryTableList">查询</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-    <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
+        <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
             <el-row style="border-bottom: 1px solid #ccc">
                 <el-col :span="1">
                     <div style="text-align: center">
@@ -239,53 +239,83 @@
                     </div>
                 </el-col>
                 <el-col :span="22">
-                  <el-row> 
-                    <el-col :span="7">
-                    <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span>订单编号:</span>
-                      {{ item.company_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                       <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-name">下单时间:</span>   
-                      {{ item.user_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                      <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-phone">装备所属公司:</span>
-                      {{ item.user_phone }}
-                    </div>   
-                    </el-col>
-                     <el-col :span="2">
-                      <div style="flex-shrink: 0;margin-bottom: 1px;font-size: 7px;">
-                          <el-button v-if="status==0" class="item" type="primary" size="small">出库</el-button>
-                          <el-button v-if="status==0" class="item" type="primary" size="small">驳回</el-button>
-                     </div>   
-                    </el-col>
-                  </el-row>
+                    <el-row>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>订单编号:</span>
+                                {{ item.company_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-name">下单时间:</span>
+                                {{ item.user_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="6">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-phone">装备所属公司:</span>
+                                {{ item.user_phone }}
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div style="flex-shrink: 0; margin-bottom: 1px; font-size: 7px">
+                                <el-button
+                                    v-if="status == 0"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    >出库</el-button
+                                >
+                                <el-button
+                                    v-if="status == 0"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    >驳回</el-button
+                                >
+                            </div>
+                        </el-col>
+                    </el-row>
 
-                  <el-row> 
-                    <el-col :span="7">
-                    <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span>出租方联系电话:</span>
-                      {{ item.company_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                       <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-name">承租方联系电话:</span>   
-                      {{ item.user_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                      <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-phone">承租方地址:</span>
-                      {{ item.user_phone }}
-                    </div>   
-                    </el-col>
-                  </el-row>
+                    <el-row>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>出租方联系电话:</span>
+                                {{ item.company_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-name">承租方联系电话:</span>
+                                {{ item.user_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-phone">承租方地址:</span>
+                                {{ item.user_phone }}
+                            </div>
+                        </el-col>
+                    </el-row>
                 </el-col>
             </el-row>
 
@@ -298,28 +328,30 @@
                 </el-col>
                 <el-col :span="8" class="goods-info">
                     <el-col :span="7">
-                     <img :src="goods.goods_pic" alt="" />
+                        <img :src="goods.goods_pic" alt="" />
                     </el-col>
                     <div class="goods-code">
                         <div style="font-size: 12px; font-weight: bold">{{ goods.goods_name }}</div>
-                        <div>租期： {{ goods.lease_day }}{{" "+"天"}}</div>
-                          <div>租金：{{ goods.lease_pic }}{{" "+"元/天"}}</div>
-                          <div>数量：{{ goods.goods_num }}{{" "+"台"}}</div>
+                        <div>租期： {{ goods.lease_day }}{{ ' ' + '天' }}</div>
+                        <div>租金：{{ goods.lease_pic }}{{ ' ' + '元/天' }}</div>
+                        <div>数量：{{ goods.goods_num }}{{ ' ' + '台' }}</div>
                     </div>
                 </el-col>
                 <el-col :span="2">
-                    <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">总费用</div>
-                        <div class="red-font">1500</div>
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
+                        总费用
+                    </div>
+                    <div class="red-font">1500</div>
                 </el-col>
                 <el-col :span="6">
-                  <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">租期</div>
-                    <div  style="color:black;font-weight: bold;">
-                        {{ "2024-10-11"+" " }}{{"至"}}{{ " "+"2024-10-11" }}
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
+                    <div style="color: black; font-weight: bold">
+                        {{ '2024-10-11' + ' ' }}{{ '至' }}{{ ' ' + '2024-10-11' }}
                     </div>
                 </el-col>
                 <el-col :span="2">
-                    <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">
-                        {{ "待出租"}}
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
+                        {{ '待出租' }}
                     </div>
                 </el-col>
                 <el-col :span="3">
@@ -359,20 +391,18 @@
                     </div>
                 </el-col>
             </el-row>
-        <PagingComponent
-        @getList="getList"
-        :pageSize="pageSize"
-        :pageNumber="pageNumber"
-        :total="total" /> 
+            <PagingComponent
+                @getList="getList"
+                :pageSize="pageSize"
+                :pageNumber="pageNumber"
+                :total="total"
+            />
         </div>
-
-
-</div>
+    </div>
 </template>
 
 <style lang="scss" scoped>
-
-  .container {
+.container {
     width: 800px;
     margin: 0 auto;
     padding: 10px;
@@ -480,5 +510,5 @@
             text-decoration: underline;
         }
     }
-}    
+}
 </style>