diff --git a/src/http/api/owner-manage/index.ts b/src/http/api/owner-manage/index.ts
index a169985..65fb4db 100644
--- a/src/http/api/owner-manage/index.ts
+++ b/src/http/api/owner-manage/index.ts
@@ -28,4 +28,10 @@ export const updateStatus = (data: any = {}) => {
 //自有装备模板选择
 export const getContractSelectList = () => {
     return get('/material-mall/contract/lisTemplate', {})
-}
\ No newline at end of file
+}
+
+
+//装备名称下拉框获取
+export const getCategoryList = (data: any = {}) => {
+    return get('/material-mall/owner/getCategoryList', data)
+}
diff --git a/src/views/user/rent-manage/index.vue b/src/views/user/rent-manage/index.vue
index c3c9cef..afe9a7d 100644
--- a/src/views/user/rent-manage/index.vue
+++ b/src/views/user/rent-manage/index.vue
@@ -1,240 +1,384 @@
 <template>
-  <div class="app-container-content">
-    <!-- 搜索表单 -->
-    <el-form
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      size="default"
-      label-width="0"
-    >
-      <el-row>
-        <el-col :span="6">
-          <el-form-item prop="maName">
-            <el-select
-              v-model="queryParams.maName"
-              placeholder="请选择装备类目"
-              style="width: 100%"
-              clearable
-              filterable
-            >
-              <el-option
-                v-for="item in equipmentNameOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item prop="maModel">
-            <el-input
-              v-model.trim="queryParams.maModel"
-              style="width: 100%"
-              clearable
-              placeholder="请输入装备名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item>
-            <el-button class="primary-lease" type="primary" @click="getContractListData">查询</el-button>
-            <el-button class="primary-lease" type="primary" @click="onReset">重置</el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="18">
-          <el-form-item>
-            <el-button class="primary-lease" type="primary" @click="addContract">新增装备</el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <div class='app-container-content'>
+        <!-- 搜索表单 -->
+        <el-form
+            :model='queryParams'
+            ref='queryFormRef'
+            :inline='true'
+            size='default'
+            label-width='0'
+        >
+            <el-row>
+                <el-col :span='6'>
+                    <el-form-item prop='modelId'>
+                        <el-select
+                            v-model='queryParams.modelId'
+                            placeholder='请选择装备类目'
+                            style='width: 100%'
+                            clearable
+                            filterable
+                        >
+                            <el-option
+                                v-for='item in equipmentNameOptions'
+                                :key='item.value'
+                                :label='item.label'
+                                :value='item.value'
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span='6'>
+                    <el-form-item prop='maName'>
+                        <el-input
+                            v-model.trim='queryParams.maName'
+                            style='width: 100%'
+                            clearable
+                            placeholder='请输入装备名称'
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span='6'>
+                    <el-form-item>
+                        <el-button class='primary-lease' type='primary' @click='getContractListData'>查询</el-button>
+                        <el-button class='primary-lease' type='primary' @click='onReset'>重置</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span='18'>
+                    <el-form-item>
+                        <el-button class='primary-lease' type='primary' @click='addContract'>新增装备</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
 
