diff --git a/components.d.ts b/components.d.ts
index c84f273..f818db3 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,6 +9,8 @@ declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
     ElBadge: typeof import('element-plus/es')['ElBadge']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
@@ -16,11 +18,13 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElCountdown: typeof import('element-plus/es')['ElCountdown']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
@@ -28,11 +32,16 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
diff --git a/env/.env.dev b/env/.env.dev
index 12a9914..8c14d12 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -7,9 +7,9 @@ VITE_API_URL = '/proxyApi'
 # 开发环境接口地址
 # VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
-# VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅 
+VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅 
 # VITE_proxyTarget = 'http://192.168.2.123:28080'  # 梁超 
-VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
+# VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
 # VITE_proxyTarget = 'http://192.168.2.129:18080'  # 马帅
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 
diff --git a/src/components/uploadComponentNew/index.vue b/src/components/uploadComponentNew/index.vue
index 89f8ae6..3e790f5 100644
--- a/src/components/uploadComponentNew/index.vue
+++ b/src/components/uploadComponentNew/index.vue
@@ -100,6 +100,11 @@ const props = defineProps({
         type: Number || String,
         default: 10,
     },
+    currentIndex: {
+        // 文件上传的最大体积 M
+        type: Number,
+        default: 0,
+    },
     disabledFlag: {
         //是否禁用
         type: Boolean,
@@ -185,7 +190,7 @@ const successUpload = (response: any, file: any) => {
         }
         Object.assign(fileInfo, response.data)
         fileListNew.value.push(fileInfo)
-        emit('onFileChange', fileListNew.value)
+        emit('onFileChange', fileListNew.value, props.currentIndex)
 
         // console.log(fileListNew.value, '-----------3333333333333')
     } else {
@@ -242,7 +247,7 @@ const handleExceed = (files: any, fileList: any) => {
 // 移除文件
 const removeFile = (file: any, data: any) => {
     fileListNew.value = fileListNew.value.filter((e: any) => e.uid != file.uid)
-    emit('onFileChange', fileListNew.value)
+    emit('onFileChange', fileListNew.value, props.currentIndex)
 }
 // 预览
 const preview = (data: any) => {
diff --git a/src/http/api/rent-termination/index.ts b/src/http/api/rent-termination/index.ts
index dffee16..f9e9f75 100644
--- a/src/http/api/rent-termination/index.ts
+++ b/src/http/api/rent-termination/index.ts
@@ -5,10 +5,30 @@ import { post, get, put } from 'http/index'
  */
 
 /**
- * 
  * @param data 查询参数 获取退租列表
  * @returns 
  */
 export const getRentTerminationListApi = (data: any = {}) => {
     return get(`/material-mall/lease-repair/list`, data)
+}
+/**
+ * @param orderId 查询参数 获取退租详情 订单ID
+ * @returns 
+ */
+export const getOrderDetailsByIdApi = (orderId: any) => {
+    return get(`/material-mall/order/getOrderDetailsById`, { orderId })
+}
+/**
+ * @param data 退租检修提交 获取退租详情 data参数
+ * @returns 
+ */
+export const setAddLeaseRepairApi = (data: any) => {
+    return post(`/material-mall/lease-repair/add`, data)
+}
+/**
+ * @param orderId 退租检修提交 获取检修详情 订单ID
+ * @returns 
+ */
+export const getOverhaulApi = (orderId: any) => {
+    return get(`/material-mall/lease-repair/getById`, { orderId })
 }
\ No newline at end of file
diff --git a/src/views/cart/components/date-picker-button.vue b/src/views/cart/components/date-picker-button.vue
index b71493b..afe0ce1 100644
--- a/src/views/cart/components/date-picker-button.vue
+++ b/src/views/cart/components/date-picker-button.vue
@@ -4,15 +4,16 @@
             {{ displayDate }}
         </el-button>
         <el-date-picker
-            v-model="selectedDate"
-            :type="pickerType"
-            :placeholder="placeholder"
-            :format="format"
-            :value-format="valueFormat"
-            :style="{ visibility: 'hidden' }"
-            @change="handleDateChange"
-            style="margin-top: -100px"
             ref="datePicker"
+            :format="format"
+            :type="pickerType"
+            v-model="selectedDate"
+            style="margin-top: -100px"
+            :placeholder="placeholder"
+            @change="handleDateChange"
+            :value-format="valueFormat"
+            :disabled-date="disabledDate"
+            :style="{ visibility: 'hidden' }"
         />
     </div>
 </template>
@@ -20,6 +21,11 @@
 <script setup>
 import { ref, computed, watch, nextTick } from 'vue'
 import { ElDatePicker, ElButton } from 'element-plus'
+const disabledDate = (date) => {
+    const today = new Date()
+    // 禁用今天之前的日期
+    return date.getTime() < today.getTime()
+}
 
 const props = defineProps({
     modelValue: {
@@ -76,11 +82,6 @@ const handleDateChange = (value) => {
     showPicker.value = false
 }
 
-// const onVisibleChange = () => {
-//     console.log('关闭')
-//     showPicker.value = false
-// }
-
 watch(
     showPicker,
     (newValue) => {
@@ -111,7 +112,6 @@ watch(
 }
 
 .date-picker-button {
-    /* min-width: 120px; */
     background-color: #1abc9c;
     color: #fff;
     height: 30px;
diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue
index df89a72..5c4616e 100644
--- a/src/views/cart/index.vue
+++ b/src/views/cart/index.vue
@@ -227,7 +227,6 @@ import { useRoute, useRouter } from 'vue-router'
 import { useStore } from '../../store/user'
 const userStore = useStore()
 const router = useRouter()
-
 const protocolChecked = ref<boolean>(false)
 const allKey = ref(0)
 const cardList = ref<any>([])
diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index 6761cab..7b48d74 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -403,7 +403,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { mainStore } from '@/store/main'
 import { getBookCarDetailsApi } from 'http/api/home/index'
 
-const router = useRouter()
+const router: any = useRouter()
 const route: any = useRoute()
 const store = mainStore()
 const ruleFormRef = ref()
@@ -425,18 +425,21 @@ const viewImgUrl = computed(() => {
 
 if (router.options.history.state.back) {
     backPath.value = router.options.history.state.back
+
+    console.log(router.options.history.state.back, 'router.options.history.state.back')
     const previousRoute: any = []
 
     if (router.options.history.state.back === '/home') {
         backName.value = '首页'
     }
     router.options.routes.forEach((route: any) => {
-        if (route.path === router.options.history.state.back) {
+        if (router.options.history.state.back.indexOf(router.path) != -1) {
             previousRoute.push(route)
         } else {
             if (route.children && route.children.length > 0) {
                 route.children.forEach((r: any) => {
-                    if (r.path === router.options.history.state.back) {
+                    console.log(r.path, 'route.path ')
+                    if (router.options.history.state.back.indexOf(r.path) != -1) {
                         previousRoute.push(r)
                     }
                 })
diff --git a/src/views/user/lessor/rent-termination/index.vue b/src/views/user/lessor/rent-termination/index.vue
index 09322e7..51779e9 100644
--- a/src/views/user/lessor/rent-termination/index.vue
+++ b/src/views/user/lessor/rent-termination/index.vue
@@ -1,3 +1,4 @@
+div
 <template>
     <!-- 寻源需求 -->
     <el-form
@@ -109,21 +110,20 @@
         <el-table-column align="center" label="操作" :width="220">
             <template #default="{ row }">
                 <el-button
-                    text
                     size="small"
                     type="primary"
+                    class="primary-lease"
                     v-if="row.isLeaseContent === 0"
-                    @click="onRepublish(1)"
+                    @click="onRepublish(1, row.orderId)"
                 >
                     退租检修
                 </el-button>
                 <el-button
-                    text
                     size="small"
                     class="primary-lease"
                     type="primary"
                     v-if="row.isLeaseContent === 1"
-                    @click="onRepublish(2)"
+                    @click="onRepublish(2, row.orderId)"
                 >
                     检修详情
                 </el-button>
@@ -132,9 +132,11 @@
     </el-table>
 
     <PagingComponent
-        @getList="getLeaseListData"
+        @getListChange="getLeaseListData"
         :pageSize="searchParams.pageSize"
         :pageNumber="searchParams.pageNum"
+        :size="searchParams.pageSize"
+        :page="searchParams.pageNum"
         :total="total"
     />
 
@@ -147,474 +149,401 @@
         v-model="addOrEditDialogVisible"
         @close="onClose"
     >
-        <el-row style="padding-bottom: 20px; display: flex; justify-content: space-between">
-            <div>
-                <span>订单编号</span>
-                <span>20000</span>
-            </div>
-            <div>
-                <span>装备套数</span>
-                <span>20000</span>
-            </div>
-            <div>
-                <span>退租时间</span>
-                <span>20000</span>
-            </div>
-        </el-row>
+        <template v-if="dialogTitle === '退租检测'">
+            <el-row
+                style="
+                    display: flex;
+                    justify-content: space-between;
+                    letter-spacing: 1px;
+                    padding: 0 10px 20px;
+                "
+            >
+                <div>
+                    <span>订单编号：</span>
+                    <span>{{ orderDetails.code }}</span>
+                </div>
+                <div>
+                    <span>装备套数：</span>
+                    <span>
+                        {{ orderDetails.maNumber }}
+                    </span>
+                </div>
+                <div>
+                    <span>退租时间：</span>
+                    <span>
+                        {{ orderDetails.rentEndTime }}
+                    </span>
+                </div>
+            </el-row>
 
-        <h1>维修费用</h1>
-        <el-form
-            v-for="(item, index) in repairFormList"
-            :key="index"
-            :model="item"
-            :rules="repairFormRules"
-            :ref="
+            <h1>维修费用</h1>
+            <el-form
+                v-for="(item, index) in repairFormList"
+                :key="item.newId"
+                :model="item"
+                :rules="repairFormRules"
+                :ref="
                 ($event:any) => {
                     repairFormRefList[index] = $event
                 }
             "
-            label-width="120px"
-            label-position="right"
-            style="position: relative"
-        >
-            <div style="position: absolute; left: -5px; top: 8px; font-weight: bold">
-                设备{{ index + 1 }}
-            </div>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="关联装备" prop="device">
-                        <el-input v-model="item.device" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="维修数量" prop="device_num">
-                        <el-input v-model="item.device_num" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="维修费用" prop="device_cost">
-                        <el-input v-model="item.device_cost" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="20">
-                    <el-form-item label="附件上传" prop="device_fileList">
-                        <UploadComponentNew
-                            :maxSize="2"
-                            :max-limit="4"
-                            width="100px"
-                            height="100px"
-                            :autoUpload="true"
-                            :multiple="true"
-                            :fileListN="item.device_fileList"
-                            listType="picture-card"
-                            :acceptTypeList="['.jpg', '.png']"
-                            :actionUrl="uploadUrl"
-                            @onFileChange="onFileChange"
-                        >
-                            <template v-slot:default>
-                                <el-icon size="48" color="#aaa"><Plus /></el-icon>
-                            </template>
-                        </UploadComponentNew>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="4" v-if="index != 0">
-                    <el-button
-                        type="danger"
-                        size="small"
-                        class="primary-lease"
-                        @click="onDeleteRepair"
-                    >
-                        移除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </el-form>
-        <el-row>
-            <el-col :span="24">
-                <el-form-item>
-                    <el-button type="primary" class="primary-lease" @click="onAddRepair">
-                        增加维修设备
-                    </el-button>
-                </el-form-item>
-            </el-col>
-        </el-row>
-        <div class="line"></div>
-        <h1>丢失费用</h1>
-        <el-form label-width="120px" label-position="right" style="position: relative">
-            <div style="position: absolute; left: 0; top: 8px; font-weight: bold">设备1</div>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="关联装备" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="报废数量" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="报废费用" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="报废原因" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="附件上传" prop="leaseName">
-                        <UploadComponentNew
-                            :maxSize="2"
-                            :minLimit="minLimit"
-                            :max-limit="4"
-                            width="100px"
-                            height="100px"
-                            :autoUpload="true"
-                            :multiple="true"
-                            :fileListN="addOrEditForm.fileInfoList"
-                            listType="picture-card"
-                            :acceptTypeList="['.jpg', '.png']"
-                            :actionUrl="uploadUrl"
-                            @onFileChange="onFileChange"
-                        >
-                            <template v-slot:default>
-                                <el-icon size="48" color="#aaa"><Plus /></el-icon>
-                            </template>
-                        </UploadComponentNew>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <el-row>
-            <el-col :span="24">
-                <el-form-item>
-                    <el-button type="primary" class="primary-lease"> 增加丢失设备 </el-button>
-                </el-form-item>
-            </el-col>
-        </el-row>
-        <div class="line"></div>
-
-        <h1>报废费用</h1>
-        <el-form label-width="120px" label-position="right" style="position: relative">
-            <div style="position: absolute; left: 0; top: 8px; font-weight: bold">设备1</div>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="关联装备" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="丢失数量" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="丢失费用" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="附件上传" prop="leaseName">
-                        <UploadComponentNew
-                            :maxSize="2"
-                            :minLimit="minLimit"
-                            :max-limit="4"
-                            width="100px"
-                            height="100px"
-                            :autoUpload="true"
-                            :multiple="true"
-                            :fileListN="addOrEditForm.fileInfoList"
-                            listType="picture-card"
-                            :acceptTypeList="['.jpg', '.png']"
-                            :actionUrl="uploadUrl"
-                            @onFileChange="onFileChange"
-                        >
-                            <template v-slot:default>
-                                <el-icon size="48" color="#aaa"><Plus /></el-icon>
-                            </template>
-                        </UploadComponentNew>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-        <el-row>
-            <el-col :span="24">
-                <el-form-item>
-                    <el-button type="primary" class="primary-lease"> 增加报废设备 </el-button>
-                </el-form-item>
-            </el-col>
-        </el-row>
-
-        <div style="text-align: right">
-            <el-button type="primary" class="primary-lease" @click="onCancel">取消</el-button>
-            <el-button type="primary" class="primary-lease" @click="onSubmit(false)"
-                >保存</el-button
+                label-width="120px"
+                label-position="right"
+                style="position: relative"
             >
-        </div>
-        <!-- <el-form
-            label-width="auto"
-            label-position="right"
-            ref="addOrEditFormRef"
-            :model="addOrEditForm"
-            :rules="addOrEditFormRules"
-        >
-            <el-row :gutter="20">
-                <el-col :span="24">
-                    <el-form-item label="需求名称" prop="leaseName">
-                        <el-input v-model="addOrEditForm.leaseName" placeholder="请输入需求名称" />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="12">
-                    <el-form-item label="装备类目" prop="typeIds">
-                        <el-cascader
-                            clearable
-                            style="width: 100%"
-                            :options="classOptions"
-                            :show-all-levels="false"
-                            placeholder="请选择装备类目"
-                            v-model="addOrEditForm.typeIds"
-                            :props="{
-                                value: 'id',
-                                label: 'name',
-                                checkStrictly: true,
-                            }"
-                            @change="onChangeClass"
-                        />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="租赁公司" prop="companyId">
-                        <el-select
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择租赁公司"
-                            v-model="addOrEditForm.companyId"
-                        >
-                            <el-option
-                                v-for="item in companyOptions"
-                                :key="item.companyId"
-                                :label="item.companyName"
-                                :value="item.companyId"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="12">
-                    <el-form-item label="联系人" prop="person">
-                        <el-input
-                            clearable
-                            placeholder="请输入联系人"
-                            v-model="addOrEditForm.person"
-                        />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="联系电话" prop="personPhone">
-                        <el-input
-                            clearable
-                            placeholder="请输入联系电话"
-                            v-model="addOrEditForm.personPhone"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="12">
-                    <el-form-item label="预估租期(天)" prop="leaseDay">
-                        <el-input-number
-                            :min="1"
-                            clearable
-                            :max="9999"
-                            style="width: 100%"
-                            v-model="addOrEditForm.leaseDay"
-                            placeholder="请输入预估租期"
-                        />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="预估数量" prop="leaseNum">
-                        <el-input-number
-                            clearable
-                            :min="1"
-                            :max="9999"
-                            style="width: 100%"
-                            v-model="addOrEditForm.leaseNum"
-                            placeholder="请输入预估数量"
-                        />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="12">
-                    <el-form-item label="需求截止日期" prop="endTime">
-                        <el-date-picker
-                            clearable
-                            type="date"
-                            style="width: 100%"
-                            value-format="YYYY-MM-DD"
-                            v-model="addOrEditForm.endTime"
-                            placeholder="请选择需求截止日期"
-                            :disabled-date="disabledDate"
-                        />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="项目所在地" prop="areaId">
-                        <el-select
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择项目所在地"
-                            v-model="addOrEditForm.areaId"
-                        >
-                            <el-option
-                                v-for="item in areaList"
-                                :key="item.areaId"
-                                :label="item.areaName"
-                                :value="item.areaId"
-                            />
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="24">
-                    <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
-                        支持格式：.jpg、.png 单个文件大小不能超过2M，最多可上传4张
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
-                <el-col :span="24">
-                    <el-form-item label="参考图片/样式">
-                        <div class="img-list" v-if="addOrEditForm.fileInfoList.length > 0">
-                            <div
-                                v-for="(item, index) in addOrEditForm.fileInfoList"
-                                :key="item.id"
-                                class="img-items"
+                <div style="position: absolute; left: -5px; top: 8px; font-weight: bold">
+                    设备{{ index + 1 }}
+                </div>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="关联装备" prop="maId">
+                            <el-select
+                                clearable
+                                style="width: 100%"
+                                placeholder="请选择关联装备"
+                                v-model="item.maId"
+                                @change="onChangeRepair($event, index)"
                             >
-                                <img :src="item.fileUrl" alt="" />
-
-                                <div class="mask-img">
-                                    <el-icon class="delete-icon" @click="onDeleteImg(index)"
-                                        ><DeleteFilled
-                                    /></el-icon>
-                                </div>
-                            </div>
-                        </div>
-                        <UploadComponentNew
-                            :maxSize="2"
-                            :minLimit="minLimit"
-                            :max-limit="4"
-                            width="120px"
-                            height="120px"
-                            :autoUpload="true"
-                            :multiple="true"
-                            :fileListN="addOrEditForm.fileInfoList"
-                            listType="picture-card"
-                            :acceptTypeList="['.jpg', '.png']"
-                            :actionUrl="uploadUrl"
-                            @onFileChange="onFileChange"
+                                <el-option
+                                    :key="item.device"
+                                    :value="item.maId"
+                                    :label="item.deviceName"
+                                    v-for="item in repairSelect"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="维修数量" prop="repairNum">
+                            <!-- <el-input v-model="item.device_num" placeholder="请输入需求名称" /> -->
+                            <el-input-number
+                                clearable
+                                :min="1"
+                                :max="9999"
+                                style="width: 100%"
+                                v-model="item.repairNum"
+                                placeholder="请输入维修数量"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="维修费用" prop="repairPrice">
+                            <el-input
+                                inputmode="numeric"
+                                v-model="item.repairPrice"
+                                placeholder="请输入维修费用"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="20">
+                        <el-form-item label="附件上传" prop="fileInfoList">
+                            <UploadComponentNew
+                                :maxSize="2"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :currentIndex="index"
+                                :actionUrl="uploadUrl"
+                                listType="picture-card"
+                                :fileListN="item.fileInfoList"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onRepairFileChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="48" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-button
+                            size="small"
+                            type="danger"
+                            class="primary-lease"
+                            @click="onDeleteRepair(index)"
                         >
-                            <template v-slot:default>
-                                <el-icon size="48" color="#aaa"><Plus /></el-icon>
-                            </template>
-                        </UploadComponentNew>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
+                            移除
+                        </el-button>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-row>
                 <el-col :span="24">
-                    <el-form-item label="需求描述" prop="description">
-                        <el-input
-                            clearable
-                            type="textarea"
-                            placeholder="请输入需求描述"
-                            v-model="addOrEditForm.description"
-                            :autosize="{ minRows: 6, maxRows: 10 }"
-                        />
+                    <el-form-item>
+                        <el-button type="primary" class="primary-lease" @click="onAddRepair">
+                            增加维修设备
+                        </el-button>
                     </el-form-item>
                 </el-col>
             </el-row>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
+            <div class="line"></div>
+
+            <h1>报废费用</h1>
+            <el-form
+                :model="item"
+                :key="item.newId"
+                v-for="(item, index) in scrapFormList"
+                :rules="scrapFormRules"
+                :ref="
+                ($event:any) => {
+                    scrapFormRefList[index] = $event
+                }
+            "
+                label-width="120px"
+                label-position="right"
+                style="position: relative"
+            >
+                <div style="position: absolute; left: 0; top: 8px; font-weight: bold">设备1</div>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="关联装备" prop="maId">
+                            <el-select
+                                clearable
+                                style="width: 100%"
+                                v-model="item.maId"
+                                placeholder="请选择关联装备"
+                                @change="onChangeScrap($event, index)"
+                            >
+                                <el-option
+                                    :key="item.device"
+                                    :value="item.maId"
+                                    :label="item.deviceName"
+                                    v-for="item in scrapSelect"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报废数量" prop="scrapNum">
+                            <el-input-number
+                                clearable
+                                :min="1"
+                                :max="9999"
+                                style="width: 100%"
+                                v-model="item.scrapNum"
+                                placeholder="请输入报废数量"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="报废费用" prop="scrapPrice">
+                            <el-input
+                                inputmode="numeric"
+                                v-model="item.scrapPrice"
+                                placeholder="请输入报废费用"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报废原因" prop="scrapReason">
+                            <el-input v-model="item.scrapReason" placeholder="请输入报废原因" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="20">
+                        <el-form-item label="附件上传" prop="fileInfoList">
+                            <UploadComponentNew
+                                :maxSize="2"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :currentIndex="index"
+                                :actionUrl="uploadUrl"
+                                listType="picture-card"
+                                :fileListN="item.fileInfoList"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onScrapFileChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="48" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-button
+                            type="danger"
+                            size="small"
+                            class="primary-lease"
+                            @click="onDeleteScrap"
+                        >
+                            移除
+                        </el-button>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-row>
+                <el-col :span="24">
+                    <el-form-item>
+                        <el-button type="primary" class="primary-lease" @click="onAddScrap">
+                            增加报废设备
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <div class="line"></div>
+            <h1>丢失费用</h1>
+            <el-form
+                v-for="(item, index) in lossFormList"
+                :key="item.newId"
+                :model="item"
+                :rules="lossFormRules"
+                :ref="
+                ($event:any) => {
+                    lossFormRefList[index] = $event
+                }
+            "
+                label-width="120px"
+                label-position="right"
+                style="position: relative"
+            >
+                <div style="position: absolute; left: 0; top: 8px; font-weight: bold">设备1</div>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="关联装备" prop="maId">
+                            <el-select
+                                clearable
+                                style="width: 100%"
+                                placeholder="请选择关联装备"
+                                v-model="item.maId"
+                                @change="onChangeLoss($event, index)"
+                            >
+                                <el-option
+                                    v-for="item in lossSelect"
+                                    :key="item.device"
+                                    :label="item.deviceName"
+                                    :value="item.maId"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="丢失数量" prop="lossNum">
+                            <el-input-number
+                                clearable
+                                :min="1"
+                                :max="9999"
+                                style="width: 100%"
+                                v-model="item.lossNum"
+                                placeholder="请输入丢失数量"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="丢失费用" prop="lossPrice">
+                            <el-input
+                                v-model="item.lossPrice"
+                                placeholder="请输入需求名称"
+                                inputmode="numeric"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="20">
+                        <el-form-item label="附件上传" prop="fileInfoList">
+                            <UploadComponentNew
+                                :maxSize="2"
+                                :max-limit="4"
+                                :currentIndex="index"
+                                width="100px"
+                                height="100px"
+                                :autoUpload="true"
+                                :multiple="true"
+                                :fileListN="item.fileInfoList"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                :actionUrl="uploadUrl"
+                                @onFileChange="onLossFileChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="48" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-button
+                            type="danger"
+                            size="small"
+                            class="primary-lease"
+                            @click="onDeleteLoss"
+                        >
+                            移除
+                        </el-button>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-row>
+                <el-col :span="24">
+                    <el-form-item>
+                        <el-button type="primary" class="primary-lease" @click="onAddLoss">
+                            增加丢失设备
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <div style="text-align: right">
                 <el-button type="primary" class="primary-lease" @click="onCancel">取消</el-button>
-                <el-button
-                    type="primary"
-                    class="primary-lease"
-                    @click="onSubmit(false)"
-                    v-if="isSave"
+                <el-button type="primary" class="primary-lease" @click="onSubmit(false)"
+                    >保存</el-button
                 >
-                    保存
-                </el-button>
-                <el-button class="primary-lease" @click="onSubmit(true)"> 提交 </el-button>
             </div>
-        </template> -->
+        </template>
+
+        <template v-else> 检修明细 </template>
     </el-dialog>
 </template>
 
 <script setup lang="ts">
 import UploadComponentNew from 'components/uploadComponentNew/index.vue'
 import PagingComponent from 'components/PagingComponent/index.vue'
-import { getCompanyListApi, getGoodsClassListApi, getAreaApi } from 'http/api/home'
-import { getRentTerminationListApi } from 'http/api/rent-termination/index'
 import {
-    addLeaseInfoApi,
-    getLeaseListApi,
-    editLeaseInfoApi,
-    deleteLeaseInfoApi,
-    getLeaseDetailsByIdApi,
-} from 'http/api/sourcing/index'
-import { InfoFilled } from '@element-plus/icons-vue'
+    getRentTerminationListApi,
+    getOrderDetailsByIdApi,
+    setAddLeaseRepairApi,
+    getOverhaulApi,
+} from 'http/api/rent-termination/index'
+
 import { ElMessage } from 'element-plus'
 const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
 const addOrEditDialogVisible = ref(false)
-const companyOptions = ref<any>([])
-const classOptions = ref<any>([])
-const addOrEditFormRef = ref<any>(null)
-const searchFormRef = ref<any>(null)
 const leaseList = ref<any>([])
-const isRepublish = ref(true)
-const isSave = ref(false)
 const total = ref(0)
 const endTime = ref([])
-const areaList = ref<any>([])
 const releaseTime = ref([])
-const dialogTitle = ref('新增')
+const dialogTitle = ref('退租检测')
 const fileListTemp = ref<any>([])
 const repairFormRefList = ref<any>([])
+const lossFormRefList = ref<any>([])
+const scrapFormRefList = ref<any>([])
+const orderDetails = ref<any>({})
+const repairSelect = ref<any>([])
+const lossSelect = ref<any>([])
+const scrapSelect = ref<any>([])
 const props2 = {
     multiple: true,
     checkStrictly: true,
 }
 // 维修表单
-const repairFormList: any = ref([
-    {
-        device: '',
-        device_num: '',
-        device_cost: '',
-        device_fileList: [],
-    },
-])
+const repairFormList: any = ref([])
+const lossFormList: any = ref([])
+const scrapFormList: any = ref([])
 
 const searchParams = reactive({
     leaseName: '',
@@ -658,40 +587,46 @@ const addOrEditFormTemp = ref<any>({
     areaId: '',
 })
 
-const addOrEditFormRules = reactive({
-    leaseName: [{ required: true, message: '请输入需求名称', trigger: 'blur' }],
-    typeIds: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
-    companyId: [{ required: true, message: '请选择租赁公司', trigger: 'change' }],
-    person: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-    personPhone: [
-        { required: true, message: '请输入联系电话', trigger: 'blur' },
+const repairFormRules = reactive({
+    maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }],
+    repairNum: [{ required: true, message: '请输入维修数量', trigger: 'blur' }],
+    fileInfoList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
+    repairPrice: [
+        { required: true, message: '请输入维修费用', trigger: 'blur' },
         {
-            pattern: /^1[3456789]\d{9}$/,
-            message: '请输入正确的联系电话',
+            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
+            message: '请输入正确的费用金额，最多两位小数点',
             trigger: 'blur',
         },
     ],
-    leaseDay: [{ required: true, message: '请输入预估租期', trigger: 'blur' }],
-    leaseNum: [{ required: true, message: '请输入预估数量', trigger: 'blur' }],
-    endTime: [{ required: true, message: '请选择需求截止日期', trigger: 'change' }],
-    fileInfoList: [{ required: true, message: '请上传参考图片', trigger: 'blur' }],
-    areaId: [{ required: true, message: '请选择项目所在地', trigger: 'change' }],
 })
-
-const repairFormRules = reactive({
-    device: [{ required: true, message: '请选择关联装备', trigger: 'blur' }],
-    device_num: [{ required: true, message: '请输入维修数量', trigger: 'blur' }],
-    device_cost: [{ required: true, message: '请输入维修费用', trigger: 'blur' }],
-    device_fileList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
+const lossFormRules = reactive({
+    maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }],
+    lossNum: [{ required: true, message: '请输入丢失数量', trigger: 'blur' }],
+    fileInfoList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
+    lossPrice: [
+        { required: true, message: '请输入丢失费用', trigger: 'blur' },
+        {
+            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
+            message: '请输入正确的费用金额，最多两位小数点',
+            trigger: 'blur',
+        },
+    ],
+})
+const scrapFormRules = reactive({
+    maId: [{ required: true, message: '请选择关联装备', trigger: 'change' }],
+    scrapNum: [{ required: true, message: '请输入报废数量', trigger: 'blur' }],
+    scrapReason: [{ required: true, message: '请输入报废原因', trigger: 'blur' }],
+    fileInfoList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
+    scrapPrice: [
+        { required: true, message: '请输入报废费用', trigger: 'blur' },
+        {
+            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
+            message: '请输入正确的费用金额，最多两位小数点',
+            trigger: 'blur',
+        },
+    ],
 })
-
-const getClassAndCompanyData = async () => {
-    const classResult: any = await getGoodsClassListApi()
-    const companyResult: any = await getCompanyListApi()
-
-    classOptions.value = classResult.data
-    companyOptions.value = companyResult.data
-}
 
 // 获取列表
 const getLeaseListData = async () => {
@@ -704,28 +639,103 @@ const getLeaseListData = async () => {
     //     searchParams.publishEndTime = releaseTime.value[1]
     // }
     const { data: res }: any = await getRentTerminationListApi()
-    console.log(res, '退租列表')
     leaseList.value = res.rows
     total.value = res.total
 }
 
 // 增加维修设备
 const onAddRepair = () => {
+    const newId = Date.now()
     repairFormList.value.push({
-        device: '',
-        device_num: '',
-        device_cost: '',
-        device_fileList: [],
+        newId,
+        maId: '',
+        deviceName: '',
+        num: '',
+        typeId: '',
+        repairNum: 0,
+        repairPrice: 0,
+        fileInfoList: [],
+    })
+}
+// 增加丢失设备
+const onAddLoss = () => {
+    const newId = Date.now()
+    lossFormList.value.push({
+        newId,
+        maId: '',
+        deviceName: '',
+        num: '',
+        typeId: '',
+        lossNum: 0,
+        lossPrice: 0,
+        fileInfoList: [],
+    })
+}
+// 增加报废设备
+const onAddScrap = () => {
+    const newId = Date.now()
+    scrapFormList.value.push({
+        newId,
+        maId: '',
+        deviceName: '',
+        num: '',
+        typeId: '',
+        scrapNum: 0,
+        scrapPrice: 0,
+        scrapReason: '',
+        fileInfoList: [],
+    })
+}
+
+// 维修模块设备选择时change事件
+const onChangeRepair = (maId: any, index: number) => {
+    repairSelect.value.forEach((e: any) => {
+        if (e.maId == maId) {
+            repairFormList.value[index].deviceName = e.deviceName
+            repairFormList.value[index].num = e.num
+            repairFormList.value[index].typeId = e.typeId
+        }
+    })
+}
+const onChangeLoss = (maId: any, index: number) => {
+    lossSelect.value.forEach((e: any) => {
+        if (e.maId == maId) {
+            lossFormList.value[index].deviceName = e.deviceName
+            lossFormList.value[index].num = e.num
+            lossFormList.value[index].typeId = e.typeId
+        }
+    })
+}
+
+const onChangeScrap = (maId: any, index: number) => {
+    scrapSelect.value.forEach((e: any) => {
+        if (e.maId == maId) {
+            scrapFormList.value[index].deviceName = e.deviceName
+            scrapFormList.value[index].num = e.num
+            scrapFormList.value[index].typeId = e.typeId
+        }
     })
 }
 const onDeleteRepair = (index: number) => {
-    // repairFormList.value.splice(index, 1)
-    repairFormList.value = repairFormList.value.slice(index, 1)
+    repairFormList.value.splice(index, 1)
+    repairFormRefList.value.splice(index, 1)
+    repairFormRefList.value.forEach((e: any) => {
+        if (e) e.clearValidate()
+    })
 }
-
-const getAreaData = async () => {
-    const res: any = await getAreaApi()
-    areaList.value = res.data
+const onDeleteLoss = (index: number) => {
+    lossFormList.value.splice(index, 1)
+    lossFormList.value.splice(index, 1)
+    lossFormList.value.forEach((e: any) => {
+        if (e) e.clearValidate()
+    })
+}
+const onDeleteScrap = (index: number) => {
+    scrapFormList.value.splice(index, 1)
+    scrapFormList.value.splice(index, 1)
+    scrapFormList.value.forEach((e: any) => {
+        if (e) e.clearValidate()
+    })
 }
 
 // 重置
@@ -741,20 +751,23 @@ const onReset = () => {
     // searchFormRef.value.resetFields()
     getLeaseListData()
 }
-// 删除
-const onDelete = async (id: any) => {
-    const res: any = await deleteLeaseInfoApi({ id })
-    if (res.code === 200) {
-        ElMessage({
-            type: 'success',
-            message: '删除成功',
-        })
-        getLeaseListData()
-    }
-}
+
 // 重新发布
-const onRepublish = async (type: any) => {
-    type == 1 ? (dialogTitle.value = '退租检测') : (dialogTitle.value = '检测详情')
+const onRepublish = async (type: any, orderId: any) => {
+    type == 1 ? (dialogTitle.value = '退租检测') : (dialogTitle.value = '检修明细')
+
+    if (type === 1) {
+        const { data: res }: any = await getOrderDetailsByIdApi(getOverhaulApi)
+        orderDetails.value = res
+        repairSelect.value = res.detailsList
+        lossSelect.value = res.detailsList
+        scrapSelect.value = res.detailsList
+        orderDetails.value.orderId = orderId
+    } else {
+        const { data: res }: any = getOverhaulApi(orderId)
+        console.log(res, '检修明细')
+    }
+
     // dialogTitle.value = '编辑'
     // isRepublish.value = false
     // isSave.value = type
@@ -807,48 +820,106 @@ const onSubmit = async (type: boolean) => {
                     resolve(valid)
                 })
             })
-            console.log(valid)
+
             if (!valid) {
                 isRepair = true
                 throw new Error('表单校验失败')
             }
         } catch (error) {}
     }
-
     if (isRepair) return
+    for (let index = 0; index < scrapFormList.value.length; index++) {
+        try {
+            const valid = await new Promise((resolve) => {
+                scrapFormRefList.value[index].validate((valid: any) => {
+                    resolve(valid)
+                })
+            })
 
-    // repairFormRef_1
-    // addOrEditFormRef.value.validate(async (valid: any) => {
-    //     if (valid) {
-    //         addOrEditForm.value.isSubmit = type
-    //         addOrEditForm.value.typeId =
-    //             addOrEditForm.value.typeIds[addOrEditForm.value.typeIds.length - 1]
-    //         addOrEditForm.value.fileInfoList.push(...fileListTemp.value)
-    //         const SUBMIT_API = isRepublish.value ? addLeaseInfoApi : editLeaseInfoApi
-    //         const res: any = await SUBMIT_API(addOrEditForm.value)
-    //         if (res.code === 200) {
-    //             ElMessage({
-    //                 type: 'success',
-    //                 message: '提交成功',
-    //             })
-    //             addOrEditDialogVisible.value = false
-    //             getLeaseListData()
-    //         }
-    //     }
-    // })
+            if (!valid) {
+                isRepair = true
+                throw new Error('表单校验失败')
+            }
+        } catch (error) {}
+    }
+    if (isRepair) return
+    for (let index = 0; index < lossFormList.value.length; index++) {
+        try {
+            const valid = await new Promise((resolve) => {
+                lossFormRefList.value[index].validate((valid: any) => {
+                    resolve(valid)
+                })
+            })
+
+            if (!valid) {
+                isRepair = true
+                throw new Error('表单校验失败')
+            }
+        } catch (error) {}
+    }
+    if (isRepair) return
+    const { orderId, code } = orderDetails.value
+    const res: any = await setAddLeaseRepairApi({
+        orderId,
+        code,
+        repairRecordList: repairFormList.value,
+        scrapRecordList: scrapFormList.value,
+        lossRecordList: lossFormList.value,
+    })
+
+    if (res.code === 200) {
+        ElMessage({
+            type: 'success',
+            message: '提交成功',
+        })
+        addOrEditDialogVisible.value = false
+        getLeaseListData()
+    }
 }
 
 // 自定义事件
-const onFileChange = (fileList: any) => {
-    fileListTemp.value = []
-    fileListTemp.value = fileList.map((e: any) => {
+const onRepairFileChange = (fileList: any, index: number) => {
+    repairFormList.value[index].fileInfoList = []
+    const fileListTemp = fileList.map((e: any) => {
         return {
             fileName: e.name,
             fileUrl: e.url,
+            modelId: repairFormList.value[index].maId,
+            taskType: 19,
+            fileType: 0,
         }
     })
 
-    // addOrEditForm.value.fileInfoList.push(...fileListTemp.value)
+    repairFormRefList.value[index].clearValidate('fileInfoList')
+    repairFormList.value[index].fileInfoList.push(...fileListTemp)
+}
+const onScrapFileChange = (fileList: any, index: number) => {
+    scrapFormList.value[index].fileInfoList = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+            modelId: scrapFormList.value[index].maId,
+            taskType: 19,
+            fileType: 1,
+        }
+    })
+    scrapFormRefList.value[index].clearValidate('fileInfoList')
+    scrapFormList.value[index].fileInfoList.push(...fileListTemp)
+}
+const onLossFileChange = (fileList: any, index: number) => {
+    lossFormList.value[index].fileInfoList = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+            modelId: lossFormList.value[index].maId,
+            taskType: 19,
+            fileType: 2,
+        }
+    })
+    lossFormRefList.value[index].clearValidate('fileInfoList')
+    lossFormList.value[index].fileInfoList.push(...fileListTemp)
 }
 
 // 取消按钮
@@ -856,26 +927,13 @@ const onCancel = () => {
     addOrEditDialogVisible.value = false
 }
 const onClose = () => {
-    // addOrEditFormRef.value.resetFields()
-    addOrEditForm.value = JSON.parse(JSON.stringify(addOrEditFormTemp.value))
-    fileListTemp.value = []
-}
-const onDeleteImg = (index: any) => {
-    addOrEditForm.value.fileInfoList.splice(index, 1)
-}
-
-const minLimit = computed(() => {
-    return addOrEditForm.value.fileInfoList.length
-})
-
-const onChangeClass = (val: any) => {
-    console.log(val, '***')
+    repairFormList.value = []
+    lossFormList.value = []
+    scrapFormList.value = []
 }
 
 onMounted(() => {
-    getClassAndCompanyData()
     getLeaseListData()
-    getAreaData()
 })
 </script>
 
diff --git a/src/views/user/lessor/settlement/index.vue b/src/views/user/lessor/settlement/index.vue
index 83f1f02..9c64ce8 100644
--- a/src/views/user/lessor/settlement/index.vue
+++ b/src/views/user/lessor/settlement/index.vue
@@ -12,7 +12,7 @@
                 <el-form-item prop="leaseName">
                     <el-input
                         style="width: 100%"
-                        placeholder="请输入需求名称"
+                        placeholder="请输入订单编号"
                         v-model="searchParams.leaseName"
                         clearable
                     />
@@ -100,13 +100,14 @@
         }"
     >
         <el-table-column align="center" label="序号" type="index" width="80" />
-        <el-table-column align="center" prop="leaseCode" label="需求编号" />
-        <el-table-column align="center" prop="leaseName" label="需求名称" />
-        <el-table-column align="center" prop="areaName" label="项目所在地" />
-        <el-table-column align="center" prop="publishUser" label="发布人" />
-        <el-table-column align="center" prop="orderUser" label="操作人" />
-        <el-table-column align="center" prop="endTime" label="需求截止日期" />
-        <el-table-column align="center" prop="orderTime" label="接单时间" />
+        <el-table-column align="center" prop="leaseCode" label="订单编号" />
+        <el-table-column align="center" prop="leaseName" label="承租人" />
+        <el-table-column align="center" prop="areaName" label="承租单位" />
+        <el-table-column align="center" prop="publishUser" label="联系电话" />
+        <el-table-column align="center" prop="orderUser" label="下单时间" />
+        <el-table-column align="center" prop="endTime" label="订单状态" />
+        <el-table-column align="center" prop="orderTime" label="租赁金额(元)" />
+        <el-table-column align="center" prop="orderTime" label="总金额(元)" />
         <!-- <el-table-column align="center" prop="leaseStatusName" label="需求状态" />
         <el-table-column align="center" label="操作" :width="220">
             <template #default="{ row }">
@@ -160,9 +161,11 @@
     /> -->
 
     <PagingComponent
-        @getList="getLeaseListData"
+        @getListChange="getLeaseListData"
         :pageSize="searchParams.pageSize"
         :pageNumber="searchParams.pageNum"
+        :size="searchParams.pageSize"
+        :page="searchParams.pageNum"
         :total="total"
     />
 
diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue
index f972aa3..711438d 100644
--- a/src/views/user/sourcingNeed/index.vue
+++ b/src/views/user/sourcingNeed/index.vue
@@ -10,20 +10,20 @@
             <el-col :span="4">
                 <el-form-item prop="leaseName">
                     <el-input
+                        clearable
                         style="width: 100%"
                         placeholder="请输入需求名称"
                         v-model="searchParams.leaseName"
-                        clearable
                     />
                 </el-form-item>
             </el-col>
             <el-col :span="4">
                 <el-form-item prop="leaseCode">
                     <el-input
+                        clearable
                         style="width: 100%"
                         placeholder="请输入需求编号"
                         v-model="searchParams.leaseCode"
-                        clearable
                     />
                 </el-form-item>
             </el-col>
@@ -44,9 +44,9 @@
             <el-col :span="6">
                 <el-form-item>
                     <el-date-picker
-                        style="width: 100%"
                         v-model="endTime"
                         type="daterange"
+                        style="width: 100%"
                         range-separator="-"
                         value-format="YYYY-MM-DD"
                         start-placeholder="截止开始日期"
@@ -57,9 +57,9 @@
             <el-col :span="6">
                 <el-form-item>
                     <el-date-picker
-                        v-model="releaseTime"
-                        style="width: 100%"
                         type="daterange"
+                        style="width: 100%"
+                        v-model="releaseTime"
                         range-separator="-"
                         value-format="YYYY-MM-DD"
                         start-placeholder="发布开始日期"
@@ -77,9 +77,9 @@
             <el-button
                 @click="
                     () => {
-                        addOrEditDialogVisible = true
                         isRepublish = true
                         dialogTitle = '新增'
+                        addOrEditDialogVisible = true
                     }
                 "
                 type="primary"
@@ -95,8 +95,8 @@
         :data="leaseList"
         show-overflow-tooltip
         :header-cell-style="{
-            background: '#00a288',
             color: '#fff',
+            background: '#00a288',
         }"
     >
         <el-table-column align="center" label="序号" type="index" width="80" />
@@ -121,19 +121,18 @@
         <el-table-column align="center" label="操作" :width="220">
             <template #default="{ row }">
                 <el-button
-                    text
                     size="small"
                     type="primary"
+                    class="primary-lease"
                     v-if="row.leaseStatus === 2"
                     @click="onRepublish(row.id, false)"
                 >
                     重新发布
                 </el-button>
                 <el-button
-                    text
                     size="small"
-                    class="primary-lease"
                     type="primary"
+                    class="primary-lease"
                     v-if="row.leaseStatus === 2 || row.leaseStatus === 0"
                     @click="onRepublish(row.id, true, row.leaseStatus)"
                 >
@@ -148,7 +147,7 @@
                     v-if="row.leaseStatus != 1"
                 >
                     <template #reference>
-                        <el-button size="small" text type="primary" class="primary-lease">
+                        <el-button size="small" type="primary" class="primary-lease">
                             删除
                         </el-button>
                     </template>
@@ -170,47 +169,23 @@
         </el-table-column>
     </el-table>
 
-    <!-- <el-pagination
-        size="small"
-        background
-        layout="prev, pager, next"
-        :page-size="searchParams.pageSize"
-        :total="total"
-        class="mt-4"
-        @current-change="onCurrentChange"
-        v-if="total > 0"
-    /> -->
-
-    <!-- <el-pagination
-        style="text-align: right"
-        background
-        small="small"
-        :total="total"
-        :page-sizes="[10, 20, 50, 100]"
-        v-model:page-size="searchParams.pageSize"
-        v-model:current-page="searchParams.pageNum"
-        layout="total, prev, pager, next,sizes"
-        @size-change="getLeaseListData"
-        @current-change="getLeaseListData"
-    /> -->
-
     <PagingComponent
-        @getListChange="getLeaseListData"
-        v-model:page-size="searchParams.pageSize"
-        v-model:page-num="searchParams.pageNum"
+        :total="total"
         :size="searchParams.pageSize"
         :page="searchParams.pageNum"
-        :total="total"
+        @getListChange="getLeaseListData"
+        v-model:page-num="searchParams.pageNum"
+        v-model:page-size="searchParams.pageSize"
     />
 
     <!-- 新增修改对话框 -->
     <el-dialog
-        :title="dialogTitle"
         width="60%"
         align-center
-        destroy-on-close
-        v-model="addOrEditDialogVisible"
         @close="onClose"
+        destroy-on-close
+        :title="dialogTitle"
+        v-model="addOrEditDialogVisible"
     >
         <el-form
             label-width="auto"
@@ -246,7 +221,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <!-- <el-form-item label="租赁公司" prop="companyId">
+                    <el-form-item label="租赁公司" prop="companyId">
                         <el-select
                             clearable
                             style="width: 100%"
@@ -254,26 +229,10 @@
                             v-model="addOrEditForm.companyId"
                         >
                             <el-option
-                                v-for="item in companyOptions"
                                 :key="item.companyId"
-                                :label="item.companyName"
                                 :value="item.companyId"
-                            />
-                        </el-select>
-                    </el-form-item> -->
-
-                    <el-form-item label="项目所在地" prop="areaId">
-                        <el-select
-                            clearable
-                            style="width: 100%"
-                            placeholder="请选择项目所在地"
-                            v-model="addOrEditForm.areaId"
-                        >
-                            <el-option
-                                v-for="item in areaList"
-                                :key="item.areaId"
-                                :label="item.areaName"
-                                :value="item.areaId"
+                                :label="item.companyName"
+                                v-for="item in companyOptions"
                             />
                         </el-select>
                     </el-form-item>
@@ -307,8 +266,8 @@
                             clearable
                             :max="9999"
                             style="width: 100%"
-                            v-model="addOrEditForm.leaseDay"
                             placeholder="请输入预估租期"
+                            v-model="addOrEditForm.leaseDay"
                         />
                     </el-form-item>
                 </el-col>
@@ -319,8 +278,8 @@
                             :min="1"
                             :max="9999"
                             style="width: 100%"
-                            v-model="addOrEditForm.leaseNum"
                             placeholder="请输入预估数量"
+                            v-model="addOrEditForm.leaseNum"
                         />
                     </el-form-item>
                 </el-col>
@@ -333,12 +292,29 @@
                             type="date"
                             style="width: 100%"
                             value-format="YYYY-MM-DD"
+                            :disabled-date="disabledDate"
                             v-model="addOrEditForm.endTime"
                             placeholder="请选择需求截止日期"
-                            :disabled-date="disabledDate"
                         />
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                    <el-form-item label="项目所在地" prop="areaId">
+                        <el-select
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择项目所在地"
+                            v-model="addOrEditForm.areaId"
+                        >
+                            <el-option
+                                :key="item.areaId"
+                                :value="item.areaId"
+                                :label="item.areaName"
+                                v-for="item in areaList"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="24">
@@ -367,17 +343,17 @@
                         </div>
                         <UploadComponentNew
                             :maxSize="2"
-                            :minLimit="minLimit"
                             :max-limit="4"
                             width="120px"
                             height="120px"
-                            :autoUpload="true"
                             :multiple="true"
-                            :fileListN="addOrEditForm.fileInfoList"
-                            listType="picture-card"
-                            :acceptTypeList="['.jpg', '.png']"
+                            :autoUpload="true"
+                            :minLimit="minLimit"
                             :actionUrl="uploadUrl"
+                            listType="picture-card"
                             @onFileChange="onFileChange"
+                            :acceptTypeList="['.jpg', '.png']"
+                            :fileListN="addOrEditForm.fileInfoList"
                         >
                             <template v-slot:default>
                                 <el-icon size="48" color="#aaa"><Plus /></el-icon>
@@ -420,8 +396,8 @@
 </template>
 
 <script setup lang="ts">
-import UploadComponentNew from 'components/uploadComponentNew/index.vue'
 import PagingComponent from 'components/PagingComponent/index.vue'
+import UploadComponentNew from 'components/uploadComponentNew/index.vue'
 import { getCompanyListApi, getGoodsClassListApi, getAreaApi } from 'http/api/home'
 import {
     addLeaseInfoApi,
@@ -433,22 +409,22 @@ import {
 import { InfoFilled } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
-const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
-const addOrEditDialogVisible = ref(false)
-const companyOptions = ref<any>([])
-const classOptions = ref<any>([])
-const addOrEditFormRef = ref<any>(null)
-const searchFormRef = ref<any>(null)
-const leaseList = ref<any>([])
-const isRepublish = ref(true)
-const isSave = ref(false)
 const total = ref(0)
 const endTime = ref([])
-const areaList = ref<any>([])
-const releaseTime = ref([])
-const dialogTitle = ref('新增')
-const fileListTemp = ref<any>([])
+const isSave = ref(false)
 const router = useRouter()
+const releaseTime = ref([])
+const isRepublish = ref(true)
+const areaList = ref<any>([])
+const leaseList = ref<any>([])
+const dialogTitle = ref('新增')
+const classOptions = ref<any>([])
+const fileListTemp = ref<any>([])
+const companyOptions = ref<any>([])
+const searchFormRef = ref<any>(null)
+const addOrEditFormRef = ref<any>(null)
+const addOrEditDialogVisible = ref(false)
+const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
 
 const searchParams = reactive({
     leaseName: '',
@@ -493,10 +469,15 @@ const addOrEditFormTemp = ref<any>({
 })
 
 const addOrEditFormRules = reactive({
+    person: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+    leaseDay: [{ required: true, message: '请输入预估租期', trigger: 'blur' }],
+    leaseNum: [{ required: true, message: '请输入预估数量', trigger: 'blur' }],
     leaseName: [{ required: true, message: '请输入需求名称', trigger: 'blur' }],
     typeIds: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
+    areaId: [{ required: true, message: '请选择项目所在地', trigger: 'change' }],
     companyId: [{ required: true, message: '请选择租赁公司', trigger: 'change' }],
-    person: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+    fileInfoList: [{ required: true, message: '请上传参考图片', trigger: 'blur' }],
+    endTime: [{ required: true, message: '请选择需求截止日期', trigger: 'change' }],
     personPhone: [
         { required: true, message: '请输入联系电话', trigger: 'blur' },
         {
@@ -505,11 +486,6 @@ const addOrEditFormRules = reactive({
             trigger: 'blur',
         },
     ],
-    leaseDay: [{ required: true, message: '请输入预估租期', trigger: 'blur' }],
-    leaseNum: [{ required: true, message: '请输入预估数量', trigger: 'blur' }],
-    endTime: [{ required: true, message: '请选择需求截止日期', trigger: 'change' }],
-    fileInfoList: [{ required: true, message: '请上传参考图片', trigger: 'blur' }],
-    areaId: [{ required: true, message: '请选择项目所在地', trigger: 'change' }],
 })
 
 const disabledDate = (date: any) => {