diff --git a/src/http/api/usercenter/seekorder.ts b/src/http/api/usercenter/seekorder.ts
index 6a7a9f2..dbed1b0 100644
--- a/src/http/api/usercenter/seekorder.ts
+++ b/src/http/api/usercenter/seekorder.ts
@@ -11,3 +11,13 @@ export const getOrderListApi = (data: any) => {
 export const getOrderListInfoApi = (data: any) => {
     return get('/material-mall/order/getOrderDetailsById',data)
 }
+
+//出库
+export const passApi = (data: any) => {
+    return post('/material-mall/order/updateOrderStatus',data)
+}
+
+//驳回
+export const failApi = (data: any) => {
+    return post('/material-mall/order/updateOrderStatus',data)
+}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 5cca330..7703969 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -216,7 +216,7 @@ const routes: Array<RouteRecordRaw> = [
                 },
             },
 
-            /* 订单管理（求租方） */
+            /* 订单管理（承租方） */
             {
                 path: 'orderManagement',
                 name: 'orderManagement',
@@ -228,7 +228,31 @@ const routes: Array<RouteRecordRaw> = [
                     isLogin: true
                 },
             },
-            /* 订单管理（订单详情） */
+            /* 订单管理（出租方） */
+                {
+                    path: 'orderManagementBuy',
+                    name: 'orderManagementBuy',
+                    component: () => import('@/views/user/orderManagementCz/index.vue'),
+                    meta: {
+                        title: '订单管理（求租）',
+                        keepAlive: true,
+                        AuthFlag: false,
+                        isLogin: true
+                    },
+                },
+            /* 订单管理（订单详情出租） */
+            {
+                path: 'orderManagementInfoBuy',
+                name: 'orderManagementInfoBuy',
+                component: () => import('@/views/user/orderManagementCz/detail.vue'),
+                meta: {
+                    title: '订单详情',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: false
+                },
+            },
+            /* 订单管理（订单详情承租） */
             {
                 path: 'orderManagementInfo',
                 name: 'orderManagementInfo',
diff --git a/src/store/user.ts b/src/store/user.ts
index e8e1c8b..1e9f1c3 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -26,20 +26,20 @@ export const useStore = defineStore('myUser', {
             leaseAndLesseeList: [],
             leaseAndLesseeUserList: [
                 { title: '订单管理', name: 'orderManagementCz' },
-                { title: '商品管理', name: 'goodsManagement' },
-                { title: '商品上下架', name: 'goodsUpdown' },
-                { title: '机手管理', name: 'operatorManagement' },
-                { title: '寻源竞价', name: 'sourcingBidding' },
-                { title: '专区管理', name: 'zoneManag' },
+                { title: '装备管理', name: 'goodsManagement' },
+                // { title: '商品上下架', name: 'goodsUpdown' },
+                // { title: '机手管理', name: 'operatorManagement' },
+                // { title: '寻源竞价', name: 'sourcingBidding' },
+                // { title: '专区管理', name: 'zoneManag' },
             ],
             isType: 1,
             leaseUserList: [
                 { title: '订单管理', name: 'orderManagementCz' },
-                { title: '商品管理', name: 'goodsManagement' },
-                { title: '商品上下架', name: 'goodsUpdown' },
-                { title: '机手管理', name: 'operatorManagement' },
-                { title: '寻源竞价', name: 'sourcingBidding' },
-                { title: '专区管理', name: 'zoneManag' },
+                { title: '装备管理管理', name: 'goodsManagement' },
+                // { title: '商品上下架', name: 'goodsUpdown' },
+                // { title: '机手管理', name: 'operatorManagement' },
+                // { title: '寻源竞价', name: 'sourcingBidding' },
+                // { title: '专区管理', name: 'zoneManag' },
             ],
             lesseeUserList: [
                 { title: '寻源需求', name: 'sourcingNeed' },
@@ -144,11 +144,11 @@ export const useStore = defineStore('myUser', {
         editUserMenuList(type: number) {
             const leaseList: any = [
                 { title: '订单管理', name: 'orderManagementCz' },
-                { title: '商品管理', name: 'goodsManagement' },
-                { title: '商品上下架', name: 'goodsUpdown' },
-                { title: '机手管理', name: 'operatorManagement' },
-                { title: '寻源竞价', name: 'sourcingBidding' },
-                { title: '专区管理', name: 'zoneManag' },
+                { title: '装备管理', name: 'goodsManagement' },
+                // { title: '商品上下架', name: 'goodsUpdown' },
+                // { title: '机手管理', name: 'operatorManagement' },
+                // { title: '寻源竞价', name: 'sourcingBidding' },
+                // { title: '专区管理', name: 'zoneManag' },
             ]
             const lesseeList: any = [
                 { title: '寻源需求', name: 'sourcingNeed' },
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 5973d99..b99be84 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -198,6 +198,7 @@ const getOrderListData = async () => {
     orderList.value.forEach((e: any) => {
         e.isChecked = false;
         e.goods_num = 1;
+        e.lease_day = 1;
         // e.devInfoVoList.forEach((j: any) => {
         //     j.isChecked = false
         // })
@@ -208,13 +209,16 @@ const getOrderListData = async () => {
 }
 
 onMounted(() => {
-    getOrderListData()
+    setTimeout(()=>{
+        getOrderListData()
+    },500)
+    
 })
 
 // 日期change事件
 const onLeaseDateChange = (e: any, item: any) => {
     item.lease_date_string = `${e[0]}至${e[1]}`
-    item.lease_day = moment(e[1]).diff(e[0], 'day')
+    item.lease_day = moment(e[1]).diff(e[0], 'day') 
 }
 
 // 删除按钮
@@ -300,6 +304,15 @@ const onCartSubmit = async () => {
         })
         return
     }
+    console.log(amountDeviceList.value[0].lease_date==undefined)
+    if (amountDeviceList.value[0].lease_date==undefined) {
+        ElMessage({
+            showClose: false,
+            message: '请选择租期',
+            type: 'error',
+        })
+        return
+    }
     if (!protocolChecked.value) {
         ElMessage({
             showClose: false,
@@ -308,6 +321,8 @@ const onCartSubmit = async () => {
         })
         return
     }
+    
+    
     console.log('提交订单')
     // 组装参数
     const detailsList = amountDeviceList.value.map((e: any) => {
@@ -328,7 +343,7 @@ const onCartSubmit = async () => {
         cost: orderAmountPice.value,
         detailsList,
     }
-
+    console.log('submitParams',submitParams)
     const res: any = await submitBookCarApi(submitParams)
     if (res.code === 200) {
         ElMessage({
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 5346403..52fc9e1 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -469,7 +469,7 @@
                         message: '保存成功'
                     })
                     dialogFormVisibleSettlein.value = false
-                    ruleFormRef.value.resetField()
+                    // ruleFormRef.value.resetField()
                     getList()
                 }
             }
@@ -504,7 +504,7 @@
                 message: '保存成功'
             })
             dialogFormVisibleSettlein.value = false
-            ruleFormRef.value.resetField()
+            // ruleFormRef.value.resetField()
             getList()
         }
     }
@@ -775,12 +775,12 @@
 
     <!-- 装备弹框 -->
     <el-dialog v-model="dialogFormVisibleSettlein" :title="settleinTitle"
-        width="60%" align-center :close-on-click-modal="false" :before-close="handleClose">
+        width="65%" align-center :close-on-click-modal="false" :before-close="handleClose">
         <el-row :gutter="10" class="mb8" style="display: flex;align-items: center;">
             <el-button type="" @click="closeDialogBtn">
                 关 闭
             </el-button>
-            <el-button type="warning" @click="saveTemp">
+            <el-button type="warning" @click="saveTemp" v-if="!equipmentDeploymentParams.maStatus||equipmentDeploymentParams.maStatus==0">
                 草 稿
             </el-button>
             <el-button type="primary" @click="submitBtn" v-if="!disabledForm || isEditDisabled" >
@@ -868,7 +868,7 @@
                     <el-date-picker
                         v-model="equipmentDeploymentParams.productionDate"
                         placeholder="请选择出厂日期"
-                        value-format="yyyy-MM-dd"
+                        value-format="YYYY-MM-DD"
                         type="date"  style="width: 350px;">
                     </el-date-picker>
                 </el-form-item>
@@ -1026,13 +1026,13 @@
                     <img class="picture-card" :src="item.fileUrl" alt="">
                     <div class="icon-list">
                         <span class="imgItem__icon hide" @click="handleDownload(item)">
-                            <i class="el-icon-download"/>
+                            <el-icon :size="20"><Download /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="picturePreview(item)">
-                            <i class="el-icon-zoom-in"/>
+                            <el-icon :size="20"><ZoomIn /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="handleRemove(mainFileList,index)">
-                            <i class="el-icon-delete"/>
+                            <el-icon :size="20"><Delete /></el-icon>
                         </span>
                     </div>
                     <p class="file-name">{{ item.fileName }}</p>
@@ -1064,13 +1064,13 @@
                     <img class="picture-card" :src="item.fileUrl" alt="">
                     <div class="icon-list">
                         <span class="imgItem__icon hide" @click="handleDownload(item)">
-                            <i class="el-icon-download"/>
+                            <el-icon :size="20"><Download /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="picturePreview(item)">
-                            <i class="el-icon-zoom-in"/>
+                            <el-icon :size="20"><ZoomIn /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="handleRemove(detailsFileList,index)">
-                            <i class="el-icon-delete"/>
+                            <el-icon :size="20"><Delete /></el-icon>
                         </span>
                     </div>
                     <p class="file-name">{{ item.fileName }}</p>
@@ -1106,13 +1106,13 @@
                     <img class="picture-card" :src="item.fileUrl" alt="">
                     <div class="icon-list">
                         <span class="imgItem__icon hide" @click="handleDownload(item)">
-                            <i class="el-icon-download"/>
+                            <el-icon :size="20"><Download /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="picturePreview(item)">
-                            <i class="el-icon-zoom-in"/>
+                            <el-icon :size="20"><ZoomIn /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="handleRemove(insurancePdf,index)">
-                            <i class="el-icon-delete"/>
+                            <el-icon :size="20"><Delete /></el-icon>
                         </span>
                     </div>
                     <p class="file-name">{{ item.fileName }}</p>
@@ -1141,13 +1141,13 @@
                     <img class="picture-card" :src="item.fileUrl" alt="">
                     <div class="icon-list">
                         <span class="imgItem__icon hide" @click="handleDownload(item)">
-                            <i class="el-icon-download"/>
+                            <el-icon :size="20"><Download /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="picturePreview(item)">
-                            <i class="el-icon-zoom-in"/>
+                            <el-icon :size="20"><ZoomIn /></el-icon>
                         </span>
                         <span class="imgItem__icon hide" @click="handleRemove(examinationPdf,index)">
-                            <i class="el-icon-delete"/>
+                            <el-icon :size="20"><Delete /></el-icon>
                         </span>
                     </div>
                     <p class="file-name">{{ item.fileName }}</p>
@@ -1167,7 +1167,7 @@
 
     <!-- 图片查看弹窗 -->
     <el-dialog v-model="dialogVisible" width="500px" height="500px">
-        <img width="100%" height="500px" :src="dialogImageUrl" />
+        <img width="500" height="500" :src="dialogImageUrl" alt="description" >
     </el-dialog>
 
 </template>
@@ -1205,36 +1205,41 @@
         margin-bottom: 20px;
     }
     .imgsBox{
-        width: auto;
+        width: 100%;
         height: auto;
         display: flex;
+        flex-wrap: wrap;
         align-items: center;
         margin-bottom: 30px;
         margin-left: 20px;
 
         .imgItem{
-            width: 160px;
-            height: 160px;
-            margin-right: 40px;
+            width: 150px;
+            height: 150px;
+            margin-right: 20px;
+            margin-bottom: 30px;
             border: 1px dashed #bbb;
             position: relative;
             .picture-card{
-                width: 160px;
-                height: 160px;
+                width: 150px;
+                height: 150px;
             }
             .icon-list{
                 width: 60px;height: 20px;
                 position: absolute;
                 top: 70px;
-                left: 40px;
+                left: 30px;
                 display: flex;
                 align-items: center;
             }
             .imgItem__icon{
                 margin: 0 5px;
+                cursor: pointer;
             }
             .file-name{
                 font-size: 10px;
+                width: 100%;
+                word-break: break-all;
             }
         }
 
diff --git a/src/views/user/orderManagement/detail.vue b/src/views/user/orderManagement/detail.vue
index 3c9dfd6..8eef986 100644
--- a/src/views/user/orderManagement/detail.vue
+++ b/src/views/user/orderManagement/detail.vue
@@ -6,39 +6,62 @@ import { getOrderListInfoApi } from 'http/api/usercenter/seekorder'
 const route = useRoute()
 /* 查询参数 */
 const cardList = ref<any>({})
-const orderStatusTemp = ref<Number>(0)
+const orderStatusTemp = ref<number>(0)
 const idTemp = ref<string>('')
 const titleStaus = ref<any>('')
-// 获取数据列表
-// const getList = async () => {
-//     const res: any = await getOrderListApi()
-//     console.log('获取数据列表***', res)
-//     tableData.value = res.rows
-//     total.value = res.total
-// }
-
+//描述信息
+const  operationDetails = ref<any>({
+            1: { title: '已出库', preOutboundUser: '', preOutboundTime: '' },
+            2: { title: '已收货', takeOverUser: '', takeOverTime: '' },
+            3: { title: '租赁结束', rentOverUser: '', rentOverTime: '' },
+        })
   // 根据步骤的 Id 返回对应的标题
 const  getStepTitle = (stepId:number)=> {
-        if (orderStatusTemp.value === 1) {
+        if (orderStatusTemp.value === 2) {
           titleStaus.value=  '待出库' ;
           return stepId === 1 ? '待出库' : '';
-        } else if (orderStatusTemp.value === 2) {
+        } else if (orderStatusTemp.value === 3) {
           titleStaus.value=  '待收货' ;
           return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : '';
-        } else if (orderStatusTemp.value === 3) {
+        } else if (orderStatusTemp.value === 4) {
           titleStaus.value=  '租赁中' ;
           return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : '';
-        } else if (orderStatusTemp.value === 4) {
-          titleStaus.value=  '发起费用结算' ;
-          return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '发起费用结算' : '';
         } else if (orderStatusTemp.value === 5) {
+          titleStaus.value=  '已退租' ;
+          return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : '';
+        } else if (orderStatusTemp.value === 6) {
           titleStaus.value= '已完成' ;
           return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : '';
+        } else if(orderStatusTemp.value === 7) {
+          titleStaus.value= '已驳回' ;
+          return stepId === 1 ? '已驳回' : '';
         }
         titleStaus.value=''
         return ''; // 默认返回空字符串
       }
 
+  // 根据步骤的 Id 返回对应的描述
+  const  getDescription=(desId:number)=>{
+    const operation = operationDetails.value[desId];
+        if (operation.title=="已出库" && titleStaus.value!=  "待出库" ) {
+            return `
+                操作人：${operation.preOutboundUser==null ?  ' ': operation.preOutboundUser}
+                操作时间：${operation.preOutboundTime==null ?  ' ': operation.preOutboundTime}
+            `;
+        }else if(operation.title=="已收货"  && titleStaus.value!=  "待收货" && titleStaus.value!=  "待出库"){
+            return `
+                操作人：${operation.takeOverUser==null ?  ' ': operation.takeOverUser}
+                操作时间：${operation.takeOverTime==null ?  ' ': operation.takeOverTime}
+            `;
+        }else if(operation.title=="租赁结束"  && (titleStaus.value!=  "待收货" && titleStaus.value!=  "待出库" && titleStaus.value!=  "租赁中")){
+            return `
+                操作人：${operation.rentOverUser==null ?  ' ': operation.rentOverUser}
+                操作时间：${operation.rentOverTime==null ?  ' ': operation.rentOverTime}
+            `;
+        }
+        return ''; // 默认返回空描述
+    }
+
 const getId = ()=>{
     orderStatusTemp.value = Number(route.query.orderStatusTemp)
     idTemp.value = String(route.query.idTemp)
@@ -52,6 +75,13 @@ const getList = async () => {
 
      const res: any = await getOrderListInfoApi(params)
     cardList.value = res.data
+    operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser
+    operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime
+    operationDetails.value[2].takeOverUser = res.data.detailsList[0].takeOverUser
+    operationDetails.value[2].takeOverTime = res.data.detailsList[0].takeOverTime
+    operationDetails.value[3].rentOverUser = res.data.detailsList[0].rentOverUser
+    operationDetails.value[3].rentOverTime = res.data.detailsList[0].rentOverTime
+
 }
 
 onBeforeMount(()=>{
@@ -70,7 +100,7 @@ const time = ref([])
     <!-- 订单管理 -->
     <div class="container">
       <el-breadcrumb separator="/">
-      <el-breadcrumb-item :to="{ path: '/myuser/orderManagement' }">订单管理</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/my-user/orderManagement' }">订单管理</el-breadcrumb-item>
       <el-breadcrumb-item>订单明细</el-breadcrumb-item>
       </el-breadcrumb>
       <div class="section">
@@ -85,12 +115,12 @@ const time = ref([])
           </el-row>
         </el-header> 
 
-         <el-steps class="step" :space="400" :active="orderStatusTemp.value" finish-status="success">
-            <el-step :title="getStepTitle(1)" ></el-step>
-            <el-step :title="getStepTitle(2)" ></el-step>
-            <el-step :title="getStepTitle(3)" ></el-step>
+         <el-steps class="step" :space="400" :active="orderStatusTemp===7 ? 1 : orderStatusTemp-1" finish-status="success">
+            <el-step :title="getStepTitle(1)" :description="getDescription(1)"></el-step>
+            <el-step :title="getStepTitle(2)" :description="getDescription(2)"></el-step>
+            <el-step :title="getStepTitle(3)" :description="getDescription(3)"></el-step>
             <el-step :title="getStepTitle(4)" ></el-step>
-            <el-step :title="getStepTitle(5)" :finish-status="orderStatusTemp.value >= 5 ? 'success' : ''"></el-step>
+            <el-step :title="getStepTitle(5)" ></el-step>
         </el-steps>
       </div>
 
@@ -179,8 +209,9 @@ const time = ref([])
                     <div v-if="goods.orderStatus=='4'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"租赁中"}}</div>
                     <div v-if="goods.orderStatus=='5'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已退租"}}</div>
                     <div v-if="goods.orderStatus=='6'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已完成"}}</div>
+                    <div v-if="goods.orderStatus=='7'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已驳回"}}</div>
                 </el-col>
-                 <el-col :span="3">
+                 <!-- <el-col :span="3">
                     <div>
                         <el-button
                             @click="handleViewOrder(j)"
@@ -199,7 +230,7 @@ const time = ref([])
                             驳回
                         </el-button>
                     </div>
-                </el-col> 
+                </el-col>  -->
             </el-row>
           </div> 
 
@@ -210,7 +241,7 @@ const time = ref([])
 <style lang="scss" scoped>
 
 .container {
-    width: 800px;
+    // width: 800px;
     margin: 0 auto;
     padding: 10px;
     // background: #eeeff6;
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue
index 002e458..302134b 100644
--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@@ -2,11 +2,12 @@
 import { ref } from 'vue'
 import PagingComponent from 'components/PagingComponent/index.vue'
 import { useRouter } from 'vue-router'
-import { getOrderListApi } from 'http/api/usercenter/seekorder'
+import { getOrderListApi,passApi } from 'http/api/usercenter/seekorder'
 import uploadComponent from 'components/uploadComponent/index.vue'
 import previewImg from './previewImg/index.vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage,ElMessageBox } from 'element-plus'
 import { useStore } from 'store/user'
+import type { FormInstance } from 'element-plus'
 const store = useStore()
 import { mainStore } from 'store/main'
 const store2 = mainStore()
@@ -18,40 +19,51 @@ const queryParams: any = ref({
     companyName: '',
     lowerBound: '',
     upperBound: '',
-    pageSize: 10,
+    pageSize: 20,
     pageNum: 1,
     startTime: '',
     endTime: '',
 })
+const queryFormRef = ref<FormInstance>()
+const numberTemp = ref<number>(0)
 const time = ref([])
 const router = useRouter()
-const pageSize = 10
+const pageSize = 20
 const pageNumber = 1
 const total: any = ref(0)
 const cardList = ref<any>([])
 const status = 0
 const statusList = [
-    { id: '0', name: '未下单' },
-    { id: '1', name: '已下单' },
     { id: '2', name: '待出库' },
-    { id: '3', name: '已出库' },
+    { id: '3', name: '待收货' },
     { id: '4', name: '租赁中' },
     { id: '5', name: '已退租' },
-    { id: '5', name: '已完成' },
+    { id: '6', name: '已完成' },
+    { id: '7', name: '已驳回' },
 ]
-// 获取数据列表
-// const getList = async () => {
-//     const res: any = await getOrderListApi()
-//     console.log('获取数据列表***', res)
-//     tableData.value = res.rows
-//     total.value = res.total
+
+// const dateTimeConvert=(param:string)=>{
+//         const time = param;
+//         // 创建一个新的Date对象
+//         const dateStart = new Date(time);
+        
+//         // 获取年、月和日
+//         const year = dateStart.getUTCFullYear();
+//         const month = (dateStart.getUTCMonth() + 1).toString().padStart(2, '0'); // 月份从0开始，需要加1
+//         const day = dateStart.getUTCDate().toString().padStart(2, '0');
+//         // 拼接成年月日格式
+//         const dateString = `${year}-${month}-${day}`
+//         return dateString;
 // }
+
+
 /** 查询列表 */
 const getList = async () => {
     if (time.value.length > 0) {
-        console.log('time', time)
-        queryParams.value.startTime = time.value[0]
-        queryParams.value.endTime = time.value[1]
+        const dateStart = new Date(time.value[0]);
+        const dateEnd = new Date(time.value[1]);
+        queryParams.value.startTime = dateStart.toLocaleDateString('en-CA')
+        queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA')
     } else {
         queryParams.value.startTime = undefined
         queryParams.value.endTime = undefined
@@ -75,205 +87,119 @@ onMounted(() => {
 
 // 查询按钮
 const queryTableList = () => {
+    queryParams.value.pageNum=1
     getList()
 }
 
-/* 退租按钮 */
-const clickRentingTermination = () => {
-    router.push({ name: 'rentinTermination' })
-    console.log('退租')
+// 重置
+const resetTableList = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    time.value = []
+    queryTableList()
 }
 
-/* 查看按钮 */
-const clickPreviewDetails = (row: any) => {
-    console.log('查看', row)
-    router.push({
-        name: 'orderDetails',
-        query: {
-            orderId: row.orderId,
-        },
+// 全选事件
+const onChangeCompany = (e: boolean, index: number, item: any) => {
+    cardList.value[index].detailsList.forEach((item:any)=>{
+        if(item.orderStatus=="3"){
+            item.isChecked = e;
+        }
     })
 }
 
-/* 续租按钮 */
-const clickRenewalOfLease = ({ row }: any) => {
-    console.log('续租', row)
-    router.push({
-        name: 'renewalOfLease',
-        query: {
-            orderId: row.orderId,
-        },
-    })
+// 单选事件
+const onChangeGoods = (index: number) => {
+    let flag = true;
+    for (let item of cardList.value[index].detailsList) {
+        if (item.orderStatus == "3" && item.isChecked != true) {
+            flag = false;
+            break; 
+        }
+    }
+    console.log('2222222',cardList.value[index])
+    cardList.value[index].isChecked = flag;
 }
 
-/* 确认收货 */
-const clickConfirmReceipt = (row: any) => {
-    console.log('确认收货')
-    router.push({
-        name: 'orderDetails',
-        query: {
-            orderId: row.orderId,
-            confirm: 'true',
-        },
+// 确认收获按钮
+    const confirmReceipt = async (index: number) => {
+        let ids: number[] = [];
+    cardList.value[index].detailsList.forEach((item:any)=>{
+        if(item.orderStatus=="3"&&item.isChecked==true){
+            ids.push(item.id)
+        }
     })
+    if(ids.length==0){
+        ElMessage({
+            showClose: false,
+            message: '请选择装备',
+            type: 'error',
+        })
+        return
+    }else{
+        ElMessageBox.confirm('是否确定收获？', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }).then(() => {
+           return passApi({'ids':ids,'orderStatus':4})
+        }).then((res) => {
+            if (res.code === 200) {
+            ElMessage({
+                type: 'success',
+                message: '确定收获成功'
+            })
+            numberTemp.value = numberTemp.value+1;
+            getList()
+            }
+        }).catch(() => {})
+    }
+    }
+
+
+// 计算是否过期
+const isExpired=(goods:any)=> {
+      // 获取当前日期并去掉时间部分
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+
+      // 将endtime转为Date对象
+      const endTime = new Date(goods.rentEndTime.replace(/-/g, "/"));
+
+      // 判断endtime是否早于今天
+      return endTime < today;
 }
 
 const settleinTitle = ref('')
 /* 编辑 **********/
 const isEditDisabled = ref(false)
-// 退租检修弹框显示隐藏
-const dialogFormVisibleSettlein: any = ref(false)
-const equipmentDeploymentParams: any = ref({
-    /* 设备名称 */
-    deviceName: '',
-    deviceTypeList: [],
-    deviceCount: 1,
-    unitName: '',
-    code: '',
-    brand: '',
-    typeId: '',
-    companyId: '',
-    productionDate: '',
-    dayLeasePrice: '',
-    person: '',
-    personPhone: '',
-    deviceWeight: '',
-})
 
-const mainFileList: any = ref([]) //检测文件1
-const detailsFileList: any = ref([]) //检测文件2
 //图片查看弹窗
 const dialogVisible: any = ref(false)
 const dialogImageUrl = ref('')
-//上传
-const upload: any = ref({
-    // 设置上传的请求头部
-    headers: { Authorization: 'Bearer ' + store2.token },
-    // 上传的地址
-    url: import.meta.env.VITE_API_URL + '/file/upload',
-})
-// 文件上传前处理-上传大小
-const beforeUpload = (file: any) => {
-    if (file.size / 1024 / 1024 > 2) {
-        ElMessage({
-            type: 'error',
-            message: '上传文件大小不能超过2M!',
-        })
-        // this.$message.error({ message: `上传文件大小不能超过2M!`,});
-        return false
-    }
-}
-// 文件上传失败
-const uploadError = () => {
-    ElMessage({
-        type: 'error',
-        message: '上传文件失败!',
-    })
-    // this.$message.error({message: `上传文件失败!`});
-}
-// 文件上传成功处理
-const handleFileSuccess = (response: any) => {
-    if (response.code == 200) {
-        let obj = {
-            // modelId:this.maId,
-            fileName: response.data.name.split('/')[4],
-            fileUrl: response.data.url,
-        }
-        console.log(obj)
-        mainFileList.value.push(obj)
+
+// 发起退租
+const handleViewBack = async (index: Number, row: any) => {
+     let ids: number[] = [];
+     ids.push(row.id)
+    ElMessageBox.confirm('是否确定发起退租？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        return passApi({'ids':ids,'orderStatus':5})
+    }).then((res) => {
+        if (res.code === 200) {
         ElMessage({
             type: 'success',
-            message: '上传成功！',
+            message: '发起退租成功'
         })
-        console.log(mainFileList.value)
-    }
+        numberTemp.value = numberTemp.value+1;
+        getList()
+        }
+    }).catch(() => {})
 }
 
-// 文件上传成功处理
-const handleFileSuccess2 = (response: any) => {
-    if (response.code == 200) {
-        let obj = {
-            // modelId:this.maId,
-            fileName: response.data.name.split('/')[4],
-            fileUrl: response.data.url,
-        }
-        console.log(obj)
-        detailsFileList.value.push(obj)
-        ElMessage({
-            type: 'success',
-            message: '上传成功！',
-        })
-        console.log(detailsFileList.value)
-    }
-}
-//退租检修
-    const handleViewBack = () => {
-        settleinTitle.value = '退租检修'
-        isEditDisabled.value = true
-        equipmentDeploymentParams.value = {
-            /* 企业Id */
-            // ownCo: mainStore().userInfo.companyId,
-            /* 租赁范围 */
-            leaseScope: '',
-            /* 设备所在地 */
-            location: '',
-            /* 省 */
-            provinceId: '',
-            /* 市 */
-            cityId: '',
-            /* 区 */
-            areaId: '',
-            /* 设备所在地 省 */
-            addressEconomize: '',
-            /* 设备所在地 市 */
-            addressProvince: '',
-            /* 设备所在地 区 */
-            addressArea: '',
-            /* 设备类型 */
-            typeId: '',
-            /* 设备类型大类 */
-            deviceType: '',
-            /* 设备类型子类 */
-            deviceTypeSon: '',
-            /* 设备类型小类*/
-            deviceTypeSun: '',
-            /* 设备品牌 */
-            brand: '',
-            /* 设备型号 */
-            modelName: '',
-            /* 出场日期 */
-            productionDate: '',
-            /* 工作小时数 */
-            workingHours: '',
-            /* 整机序列号 */
-            serialNumber: '',
-            /* 月租金 */
-            monthLeasePrice: '',
-            /* 日租金 */
-            dayLeasePrice: '',
-            /* 是否提供机手 */
-            isOperator: '',
-            /* 机手月费用 */
-            jsMonthPrice: '',
-            /* 机手日费用 */
-            jsDayPrice: '',
-            /* 详细说明 */
-            description: '',
-            /* 设备主图片 */
-            picUrl: '',
-            /* 检测信息 ，保险信息*/
-            fileList: [],
-            /* 设备状态 */
-            maStatus: 15,
-            detectionList: [],
-            insureList: [],
-            picList: []
-        }
-        // 打开退组检修弹框
-        dialogFormVisibleSettlein.value = true
-    }
-
-const settlemoneyTitle = ref('')
 const moneyParams1: any = ref({
     /* 设备名称 */
     deviceName: '',
@@ -281,59 +207,80 @@ const moneyParams1: any = ref({
     deviceCount: 1,
     unitName: '',
 })
-const moneyParams2: any = ref({
-    /* 设备名称 */
-    deviceName: '',
-    deviceTypeList: [],
-    deviceCount: 1,
-    unitName: '',
-})
-const moneyParams3: any = ref({
-    /* 设备名称 */
-    deviceName: '',
-    deviceTypeList: [],
-    deviceCount: 1,
-    unitName: '',
-})
-const tableData: any = ref([
+const settleListTitle = ref('')
+// 费用清单弹框显示隐藏
+const dialogFormVisibleSettleList: any = ref(false)
+const tableData1: any = ref([
    {
     name1:'测试1',
     name2:'测试1-1',
-    name3:'测试1-2',
-    jy1:'外观1-1',
-    jy2:'故障1-2',
-    jy3:'外观1-2',
-    jy4:'故障1-2',
-    jy5:'外观1-3',
-    jy6:'故障1-3',
-    jy7:'',
-    jy8:'',
-    remark:'备注1',
+    name3:'3台',
+    jy1:'100',
+    jy2:'31',
+    jy3:'2024-11-25 至2024-12-25',
+    jy4:'1600',
    },
     {
     name1:'测试2',
     name2:'测试2-1',
-    name3:'测试2-2',
-    jy1:'外观2-1',
-    jy2:'故障2-2',
-    jy3:'外观2-2',
-    jy4:'故障2-2',
-    jy5:'外观2-3',
-    jy6:'故障2-3',
-    jy7:'',
-    jy8:'',
-    remark:'备注2',
+    name3:'3台',
+    jy1:'100',
+    jy2:'31',
+    jy3:'2024-11-25 至2024-12-25',
+    jy4:'1600',
    }
 ])
-
-const partItems1: any = ref([{}])
-const partItems2: any = ref([{}])
-const partItems3: any = ref([{}])
-// 费用结算弹框显示隐藏
-const dialogFormVisibleSettlemoney: any = ref(false)
-//费用结算
-    const handleViewMoney = () => {
-        settlemoneyTitle.value = '费用结算'
+const tableData2: any = ref([
+   {
+    name1:'测试2',
+    name2:'测试2-1',
+    name3:'3台',
+    jy1:'类型1',
+    jy2:'维修中',
+    jy3:'1500',
+   },
+    {
+    name1:'测试2',
+    name2:'测试2-2',
+    name3:'3台',
+    jy1:'类型2',
+    jy2:'维修中',
+    jy3:'1500',
+   }
+])
+const tableData3: any = ref([
+   {
+    name1:'测试3',
+    name2:'测试3-1',
+    name3:'3台',
+    jy1:'轻度维修',
+    jy2:'1400',
+   },
+    {
+    name1:'测试3',
+    name2:'测试3-2',
+    name3:'3台',
+    jy1:'轻度维修',
+    jy2:'1400',
+   }
+])
+const tableData4: any = ref([
+   {
+    name1:'测试4',
+    name2:'测试4-1',
+    name3:'3台',
+    jy1:'1400',
+   },
+    {
+    name1:'测试4',
+    name2:'测试4-2',
+    name3:'3台',
+    jy1:'1400',
+   }
+])
+//费用清单
+    const handleViewList = () => {
+        settleListTitle.value = '费用清单'
         moneyParams1.value = {
             /* 设备状态 */
             maStatus: 15,
@@ -341,58 +288,8 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             insureList: [],
             picList: []
         }
-        moneyParams2.value = {
-            /* 设备状态 */
-            maStatus: 15,
-            detectionList: [],
-            insureList: [],
-            picList: []
-        }
-        moneyParams3.value = {
-            /* 设备状态 */
-            maStatus: 15,
-            detectionList: [],
-            insureList: [],
-            picList: []
-        }
-        // 打开退组检修弹框
-        dialogFormVisibleSettlemoney.value = true
-    }
-
-    //维修费用
- const  addPartItem1=()=> {
-      partItems1.value.push({ partType: "", num: "", isCharge: "" });
-    }
- const  removePartItem1 =(index:number)=> {
-      if (partItems1.value.length > 1) {
-        partItems1.value.splice(index, 1);
-      }
-    }
-
-    //报废费用
- const  addPartItem2=()=> {
-      partItems2.value.push({ partType: "", num: "", isCharge: "" });
-    }
- const  removePartItem2 =(index:number)=> {
-      if (partItems2.value.length > 1) {
-        partItems2.value.splice(index, 1);
-      }
-    }
-
-        //报废费用 修改
-
-
-         //报废费用 修改
-
-          //报废费用 修改
-           //报废费用 修改
- const  addPartItem3=()=> {
-      partItems3.value.push({ partType: "", num: "", isCharge: "" });
-    }
- const  removePartItem3 =(index:number)=> {
-      if (partItems3.value.length > 1) {
-        partItems3.value.splice(index, 1);
-      }
+        // 打开费用清单弹框
+        dialogFormVisibleSettleList.value = true
     }
 
 </script>
@@ -400,7 +297,7 @@ const dialogFormVisibleSettlemoney: any = ref(false)
 <template>
     <!-- 订单管理 -->
     <div class="container">
-        <el-form :model="queryParams" :inline="true" size="default" label-width="0">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" size="default" label-width="0">
             <el-row>
                 <el-col :span="6">
                     <el-form-item prop="deviceName">
@@ -487,68 +384,10 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                 <el-col :span="12">
                     <el-form-item>
                         <el-button type="primary" @click="queryTableList">查询</el-button>
-                        <el-button @click="resetQuery">重置</el-button>
+                        <el-button @click="resetTableList(queryFormRef)">重置</el-button>
                     </el-form-item>
                 </el-col>
             </el-row>
-            <!-- <el-form-item label="装备名称：" prop="deviceName">
-                <el-input v-model.trim="queryParams.deviceName" style="width: 160px" clearable />
-            </el-form-item>
-            <el-form-item prop="dateRange">
-                <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="orderStatus">
-                <el-select
-                    v-model="queryParams.orderStatus"
-                    placeholder="请选择订单状态"
-                    style="width: 120px"
-                    clearable
-                >
-                    <el-option
-                        v-for="item in statusList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="出租单位：" prop="czcompanyName">
-                <el-input
-                    v-model.trim="queryParams.czcompanyName"
-                    clearable
-                    maxlength="20"
-                    style="width: 160px"
-                />
-            </el-form-item>
-            <el-form-item label="承租单位：" prop="companyName">
-                <el-input
-                    v-model.trim="queryParams.companyName"
-                    clearable
-                    maxlength="20"
-                    style="width: 160px"
-                />
-            </el-form-item>
-            <el-form-item prop="lowerBound">
-                <span
-                    style="
-                        display: flex;
-                        justify-content: center;
-                        width: 20px;
-                        text-align: center;
-                        margin-left: 25px;
-                    "
-                    >——</span
-                >
-            </el-form-item>
-            <el-form-item prop="upperBound"> </el-form-item> -->
         </el-form>
 
         <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
@@ -556,6 +395,7 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                 <el-col :span="1">
                     <div style="text-align: center">
                         <el-checkbox
+                            :key="numberTemp"
                             v-model="item.isChecked"
                             @change="onChangeCompany($event, index, item)"
                         >
@@ -594,18 +434,12 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                         <el-col :span="4">
                             <div style="flex-shrink: 0; margin-bottom: 1px; font-size: 7px">
                                 <el-button
-                                    v-if="status == 0"
+                                    v-if="item.czOrderStatus == '3'"
                                     class="item"
                                     type="primary"
                                     size="small"
-                                    >出库</el-button
-                                >
-                                <el-button
-                                    v-if="status == 0"
-                                    class="item"
-                                    type="primary"
-                                    size="small"
-                                    >驳回</el-button
+                                    @click="confirmReceipt(index)"
+                                    >确认收货</el-button
                                 >
                             </div>
                         </el-col>
@@ -646,7 +480,7 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             <el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j">
                 <el-col :span="1">
                     <div style="text-align: center">
-                        <el-checkbox v-model="goods.isChecked" @change="onChangeGoods(index)">
+                        <el-checkbox  :key="numberTemp" v-model="goods.isChecked" @change="onChangeGoods(index)" :disabled="goods.orderStatus!='3'">
                         </el-checkbox>
                     </div>
                 </el-col>
@@ -676,18 +510,6 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                     <div style="color: black; font-weight: bold">{{ goods.rentEndTime }}</div>
                 </el-col>
                 <el-col :span="2">
-                    <div
-                        v-if="goods.orderStatus == '0'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
-                    >
-                        {{ '未下单' }}
-                    </div>
-                    <div
-                        v-if="goods.orderStatus == '1'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
-                    >
-                        {{ '已下单' }}
-                    </div>
                     <div
                         v-if="goods.orderStatus == '2'"
                         style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
@@ -696,28 +518,41 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                     </div>
                     <div
                         v-if="goods.orderStatus == '3'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C76F60"
                     >
                         {{ '待收货' }}
                     </div>
                     <div
-                        v-if="goods.orderStatus == '4'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
+                        v-if="goods.orderStatus == '4' && isExpired(goods)"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06"
+                    >
+                        {{ '租赁中' }}
+                        <span style="color: red">(已过期)</span>
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '4' && !isExpired(goods)"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06"
                     >
                         {{ '租赁中' }}
                     </div>
                     <div
                         v-if="goods.orderStatus == '5'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #5B33CC"
                     >
                         {{ '已退租' }}
                     </div>
                     <div
                         v-if="goods.orderStatus == '6'"
-                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C00017"
                     >
                         {{ '已完成' }}
                     </div>
+                    <div
+                        v-if="goods.orderStatus == '7'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #797979"
+                    >
+                        {{ '已驳回' }}
+                    </div>
                 </el-col>
                 <el-col :span="3">
                     <div>
@@ -738,20 +573,22 @@ const dialogFormVisibleSettlemoney: any = ref(false)
                             租赁协议
                         </el-button>
                         <el-button
-                            @click="handleViewBack(j)"
+                            v-if="goods.orderStatus=='4'"
+                            @click="handleViewBack(j,item.detailsList[j])"
                             type="text"
                             size="mini"
                             style="color: #blue; font-weight: bold"
                         >
-                            退租检修
+                            发起退租
                         </el-button>
-                        <el-button
-                            @click="handleViewMoney(j)"
+                         <el-button
+                            v-if="goods.orderStatus=='6'"
+                            @click="handleViewList(j)"
                             type="text"
                             size="mini"
                             style="color: #blue; font-weight: bold"
                         >
-                            费用结算
+                            费用清单
                         </el-button>
                     </div>
                 </el-col>
@@ -764,279 +601,15 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             :total="total"
         />
 
-        <!-- 退租检修弹框 -->
-        <el-dialog
-            v-model="dialogFormVisibleSettlein"
-            :title="settleinTitle"
-            width="60%"
-            align-center
-            :close-on-click-modal="false"
-        >
-            <div style="height: 80px">
-                <div
-                    class="info"
-                    style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
-                >
-                    <div
-                        class="item"
-                        style="
-                            width: 30%;
-                            flex-shrink: 0;
-                            margin-bottom: 5px;
-                            font-size: 16px;
-                            margin-left: 40px;
-                        "
-                    >
-                        <span>订单编号：10000212135656</span>
-                    </div>
-
-                    <div
-                        class="item"
-                        style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
-                    >
-                        <span>装备套数：2套</span>
-                    </div>
-
-                    <div
-                        class="item"
-                        style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
-                    >
-                        <span>退租时间：2024-10-10 10:00:00</span>
-                    </div>
-                </div>
-                <div
-                    class="item"
-                    style="
-                        width: 30%;
-                        flex-shrink: 0;
-                        margin-bottom: 12px;
-                        font-size: 16px;
-                        margin-left: 80px;
-                    "
-                >
-                    <span>装备名称：挖掘机</span>
-                </div>
-
-                <div class="info" style="margin-top: 5px; display: flex; flex-wrap: wrap">
-                    <div
-                        class="item"
-                        style="
-                            width: 30%;
-                            flex-shrink: 0;
-                            margin-bottom: 5px;
-                            font-size: 16px;
-                            margin-left: 80px;
-                        "
-                    >
-                        <span>装备编码：10000212135656</span>
-                    </div>
-                    <div
-                        class="item"
-                        style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
-                    >
-                        <span>型号：ZJO9777466</span>
-                    </div>
-
-                    <div
-                        class="item"
-                        style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
-                    >
-                        <span>数量：3</span>
-                    </div>
-                </div>
-            </div>
-            <div class="title">
-                <span class="title-sign"></span>
-                <span class="title-text">外观检测</span>
-            </div>
-            <el-form label-width="160" ref="ruleFormRef" :model="equipmentDeploymentParams">
-                <el-row>
-                    <el-form-item label="是否合格：" prop="pass">
-                        <el-select
-                            v-model="equipmentDeploymentParams.pass"
-                            placeholder="请选择是否合格"
-                            clearable
-                            style="width: 350px"
-                        >
-                            <el-option label="是" value="0"></el-option>
-                            <el-option label="否" value="1"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="费用：" prop="fy">
-                        <el-input
-                            v-model="equipmentDeploymentParams.fy"
-                            placeholder="请输入设备数量"
-                            clearable
-                            maxlength="20"
-                            style="width: 350px"
-                        />
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="备注：" prop="remark1">
-                        <el-input
-                            placeholder="请输入"
-                            autocomplete="off"
-                            style="width: 860px"
-                            maxlength="50"
-                            v-model="equipmentDeploymentParams.remark1"
-                            clearable
-                        />
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <div class="uploadBox">
-                <div class="labelBox">
-                    <div style="margin-left: 40px">
-                        <span style="font-size: 14px">检验文件: </span>
-                    </div>
-                    <div style="margin-left: 20px">
-                        <el-upload
-                            ref="upload"
-                            :limit="6"
-                            :headers="upload.headers"
-                            :action="upload.url"
-                            :show-file-list="false"
-                            accept=".png, .jpg, .jpeg"
-                            :on-success="handleFileSuccess"
-                            :auto-upload="true"
-                            :before-upload="beforeUpload"
-                            :on-error="uploadError"
-                        >
-                            <el-button icon="el-icon-folder-add">上传文件</el-button>
-                        </el-upload>
-                    </div>
-                    <div style="color: #999; font-size: 12px; margin-left: 20px">
-                        支持格式：.jpg .png，单个文件大小不能超过2M
-                    </div>
-                </div>
-                <div class="imgsBox">
-                    <div class="imgItem" v-for="(item, index) in mainFileList" :key="index">
-                        <img class="picture-card" :src="item.fileUrl" alt="" />
-                        <div class="icon-list">
-                            <span class="imgItem__icon hide" @click="handleDownload(item)">
-                                <i class="el-icon-download" />
-                            </span>
-                            <span class="imgItem__icon hide" @click="picturePreview(item)">
-                                <i class="el-icon-zoom-in" />
-                            </span>
-                            <span
-                                class="imgItem__icon hide"
-                                @click="handleRemove(mainFileList, index)"
-                            >
-                                <i class="el-icon-delete" />
-                            </span>
-                        </div>
-                        <p class="file-name">{{ item.fileName }}</p>
-                    </div>
-                </div>
-                <div class="tipBox">*注:图片排序为平台展示顺序，不得少于1张，不得多于6张</div>
-            </div>
-            <div class="title">
-                <span class="title-sign"></span>
-                <span class="title-text">维修内容</span>
-            </div>
-            <el-form label-width="160" ref="ruleFormRef" :model="equipmentDeploymentParams">
-                <el-row>
-                    <el-form-item label="是否合格：" prop="pass2">
-                        <el-select
-                            v-model="equipmentDeploymentParams.pass2"
-                            placeholder="请选择是否合格"
-                            clearable
-                            style="width: 350px"
-                        >
-                            <el-option label="是" value="0"></el-option>
-                            <el-option label="否" value="1"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="费用：" prop="fy2">
-                        <el-input
-                            v-model="equipmentDeploymentParams.fy2"
-                            placeholder="请输入设备数量"
-                            clearable
-                            maxlength="20"
-                            style="width: 350px"
-                        />
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="备注：" prop="remark2">
-                        <el-input
-                            placeholder="请输入"
-                            autocomplete="off"
-                            style="width: 860px"
-                            maxlength="50"
-                            v-model="equipmentDeploymentParams.remark2"
-                            clearable
-                        />
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <div class="uploadBox">
-                <div class="labelBox">
-                    <div style="margin-left: 40px">
-                        <span style="font-size: 14px">检验文件: </span>
-                    </div>
-                    <div style="margin-left: 20px">
-                        <el-upload
-                            ref="upload2"
-                            :limit="6"
-                            :headers="upload.headers"
-                            :action="upload.url"
-                            :show-file-list="false"
-                            accept=".png, .jpg, .jpeg"
-                            :on-success="handleFileSuccess2"
-                            :auto-upload="true"
-                            :before-upload="beforeUpload"
-                            :on-error="uploadError"
-                        >
-                            <el-button icon="el-icon-folder-add">上传文件</el-button>
-                        </el-upload>
-                    </div>
-                    <div style="color: #999; font-size: 12px; margin-left: 20px">
-                        支持格式：.jpg .png，单个文件大小不能超过2M
-                    </div>
-                </div>
-                <div class="imgsBox">
-                    <div class="imgItem" v-for="(item, index) in detailsFileList" :key="index">
-                        <img class="picture-card" :src="item.fileUrl" alt="" />
-                        <div class="icon-list">
-                            <span class="imgItem__icon hide" @click="handleDownload(item)">
-                                <i class="el-icon-download" />
-                            </span>
-                            <span class="imgItem__icon hide" @click="picturePreview(item)">
-                                <i class="el-icon-zoom-in" />
-                            </span>
-                            <span
-                                class="imgItem__icon hide"
-                                @click="handleRemove(detailsFileList, index)"
-                            >
-                                <i class="el-icon-delete" />
-                            </span>
-                        </div>
-                        <p class="file-name">{{ item.fileName }}</p>
-                    </div>
-                </div>
-                <div class="tipBox">*注:图片排序为平台展示顺序，不得少于1张，不得多于6张</div>
-            </div>
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
-                    <el-button @click="submitBtn" type="success"> 保存 </el-button>
-                </span>
-            </template>
-        </el-dialog>
     </div>
-
-    <!-- 费用结算弹框 -->
-    <el-dialog
-        v-model="dialogFormVisibleSettlemoney"
-        :title="settlemoneyTitle"
+    <!-- 费用清单弹框 -->
+    <el-dialog         
+        v-model="dialogFormVisibleSettleList"
+        :title="settleListTitle"
         width="60%"
         align-center
-        :close-on-click-modal="false"
-    >
-        <div style="height: 80px">
+        :close-on-click-modal="false">
+         <div style="height: 80px">
             <div
                 class="info"
                 style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
@@ -1097,249 +670,83 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             </div>
             <div class="title">
                 <span class="title-sign"></span>
-                <span class="title-text">退租检测信息</span>
+                <span class="title-text">租赁费用明细</span>
             </div>
         </div>
-        <!-- 表格 -->
+         <!-- 表格 -->
         <el-table
-            :data="tableData"
+            :data="tableData1"
             class="table"
             style="margin-left: 50px; width: 1100px"
             row-key="id"
             show-overflow-tooltip
             :header-cell-style="{ background: 'white', color: 'black' }"
         >
-            <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
-            <el-table-column align="center" prop="name1" label="机具名称" />
-            <el-table-column align="center" prop="name2" label="规格型号" />
-            <el-table-column align="center" prop="name3" label="装备编码" />
-            <el-table-column align="center" prop="typeName" label="检验内容">
-                <el-table-column label="外观检验" align="center" prop="jy1" />
-                <el-table-column label="故障检验" align="center" prop="jy2" />
-            </el-table-column>
-            <el-table-column align="center" prop="typeName" label="维修内容">
-                <el-table-column label="外观检验" align="center" prop="jy3" />
-                <el-table-column label="故障检验" align="center" prop="jy4" />
-            </el-table-column>
-            <el-table-column align="center" prop="typeName" label="金额">
-                <el-table-column label="外观检验" align="center" prop="jy5" />
-                <el-table-column label="故障检验" align="center" prop="jy6" />
-            </el-table-column>
-            <el-table-column align="center" prop="typeName" label="附件">
-                <el-table-column label="外观检验" align="center" prop="jy7" />
-                <el-table-column label="故障检验" align="center" prop="jy8" />
-            </el-table-column>
-            <el-table-column align="center" label="备注" prop="remark" width="80px">
-            </el-table-column>
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="数量" />
+            <el-table-column label="租赁单价(元/日)" align="center" prop="jy1" />
+            <el-table-column label="租赁天数" align="center" prop="jy2" />
+            <el-table-column label="租期" align="center" prop="jy3" />
+            <el-table-column label="租期费用" align="center" prop="jy4" />
         </el-table>
         <div class="title">
             <span class="title-sign"></span>
-            <span class="title-text">费用结算</span>
+            <span class="title-text">维修费用明细</span>
         </div>
-        <div>
-            <span style="color: #ff9900; margin-left: 100px">● </span>
-            <span class="title-text">维修费用</span>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData2"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="维修数量" />
+            <el-table-column label="维修类型" align="center" prop="jy1" />
+            <el-table-column label="维修状态" align="center" prop="jy2" />
+            <el-table-column label="维修费用（元）" align="center" prop="jy3" />
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">报废费用明细</span>
         </div>
-        <el-form label-width="240" ref="ruleFormRef2" :model="moneyParams1">
-            <div v-for="(item, index) in partItems1" :key="index" class="dynamic-item">
-                <div
-                    style="
-                        margin-top: 10px;
-                        margin-left: 180px;
-                        margin-bottom: 5px;
-                        font-size: 18px;
-                    "
-                >
-                    设备：{{ index + 1 }}
-                </div>
-                <el-row>
-                    <el-form-item label="关联装备" prop="partType">
-                        <el-select
-                            v-model="item.device"
-                            placeholder="请选择"
-                            clearable
-                            style="width: 300px"
-                        >
-                            <el-option label="设备1" value="0"></el-option>
-                            <el-option label="设备2" value="1"></el-option>
-                            <el-option label="设备3" value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="维修数量" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="维修费用" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="维修类型" prop="isCharge">
-                        <el-select
-                            v-model="item.isCharge"
-                            placeholder="请选择"
-                            filterable
-                            clearable
-                            style="width: 300px"
-                        >
-                            <el-option label="维修类型1" value="0"></el-option>
-                            <el-option label="维修类型2" value="1"></el-option>
-                            <el-option label="维修类型3" value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <div style="margin-left: 130px">
-                        <el-button @click="addPartItem1" type="success"> 增加维修设备</el-button>
-                        <el-button @click="removePartItem1(index)" v-if="index != 0" type="danger">
-                            删除维修设备</el-button
-                        >
-                    </div>
-                </el-row>
-            </div>
-        </el-form>
-
-        <div style="margin-top: 10px">
-            <span style="color: #ff9900; margin-left: 100px">● </span>
-            <span class="title-text">报废费用</span>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData3"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="报废数量" />
+            <el-table-column label="报废原因" align="center" prop="jy1" />
+            <el-table-column label="报废费用（元）" align="center" prop="jy2" />
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">丢失费用明细</span>
         </div>
-        <el-form label-width="240" ref="ruleFormRef3" :model="moneyParams2">
-            <div v-for="(item, index) in partItems2" :key="index" class="dynamic-item">
-                <div
-                    style="
-                        margin-top: 10px;
-                        margin-left: 180px;
-                        margin-bottom: 5px;
-                        font-size: 18px;
-                    "
-                >
-                    设备：{{ index + 1 }}
-                </div>
-                <el-row>
-                    <el-form-item label="关联装备" prop="partType">
-                        <el-select
-                            v-model="item.device"
-                            placeholder="请选择"
-                            clearable
-                            style="width: 300px"
-                        >
-                            <el-option label="设备1" value="0"></el-option>
-                            <el-option label="设备2" value="1"></el-option>
-                            <el-option label="设备3" value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="报废数量" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="报废费用" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="报废原因" prop="isCharge">
-                        <el-input
-                            v-model="item.isCharg"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <div style="margin-left: 130px">
-                        <el-button @click="addPartItem2" type="success"> 增加报废设备</el-button>
-                        <el-button @click="removePartItem2(index)" v-if="index != 0" type="danger">
-                            删除报废设备</el-button
-                        >
-                    </div>
-                </el-row>
-            </div>
-        </el-form>
-
-        <div style="margin-top: 10px">
-            <span style="color: #ff9900; margin-left: 100px">● </span>
-            <span class="title-text">丢失费用</span>
-        </div>
-        <el-form label-width="240" ref="ruleFormRef4" :model="moneyParams3">
-            <div v-for="(item, index) in partItems3" :key="index" class="dynamic-item">
-                <div
-                    style="
-                        margin-top: 10px;
-                        margin-left: 180px;
-                        margin-bottom: 5px;
-                        font-size: 18px;
-                    "
-                >
-                    设备：{{ index + 1 }}
-                </div>
-                <el-row>
-                    <el-form-item label="关联装备" prop="partType">
-                        <el-select
-                            v-model="item.device"
-                            placeholder="请选择"
-                            clearable
-                            style="width: 300px"
-                        >
-                            <el-option label="设备1" value="0"></el-option>
-                            <el-option label="设备2" value="1"></el-option>
-                            <el-option label="设备3" value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="丢失数量" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="丢失费用" prop="partNum">
-                        <el-input
-                            v-model="item.partNum"
-                            placeholder="请输入"
-                            maxlength="20"
-                            style="width: 300px"
-                        >
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <div style="margin-left: 130px">
-                        <el-button @click="addPartItem3" type="success"> 增加丢失设备</el-button>
-                        <el-button @click="removePartItem3(index)" v-if="index != 0" type="danger">
-                            删除丢失设备</el-button
-                        >
-                    </div>
-                </el-row>
-            </div>
-        </el-form>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData4"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="丢失数量" />
+            <el-table-column label="报废费用（元）" align="center" prop="jy1" />
+        </el-table>
         <template #footer>
             <span class="dialog-footer">
                 <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
@@ -1347,6 +754,7 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             </span>
         </template>
     </el-dialog>
+
 </template>
 
 <style lang="scss" scoped>
@@ -1486,6 +894,7 @@ const dialogFormVisibleSettlemoney: any = ref(false)
             display: flex;
             align-items: center;
             font-size: 13px;
+            
             div {
                 text-align: center;
             }
diff --git a/src/views/user/orderManagementCz/detail.vue b/src/views/user/orderManagementCz/detail.vue
new file mode 100644
index 0000000..d4a817f
--- /dev/null
+++ b/src/views/user/orderManagementCz/detail.vue
@@ -0,0 +1,331 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import PagingComponent from 'components/PagingComponent/index.vue'
+import { useRouter } from 'vue-router'
+import { getOrderListInfoApi } from 'http/api/usercenter/seekorder'
+const route = useRoute()
+/* 查询参数 */
+const cardList = ref<any>({})
+const orderStatusTemp = ref<number>(0)
+const idTemp = ref<string>('')
+const titleStaus = ref<any>('')
+
+//描述信息
+const  operationDetails = ref<any>({
+            1: { title: '已出库', preOutboundUser: '', preOutboundTime: '' },
+            2: { title: '已收货', takeOverUser: '', takeOverTime: '' },
+            3: { title: '租赁结束', rentOverUser: '', rentOverTime: '' },
+        })
+// 获取数据列表
+// const getList = async () => {
+//     const res: any = await getOrderListApi()
+//     console.log('获取数据列表***', res)
+//     tableData.value = res.rows
+//     total.value = res.total
+// }
+
+  // 根据步骤的 Id 返回对应的标题
+const  getStepTitle = (stepId:number)=> {
+        if (orderStatusTemp.value === 2) {
+          titleStaus.value=  '待出库' ;
+          return stepId === 1 ? '待出库' : '';
+        } else if (orderStatusTemp.value === 3) {
+          titleStaus.value=  '待收货' ;
+          return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : '';
+        } else if (orderStatusTemp.value === 4) {
+          titleStaus.value=  '租赁中' ;
+          return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : '';
+        } else if (orderStatusTemp.value === 5) {
+          titleStaus.value=  '已退租' ;
+          return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : '';
+        } else if (orderStatusTemp.value === 6) {
+          titleStaus.value= '已完成' ;
+          return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : '';
+        } else if(orderStatusTemp.value === 7) {
+          titleStaus.value= '已驳回' ;
+          return stepId === 1 ? '已驳回' : '';
+        }
+        titleStaus.value=''
+        return ''; // 默认返回空字符串
+      }
+
+  // 根据步骤的 Id 返回对应的描述
+  const  getDescription=(desId:number)=>{
+    const operation = operationDetails.value[desId];
+        if (operation.title=="已出库" && titleStaus.value!=  "待出库" ) {
+            return `
+                操作人：${operation.preOutboundUser==null ?  ' ': operation.preOutboundUser}
+                操作时间：${operation.preOutboundTime==null ?  ' ': operation.preOutboundTime}
+            `;
+        }else if(operation.title=="已收货"  && titleStaus.value!=  "待收货" && titleStaus.value!=  "待出库"){
+            return `
+                操作人：${operation.takeOverUser==null ?  ' ': operation.takeOverUser}
+                操作时间：${operation.takeOverTime==null ?  ' ': operation.takeOverTime}
+            `;
+        }else if(operation.title=="租赁结束"  && (titleStaus.value!=  "待收货" && titleStaus.value!=  "待出库" && titleStaus.value!=  "租赁中")){
+            return `
+                操作人：${operation.rentOverUser==null ?  ' ': operation.rentOverUser}
+                操作时间：${operation.rentOverTime==null ?  ' ': operation.rentOverTime}
+            `;
+        }
+        return ''; // 默认返回空描述
+    }
+
+const getId = ()=>{
+    orderStatusTemp.value = Number(route.query.orderStatusTemp)
+    idTemp.value = String(route.query.idTemp)
+}
+
+/** 查询列表 */
+const getList = async () => {
+    let params = {
+        id: idTemp.value
+    }
+
+     const res: any = await getOrderListInfoApi(params)
+    cardList.value = res.data
+    operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser
+    operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime
+    operationDetails.value[2].takeOverUser = res.data.detailsList[0].takeOverUser
+    operationDetails.value[2].takeOverTime = res.data.detailsList[0].takeOverTime
+    operationDetails.value[3].rentOverUser = res.data.detailsList[0].rentOverUser
+    operationDetails.value[3].rentOverTime = res.data.detailsList[0].rentOverTime
+}
+
+onBeforeMount(()=>{
+   getId()
+})
+
+onMounted(() => {
+    getList()
+})
+
+
+const time = ref([])
+</script>
+
+<template>
+    <!-- 订单管理 -->
+    <div class="container">
+      <el-breadcrumb separator="/">
+      <el-breadcrumb-item :to="{ path: '/my-user/orderManagementCz' }">订单管理</el-breadcrumb-item>
+      <el-breadcrumb-item>订单明细</el-breadcrumb-item>
+      </el-breadcrumb>
+      <div class="section">
+        <el-header>
+          <el-row type="flex" justify="space-between" align="middle">
+          <el-col :span="3">
+            <span>订单流程</span>
+          </el-col>
+          <el-col :span="2" style="text-align:right;margin-right:20px;font-size: 20px;">
+            <div style="color:green;">{{titleStaus}}</div>
+          </el-col>
+          </el-row>
+        </el-header> 
+
+         <el-steps class="step" :space="400" :active="orderStatusTemp===7 ? 1 : orderStatusTemp-1" finish-status="success">
+            <el-step :title="getStepTitle(1)" :description="getDescription(1)"></el-step>
+            <el-step :title="getStepTitle(2)" :description="getDescription(2)"></el-step>
+            <el-step :title="getStepTitle(3)" :description="getDescription(3)"></el-step>
+            <el-step :title="getStepTitle(4)" ></el-step>
+            <el-step :title="getStepTitle(5)" ></el-step>
+        </el-steps>
+      </div>
+
+     <div class="section">
+        <el-header style="height:30px">租赁信息
+        </el-header>
+      <div style="height: 80px;">
+          <div
+            class="info"
+            style="margin-top: 5px; display: flex; flex-wrap: wrap;"
+            
+          >
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
+              <span>订单编号：{{cardList.code}}</span>
+            </div>
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span>下单时间：{{cardList.orderTime}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span></span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
+              <span>出租单位：{{cardList.czcompanyName}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span>出租人：{{cardList.person}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span>出租人电话：{{cardList.personPhone}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
+              <span>承租单位：{{cardList.companyName}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span>承租人：{{cardList.nickName}}</span>
+            </div>
+            
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;opacity: 0.7">
+              <span>承租人电话：{{cardList.phoneNumber}}</span>
+            </div>
+
+            <div class="item" style="width: 30%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;margin-left: 40px;opacity: 0.7">
+              <span>租赁协议：</span>
+            </div>
+          </div>
+        </div>
+
+           <div class="cart-tbody" >
+            <el-row class="cart-list" v-for="(goods, j) in cardList.detailsList" :key="j">
+                <el-col :span="9" class="goods-info">
+                    <el-col :span="7">
+                        <img :src="goods.url" alt="" />
+                    </el-col>
+                    <div class="goods-code">
+                        <div style="font-size: 10px; font-weight: bold">{{ goods.deviceName }}</div>
+                        <div>租期：{{ goods.days }}{{ ' ' + '天' }}</div>
+                        <div>租金：{{ goods.dayLeasePrice }}{{ ' ' + '元/天' }}</div>
+                        <div>数量：{{ 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">{{goods.costs}}</div>
+                </el-col>
+                <el-col :span="7">
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
+                    <div style="color: black; font-weight: bold">
+                        {{ goods.rentBeginTime  }}
+                    </div>
+                    <div style="margin-top:3px;margin-bottom:3px">{{ '至' }}</div>
+                    <div style="color: black; font-weight: bold">{{ goods.rentEndTime }}</div>
+                </el-col>
+                <el-col :span="2">
+                    <div v-if="goods.orderStatus=='0'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"未下单"}}</div>
+                    <div v-if="goods.orderStatus=='1'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已下单"}}</div>
+                    <div v-if="goods.orderStatus=='2'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"待出库"}}</div>
+                    <div v-if="goods.orderStatus=='3'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"待收货"}}</div>
+                    <div v-if="goods.orderStatus=='4'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"租赁中"}}</div>
+                    <div v-if="goods.orderStatus=='5'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已退租"}}</div>
+                    <div v-if="goods.orderStatus=='6'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已完成"}}</div>
+                    <div v-if="goods.orderStatus=='7'" style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color:blue">{{"已驳回"}}</div>
+                </el-col>
+                 <!-- <el-col :span="3">
+                    <div>
+                        <el-button
+                            @click="handleViewOrder(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            出库
+                        </el-button>
+                        <el-button
+                            @click="handleViewOrder(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            驳回
+                        </el-button>
+                    </div>
+                </el-col>  -->
+            </el-row>
+          </div> 
+
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+
+.container {
+    // width: 800px;
+    margin: 0 auto;
+    padding: 10px;
+    // background: #eeeff6;
+    font-size: 14px;
+    .step{
+        margin-left:80px;;
+    }
+
+    .section {
+        margin-top: 20px;
+        margin-bottom: 20px;
+    }
+   .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;
+            
+            div {
+                text-align: center;
+            }
+
+            .goods-info {
+                display: flex;
+                align-content: center;
+                img {
+                    width: 140px;
+                    height: 80px;
+                }
+
+                .goods-code {
+                    margin-left: 70px;
+                    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;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue
index 5fd0b43..a6e4052 100644
--- a/src/views/user/orderManagementCz/index.vue
+++ b/src/views/user/orderManagementCz/index.vue
@@ -1,147 +1,1957 @@
 <script setup lang="ts">
-    import { ref } from 'vue'
-    const queryParams = ref({})
-    import PagingComponent from 'components/PagingComponent/index.vue'
-    import { getOrderListApi } from '@/http/api/usercenter/seekorder'
-    // import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { ref } from 'vue'
+import PagingComponent from 'components/PagingComponent/index.vue'
+import { useRouter } from 'vue-router'
+import { getOrderListApi,passApi,failApi } from 'http/api/usercenter/seekorder'
+import uploadComponent from 'components/uploadComponent/index.vue'
+import previewImg from './previewImg/index.vue'
+import { ElMessage,ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { useStore } from 'store/user'
+const store = useStore()
+import { mainStore } from 'store/main'
+const store2 = mainStore()
+/* 查询参数 */
+const queryParams: any = ref({
+    deviceName: '',
+    orderStatus: '',
+    czcompanyName: '',
+    companyName: '',
+    lowerBound: '',
+    upperBound: '',
+    pageSize: 20,
+    pageNum: 1,
+    startTime: '',
+    endTime: '',
+})
+const queryFormRef = ref<FormInstance>()
+const time = ref([])
+const router = useRouter()
+const pageSize = 20
+const pageNumber = 1
+const total: any = ref(0)
+const numberTemp = ref<number>(0)
+const cardList = ref<any>([])
+const status = 0
+const statusList = [
+    { id: '2', name: '待出库' },
+    { id: '3', name: '已出库' },
+    { id: '4', name: '租赁中' },
+    { id: '5', name: '已退租' },
+    { id: '6', name: '已完成' },
+    { id: '7', name: '已驳回' },
+]
 
-    const router = useRouter()
-
-    const pageSize: any = ref(20)
-    const pageNumber: any = ref(1)
-    const total: any = ref(0)
-    const tableData: any = ref([])
-
-    // 获取数据列表
-    const getList = async () => {
-        const res = await getOrderListApi()
-        console.log('获取数据列表***', res)
-        tableData.value = res.rows || []
-        total.value = res.total
+/** 查询列表 */
+const getList = async () => {
+    if (time.value.length > 0) {
+        const dateStart = new Date(time.value[0]);
+        const dateEnd = new Date(time.value[1]);
+        queryParams.value.startTime = dateStart.toLocaleDateString('en-CA')
+        queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA')
+    } else {
+        queryParams.value.startTime = undefined
+        queryParams.value.endTime = undefined
     }
+    const res: any = await getOrderListApi(queryParams.value)
+    cardList.value = res.rows
+    total.value = res.total
+}
 
+//订单详情
+const handleViewOrder = (index: Number, row: any) => {
+    router.push({
+        name: 'orderManagementInfoBuy',
+        query: { orderStatusTemp: Number(row.orderStatus), idTemp: row.id },
+    })
+}
+
+onMounted(() => {
     getList()
+})
 
-    /* 结算按钮 */
-    const settlementBtn = () => {
-        router.push('/myuser/settlement')
+// 查询按钮
+const queryTableList = () => {
+    queryParams.value.pageNum=1
+    getList()
+}
+
+// 重置
+const resetTableList = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    time.value = []
+    queryTableList()
+}
+
+// 全选事件
+const onChangeCompany = (e: boolean, index: number, item: any) => {
+    cardList.value[index].detailsList.forEach((item:any)=>{
+        if(item.orderStatus=="2"){
+            item.isChecked = e;
+        }
+    })
+}
+
+// 单选事件
+const onChangeGoods = (index: number) => {
+    let flag = true;
+    for (let item of cardList.value[index].detailsList) {
+        if (item.orderStatus == "2" && item.isChecked != true) {
+            flag = false;
+            break; 
+        }
     }
+    cardList.value[index].isChecked = flag;
+}
 
-    /* 确认按钮 */
-    const confirmBtn = (row: any) => {
-        router.push({
-            name: 'orderConfirm',
-            query: {
-                orderId: row.orderId
+// 出库按钮
+    const confirmPass = async (index: number) => {
+        let ids: number[] = [];
+        cardList.value[index].detailsList.forEach((item:any)=>{
+            if(item.orderStatus=="2" && item.isChecked==true){
+                console.log(2222222222)
+                ids.push(item.id)
             }
         })
+        console.log('ids',ids)
+        if(ids.length==0){
+        ElMessage({
+            showClose: false,
+            message: '请选择装备',
+            type: 'error',
+        })
+        return
+        }else{
+        ElMessageBox.confirm('是否确定出库？', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }).then(() => {
+            return passApi({'ids':ids,'orderStatus':3})
+            // return removeDeviceApi([row.maId])
+        }).then((res) => {
+            if (res.code === 200) {
+            ElMessage({
+                type: 'success',
+                message: '出库成功'
+            })
+            numberTemp.value = numberTemp.value+1;
+            getList()
+            }
+        }).catch(() => {})
+    }
     }
 
-    /* 查看按钮 */
-    const clickPreviewDetails = (row: any) => {
-        console.log('查看')
-        router.push({
-            name: 'orderDetails',
-            query: {
-                orderId: row.orderId
+// 驳回按钮
+    const confirmFail = async (index: number) => {
+        let ids: number[] = [];
+        cardList.value[index].detailsList.forEach((item:any)=>{
+            if(item.orderStatus=="2" && item.isChecked==true){
+                ids.push(item.id)
             }
         })
+        console.log('ids',ids)
+        if(ids.length==0){
+        ElMessage({
+            showClose: false,
+            message: '请选择装备',
+            type: 'error',
+        })
+        return
+        }else{
+        ElMessageBox.confirm('是否确定驳回？', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }).then(() => {
+            return failApi({'ids':ids,'orderStatus':7})
+            // return removeDeviceApi([row.maId])
+        }).then((res) => {
+            if (res.code === 200) {
+            ElMessage({
+                type: 'success',
+                message: '驳回成功'
+            })
+            numberTemp.value = numberTemp.value+1;
+            getList()
+            }
+        }).catch(() => {})
+    }
+}
+
+// 计算是否过期
+const isExpired=(goods:any)=> {
+      // 获取当前日期并去掉时间部分
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+
+      // 将endtime转为Date对象
+      const endTime = new Date(goods.rentEndTime.replace(/-/g, "/"));
+
+      // 判断endtime是否早于今天
+      return endTime < today;
+}
+
+/* 退租按钮 */
+const clickRentingTermination = () => {
+    router.push({ name: 'rentinTermination' })
+    console.log('退租')
+}
+
+/* 确认收货 */
+const clickConfirmReceipt = (row: any) => {
+    console.log('确认收货')
+    router.push({
+        name: 'orderDetails',
+        query: {
+            orderId: row.orderId,
+            confirm: 'true',
+        },
+    })
+}
+
+const settleinTitle = ref('')
+/* 编辑 **********/
+const isEditDisabled = ref(false)
+// 退租检修弹框显示隐藏
+const dialogFormVisibleSettlein: any = ref(false)
+const equipmentDeploymentParams: any = ref({
+    /* 设备名称 */
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    unitName: '',
+    code: '',
+    brand: '',
+    typeId: '',
+    companyId: '',
+    productionDate: '',
+    dayLeasePrice: '',
+    person: '',
+    personPhone: '',
+    deviceWeight: '',
+})
+
+const mainFileList: any = ref([]) //检测文件1
+const detailsFileList: any = ref([]) //检测文件2
+//图片查看弹窗
+const dialogVisible: any = ref(false)
+const dialogImageUrl = ref('')
+//上传
+const upload: any = ref({
+    // 设置上传的请求头部
+    headers: { Authorization: 'Bearer ' + store2.token },
+    // 上传的地址
+    url: import.meta.env.VITE_API_URL + '/file/upload',
+})
+// 文件上传前处理-上传大小
+const beforeUpload = (file: any) => {
+    if (file.size / 1024 / 1024 > 2) {
+        ElMessage({
+            type: 'error',
+            message: '上传文件大小不能超过2M!',
+        })
+        // this.$message.error({ message: `上传文件大小不能超过2M!`,});
+        return false
+    }
+}
+// 文件上传失败
+const uploadError = () => {
+    ElMessage({
+        type: 'error',
+        message: '上传文件失败!',
+    })
+    // this.$message.error({message: `上传文件失败!`});
+}
+// 文件上传成功处理
+const handleFileSuccess = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            // modelId:this.maId,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        mainFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(mainFileList.value)
+    }
+}
+
+// 文件上传成功处理
+const handleFileSuccess2 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            // modelId:this.maId,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        detailsFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(detailsFileList.value)
+    }
+}
+//退租检修
+    const handleViewBack = () => {
+        settleinTitle.value = '退租检修'
+        isEditDisabled.value = true
+        equipmentDeploymentParams.value = {
+            /* 企业Id */
+            // ownCo: mainStore().userInfo.companyId,
+            /* 租赁范围 */
+            leaseScope: '',
+            /* 设备所在地 */
+            location: '',
+            /* 省 */
+            provinceId: '',
+            /* 市 */
+            cityId: '',
+            /* 区 */
+            areaId: '',
+            /* 设备所在地 省 */
+            addressEconomize: '',
+            /* 设备所在地 市 */
+            addressProvince: '',
+            /* 设备所在地 区 */
+            addressArea: '',
+            /* 设备类型 */
+            typeId: '',
+            /* 设备类型大类 */
+            deviceType: '',
+            /* 设备类型子类 */
+            deviceTypeSon: '',
+            /* 设备类型小类*/
+            deviceTypeSun: '',
+            /* 设备品牌 */
+            brand: '',
+            /* 设备型号 */
+            modelName: '',
+            /* 出场日期 */
+            productionDate: '',
+            /* 工作小时数 */
+            workingHours: '',
+            /* 整机序列号 */
+            serialNumber: '',
+            /* 月租金 */
+            monthLeasePrice: '',
+            /* 日租金 */
+            dayLeasePrice: '',
+            /* 是否提供机手 */
+            isOperator: '',
+            /* 机手月费用 */
+            jsMonthPrice: '',
+            /* 机手日费用 */
+            jsDayPrice: '',
+            /* 详细说明 */
+            description: '',
+            /* 设备主图片 */
+            picUrl: '',
+            /* 检测信息 ，保险信息*/
+            fileList: [],
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        // 打开退组检修弹框
+        dialogFormVisibleSettlein.value = true
     }
 
-    const time = ref([])
+const settlemoneyTitle = ref('')
+const moneyParams1: any = ref({
+    /* 设备名称 */
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    unitName: '',
+})
+const moneyParams2: any = ref({
+    /* 设备名称 */
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    unitName: '',
+})
+const moneyParams3: any = ref({
+    /* 设备名称 */
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    unitName: '',
+})
+const tableData: any = ref([
+   {
+    name1:'测试1',
+    name2:'测试1-1',
+    name3:'测试1-2',
+    jy1:'外观1-1',
+    jy2:'故障1-2',
+    jy3:'外观1-2',
+    jy4:'故障1-2',
+    jy5:'外观1-3',
+    jy6:'故障1-3',
+    jy7:'',
+    jy8:'',
+    remark:'备注1',
+   },
+    {
+    name1:'测试2',
+    name2:'测试2-1',
+    name3:'测试2-2',
+    jy1:'外观2-1',
+    jy2:'故障2-2',
+    jy3:'外观2-2',
+    jy4:'故障2-2',
+    jy5:'外观2-3',
+    jy6:'故障2-3',
+    jy7:'',
+    jy8:'',
+    remark:'备注2',
+   }
+])
+
+const partItems1: any = ref([{}])
+const partItems2: any = ref([{}])
+const partItems3: any = ref([{}])
+// 费用结算弹框显示隐藏
+const dialogFormVisibleSettlemoney: any = ref(false)
+//费用结算
+    const handleViewMoney = () => {
+        settlemoneyTitle.value = '费用结算'
+        moneyParams1.value = {
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        moneyParams2.value = {
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        moneyParams3.value = {
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        // 打开退组检修弹框
+        dialogFormVisibleSettlemoney.value = true
+    }
+
+    //维修费用
+ const  addPartItem1=()=> {
+      partItems1.value.push({ partType: "", num: "", isCharge: "" });
+    }
+ const  removePartItem1 =(index:number)=> {
+      if (partItems1.value.length > 1) {
+        partItems1.value.splice(index, 1);
+      }
+    }
+
+    //报废费用
+ const  addPartItem2=()=> {
+      partItems2.value.push({ partType: "", num: "", isCharge: "" });
+    }
+ const  removePartItem2 =(index:number)=> {
+      if (partItems2.value.length > 1) {
+        partItems2.value.splice(index, 1);
+      }
+    }
+
+        //报废费用 修改
+ const  addPartItem3=()=> {
+      partItems3.value.push({ partType: "", num: "", isCharge: "" });
+    }
+ const  removePartItem3 =(index:number)=> {
+      if (partItems3.value.length > 1) {
+        partItems3.value.splice(index, 1);
+      }
+    }
+
+const settleListTitle = ref('')
+// 费用清单弹框显示隐藏
+const dialogFormVisibleSettleList: any = ref(false)
+const tableData1: any = ref([
+   {
+    name1:'测试1',
+    name2:'测试1-1',
+    name3:'3台',
+    jy1:'100',
+    jy2:'31',
+    jy3:'2024-11-25 至2024-12-25',
+    jy4:'1600',
+   },
+    {
+    name1:'测试2',
+    name2:'测试2-1',
+    name3:'3台',
+    jy1:'100',
+    jy2:'31',
+    jy3:'2024-11-25 至2024-12-25',
+    jy4:'1600',
+   }
+])
+const tableData2: any = ref([
+   {
+    name1:'测试2',
+    name2:'测试2-1',
+    name3:'3台',
+    jy1:'类型1',
+    jy2:'维修中',
+    jy3:'1500',
+   },
+    {
+    name1:'测试2',
+    name2:'测试2-2',
+    name3:'3台',
+    jy1:'类型2',
+    jy2:'维修中',
+    jy3:'1500',
+   }
+])
+const tableData3: any = ref([
+   {
+    name1:'测试3',
+    name2:'测试3-1',
+    name3:'3台',
+    jy1:'轻度维修',
+    jy2:'1400',
+   },
+    {
+    name1:'测试3',
+    name2:'测试3-2',
+    name3:'3台',
+    jy1:'轻度维修',
+    jy2:'1400',
+   }
+])
+const tableData4: any = ref([
+   {
+    name1:'测试4',
+    name2:'测试4-1',
+    name3:'3台',
+    jy1:'1400',
+   },
+    {
+    name1:'测试4',
+    name2:'测试4-2',
+    name3:'3台',
+    jy1:'1400',
+   }
+])
+//费用清单
+    const handleViewList = () => {
+        settleListTitle.value = '费用清单'
+        moneyParams1.value = {
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        // 打开费用清单弹框
+        dialogFormVisibleSettleList.value = true
+    }
+
+const tableData5: any = ref([
+   {
+    name1:'测试1',
+    name2:'测试1-1',
+    name3:'测试1-2',
+    jy1:'外观1-1',
+    jy2:'故障1-2',
+    jy3:'外观1-2',
+    jy4:'故障1-2',
+    jy5:'外观1-3',
+    jy6:'故障1-3',
+    jy7:'',
+    jy8:'',
+    remark:'备注1',
+   },
+    {
+    name1:'测试2',
+    name2:'测试2-1',
+    name3:'测试2-2',
+    jy1:'外观2-1',
+    jy2:'故障2-2',
+    jy3:'外观2-2',
+    jy4:'故障2-2',
+    jy5:'外观2-3',
+    jy6:'故障2-3',
+    jy7:'',
+    jy8:'',
+    remark:'备注2',
+   }
+])
+ const settleRepairTitle = ref('')   
+// 检修详情弹框显示隐藏
+const dialogFormVisibleSettleRepair: any = ref(false)
+ //检修详情   
+     const handleViewRepair = () => {
+        settleListTitle.value = '检修详情'
+        moneyParams1.value = {
+            /* 设备状态 */
+            maStatus: 15,
+            detectionList: [],
+            insureList: [],
+            picList: []
+        }
+        // 打开检修详情弹框
+        dialogFormVisibleSettleRepair.value = true
+    }
 </script>
 
 <template>
-    <!-- 订单管理(承租方) -->
-    <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">查询</el-button>
-            <el-button type="success">重置</el-button>
-        </el-form-item>
-    </el-form>
+    <!-- 订单管理 -->
+    <div class="container">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" size="default" label-width="0">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item prop="deviceName">
+                        <el-input
+                            style="width: 100%"
+                            v-model.trim="queryParams.deviceName"
+                            clearable
+                            placeholder="请输入装备名称"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="orderStatus">
+                        <el-select
+                            v-model="queryParams.orderStatus"
+                            placeholder="请选择订单状态"
+                            style="width: 100%"
+                            clearable
+                        >
+                            <el-option
+                                v-for="item in statusList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="dateRange">
+                        <el-date-picker
+                            v-model="time"
+                            type="daterange"
+                            unlink-panels
+                            range-separator="-"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                            style="width: 100%"
+                        />
+                    </el-form-item>
+                </el-col>
 
-    <!-- 表格 -->
-    <el-table
-        :data="tableData"
-        show-overflow-tooltip
-        :header-cell-style="{
-            background: '#3E98FF',
-            color: '#fff'
-        }"
-        fit>
-        <el-table-column align="center" prop="code" label="订单编号" />
-        <el-table-column align="center" prop="supplierCompany" label="客户单位" />
-        <el-table-column align="center" prop="time" label="订单创建日期" />
-        <el-table-column align="center" prop="orderPhone" label="联系方式" />
-        <el-table-column align="center" prop="typeName" label="装备类型" />
-        <el-table-column align="center" prop="deviceName" label="装备名称" />
-        <el-table-column align="center" label="订单状态">
-            <template #default="{ row }">
-                <el-tag v-if="row.orderStatus == 31">待确认</el-tag>
-                <el-tag v-if="row.orderStatus == 32">待合同上传</el-tag>
-                <el-tag v-if="row.orderStatus == 35">待收货</el-tag>
-                <el-tag v-if="row.orderStatus == 36">进行中</el-tag>
-            </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="操作" width="260px">
-            <template #default="{ row }">
-                <el-button
-                    size="small"
-                    type="primary"
-                    @click="confirmBtn(row)"
-                    v-if="row.orderStatus == 31">
-                    确认
-                </el-button>
-                <el-button
-                    size="small"
-                    type="warning"
-                    @click="clickPreviewDetails(row)"
-                    v-if="row.orderStatus != 31">
-                    查看
-                </el-button>
-                <el-button size="small" type="danger" v-if="row.orderStatus == 39">删除</el-button>
-                <el-button
-                    size="small"
-                    type="success"
-                    @click="settlementBtn"
-                    v-if="row.orderStatus == 34">
-                    结算
-                </el-button>
-            </template>
-        </el-table-column>
-    </el-table>
+                <el-col :span="6">
+                    <el-form-item prop="czcompanyName">
+                        <el-input
+                            v-model.trim="queryParams.czcompanyName"
+                            clearable
+                            maxlength="20"
+                            placeholder="出租单位"
+                            style="width: 100%"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
 
-    <PagingComponent
-        @getList="getList"
-        :pageSize="pageSize"
-        :pageNumber="pageNumber"
-        :total="total" />
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item prop="companyName">
+                        <el-input
+                            v-model.trim="queryParams.companyName"
+                            clearable
+                            maxlength="20"
+                            placeholder="承租单位"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-input
+                        v-model.trim="queryParams.lowerBound"
+                        placeholder="租金/元"
+                        clearable
+                        maxlength="20"
+                        style="width: 45%"
+                    />
+                    <span style="display: inline-block; width: 5%; text-align: center"> - </span>
+                    <el-input
+                        v-model.trim="queryParams.upperBound"
+                        placeholder="租金/元"
+                        clearable
+                        maxlength="20"
+                        style="width: 45%"
+                    />
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item>
+                        <el-button type="primary" @click="queryTableList">查询</el-button>
+                        <el-button @click="resetTableList(queryFormRef)">重置</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+        <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">
+                        <el-checkbox
+                            :key="numberTemp"
+                            v-model="item.isChecked"
+                            @change="onChangeCompany($event, index, item)"
+                        >
+                        </el-checkbox>
+                    </div>
+                </el-col>
+                <el-col :span="22">
+                    <el-row>
+                        <el-col :span="6">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>订单编号:</span>
+                                {{ item.code }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>下单时间:</span>
+                                {{ item.orderTime }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>装备所属公司:</span>
+                                {{ item.czcompanyName }}
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div style="flex-shrink: 0; margin-bottom: 1px; font-size: 7px">
+                                <el-button
+                                    v-if="item.orderStatus == '2'"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    @click="confirmPass(index)"
+                                    >出库</el-button
+                                >
+                                <el-button
+                                    v-if="item.orderStatus == '2'"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    @click="confirmFail(index)"
+                                    >驳回</el-button
+                                >
+                            </div>
+                        </el-col>
+                    </el-row>
+
+                    <el-row>
+                        <el-col :span="6">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>出租方电话:</span>
+                                {{ item.personPhone }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>承租方电话:</span>
+                                {{ item.phoneNumber }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>承租方地址:</span>
+                                {{ item.companyName }}
+                            </div>
+                        </el-col>
+                    </el-row>
+                </el-col>
+            </el-row>
+
+            <el-row class="cart-list" v-for="(goods, j) in item.detailsList" :key="j">
+                <el-col :span="1">
+                    <div style="text-align: center">
+                        <el-checkbox :key="numberTemp" v-model="goods.isChecked" @change="onChangeGoods(index)" :disabled="goods.orderStatus!='2'">
+                        </el-checkbox>
+                    </div>
+                </el-col>
+                <el-col :span="9" class="goods-info">
+                    <el-col :span="7">
+                        <img :src="goods.url" alt="" />
+                    </el-col>
+                    <div class="goods-code">
+                        <div style="font-size: 10px; font-weight: bold">{{ goods.deviceName }}</div>
+                        <div>租期：{{ goods.days }}{{ ' ' + '天' }}</div>
+                        <div>租金：{{ goods.dayLeasePrice }}{{ ' ' + '元/天' }}</div>
+                        <div>数量：{{ 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">{{ goods.costs }}</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">
+                        {{ goods.rentBeginTime }}
+                    </div>
+                    <div style="margin-top: 3px; margin-bottom: 3px">{{ '至' }}</div>
+                    <div style="color: black; font-weight: bold">{{ goods.rentEndTime }}</div>
+                </el-col>
+                <el-col :span="2">
+                    <div
+                        v-if="goods.orderStatus == '2'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: blue"
+                    >
+                        {{ '待出库' }}
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '3'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C76F60"
+                    >
+                        {{ '待收货' }}
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '4' && isExpired(goods)"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06"
+                    >
+                        {{ '租赁中' }}
+                        <span style="color: red">(已过期)</span>
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '4' && !isExpired(goods)"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #008D06"
+                    >
+                        {{ '租赁中' }}
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '5'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #5B33CC"
+                    >
+                        {{ '已退租' }}
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '6'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #C00017"
+                    >
+                        {{ '已完成' }}
+                    </div>
+                    <div
+                        v-if="goods.orderStatus == '7'"
+                        style="font-size: 14px; font-weight: bold; margin-bottom: 10px; color: #797979"
+                    >
+                        {{ '已驳回' }}
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div>
+                        <el-button
+                            @click="handleViewOrder(j, item.detailsList[j])"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            订单详情
+                        </el-button>
+                        <el-button
+                            @click="handleViewOrder(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            租赁协议
+                        </el-button>
+                        <el-button
+                            v-if="goods.orderStatus=='5'"
+                            @click="handleViewBack(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            退租检修
+                        </el-button>
+                        <el-button
+                            v-if="goods.orderStatus=='5'"
+                            @click="handleViewMoney(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            费用结算
+                        </el-button>
+                         <el-button
+                            v-if="goods.orderStatus=='6'"
+                            @click="handleViewRepair(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            检修详情
+                        </el-button>
+                         <el-button
+                            v-if="goods.orderStatus=='6'"
+                            @click="handleViewList(j)"
+                            type="text"
+                            size="mini"
+                            style="color: #blue; font-weight: bold"
+                        >
+                            费用清单
+                        </el-button>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+        <PagingComponent
+            @getList="getList"
+            :pageSize="pageSize"
+            :pageNumber="pageNumber"
+            :total="total"
+        />
+
+    </div>
+    <!-- 退租检修弹框 -->
+    <el-dialog
+        v-model="dialogFormVisibleSettlein"
+        :title="settleinTitle"
+        width="60%"
+        align-center
+        :close-on-click-modal="false"
+    >
+        <div style="height: 80px">
+            <div
+                class="info"
+                style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
+            >
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>订单编号：10000212135656</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>装备套数：2套</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>退租时间：2024-10-10 10:00:00</span>
+                </div>
+            </div>
+            <div
+                class="item"
+                style="
+                    width: 30%;
+                    flex-shrink: 0;
+                    margin-bottom: 12px;
+                    font-size: 16px;
+                    margin-left: 80px;
+                "
+            >
+                <span>装备名称：挖掘机</span>
+            </div>
+
+            <div class="info" style="margin-top: 5px; display: flex; flex-wrap: wrap">
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 80px;
+                    "
+                >
+                    <span>装备编码：10000212135656</span>
+                </div>
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>型号：ZJO9777466</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>数量：3</span>
+                </div>
+            </div>
+        </div>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">外观检测</span>
+        </div>
+        <el-form label-width="160" ref="ruleFormRef" :model="equipmentDeploymentParams">
+            <el-row>
+                <el-form-item label="是否合格：" prop="pass">
+                    <el-select
+                        v-model="equipmentDeploymentParams.pass"
+                        placeholder="请选择是否合格"
+                        clearable
+                        style="width: 350px"
+                    >
+                        <el-option label="是" value="0"></el-option>
+                        <el-option label="否" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="费用：" prop="fy">
+                    <el-input
+                        v-model="equipmentDeploymentParams.fy"
+                        placeholder="请输入设备数量"
+                        clearable
+                        maxlength="20"
+                        style="width: 350px"
+                    />
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-form-item label="备注：" prop="remark1">
+                    <el-input
+                        placeholder="请输入"
+                        autocomplete="off"
+                        style="width: 860px"
+                        maxlength="50"
+                        v-model="equipmentDeploymentParams.remark1"
+                        clearable
+                    />
+                </el-form-item>
+            </el-row>
+        </el-form>
+        <div class="uploadBox">
+            <div class="labelBox">
+                <div style="margin-left: 40px">
+                    <span style="font-size: 14px">检验文件: </span>
+                </div>
+                <div style="margin-left: 20px">
+                    <el-upload
+                        ref="upload"
+                        :limit="6"
+                        :headers="upload.headers"
+                        :action="upload.url"
+                        :show-file-list="false"
+                        accept=".png, .jpg, .jpeg"
+                        :on-success="handleFileSuccess"
+                        :auto-upload="true"
+                        :before-upload="beforeUpload"
+                        :on-error="uploadError"
+                    >
+                        <el-button icon="el-icon-folder-add">上传文件</el-button>
+                    </el-upload>
+                </div>
+                <div style="color: #999; font-size: 12px; margin-left: 20px">
+                    支持格式：.jpg .png，单个文件大小不能超过2M
+                </div>
+            </div>
+            <div class="imgsBox">
+                <div class="imgItem" v-for="(item, index) in mainFileList" :key="index">
+                    <img class="picture-card" :src="item.fileUrl" alt="" />
+                    <div class="icon-list">
+                        <span class="imgItem__icon hide" @click="handleDownload(item)">
+                            <i class="el-icon-download" />
+                        </span>
+                        <span class="imgItem__icon hide" @click="picturePreview(item)">
+                            <i class="el-icon-zoom-in" />
+                        </span>
+                        <span
+                            class="imgItem__icon hide"
+                            @click="handleRemove(mainFileList, index)"
+                        >
+                            <i class="el-icon-delete" />
+                        </span>
+                    </div>
+                    <p class="file-name">{{ item.fileName }}</p>
+                </div>
+            </div>
+            <div class="tipBox">*注:图片排序为平台展示顺序，不得少于1张，不得多于6张</div>
+        </div>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">维修内容</span>
+        </div>
+        <el-form label-width="160" ref="ruleFormRef" :model="equipmentDeploymentParams">
+            <el-row>
+                <el-form-item label="是否合格：" prop="pass2">
+                    <el-select
+                        v-model="equipmentDeploymentParams.pass2"
+                        placeholder="请选择是否合格"
+                        clearable
+                        style="width: 350px"
+                    >
+                        <el-option label="是" value="0"></el-option>
+                        <el-option label="否" value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="费用：" prop="fy2">
+                    <el-input
+                        v-model="equipmentDeploymentParams.fy2"
+                        placeholder="请输入设备数量"
+                        clearable
+                        maxlength="20"
+                        style="width: 350px"
+                    />
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-form-item label="备注：" prop="remark2">
+                    <el-input
+                        placeholder="请输入"
+                        autocomplete="off"
+                        style="width: 860px"
+                        maxlength="50"
+                        v-model="equipmentDeploymentParams.remark2"
+                        clearable
+                    />
+                </el-form-item>
+            </el-row>
+        </el-form>
+        <div class="uploadBox">
+            <div class="labelBox">
+                <div style="margin-left: 40px">
+                    <span style="font-size: 14px">检验文件: </span>
+                </div>
+                <div style="margin-left: 20px">
+                    <el-upload
+                        ref="upload2"
+                        :limit="6"
+                        :headers="upload.headers"
+                        :action="upload.url"
+                        :show-file-list="false"
+                        accept=".png, .jpg, .jpeg"
+                        :on-success="handleFileSuccess2"
+                        :auto-upload="true"
+                        :before-upload="beforeUpload"
+                        :on-error="uploadError"
+                    >
+                        <el-button icon="el-icon-folder-add">上传文件</el-button>
+                    </el-upload>
+                </div>
+                <div style="color: #999; font-size: 12px; margin-left: 20px">
+                    支持格式：.jpg .png，单个文件大小不能超过2M
+                </div>
+            </div>
+            <div class="imgsBox">
+                <div class="imgItem" v-for="(item, index) in detailsFileList" :key="index">
+                    <img class="picture-card" :src="item.fileUrl" alt="" />
+                    <div class="icon-list">
+                        <span class="imgItem__icon hide" @click="handleDownload(item)">
+                            <i class="el-icon-download" />
+                        </span>
+                        <span class="imgItem__icon hide" @click="picturePreview(item)">
+                            <i class="el-icon-zoom-in" />
+                        </span>
+                        <span
+                            class="imgItem__icon hide"
+                            @click="handleRemove(detailsFileList, index)"
+                        >
+                            <i class="el-icon-delete" />
+                        </span>
+                    </div>
+                    <p class="file-name">{{ item.fileName }}</p>
+                </div>
+            </div>
+            <div class="tipBox">*注:图片排序为平台展示顺序，不得少于1张，不得多于6张</div>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
+                <el-button @click="submitBtn" type="success"> 保存 </el-button>
+            </span>
+        </template>
+    </el-dialog>
+
+    <!-- 费用结算弹框 -->
+    <el-dialog
+        v-model="dialogFormVisibleSettlemoney"
+        :title="settlemoneyTitle"
+        width="60%"
+        align-center
+        :close-on-click-modal="false"
+    >
+        <div style="height: 80px">
+            <div
+                class="info"
+                style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
+            >
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>订单编号：10000212135656</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>装备套数：2套</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>退租时间：2024-10-10 10:00:00</span>
+                </div>
+            </div>
+            <div class="info" style="margin-top: 5px; display: flex; flex-wrap: wrap">
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>结算单位：安徽送变电公司</span>
+                </div>
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>租赁天数：30{{ '/天' }}</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>租赁费用(元)：1800</span>
+                </div>
+            </div>
+            <div class="title">
+                <span class="title-sign"></span>
+                <span class="title-text">退租检测信息</span>
+            </div>
+        </div>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
+            <el-table-column align="center" prop="name1" label="机具名称" />
+            <el-table-column align="center" prop="name2" label="规格型号" />
+            <el-table-column align="center" prop="name3" label="装备编码" />
+            <el-table-column align="center" prop="typeName" label="检验内容">
+                <el-table-column label="外观检验" align="center" prop="jy1" />
+                <el-table-column label="故障检验" align="center" prop="jy2" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="维修内容">
+                <el-table-column label="外观检验" align="center" prop="jy3" />
+                <el-table-column label="故障检验" align="center" prop="jy4" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="金额">
+                <el-table-column label="外观检验" align="center" prop="jy5" />
+                <el-table-column label="故障检验" align="center" prop="jy6" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="附件">
+                <el-table-column label="外观检验" align="center" prop="jy7" />
+                <el-table-column label="故障检验" align="center" prop="jy8" />
+            </el-table-column>
+            <el-table-column align="center" label="备注" prop="remark" width="80px">
+            </el-table-column>
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">费用结算</span>
+        </div>
+        <div>
+            <span style="color: #ff9900; margin-left: 100px">● </span>
+            <span class="title-text">维修费用</span>
+        </div>
+        <el-form label-width="240" ref="ruleFormRef2" :model="moneyParams1">
+            <div v-for="(item, index) in partItems1" :key="index" class="dynamic-item">
+                <div
+                    style="
+                        margin-top: 10px;
+                        margin-left: 180px;
+                        margin-bottom: 5px;
+                        font-size: 18px;
+                    "
+                >
+                    设备：{{ index + 1 }}
+                </div>
+                <el-row>
+                    <el-form-item label="关联装备" prop="partType">
+                        <el-select
+                            v-model="item.device"
+                            placeholder="请选择"
+                            clearable
+                            style="width: 300px"
+                        >
+                            <el-option label="设备1" value="0"></el-option>
+                            <el-option label="设备2" value="1"></el-option>
+                            <el-option label="设备3" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="维修数量" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <el-form-item label="维修费用" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="维修类型" prop="isCharge">
+                        <el-select
+                            v-model="item.isCharge"
+                            placeholder="请选择"
+                            filterable
+                            clearable
+                            style="width: 300px"
+                        >
+                            <el-option label="维修类型1" value="0"></el-option>
+                            <el-option label="维修类型2" value="1"></el-option>
+                            <el-option label="维修类型3" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <div style="margin-left: 130px">
+                        <el-button @click="addPartItem1" type="success"> 增加维修设备</el-button>
+                        <el-button @click="removePartItem1(index)" v-if="index != 0" type="danger">
+                            删除维修设备</el-button
+                        >
+                    </div>
+                </el-row>
+            </div>
+        </el-form>
+
+        <div style="margin-top: 10px">
+            <span style="color: #ff9900; margin-left: 100px">● </span>
+            <span class="title-text">报废费用</span>
+        </div>
+        <el-form label-width="240" ref="ruleFormRef3" :model="moneyParams2">
+            <div v-for="(item, index) in partItems2" :key="index" class="dynamic-item">
+                <div
+                    style="
+                        margin-top: 10px;
+                        margin-left: 180px;
+                        margin-bottom: 5px;
+                        font-size: 18px;
+                    "
+                >
+                    设备：{{ index + 1 }}
+                </div>
+                <el-row>
+                    <el-form-item label="关联装备" prop="partType">
+                        <el-select
+                            v-model="item.device"
+                            placeholder="请选择"
+                            clearable
+                            style="width: 300px"
+                        >
+                            <el-option label="设备1" value="0"></el-option>
+                            <el-option label="设备2" value="1"></el-option>
+                            <el-option label="设备3" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="报废数量" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <el-form-item label="报废费用" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="报废原因" prop="isCharge">
+                        <el-input
+                            v-model="item.isCharg"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <div style="margin-left: 130px">
+                        <el-button @click="addPartItem2" type="success"> 增加报废设备</el-button>
+                        <el-button @click="removePartItem2(index)" v-if="index != 0" type="danger">
+                            删除报废设备</el-button
+                        >
+                    </div>
+                </el-row>
+            </div>
+        </el-form>
+
+        <div style="margin-top: 10px">
+            <span style="color: #ff9900; margin-left: 100px">● </span>
+            <span class="title-text">丢失费用</span>
+        </div>
+        <el-form label-width="240" ref="ruleFormRef4" :model="moneyParams3">
+            <div v-for="(item, index) in partItems3" :key="index" class="dynamic-item">
+                <div
+                    style="
+                        margin-top: 10px;
+                        margin-left: 180px;
+                        margin-bottom: 5px;
+                        font-size: 18px;
+                    "
+                >
+                    设备：{{ index + 1 }}
+                </div>
+                <el-row>
+                    <el-form-item label="关联装备" prop="partType">
+                        <el-select
+                            v-model="item.device"
+                            placeholder="请选择"
+                            clearable
+                            style="width: 300px"
+                        >
+                            <el-option label="设备1" value="0"></el-option>
+                            <el-option label="设备2" value="1"></el-option>
+                            <el-option label="设备3" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="丢失数量" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <el-form-item label="丢失费用" prop="partNum">
+                        <el-input
+                            v-model="item.partNum"
+                            placeholder="请输入"
+                            maxlength="20"
+                            style="width: 300px"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </el-row>
+                <el-row>
+                    <div style="margin-left: 130px">
+                        <el-button @click="addPartItem3" type="success"> 增加丢失设备</el-button>
+                        <el-button @click="removePartItem3(index)" v-if="index != 0" type="danger">
+                            删除丢失设备</el-button
+                        >
+                    </div>
+                </el-row>
+            </div>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
+                <el-button @click="submitBtn" type="success"> 保存 </el-button>
+            </span>
+        </template>
+    </el-dialog>
+
+    <!-- 费用清单弹框 -->
+    <el-dialog         
+        v-model="dialogFormVisibleSettleList"
+        :title="settleListTitle"
+        width="60%"
+        align-center
+        :close-on-click-modal="false">
+         <div style="height: 80px">
+            <div
+                class="info"
+                style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
+            >
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>订单编号：10000212135656</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>装备套数：2套</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>退租时间：2024-10-10 10:00:00</span>
+                </div>
+            </div>
+            <div class="info" style="margin-top: 5px; display: flex; flex-wrap: wrap">
+                <div
+                    class="item"
+                    style="
+                        width: 30%;
+                        flex-shrink: 0;
+                        margin-bottom: 5px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>结算单位：安徽送变电公司</span>
+                </div>
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>租赁天数：30{{ '/天' }}</span>
+                </div>
+
+                <div
+                    class="item"
+                    style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
+                >
+                    <span>租赁费用(元)：1800</span>
+                </div>
+            </div>
+            <div class="title">
+                <span class="title-sign"></span>
+                <span class="title-text">租赁费用明细</span>
+            </div>
+        </div>
+         <!-- 表格 -->
+        <el-table
+            :data="tableData1"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="数量" />
+            <el-table-column label="租赁单价(元/日)" align="center" prop="jy1" />
+            <el-table-column label="租赁天数" align="center" prop="jy2" />
+            <el-table-column label="租期" align="center" prop="jy3" />
+            <el-table-column label="租期费用" align="center" prop="jy4" />
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">维修费用明细</span>
+        </div>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData2"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="维修数量" />
+            <el-table-column label="维修类型" align="center" prop="jy1" />
+            <el-table-column label="维修状态" align="center" prop="jy2" />
+            <el-table-column label="维修费用（元）" align="center" prop="jy3" />
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">报废费用明细</span>
+        </div>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData3"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="报废数量" />
+            <el-table-column label="报废原因" align="center" prop="jy1" />
+            <el-table-column label="报废费用（元）" align="center" prop="jy2" />
+        </el-table>
+        <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">丢失费用明细</span>
+        </div>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData4"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column align="center" prop="name1" label="装备名称" />
+            <el-table-column align="center" prop="name2" label="型号" />
+            <el-table-column align="center" prop="name3" label="丢失数量" />
+            <el-table-column label="报废费用（元）" align="center" prop="jy1" />
+        </el-table>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
+                <el-button @click="submitBtn" type="success"> 保存 </el-button>
+            </span>
+        </template>
+    </el-dialog>
+
+    <!-- 检修详情弹框 -->
+    <el-dialog 
+        v-model="dialogFormVisibleSettleRepair"
+        :title="settleRepairTitle"
+        width="60%"
+        :close-on-click-modal="false">
+        <div style="height: 80px">
+            <div
+                class="info"
+                style="margin-top: 5px; margin-bottom: 1px; display: flex; flex-wrap: wrap"
+            >
+                <div
+                    class="item"
+                    style="
+                        width: 48%;
+                        flex-shrink: 0;
+                        margin-bottom: 1px;
+                        font-size: 16px;
+                        margin-left: 40px;
+                    "
+                >
+                    <span>订单编号：10000212135656</span>
+                </div>
+
+
+                <div
+                    class="item"
+                    style="width: 48%; flex-shrink: 0; margin-bottom: 1px; font-size: 16px"
+                >
+                    <span>退租时间：2024-10-10 10:00:00</span>
+                </div>
+            </div>
+        </div>
+        <!-- 表格 -->
+        <el-table
+            :data="tableData5"
+            class="table"
+            style="margin-left: 50px; width: 1100px"
+            row-key="id"
+            show-overflow-tooltip
+            :header-cell-style="{ background: 'white', color: 'black' }"
+        >
+            <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
+            <el-table-column align="center" prop="name1" label="机具名称" />
+            <el-table-column align="center" prop="name2" label="规格型号" />
+            <el-table-column align="center" prop="name3" label="装备编码" />
+            <el-table-column align="center" prop="typeName" label="检验内容">
+                <el-table-column label="外观检验" align="center" prop="jy1" />
+                <el-table-column label="故障检验" align="center" prop="jy2" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="维修内容">
+                <el-table-column label="外观检验" align="center" prop="jy3" />
+                <el-table-column label="故障检验" align="center" prop="jy4" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="金额">
+                <el-table-column label="外观检验" align="center" prop="jy5" />
+                <el-table-column label="故障检验" align="center" prop="jy6" />
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="附件">
+                <el-table-column label="外观检验" align="center" prop="jy7" />
+                <el-table-column label="故障检验" align="center" prop="jy8" />
+            </el-table-column>
+            <el-table-column align="center" label="备注" prop="remark" width="80px">
+            </el-table-column>
+        </el-table>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
+                <el-button @click="submitBtn" type="success"> 保存 </el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
-<style>
-    .el-form {
-        margin: 15px 0;
+<style lang="scss" scoped>
+.logo {
+    padding: 15px 0;
+    display: flex;
+    margin-left: 80px;
+}
+.title {
+    margin: 10px;
+    margin-left: 20px;
+    display: flex;
+    align-items: center;
+}
+.title-sign {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #409eff;
+    margin-left: 45px;
+}
+.title-text {
+    font-weight: 700;
+    margin-left: 10px;
+}
+.uploadBox {
+    margin: 20px 40px;
+}
+.labelBox {
+    width: auto;
+    height: auto;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+}
+.imgsBox {
+    width: auto;
+    height: auto;
+    display: flex;
+    align-items: center;
+    margin-bottom: 30px;
+    margin-left: 20px;
+
+    .imgItem {
+        width: 160px;
+        height: 160px;
+        margin-right: 40px;
+        border: 1px dashed #bbb;
+        position: relative;
+        .picture-card {
+            width: 160px;
+            height: 160px;
+        }
+        .icon-list {
+            width: 60px;
+            height: 20px;
+            position: absolute;
+            top: 70px;
+            left: 40px;
+            display: flex;
+            align-items: center;
+        }
+        .imgItem__icon {
+            margin: 0 5px;
+        }
+        .file-name {
+            font-size: 10px;
+        }
     }
+
+    .hide {
+        display: none;
+    }
+    .imgItem:hover .hide {
+        display: block;
+    }
+}
+.tipBox {
+    color: red;
+    font-size: 12px;
+    margin-left: 20px;
+}
+.container {
+    // width: 800px;
+    // margin: 0 auto;
+    // padding: 10px;
+    background: #eeeff6;
+    font-size: 14px;
+
+    .cart-title {
+        margin-top: 10px;
+        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;
+
+        .cart-user-info {
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+
+            .code,
+            .orderTime {
+                padding: 3px 18px;
+                border: 1px solid #ccc;
+            }
+
+            .czcompanyName {
+                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: 140px;
+                    height: 80px;
+                }
+
+                .goods-code {
+                    margin-left: 70px;
+                    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;
+        }
+    }
+}
+
+:deep .el-form--inline .el-form-item {
+    margin-right: 6px;
+    width: 95%;
+}
 </style>