-    <!-- 表格 -->
-    <el-table
-      :data="qualityLis"
-      show-overflow-tooltip
-      :header-cell-style="{ background: '#00a288', color: '#fff' }"
-    >
-      <el-table-column align="center" prop="maName" label="装备类目" />
-      <el-table-column align="center" prop="maModel" label="装备名称" />
-      <el-table-column align="center" prop="maNum" label="装备数量" />
-      <el-table-column align="center" label="操作" :width="220">
-        <template #default="{ row }">
-          <el-button size="small" type="primary" @click="onContract(row)">编辑</el-button>
-          <el-button size="small" type="danger" @click="onDelete(row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <PagingComponent
-      @getList="getContractListData"
-      :pageSize="queryParams.pageSize"
-      :pageNumber="queryParams.pageNum"
-      :total="total"
-    />
-
-    <!-- 新增/编辑弹窗 -->
-    <el-dialog
-      v-model="dialogVisibleSettlein"
-      :title="settleinTitle"
-      width="40%"
-      destroy-on-close
-      class="centered-dialog"
-      :close-on-click-modal="false"
-      @close="onDialogClose"
-    >
-      <el-form
-        label-width="140px"
-        ref="addAndEditFormRef"
-        label-position="right"
-        :model="addAndEditForm"
-        :rules="addAndEditFormRules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="装备类目：" prop="maNameId">
-              <el-select
-                v-model="addAndEditForm.maNameId"
-                placeholder="请选择装备类目"
-                style="width: 100%"
-                clearable
-                filterable
-              >
-                <el-option
-                  v-for="item in equipmentNameOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="装备名称：" prop="maModel">
-              <el-input
-                v-model="addAndEditForm.maModel"
-                maxlength="50"
-                placeholder="请输入装备名称"
-                clearable
-                style="width: 100%"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="装备数量：" prop="maNum">
-              <el-input-number
-                v-model="addAndEditForm.maNum"
-                :min="1"
-                placeholder="请输入数量"
-                style="width: 100%"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- 图片一类的处理 -->
-        <el-row :gutter="20" v-if="!isViewForm">
-          <el-col :span="24">
-            <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
-              <div class="tipBox">
-                *注: 支持格式：.jpg、.png 单个文件大小不能超过5M
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item
-              style="font-weight: bold"
-              label="装备图："
-              prop="mainFileList"
-            >
-              <div
-                class="img-list"
-                v-if="addAndEditForm.mainFileList.length > 0 && !isAdd"
-              >
-                <div
-                  v-for="(j, i) in addAndEditForm.mainFileList"
-                  :key="j.fileUrl"
-                  class="img-items"
-                >
-                  <img :src="j.fileUrl" alt="" />
-
-                  <div class="mask-img">
-                    <div>
-                      <el-icon
-                        class="delete-icon"
-                        @click="onDeleteImgInMain(i)"
-                        v-if="!isViewForm"
-                      >
-                        <DeleteFilled />
-                      </el-icon>
-                      <el-icon
-                        class="delete-icon"
-                        style="margin-left: 10px"
-                        @click="onPreviewImg(j.fileUrl)"
-                      >
-                        <ZoomIn />
-                      </el-icon>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <UploadComponentNew
-                v-if="!isViewForm"
-                :maxSize="5"
-                :max-limit="6"
-                width="100px"
-                height="100px"
-                :actionUrl="uploadUrl"
-                :autoUpload="true"
-                :multiple="true"
-                :minLimit="addAndEditForm.mainFileList.length"
-                listType="picture-card"
-                :acceptTypeList="['.jpg', '.png']"
-                @onFileChange="onMainFileChange"
-              >
-                <template v-slot:default>
-                  <el-icon size="42" color="#aaa"><Plus /></el-icon>
+        <!-- 表格 -->
+        <el-table
+            :data='qualityLis'
+            show-overflow-tooltip
+            :header-cell-style="{ background: '#2CBAB2', color: '#fff' }"
+        >
+            <el-table-column align='center' prop='modelName' label='装备类目' />
+            <el-table-column align='center' prop='maName' label='装备名称' />
+            <el-table-column align='center' prop='maNum' label='装备数量' />
+            <el-table-column align='center' prop='proCode' label='所属项目' />
+            <el-table-column align='center' prop='rentalCompany' label='出租公司' />
+            <el-table-column align='center' prop='leaseTerm' label='租赁时间' />
+            <el-table-column align='center' prop='returnTime' label='归还时间' />
+            <el-table-column align='center' prop='actualNumber' label='实际使用台班数' />
+            <el-table-column align='center' prop='rentalAmount' label='租赁金额' />
+            <el-table-column align='center' prop='fileList' label='装备图'>
+                <template #default='{ row }'>
+                    <span
+                        v-if="row.fileList && row.fileList.trim() !== ''"
+                        class='link-text'
+                        @click='previewTableImages(row.fileList)'
+                        style='color:#2CBAB2;cursor:pointer;'
+                    >
+                      已上传
+                    </span>
+                    <span v-else>
+                      未上传
+                    </span>
                 </template>
-              </UploadComponentNew>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" class="primary-lease" @click="onCancel">取消</el-button>
-          <el-button class="primary-lease" type="primary" @click="onSubmit">提交</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+            </el-table-column>
+
+            <el-table-column align='center' label='操作' :width='220'>
+                <template #default='{ row }'>
+                    <el-button size='small' type='text' @click='onContract(row)'>编辑</el-button>
+                    <el-button size='small' type='text' @click='onDelete(row.id)' style='color: #FF5129;'>删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <PagingComponent
+            @getList='getContractListData'
+            :pageSize='queryParams.pageSize'
+            :pageNumber='queryParams.pageNum'
+            :total='total'
+        />
+
+        <!-- 新增/编辑弹窗 -->
+        <el-dialog
+            v-model='dialogVisibleSettlein'
+            :title='settleinTitle'
+            width='40%'
+            destroy-on-close
+            class='centered-dialog'
+            :close-on-click-modal='false'
+            @close='onDialogClose'
+        >
+            <el-form
+                label-width='140px'
+                ref='addAndEditFormRef'
+                label-position='right'
+                :model='addAndEditForm'
+                :rules='addAndEditFormRules'
+            >
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='装备类目：' prop='modelId'>
+                            <el-select
+                                v-model='addAndEditForm.modelId'
+                                placeholder='请选择装备类目'
+                                style='width: 100%'
+                                clearable
+                                filterable
+                            >
+                                <el-option
+                                    v-for='item in equipmentNameOptions'
+                                    :key='item.value'
+                                    :label='item.label'
+                                    :value='item.value'
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='装备名称：' prop='maName'>
+                            <el-input
+                                v-model='addAndEditForm.maName'
+                                maxlength='50'
+                                placeholder='请输入装备名称'
+                                clearable
+                                style='width: 100%'
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='装备数量：' prop='maNum'>
+                            <el-input-number
+                                v-model='addAndEditForm.maNum'
+                                :min='1'
+                                placeholder='请输入数量'
+                                style='width: 100%'
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item prop='proCode' label='所属项目:'>
+                            <el-select
+                                v-model='addAndEditForm.proCode'
+                                placeholder='请选择所属项目'
+                                style='width: 100%;'
+                            >
+                                <el-option
+                                    v-for='item in projectList'
+                                    :key='item.proCode'
+                                    :label='item.proName'
+                                    :value='item.proCode'
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='出租公司：' prop='rentalCompany'>
+                            <el-input
+                                v-model='addAndEditForm.rentalCompany'
+                                maxlength='50'
+                                placeholder='请输入出租公司'
+                                clearable
+                                style='width: 100%'
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='租赁时间' prop='leaseTerm'>
+                            <el-date-picker
+                                v-model='addAndEditForm.leaseTerm'
+                                type='date'
+                                placeholder='请选择租赁时间'
+                                style='width: 100%'
+                                format='YYYY-MM-DD'
+                                value-format='YYYY-MM-DD'
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='归还时间' prop='returnTime'>
+                            <el-date-picker
+                                v-model='addAndEditForm.returnTime'
+                                placeholder='请选择归还时间'
+                                type='date'
+                                style='width: 100%'
+                                format='YYYY-MM-DD'
+                                value-format='YYYY-MM-DD'
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='实际使用台班数：' prop='actualNumber'>
+                            <el-input-number
+                                v-model='addAndEditForm.actualNumber'
+                                :min='1'
+                                placeholder='请输入实际使用台班数'
+                                style='width: 100%'
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item label='租赁金额：' prop='rentalAmount'>
+                            <el-input-number
+                                v-model='addAndEditForm.rentalAmount'
+                                :min='1'
+                                placeholder='请输入租赁金额'
+                                style='width: 100%'
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+                <!-- 图片一类的处理 -->
+                <el-row :gutter='20' v-if='!isViewForm'>
+                    <el-col :span='24'>
+                        <el-form-item label='1' style='margin-bottom: 0' class='upload-tip'>
+                            <div class='tipBox'>
+                                *注: 支持格式：.jpg、.png 单个文件大小不能超过5M
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter='20'>
+                    <el-col :span='24'>
+                        <el-form-item
+                            style='font-weight: bold'
+                            label='装备图：'
+                            prop='mainFileList'
+                        >
+                            <div
+                                class='img-list'
+                                v-if='addAndEditForm.mainFileList.length > 0 && !isAdd'
+                            >
+                                <div
+                                    v-for='(j, i) in addAndEditForm.mainFileList'
+                                    :key='j.fileUrl'
+                                    class='img-items'
+                                >
+                                    <img :src='j.fileUrl' alt='' />
+
+                                    <div class='mask-img'>
+                                        <div>
+                                            <el-icon
+                                                class='delete-icon'
+                                                @click='onDeleteImgInMain(i)'
+                                                v-if='!isViewForm'
+                                            >
+                                                <DeleteFilled />
+                                            </el-icon>
+                                            <el-icon
+                                                class='delete-icon'
+                                                style='margin-left: 10px'
+                                                @click='onPreviewImg(j.fileUrl)'
+                                            >
+                                                <ZoomIn />
+                                            </el-icon>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <UploadComponentNew
+                                v-if='!isViewForm'
+                                :maxSize='5'
+                                :max-limit='6'
+                                width='100px'
+                                height='100px'
+                                :actionUrl='uploadUrl'
+                                :autoUpload='true'
+                                :multiple='true'
+                                :minLimit='addAndEditForm.mainFileList.length'
+                                listType='picture-card'
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange='onMainFileChange'
+                            >
+                                <template v-slot:default>
+                                    <el-icon size='42' color='#aaa'>
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <div class='dialog-footer'>
+                    <el-button type='primary' class='primary-lease' @click='onCancel'
+                               style='background: #FFFFFF;border: 1px solid #CCCCCC;color: #666666;'>取消
+                    </el-button>
+                    <el-button class='primary-lease' type='primary' @click='onSubmit'>提交</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+
+        <el-dialog
+            v-model="dialogVisiblePreview"
+            title="查看装备图片"
+            width="60%"
+        >
+            <div style="display:flex; flex-wrap:wrap; gap:10px;">
+                <img
+                    v-for="(url, index) in previewImages"
+                    :key="index"
+                    :src="url"
+                    style="width:120px; height:120px; object-fit:cover; cursor:pointer;border: 2px solid #2CBAB2;border-radius: 4px;padding: 2px; "
+                    @click="window.open(url)"
+                />
+            </div>
+            <template #footer>
+                <el-button @click="dialogVisiblePreview = false">关闭</el-button>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import UploadComponentNew from 'components/uploadComponentNew/index.vue'
 import PagingComponent from 'components/PagingComponent/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive, onMounted } from 'vue'
 import { useStore } from 'store/user'
+
 const store = useStore()
 import { mainStore } from 'store/main'
+
 const store2 = mainStore()
 import {
-  getEquipmentNameList, //装备类目
-  getContractListApi, //列表
-  addContractApi, //新增
-  editContractApi, //修改
-  delContractApi, //删除
+    getEquipmentNameList, //装备类目
+    getContractListApi, //列表
+    addContractApi, //新增
+    editContractApi, //修改
+    delContractApi, //删除
+    getCategoryList, //装备类目
 } from 'http/api/owner-manage'
+import { getProListApi } from '@/http/api/cart'
 
 const uploadUrlTemp = ref('')
 const isViewForm = ref(false)
@@ -243,289 +387,421 @@ const isAdd = ref(false)
 const queryFormRef = ref<any>(null)
 const total = ref(0)
 const equipmentNameOptions = ref<any[]>([])
+const projectList: any = ref([])
 const queryParams: any = reactive({
-  maName: '',
-  maModel: '',
-  type: '1',
-  pageSize: 10,
-  pageNum: 1,
+    modelId: '',
+    maName: '',
+    type: '1',
+    pageSize: 10,
+    pageNum: 1,
 })
+
+const dialogVisiblePreview = ref(false)
+const previewImages = ref<string[]>([])
+const previewTableImages = (fileList: string) => {
+    if (!fileList) return
+    // 拆成数组
+    previewImages.value = fileList.split(',')
+    dialogVisiblePreview.value = true
+}
+
 const addAndEditForm = ref<any>({
-  id: null,
-  maNameId: '',
-  maType: '',
-  maModel: '',
-  maNum: '',
-  type: '1',
-  mainFileList: [], // 确保初始化
-  mainFileTempList: [] // 临时存储新上传的文件
+    id: null,
+    modelId: '',
+    maType: '',
+    maName: '',
+    maNum: '',
+    type: '1',
+    mainFileList: [], // 确保初始化
+    mainFileTempList: [], // 临时存储新上传的文件
+    proCode: '',
+    rentalCompany: '',
+    leaseTerm: null,
+    returnTime: null,
+    actualNumber: '',
+    rentalAmount: '',
+    fileList: '',
 })
 const addAndEditFormRef = ref()
 const mainFileList: any = ref([]) //主展示
 const settleinTitle = ref('')
 const dialogVisibleSettlein: any = ref(false)
 const headerInfo = reactive({
-  Authorization: 'Bearer ' + store2.token,
+    Authorization: 'Bearer ' + store2.token,
 })
 const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
 
 const onDeleteImgInMain = (index: any) => {
-  addAndEditForm.value.mainFileList.splice(index, 1)
+    addAndEditForm.value.mainFileList.splice(index, 1)
+
+    addAndEditForm.value.fileList = addAndEditForm.value.mainFileList
+        .map(item => item.fileUrl)
+        .join(',')
 }
 
 const handleUpload = (file: any, fileList: any) => {
-  if (file.code == 200) {
-    ElMessage.success('上传成功')
-  } else {
-    ElMessage.error(file.msg || '上传失败')
-  }
-  getContractListData()
+    if (file.code == 200) {
+        ElMessage.success('上传成功')
+    } else {
+        ElMessage.error(file.msg || '上传失败')
+    }
+    getContractListData()
 }
 
 // 处理上传成功的图片
 const onMainFileChange = (fileList: any[]) => {
-  // 将上传的文件信息存储到临时列表
-  addAndEditForm.value.mainFileTempList = fileList.map(file => ({
-    fileName: file.name, // 文件名
-    fileUrl: file.url    // 文件URL
-  }))
+    // 将上传的文件信息存储到临时列表
+    /*addAndEditForm.value.mainFileTempList = fileList.map(file => ({
+        fileName: file.name, // 文件名
+        fileUrl: file.url,    // 文件URL
+    }))*/
+    addAndEditForm.value.fileList = fileList
+        .map(file => file.url)
+        .join(',')
 }
 
 // 获取列表
 const getContractListData = async () => {
-  const { data: res }: any = await getContractListApi(queryParams)
-  qualityLis.value = res.rows || []
-  total.value = res.total
-  console.log('表格数据:', qualityLis.value) // 调试用
+    const { data: res }: any = await getContractListApi(queryParams)
+    qualityLis.value = res.rows || []
+    total.value = res.total
+    console.log('表格数据:', qualityLis.value) // 调试用
 }
 
 //获取装备类目
 const loadEquipmentNameOptions = async () => {
-  const res: any = await getEquipmentNameList()
-  if (res.code === 200) {
-    equipmentNameOptions.value = res.data.map(item => ({
-      label: item.name,
-      value: item.id
-    }))
-    console.log('下拉选项:', equipmentNameOptions.value) // 调试用
-  } else {
-    ElMessage.error('获取装备类目失败')
-  }
+    const res: any = await getCategoryList()
+    if (res.code === 200) {
+        equipmentNameOptions.value = res.data.map(item => ({
+            label: item.equipmentName,
+            value: item.typeId,
+        }))
+        console.log('下拉选项:', equipmentNameOptions.value) // 调试用
+    } else {
+        ElMessage.error('获取装备类目失败')
+    }
+}
+
+
+//获取所属项目
+const loadProjectListOptions = async () => {
+    const res: any = await getProListApi()
+    if (res.code === 200) {
+        projectList.value = res.data
+        console.log('下拉选项:') // 调试用
+    } else {
+        ElMessage.error('获取所属项目失败')
+    }
+}
+
+
+const validateLeaseTime = (_rule: any, value: string, callback: any) => {
+    const returnTime = addAndEditForm.value.returnTime
+    if (!value || !returnTime) {
+        callback()
+    } else if (new Date(value) > new Date(returnTime)) {
+        callback(new Error('租赁时间必须早于归还时间'))
+    } else {
+        callback()
+    }
+}
+
+const validateReturnTime = (_rule: any, value: string, callback: any) => {
+    const leaseTerm = addAndEditForm.value.leaseTerm
+    if (!value || !leaseTerm) {
+        callback()
+    } else if (new Date(value) < new Date(leaseTerm)) {
+        callback(new Error('归还时间必须晚于租赁时间'))
+    } else {
+        callback()
+    }
 }
 
 // 重置
 const onReset = () => {
-  queryParams.maName = ''
-  queryParams.maModel = ''
-  queryParams.pageNum = 1
-  queryParams.pageSize = 10
-  queryFormRef.value.resetFields()
-  getContractListData()
+    queryParams.maName = ''
+    queryParams.maName = ''
+    queryParams.pageNum = 1
+    queryParams.pageSize = 10
+    queryFormRef.value.resetFields()
+    getContractListData()
 }
 
 // 新增装备
 const addContract = () => {
-  settleinTitle.value = '外租装备新建'
-  dialogVisibleSettlein.value = true
-  addAndEditForm.value.id = null
-  isViewForm.value = false
-  addAndEditForm.value.maNameId = ''
-  addAndEditForm.value.maType = ''
-  addAndEditForm.value.maModel = ''
-  addAndEditForm.value.maNum = ''
-  addAndEditForm.value.mainFileList = [] // 修复：加.value
-  addAndEditForm.value.mainFileTempList = [] // 修复：加.value
+    settleinTitle.value = '外租装备新建'
+    dialogVisibleSettlein.value = true
+    addAndEditForm.value.id = null
+    isViewForm.value = false
+    addAndEditForm.value.modelId = ''
+    addAndEditForm.value.maType = ''
+    addAndEditForm.value.maName = ''
+    addAndEditForm.value.maNum = ''
+    addAndEditForm.value.mainFileList = [] // 修复：加.value
+    addAndEditForm.value.mainFileTempList = [] // 修复：加.value
+
+    addAndEditForm.value.proCode = ''
+    addAndEditForm.value.rentalCompany = ''
+    addAndEditForm.value.leaseTerm = null
+    addAndEditForm.value.returnTime = null
+    addAndEditForm.value.actualNumber = ''
+    addAndEditForm.value.rentalAmount = ''
+    addAndEditForm.value.fileList = ''
 }
 
 //  编辑装备时加载已有图片
 const onContract = (row: any) => {
-  // 加载已有图片（如果后端返回了图片数据）
-  if (row.mainFileList) {
-    addAndEditForm.value.mainFileList = row.mainFileList.map((img: any) => ({
-      fileName: img.fileName,
-      fileUrl: img.fileUrl
-    }))
-  } else {
-    addAndEditForm.value.mainFileList = []
-  }
-  
-  addAndEditForm.value.mainFileTempList = []
-  addAndEditForm.value.id = row.id
-  // 通过装备类目匹配下拉选项，获取对应的id
-  const matchedOption = equipmentNameOptions.value.find(option => option.label === row.maName)
-  if (matchedOption) {
-    addAndEditForm.value.maNameId = matchedOption.value
-  } else {
-    // 如果找不到匹配，尝试使用其他字段
-    addAndEditForm.value.maNameId = row.maNameId || row.maName_id || row.equipmentId || row.id
-  }
-  
-  addAndEditForm.value.maType = row.maType
-  addAndEditForm.value.maModel = row.maModel
-  addAndEditForm.value.maNum = row.maNum
-  settleinTitle.value = '外租装备修改'
-  dialogVisibleSettlein.value = true
-  
-  // 检查是否能找到对应的选项
-  const foundOption = equipmentNameOptions.value.find(item => item.value === addAndEditForm.value.maNameId)
-  console.log('找到的选项:', foundOption) // 调试用
-  
-  if (!foundOption) {
-    console.warn('警告：找不到对应的装备类目选项，maNameId:', addAndEditForm.value.maNameId)
-  }
+    // 加载已有图片（如果后端返回了图片数据）
+    if (row.fileList) {
+        addAndEditForm.value.mainFileList = row.fileList.split(',').map((url: string) => ({
+            fileName: url.split('/').pop(),
+            fileUrl: url,
+        }))
+    } else {
+        addAndEditForm.value.mainFileList = []
+    }
+    addAndEditForm.value.mainFileTempList = []
+
+    addAndEditForm.value.id = row.id
+    // 通过装备类目匹配下拉选项，获取对应的id
+    const matchedOption = equipmentNameOptions.value.find(option => option.label === row.maName)
+    if (matchedOption) {
+        addAndEditForm.value.modelId = matchedOption.value
+    } else {
+        // 如果找不到匹配，尝试使用其他字段
+        addAndEditForm.value.modelId = row.modelId || row.maName_id || row.equipmentId || row.id
+    }
+
+
+    // 通过所属项目下拉选项，获取对应的id
+    const projectListOption = projectList.value.find(option => option.label === row.maName)
+    if (projectListOption) {
+        addAndEditForm.value.proCode = projectListOption.value
+    } else {
+        // 如果找不到匹配，尝试使用其他字段
+        addAndEditForm.value.proCode = row.proCode || row.id
+    }
+
+    addAndEditForm.value.maType = row.maType
+    addAndEditForm.value.maName = row.maName
+    addAndEditForm.value.maNum = row.maNum
+
+    addAndEditForm.value.rentalCompany = row.rentalCompany
+    addAndEditForm.value.leaseTerm = row.leaseTerm
+    addAndEditForm.value.returnTime = row.returnTime
+    addAndEditForm.value.actualNumber = row.actualNumber
+    addAndEditForm.value.rentalAmount = row.rentalAmount
+
+    settleinTitle.value = '外租装备修改'
+    dialogVisibleSettlein.value = true
+
+    // 检查是否能找到对应的选项
+    const foundOption = equipmentNameOptions.value.find(item => item.value === addAndEditForm.value.modelId)
+    console.log('找到的选项:', foundOption) // 调试用
+
+    if (!foundOption) {
+        console.warn('警告：找不到对应的装备类目选项，modelId:', addAndEditForm.value.modelId)
+    }
 }
 
 const onDialogClose = () => {
-  addAndEditFormRef.value.resetFields()
-  addAndEditForm.value.id = null
-  addAndEditForm.value.maNameId = ''
-  addAndEditForm.value.maType = ''
-  addAndEditForm.value.maModel = ''
-  addAndEditForm.value.maNum = ''
+    addAndEditFormRef.value.resetFields()
+    addAndEditForm.value.id = null
+    addAndEditForm.value.modelId = ''
+    addAndEditForm.value.maType = ''
+    addAndEditForm.value.maName = ''
+    addAndEditForm.value.maNum = ''
 }
 
 const addAndEditFormRules = reactive({
-  maNameId: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
-  maType: [{ required: true, message: '请输入装备分类', trigger: 'blur' }],
-  maModel: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
-  maNum: [{ required: true, type: 'number', message: '请输入装备数量', trigger: 'blur' }]
+    modelId: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
+    maType: [{ required: true, message: '请输入装备分类', trigger: 'blur' }],
+    maName: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+    maNum: [{ required: true, type: 'number', message: '请输入装备数量', trigger: 'blur' }],
+
+    proCode: [{ required: true, message: '请选择所属项目', trigger: 'change' }],
+    rentalCompany: [{ required: true, message: '请输入出租公司', trigger: 'blur' }],
+    leaseTerm: [
+        { required: true, message: '请选择租赁时间', trigger: 'change' },
+        { validator: validateLeaseTime, trigger: 'change' },
+    ],
+    returnTime: [
+        { required: true, message: '请选择归还时间', trigger: 'change' },
+        { validator: validateReturnTime, trigger: 'change' },
+    ],
+    actualNumber: [{ required: true, type: 'number', message: '请输入实际使用台班数', trigger: 'blur' }],
+    rentalAmount: [{ required: true, type: 'number', message: '请输入租赁金额', trigger: 'blur' }],
 })
 
 const onSubmit = () => {
-  addAndEditFormRef.value.validate(async (valid: any) => {
-    if (valid) {
-      // 合并临时图片到主图片列表
-      addAndEditForm.value.mainFileList = [
-        ...addAndEditForm.value.mainFileList,
-        ...addAndEditForm.value.mainFileTempList
-      ]
-      // 清空临时列表
-      addAndEditForm.value.mainFileTempList = []
-      const SEN_API = settleinTitle.value === '外租装备修改' ? editContractApi : addContractApi
-      const res: any = await SEN_API(addAndEditForm.value)
-      if (res.code === 200) {
-        ElMessage.success('提交成功')
-        dialogVisibleSettlein.value = false
-        getContractListData();
-      } else {
-        ElMessage.error(res.msg || '提交失败')
-      }
-    }
-  })
+    addAndEditFormRef.value.validate(async (valid: any) => {
+        if (valid) {
+            /*// 合并临时图片到主图片列表
+            addAndEditForm.value.mainFileList = [
+                ...addAndEditForm.value.mainFileList,
+                ...addAndEditForm.value.mainFileTempList,
+            ]
+            // 清空临时列表
+            addAndEditForm.value.mainFileTempList = []*/
+            const SEN_API = settleinTitle.value === '外租装备修改' ? editContractApi : addContractApi
+            const res: any = await SEN_API(addAndEditForm.value)
+            if (res.code === 200) {
+                ElMessage.success('提交成功')
+                dialogVisibleSettlein.value = false
+                getContractListData()
+            } else {
+                ElMessage.error(res.msg || '提交失败')
+            }
+        }
+    })
 }
 
 // 删除
 const onDelete = async (id: any) => {
-  ElMessageBox.confirm('是否确定删除？', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-  .then(async () => {
-    const res = await delContractApi({ id })
-    if (res.code === 200) {
-      ElMessage.success('删除成功')
-      getContractListData();
-    } else {
-      ElMessage.error(res.msg || '删除失败')
-    }
-  })
-  .catch(() => {})
+    ElMessageBox.confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(async () => {
+            const res = await delContractApi({ id })
+            if (res.code === 200) {
+                ElMessage.success('删除成功')
+                getContractListData()
+            } else {
+                ElMessage.error(res.msg || '删除失败')
+            }
+        })
+        .catch(() => {
+        })
 }
 
 // 取消按钮
 const onCancel = () => {
-  dialogVisibleSettlein.value = false
+    dialogVisibleSettlein.value = false
 }
 
 onMounted(() => {
-  getContractListData()
-  loadEquipmentNameOptions()
-  uploadUrlTemp.value = window.location.origin + '/iws/mall-view/contract-template-250224.docx'
+    getContractListData()
+    loadEquipmentNameOptions()
+    loadProjectListOptions()
+    uploadUrlTemp.value = window.location.origin + '/iws/mall-view/contract-template-250224.docx'
 })
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .tipBox {
-  color: red;
-  font-size: 12px;
-  margin-left: 20px;
+    color: red;
+    font-size: 12px;
+    margin-left: 20px;
 }
 
 :deep.editor {
-  height: 300px;
+    height: 300px;
 }
+
 :deep.upload-tip .el-form-item__label {
-  color: transparent;
+    color: transparent;
 }
+
 .el-pagination {
-  justify-content: flex-end;
-  padding: 5px 0;
+    justify-content: flex-end;
+    padding: 5px 0;
 }
+
 :deep.el-pagination.is-background .el-pager li.is-active {
-  background-color: #3cb4a6;
+    background-color: #3cb4a6;
 }
+
 :deep.el-form--inline .el-form-item {
-  margin-right: 6px;
-  width: 95%;
+    margin-right: 6px;
+    width: 95%;
 }
+
 .img-list {
-  display: flex;
-  align-items: center;
-  .img-items {
-    width: 120px;
-    height: 120px;
-    margin-right: 8px;
-    position: relative;
-    img {
-      width: 100%;
-      height: 100%;
+    display: flex;
+    align-items: center;
+
+    .img-items {
+        width: 120px;
+        height: 120px;
+        margin-right: 8px;
+        position: relative;
+
+        img {
+            width: 100%;
+            height: 100%;
+        }
+
+        .mask-img {
+            visibility: hidden;
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background-color: #000;
+            opacity: 0.5;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .delete-icon {
+                font-size: 20px;
+                cursor: pointer;
+                z-index: 9;
+                color: #fff;
+            }
+        }
     }
-    .mask-img {
-      visibility: hidden;
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background-color: #000;
-      opacity: 0.5;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .delete-icon {
-        font-size: 20px;
-        cursor: pointer;
-        z-index: 9;
-        color: #fff;
-      }
+
+    .img-items:hover .mask-img {
+        visibility: visible;
     }
-  }
-  .img-items:hover .mask-img {
-    visibility: visible;
-  }
 }
+
 .app-container-content {
-  padding: 20px;
-  :deep(.el-dialog) {
-    display: flex !important;
-    flex-direction: column !important;
-    margin: 0 !important;
-    position: absolute !important;
-    top: 50% !important;
-    left: 50% !important;
-    transform: translate(-50%, -50%) !important;
-    max-height: 100vh !important;
-    .el-dialog__body {
-      flex: 1;
-      overflow-y: scroll !important;
+    padding: 20px;
+
+    :deep(.el-dialog) {
+        display: flex !important;
+        flex-direction: column !important;
+        margin: 0 !important;
+        position: absolute !important;
+        top: 50% !important;
+        left: 50% !important;
+        transform: translate(-50%, -50%) !important;
+        max-height: 100vh !important;
+
+        .el-dialog__body {
+            flex: 1;
+            overflow-y: scroll !important;
+        }
+
+        .dialog-content {
+            padding: 20px;
+        }
     }
-    .dialog-content {
-      padding: 20px;
-    }
-  }
 }
+
 :deep(.el-overlay) {
-  z-index: 99 !important;
+    z-index: 99 !important;
 }
-</style>
\ No newline at end of file
+
+:deep .el-button--danger {
+    color: #FFF;
+    background-color: #FF5129;
+    border-color: #FF5129;
+}
+
+:deep .el-button--text {
+    font-family: Microsoft YaHei, Microsoft YaHei;
+    font-weight: 400;
+    font-size: 14px;
+    color: #2CBAB2;
+    line-height: 22px;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+}
+</style>