diff --git a/src/http/api/usercenter/goodsmang.ts b/src/http/api/usercenter/goodsmang.ts
index b81117e..26ce63f 100644
--- a/src/http/api/usercenter/goodsmang.ts
+++ b/src/http/api/usercenter/goodsmang.ts
@@ -5,7 +5,7 @@ import { get, post, put } from '../../index'
 // 获取装备列表
 export const getEquipmentListApi = (data: any) => {
     return get('/material-mall/dev/devList', data)
-} 
+}
 
 //获取装备详情
 export const getDetailApi = (id: any) => {
@@ -48,4 +48,37 @@ export const downLoadTemplate = () => {
     return post('/material-mall/dev/downLoadDev', {})
 }
 
+// 获取装备申请列表接口
+export const getEquipmentApplyListApi = (data: any) => {
+    return get('/material-mall/order/orderList', data)
+}
 
+// 获取装备新增时的id
+export const getEquipmentAddIdApi = () => {
+    return post('/material-mall/order/addOrder', {})
+}
+
+// 新增装备 新接口
+export const equipmentAddApiNew = (data: any) => {
+    return post('/material-mall/order/addDevice', data)
+}
+// 修改装备 新接口
+export const equipmentEditApiNew = (data: any) => {
+    return post('/material-mall/order/editDevice', data)
+}
+// 获取草稿订单列表
+export const equipmentDraftListApiNew = (data: any) => {
+    return get('/material-mall/order/devList', data)
+}
+// 提交申请接口
+export const equipmentSubmitApiNew = (data: any) => {
+    return post('/material-mall/order/submitOrder', data)
+}
+// 删除接口 外侧
+export const equipmentDelApiNew = (data: any) => {
+    return post('/material-mall/order/delOrder', data)
+}
+// 通过或驳回接口
+export const equipmentPassAndRejectApiNew = (data: any) => {
+    return post('/material-mall/order/checkDevice', data)
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 2c2c62d..8380af4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -4,12 +4,9 @@ import myInfo from './module/myInfo'
 // import login from '../hooks/login'
 // const { getLoginIwsInfo } = login()
 
-
 import { mainStore } from 'store/main'
 // import { el } from 'element-plus/es/locale'
 
-
-
 const routes: Array<RouteRecordRaw> = [
     {
         path: '/index',
@@ -18,8 +15,8 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '目录页',
             keepAlive: true,
-            AuthFlag: false
-        }
+            AuthFlag: false,
+        },
     },
     /* 登录页 */
     {
@@ -29,8 +26,8 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '登录页',
             keepAlive: true,
-            AuthFlag: false
-        }
+            AuthFlag: false,
+        },
     },
     /* 注册页 */
     {
@@ -41,7 +38,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '注册页',
             keepAlive: true,
             AuthFlag: true,
-        }
+        },
     },
     {
         path: '/test', // 主路由地址
@@ -50,9 +47,9 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '测试',
             keepAlive: true,
-            AuthFlag: false
+            AuthFlag: false,
         },
-        children: [...test]
+        children: [...test],
     },
     {
         path: '/myInfo', // 主路由地址
@@ -61,14 +58,11 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '我的',
             keepAlive: true,
-            AuthFlag: false
+            AuthFlag: false,
         },
-        children: [...myInfo]
+        children: [...myInfo],
     },
 
-
-
-
     // 首页
     {
         path: '/',
@@ -77,7 +71,7 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '首页',
             keepAlive: false,
-            AuthFlag: false
+            AuthFlag: false,
         },
 
         children: [
@@ -101,7 +95,7 @@ const routes: Array<RouteRecordRaw> = [
                 meta: {
                     title: '装备共享大厅',
                     activeName: 'equipList',
-                }
+                },
             },
             // 专区设备
             {
@@ -111,7 +105,7 @@ const routes: Array<RouteRecordRaw> = [
                 meta: {
                     title: '装备共享大厅',
                     activeName: 'zoneEquipment',
-                }
+                },
             },
             //装备详情
             {
@@ -122,13 +116,13 @@ const routes: Array<RouteRecordRaw> = [
                     title: '装备详情',
                     keepAlive: false,
                     AuthFlag: false,
-                }
+                },
             },
             // 资讯详情
             {
                 path: '/consultationDetails/:id',
                 name: 'consultationDetails',
-                component: () => (import('views/consultationDetails/index.vue'))
+                component: () => import('views/consultationDetails/index.vue'),
             },
             // 收藏夹页面
             {
@@ -136,9 +130,9 @@ const routes: Array<RouteRecordRaw> = [
                 name: 'collect',
                 meta: {
                     title: '我的收藏',
-                    isLogin: true
+                    isLogin: true,
                 },
-                component: () => import('views/collect/index.vue')
+                component: () => import('views/collect/index.vue'),
             },
             // 寻源比价页面
             {
@@ -174,8 +168,8 @@ const routes: Array<RouteRecordRaw> = [
                             activeName: 'parity',
                         },
                         component: () => import('views/parity/parityCom/notice.vue'),
-                    }
-                ]
+                    },
+                ],
             },
             // 寻源比价 （报价）
             {
@@ -185,9 +179,8 @@ const routes: Array<RouteRecordRaw> = [
                     title: '企业专区',
                     isLogin: true,
                     AuthFlag: false,
-
                 },
-                component: () => import('views/parity/parityCom/quotation.vue')
+                component: () => import('views/parity/parityCom/quotation.vue'),
             },
             // 企业专区页面
             {
@@ -199,7 +192,7 @@ const routes: Array<RouteRecordRaw> = [
                     AuthFlag: false,
                     activeName: 'enterpriseZone',
                 },
-                component: () => import('views/enterpriseZone/index.vue')
+                component: () => import('views/enterpriseZone/index.vue'),
             },
         ],
     },
@@ -212,7 +205,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '标签管理-详情',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
     {
@@ -223,7 +216,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '数据大屏',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
     {
@@ -234,7 +227,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '数据大屏',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
     {
@@ -245,7 +238,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '数据大屏',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
     {
@@ -256,7 +249,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '数据大屏',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
     // 消息
@@ -268,7 +261,7 @@ const routes: Array<RouteRecordRaw> = [
             title: '消息',
             keepAlive: true,
             AuthFlag: false,
-            isLogin: true
+            isLogin: true,
         },
     },
 
@@ -280,10 +273,9 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '个人中心',
             keepAlive: false,
-            AuthFlag: false
+            AuthFlag: false,
         },
         children: [
-
             {
                 path: '/orderManagementCz',
                 name: 'orderManagementCz',
@@ -292,20 +284,55 @@ const routes: Array<RouteRecordRaw> = [
                     title: '订单管理（出租方）',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
                 path: '/goodsManagement',
                 name: 'goodsManagement',
-                component: () => import('views/user/goodsManagement/index.vue'),
+                component: () => import('views/user/goodsManagement/index_new.vue'),
                 meta: {
                     title: '商品管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
+            {
+                path: '/equipmentInput',
+                name: 'equipmentInput',
+                component: () => import('views/user/goodsManagement/equipmentInput/index.vue'),
+                meta: {
+                    title: '装备录入',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true,
+                },
+            },
+            {
+                path: '/goodsAuditing',
+                name: 'goodsAuditing',
+                component: () => import('views/user/goodsAuditing/index_new.vue'),
+                meta: {
+                    title: '装备审核',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true,
+                },
+            },
+
+            // 9.15 新增修改版本 原装备管理隐藏
+            // {
+            //     path: '/goodsManagement',
+            //     name: 'goodsManagement',
+            //     component: () => import('views/user/goodsManagement/index.vue'),
+            //     meta: {
+            //         title: '商品管理',
+            //         keepAlive: true,
+            //         AuthFlag: false,
+            //         isLogin: true
+            //     },
+            // },
             {
                 path: '/accept-orders',
                 name: 'accept-orders',
@@ -314,7 +341,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '接单管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -325,42 +352,42 @@ const routes: Array<RouteRecordRaw> = [
                     title: '合同管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
+                },
+            },
+            {
+                path: '/owned-manage',
+                name: 'owned-manage',
+                component: () => import('views/user/owned-manage/index.vue'),
+                meta: {
+                    title: '自有装备管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true,
+                },
+            },
+            {
+                path: '/rent-facility',
+                name: 'rent-facility',
+                component: () => import('views/user/rent-facility/index.vue'),
+                meta: {
+                    title: '自有装备管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true,
+                },
+            },
+            {
+                path: '/rent-manage',
+                name: 'rent-manage',
+                component: () => import('views/user/rent-manage/index.vue'),
+                meta: {
+                    title: '自有装备管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true,
                 },
             },
-			{
-			    path: '/owned-manage',
-			    name: 'owned-manage',
-			    component: () => import('views/user/owned-manage/index.vue'),
-			    meta: {
-			        title: '自有装备管理',
-			        keepAlive: true,
-			        AuthFlag: false,
-			        isLogin: true
-			    },
-			},
-			{
-			    path: '/rent-facility',
-			    name: 'rent-facility',
-			    component: () => import('views/user/rent-facility/index.vue'),
-			    meta: {
-			        title: '自有装备管理',
-			        keepAlive: true,
-			        AuthFlag: false,
-			        isLogin: true
-			    },
-			},
-			{
-			    path: '/rent-manage',
-			    name: 'rent-manage',
-			    component: () => import('views/user/rent-manage/index.vue'),
-			    meta: {
-			        title: '自有装备管理',
-			        keepAlive: true,
-			        AuthFlag: false,
-			        isLogin: true
-			    },
-			},
             {
                 path: '/quickMessage',
                 name: 'quickMessage',
@@ -369,7 +396,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '快捷消息设置',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -380,7 +407,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '个人中心',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -391,7 +418,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '退租管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
 
@@ -403,7 +430,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '结算管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -414,7 +441,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '装备维保',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -425,7 +452,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '安全证书管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -436,7 +463,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '标签管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -447,7 +474,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '维修保养管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -458,7 +485,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '需求管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -469,7 +496,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '订单管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             {
@@ -480,7 +507,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '收货地址管理',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
 
@@ -530,7 +557,7 @@ const routes: Array<RouteRecordRaw> = [
                     title: '订单详情',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: false
+                    isLogin: false,
                 },
             },
             // /* 订单管理（订单详情承租） */
@@ -542,19 +569,20 @@ const routes: Array<RouteRecordRaw> = [
                     title: '订单详情',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: false
+                    isLogin: false,
                 },
             },
             // /* 订单管理（退租） */
             {
                 path: '/rentinTermination',
                 name: 'rentinTermination',
-                component: () => import('views/user/orderManagement/orderCom/rentinTermination.vue'),
+                component: () =>
+                    import('views/user/orderManagement/orderCom/rentinTermination.vue'),
                 meta: {
                     title: '订单管理（退租）',
                     keepAlive: true,
                     AuthFlag: false,
-                    isLogin: true
+                    isLogin: true,
                 },
             },
             // /* 订单管理（续租） */
@@ -716,9 +744,9 @@ const routes: Array<RouteRecordRaw> = [
             //         isLogin: true
             //     },
             // },
-        ]
+        ],
     },
-    // 预约车页面 
+    // 预约车页面
     {
         path: '/cart',
         name: 'cart',
@@ -726,7 +754,7 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '预约车',
             keepAlive: false,
-            AuthFlag: false
+            AuthFlag: false,
         },
     },
     // 订单确认页面
@@ -737,10 +765,10 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '订单提交',
             keepAlive: false,
-            AuthFlag: false
+            AuthFlag: false,
         },
     },
-    // 需求详情页面 
+    // 需求详情页面
     {
         path: '/demand-details',
         name: 'demand-details',
@@ -748,7 +776,7 @@ const routes: Array<RouteRecordRaw> = [
         meta: {
             title: '需求详情',
             keepAlive: false,
-            AuthFlag: false
+            AuthFlag: false,
         },
     },
 
@@ -801,8 +829,6 @@ const routes: Array<RouteRecordRaw> = [
     //             },
     //         },
 
-
-
     //     ]
     // },
     // /**
@@ -843,24 +869,21 @@ const routes: Array<RouteRecordRaw> = [
     //         },
     //     ]
     // }
-
-
-
 ]
 
-
 const router = createRouter({
     // 路由模式
     // history: createWebHistory('/iws/mall-view/'),
-    history: import.meta.env.VITE_ENV === 'production' ? createWebHashHistory() : createWebHistory('/iws/mall-view/'),
-    routes
+    history:
+        import.meta.env.VITE_ENV === 'production'
+            ? createWebHashHistory()
+            : createWebHistory('/iws/mall-view/'),
+    routes,
 })
 
-
 const white = ['/qr-code', '/big-screen']
 // 使页面跳转后滚动条恢复至顶部
 router.beforeEach((to, from, next) => {
-
     const store = mainStore()
     if (to.meta.isLogin && !to.meta.AuthFlag) {
         if (store.token) {
@@ -876,15 +899,14 @@ router.beforeEach((to, from, next) => {
         next()
     }
 
-
     // if (store.token || to.path == '/login' || to.path == '/' || to.path == '/home' || to.path == '/register' || to.path == '/equipList' || to.path == '/equipDetail') {
 
     // } else {
     //     next('/login')
     // }
     // chrome
-    document.body.scrollTop = 0;
+    document.body.scrollTop = 0
     // firefox 兼容火狐
-    document.documentElement.scrollTop = 0;
+    document.documentElement.scrollTop = 0
 })
 export default router
diff --git a/src/views/user/goodsAuditing/equipmentInput/index.vue b/src/views/user/goodsAuditing/equipmentInput/index.vue
new file mode 100644
index 0000000..a508422
--- /dev/null
+++ b/src/views/user/goodsAuditing/equipmentInput/index.vue
@@ -0,0 +1,2999 @@
+<script setup lang="ts">
+import PagingComponent from 'components/PagingComponent/index.vue'
+import UploadComponentNew from 'components/uploadComponentNew/index.vue'
+import TitleTip from 'components/TitleTip/index.vue'
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, watch } from 'vue'
+import { useStore } from 'store/user'
+import { mainStore } from 'store/main'
+import dayjs from 'dayjs'
+import {
+    equipmentAddApi,
+    equipmentEditApi,
+    getCompanyListApi,
+    getDetailApi,
+    getEquipmentListApi,
+    getEquipmentTypeApi,
+    removeDeviceApi,
+    updateUpDownApi,
+    getEquipmentAddIdApi,
+    equipmentAddApiNew,
+    equipmentEditApiNew,
+    equipmentDraftListApiNew,
+    equipmentSubmitApiNew,
+    equipmentPassAndRejectApiNew,
+} from 'http/api/usercenter/goodsmang'
+
+const props = defineProps({
+    orderIds: {
+        type: [String, Number],
+        default: '',
+    },
+    isView: {
+        type: Boolean,
+        default: false,
+    },
+})
+
+const store = useStore()
+const store2 = mainStore()
+const isViewForm = ref(false)
+
+const isDisabled = ref(false)
+const isMaStatus = ref(false)
+const isAdd = ref(false)
+
+const previewDialogVisible = ref(false)
+const previewDialogImageUrl = ref('')
+const orderId = ref('')
+
+const batchAddVisible: any = ref(false) // 批量新增
+const batchAddData: any = ref([]) // 批量新增
+const batchAddColumn: any = ref([
+    { label: '装备名称', prop: 'deviceName' },
+    { label: '装备型号', prop: 'typeName' },
+    { label: '上传人', prop: 'uploadUser' },
+    { label: '上传时间', prop: 'uploadTime' },
+])
+
+const uploadUrlTemp = window.location.origin + '/iws/mall-view/MaDevTemplate.xlsx'
+
+// 注册地址拼装
+const AssemblyRegisterAddress: any = reactive([])
+const deviceType: any = reactive([])
+
+onMounted(() => {
+    // 获取装备树
+    getTypeTreeData()
+    // 获取下拉
+    getCompanyList()
+    // 获取省级数据
+    // store.getprovinceList()
+    // 获取设备类型
+    // store.getDeviceTypeList()
+})
+// 设备类型树
+const deviceTypeTree: any = ref([])
+const partTypeTreeProps: any = ref({
+    children: 'children',
+    label: 'name',
+    multiple: false,
+    value: 'id',
+})
+// 获取装备树
+const getTypeTreeData = async () => {
+    const res: any = await getEquipmentTypeApi()
+    console.log('treeData==========', res)
+    deviceTypeTree.value = res.data
+}
+//装备类目-change
+const deviceTypeChange = (val: any) => {
+    console.log('ssssssssssssssssssssssssss', val)
+    if (val != null && val.length > 0) {
+        queryParams.value.typeId = val[3]
+    } else {
+        queryParams.value.typeId = ''
+    }
+}
+//反显 树结构数据获取父
+const getSelectId = (list: any, id: any) => {
+    for (let i in list) {
+        if (list[i].id == id) {
+            //查询到就返回该数组对象的value
+            return [list[i].id]
+        }
+        if (list[i].children) {
+            let node: any = getSelectId(list[i].children, id)
+            if (node !== undefined) {
+                //查询到把父节把父节点加到数组前面
+                node.unshift(list[i].id)
+                return node
+            }
+        }
+    }
+}
+
+/* 装备树选中数组 */
+const deviceTypeList: any = ref([])
+//日期周期
+const dateRange: any = ref([])
+/* 查询参数 */
+const queryParams: any = ref({
+    deviceName: '',
+    code: '',
+    maStatus: '',
+    typeId: '',
+    pageSize: 10,
+    pageNum: 1,
+    startTime: '',
+    endTime: '',
+    orderId: '',
+})
+const queryFormRef = ref<FormInstance>()
+const total: any = ref(0)
+const tableData: any = ref([])
+/* 查询按钮 */
+const queryTableList = () => {
+    queryParams.value.pageNum = 1
+    getList()
+}
+// 重置
+const resetTableList = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    dateRange.value = []
+    queryParams.value.startTime = ''
+    queryParams.value.endTime = ''
+    deviceTypeList.value = []
+    queryParams.value.typeId = null
+    queryTableList()
+}
+// 获取数据列表
+const getList = async () => {
+    console.log(queryParams.value.pageNum, '***9999', queryParams.value.pageSize)
+
+    if (dateRange.value.length > 0) {
+        queryParams.value.startTime = dateRange.value[0]
+        queryParams.value.endTime = dateRange.value[1]
+    }
+
+    const res: any = await equipmentDraftListApiNew(queryParams.value)
+    console.log(res, '列表数据**--**')
+    total.value = res?.data?.total
+    // tableData.value = res.rows.filter((item: any) => item !== null)
+
+    tableData.value = res?.data?.rows
+}
+// 获取数据列表
+getList()
+
+//---列表按钮事件---
+// 装备新增按钮
+const equipmentDeployment = (row: any) => {
+    isAdd.value = true
+    settleinTitle.value = '新增装备'
+    isMaStatus.value = false
+    isViewForm.value = false
+    isEditForm.value = false
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+    disabledForm.value = false
+    isEditDisabled.value = true
+    equipmentDeploymentParams.value = {
+        deviceName: '',
+        deviceTypeList: [],
+        deviceCount: 1,
+        originaValue: '',
+        itemTypeModel: '',
+        deviceType: '',
+        buyPrice: '',
+        unitName: '',
+        code: '',
+        brand: '',
+        typeId: '',
+        companyId: '',
+        productionDate: '',
+        dayLeasePrice: '',
+        person: '',
+        personPhone: '',
+        deviceWeight: '',
+        checkDate: '',
+        checkCycle: '',
+    }
+    mainFileList.value = []
+    detailsFileList.value = []
+    insurancePdf.value = []
+    examinationPdf.value = []
+
+    //装备证书table
+    equipTableList.value = []
+
+    if (row) {
+        console.log('🚀 ~ equipmentDeployment ~ row:', row)
+        getTypeTreeData()
+        // addAndEditForm.value = row
+        Object.assign(addAndEditForm, row)
+        // equipTableList.value = [...row.tableList]
+        if (row.tableList && row.tableList.length) {
+            equipTableList.value = row.tableList.map((item: any) => {
+                return {
+                    identifyCode: item.identifyCode,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                }
+            })
+        }
+
+        addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
+    }
+    // 打开入驻弹框
+    dialogFormVisibleSettlein.value = true
+}
+const isEditForm = ref(false)
+const maId: any = ref('')
+const warningDays: any = ref(0)
+// 编辑按钮
+const editRowInfo = (row: any) => {
+    isAdd.value = false
+    settleinTitle.value = '装备编辑'
+    getDetailData(row)
+    isMaStatus.value = true
+    disabledForm.value = false
+    isEditDisabled.value = true
+    isViewForm.value = false
+    isEditForm.value = true
+}
+/* 查看按钮 */
+const previewRowInfo = (row: any) => {
+    isAdd.value = false
+    settleinTitle.value = '装备详情'
+    getDetailData(row)
+    disabledForm.value = true
+    isEditDisabled.value = false
+    isViewForm.value = true
+    isEditForm.value = false
+}
+// 删除按钮
+const deleteRowInfo = async (row: any) => {
+    ElMessageBox.confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(() => {
+            return removeDeviceApi([row.maId])
+        })
+        .then((res) => {
+            if (res.code === 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功',
+                })
+                getList()
+            }
+        })
+        .catch(() => {})
+}
+//获取详情接口
+const getDetailData = async (row: any) => {
+    await getTypeTreeData()
+    const { data: res }: any = await getDetailApi(row.maId)
+    const {
+        deviceName,
+        // deviceTypeList,
+        deviceCount,
+        originaValue,
+        itemTypeModel,
+        deviceType,
+        buyPrice,
+        unitName,
+        code,
+        brand,
+        typeId,
+        companyId,
+        productionDate,
+        dayLeasePrice,
+        person,
+        personPhone,
+        deviceWeight,
+        checkDate,
+        checkCycle,
+        mainFileList,
+        detailsFileList,
+        insurancePdf,
+        examinationPdf,
+        devInfoProperties,
+        tableList,
+        maintenanceAlarmDay,
+        isZone,
+        zoneId,
+        expirationTime,
+    } = res
+
+    Object.assign(addAndEditForm, {
+        deviceName,
+        deviceCount,
+        originaValue,
+        itemTypeModel,
+        deviceType,
+        buyPrice,
+        unitName,
+        code,
+        brand,
+        typeId,
+        companyId,
+        productionDate,
+        dayLeasePrice,
+        person,
+        personPhone,
+        deviceWeight,
+        checkDate,
+        checkCycle,
+        mainFileList,
+        detailsFileList,
+        insurancePdf,
+        examinationPdf,
+        devInfoProperties,
+        tableList,
+        maintenanceAlarmDay,
+        isZone,
+        zoneId,
+        expirationTime,
+    })
+
+    if (settleinTitle.value == '装备编辑') {
+        Object.assign(addAndEditForm, {
+            maId: row.maId,
+        })
+    }
+
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+    descriptionFormList.value[0].insurancePdfs = insurancePdf
+    descriptionFormList.value[0].examinationPdfs = examinationPdf
+    options.value = []
+    addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
+    warningDays.value = addAndEditForm.maintenanceAlarmDay
+    // warningDays.value =  addAndEditForm.deviceTypeList[addAndEditForm.deviceTypeList.length-1].data.maintenanceAlarmDay
+    //  warningDays.value = addAndEditForm.deviceTypeList.maintenanceAlarmDay
+    propertyNames.value = addAndEditForm.devInfoProperties
+    equipTableList.value = []
+    if (isEditForm.value == true) {
+        if (addAndEditForm.tableList != null) {
+            addAndEditForm.tableList.forEach((item: any) => {
+                console.log('🚀 ~ addAndEditForm.tableList.forEach ~ item:', item)
+                if (item.examinationPdf && item.examinationPdf.length > 0) {
+                    item.examinationPdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                if (item.insurancePdf && item.insurancePdf.length > 0) {
+                    item.insurancePdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                equipTableList.value.push({
+                    id: item.id,
+                    identifyCode: item.identifyCode,
+                    name2: item.insurancePdf[0]?.fileUrl,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                    name6: item.examinationPdf[0]?.fileUrl,
+                    insurancePdf: item.insurancePdf,
+                    examinationPdf: item.examinationPdf,
+                })
+            })
+            console.log(equipTableList.value, '--->>>addAndEditForm.tableList')
+        } else {
+            equipTableList.value = [
+                {
+                    id: '',
+                    identifyCode: '',
+                    name2: '',
+                    checkMan: '',
+                    checkDate: '',
+                    nextCheckDate: '',
+                    name6: '',
+                    insurancePdf: [],
+                    examinationPdf: [],
+                },
+            ]
+        }
+    } else {
+        console.log('详情--->?>')
+        if (addAndEditForm.tableList != null) {
+            addAndEditForm.tableList.forEach((item: any) => {
+                if (item.examinationPdf && item.examinationPdf.length > 0) {
+                    item.examinationPdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                if (item.insurancePdf && item.insurancePdf.length > 0) {
+                    item.insurancePdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                equipTableList.value.push({
+                    id: item.id,
+                    identifyCode: item.identifyCode,
+                    name2: item.insurancePdf[0]?.fileUrl,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                    name6: item.examinationPdf[0]?.fileUrl,
+                    insurancePdf: item.insurancePdf,
+                    examinationPdf: item.examinationPdf,
+                })
+            })
+        } else {
+            equipTableList.value = []
+        }
+    }
+    console.log('tt23123', equipTableList.value)
+    // addAndEditForm.deviceTypeList[0].data.propertyNames.forEach((item:any) =>{
+    //     options.value.push({'label':item,'value':item})
+    //  })
+    dialogFormVisibleSettlein.value = true
+
+    console.log(res, '详情接口')
+
+    // console.log(row, '----row----')
+    // maId.value = row.maId
+    // const res: any = await getDetailApi(row.maId)
+    // console.log(res, '----detail----')
+    // equipmentDeploymentParams.value = res.data
+    // equipmentDeploymentParams.value.companyId = Number(res.data.companyId)
+    // mainFileList.value = res.data.mainFileList
+    // detailsFileList.value = res.data.detailsFileList
+    // insurancePdf.value = res.data.insurancePdf
+    // examinationPdf.value = res.data.examinationPdf
+    // //反显 装备树
+    // equipmentDeploymentParams.value.deviceTypeList = getSelectId(
+    //     deviceTypeTree.value,
+    //     equipmentDeploymentParams.value.typeId,
+    // )
+    // dialogFormVisibleSettlein.value = true
+    // equipmentDeploymentParams.value.cityId = String(equipmentDeploymentParams.value.cityId)
+    // equipmentDeploymentParams.value.areaId = String(equipmentDeploymentParams.value.areaId)
+    // equipmentDeploymentParams.value.provinceId = String(
+    //     equipmentDeploymentParams.value.provinceId
+    // )
+    // equipmentDeploymentParams.value.leaseScope = String(
+    //     equipmentDeploymentParams.value.leaseScope
+    // )
+    // equipmentDeploymentParams.value.groupId = Number(equipmentDeploymentParams.value.groupId)
+    // equipmentDeploymentParams.value.typeId = Number(equipmentDeploymentParams.value.typeId)
+    // store.getprovinceList()
+    // store.getmarketList(row.provinceId)
+    // store.getareaList(row.cityId)
+    // store.getDeviceTypeList()
+    // store.getDeviceTypeSonList(row.companyId)
+    // store.getDeviceTypeSunList(row.groupId)
+}
+
+const ids: any = ref([])
+const handleSelectionChange = (selection: any) => {
+    // ids.value = selection.map((item: any) => item.maId)
+    ids.value = selection
+}
+// 上下架（批量）
+const handleUpdateUpDown = (row: any, maStatus: any) => {
+    ElMessageBox.confirm('是否确定操作', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(() => {
+            let maIds = []
+            if (!row) {
+                maIds = ids.value
+            } else {
+                maIds.push(row.maId)
+            }
+            if (maIds.length == 0) {
+                ElMessage({ type: 'error', message: '请选择要操作的数据' })
+                return
+            }
+            return updateUpDownApi({ maIds, maStatus })
+        })
+        .then((res) => {
+            if (res.code == 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '操作成功',
+                })
+                getList()
+            }
+        })
+        .catch(() => {})
+}
+
+/*
+        ----装备弹窗-----
+    */
+/* 查看 */
+const disabledForm = ref(false)
+/* 编辑 */
+const isEditDisabled = ref(false)
+/* 入驻框的标题 */
+const settleinTitle = ref('')
+//所属公司
+const companyDataList: any = ref([])
+/*
+ *  商品入驻弹框参数
+ */
+const equipmentDeploymentParams: any = ref({
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    originaValue: '',
+    itemTypeModel: '',
+    deviceType: '',
+    buyPrice: '',
+    unitName: '',
+    code: '',
+    brand: '',
+    typeId: '',
+    companyId: '',
+    productionDate: '',
+    dayLeasePrice: '',
+    person: '',
+    personPhone: '',
+    deviceWeight: '',
+    checkDate: '',
+    checkCycle: '',
+})
+//编码类型禁止修改数目
+const countDisabled = ref(false)
+//装备类目-change
+const dialogTypeCascader = ref()
+//装备类目-change
+const dialogTypeChange = async () => {
+    options.value = []
+    const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
+    console.log('deviceTypeList', deviceTypeList[0].data)
+    warningDays.value = deviceTypeList[0].data.maintenanceAlarmDay
+    if (deviceTypeList[0].data.deviceType == 0) {
+        addAndEditForm.deviceCount = 1
+        typeDisabled.value = true
+    } else {
+        addAndEditForm.deviceCount = 1
+        typeDisabled.value = false
+    }
+    if (deviceTypeList[0].data.maTypeProperties == null) {
+        propertyNames.value = []
+    } else {
+        propertyNames.value = []
+        deviceTypeList[0].data.maTypeProperties.forEach((item: any) => {
+            propertyNames.value.push({ propertyName: item.propertyName, propertyValue: '' })
+        })
+        deviceTypeList[0].data.maTypeProperties.forEach((item: any) => {
+            options.value.push({ label: item.propertyName, value: item.propertyName })
+        })
+        console.log(propertyNames.value)
+    }
+    isDisabled.value = true
+    addAndEditForm.unitName = deviceTypeList[0].data.unitName
+    addAndEditForm.dayLeasePrice = deviceTypeList[0].data.leasePrice
+    addAndEditFormRef.value.clearValidate(['unitName', 'dayLeasePrice'])
+    equipTableList.value = []
+    equipTableList.value.push({
+        id: '',
+        identifyCode: '',
+        name2: '',
+        checkMan: '',
+        checkDate: '',
+        nextCheckDate: '',
+        name6: '',
+        insurancePdf: [],
+        examinationPdf: [],
+    })
+}
+
+//获取所属公司下拉数据
+const getCompanyList = async () => {
+    const res: any = await getCompanyListApi()
+    console.log(res, '列表数据**--**-----------')
+    companyDataList.value = res.data
+}
+// 装备弹框显示隐藏
+const dialogFormVisibleSettlein: any = ref(false)
+const ruleFormRef: any = ref(null)
+//表单校验规则
+const equipRules = ref({
+    originaValue: [
+        {
+            required: true,
+            message: '请输入原值',
+            trigger: 'blur',
+        },
+    ],
+    buyPrice: [
+        {
+            required: true,
+            message: '请输入原值',
+            trigger: 'blur',
+        },
+    ],
+    itemTypeModel: [
+        {
+            required: true,
+            message: '请输入规格型号',
+            trigger: 'blur',
+        },
+    ],
+    deviceType: [
+        {
+            required: false,
+            message: '请选择管理方式',
+            trigger: 'change',
+        },
+    ],
+    deviceName: [
+        {
+            required: true,
+            message: '请输入装备名称',
+            trigger: 'blur',
+        },
+    ],
+    deviceTypeList: [
+        {
+            required: true,
+            message: '请选择装备类目',
+            trigger: 'change',
+        },
+    ],
+    deviceCount: [
+        {
+            required: true,
+            message: '请输入上架数量',
+            trigger: 'blur',
+        },
+    ],
+    unitName: [
+        {
+            required: true,
+            message: '装备单位不可为空',
+            trigger: 'blur',
+        },
+    ],
+    brand: [
+        {
+            required: true,
+            message: '请输入装备品牌',
+            trigger: 'blur',
+        },
+    ],
+    code: [
+        {
+            required: true,
+            message: '请输入装备编号',
+            trigger: 'change',
+        },
+    ],
+    companyId: [
+        {
+            required: true,
+            message: '请选择所属公司',
+            trigger: 'change',
+        },
+    ],
+    productionDate: [
+        {
+            required: true,
+            message: '请选择出厂日期',
+            trigger: 'change',
+        },
+    ],
+    dayLeasePrice: [
+        {
+            required: true,
+            message: '请输入日租金',
+            trigger: 'blur',
+        },
+    ],
+    expirationTime: [
+        {
+            required: true,
+            trigger: 'change',
+            message: '请选择标准使用时间',
+        },
+    ],
+
+    person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+    checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }],
+    checkCycle: [{ required: true, message: '校验周期不能为空', trigger: 'blur' }],
+    personPhone: [
+        { required: true, message: '联系电话不能为空', trigger: 'blur' },
+        {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur',
+        },
+    ],
+    mainFileList: [{ required: true, message: '请上传主展示图', trigger: 'change' }],
+    detailsFileList: [{ required: true, message: '请上传详情展示图', trigger: 'change' }],
+})
+
+const getProertyNameRules = (item: any) => {
+    if (item.mustHave == 1) {
+        return [{ required: true, message: '请输入属性描述', trigger: 'blur' }]
+    } else {
+        return []
+    }
+}
+
+const getProertyValueRules = (item: any) => {
+    if (item.mustHave == 1) {
+        return [{ required: true, message: '请输入属性值', trigger: 'blur' }]
+    } else {
+        return []
+    }
+}
+
+const descriptionRules = ref({
+    identifyCode: [{ required: true, message: '请填写装备唯一标识符', trigger: 'blur' }],
+    insurancePdfs: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+    examinationPdfs: [{ required: true, message: '请上传检测证明', trigger: 'change' }],
+})
+// 弹框保存提交
+const submitBtn = async () => {
+    submitFun(isEditForm.value ? 3 : 1)
+}
+const submitFun = (type: any) => {
+    //  type 1 提交(新增时) 2 存草稿(新增时) 3 编辑时的提交 4 编辑时存草稿
+    console.log('🚀 ~ submitFun ~ addAndEditForm:', addAndEditForm)
+    console.log(isAdd.value, isEditForm.value)
+    if (isAdd.value || isEditForm.value) {
+        addAndEditForm.mainFileList = Array.from(
+            new Set([...addAndEditForm.mainFileList, ...addAndEditForm.mainFileTempList]),
+        )
+        addAndEditForm.detailsFileList = Array.from(
+            new Set([...addAndEditForm.detailsFileList, ...addAndEditForm.detailsFileTempList]),
+        )
+    }
+    if (type === 2 || type === 4) {
+        equipRules.value.mainFileList = [] // 清空规则，相当于不校验
+        equipRules.value.detailsFileList = [] // 清空规则，相当于不校验
+    } else {
+        equipRules.value.mainFileList = [
+            { required: true, message: '请上传主展示图', trigger: 'change' },
+        ] // 清空规则，相当于不校验
+        equipRules.value.detailsFileList = [
+            { required: true, message: '请上传详情展示图', trigger: 'change' },
+        ] // 清空规则，相当于不校验
+    }
+
+    addAndEditFormRef.value.validate(async (valid: any) => {
+        if (valid) {
+            let isDescription = false
+
+            descriptionFormList.value.forEach((e: any, index: number) => {
+                e.insurancePdfs = [...e.insurancePdfs, ...e.insuranceATempPdf]
+                e.examinationPdfs = [...e.examinationPdfs, ...e.examinationTempPdf]
+
+                if (type == 3 || type == 4) {
+                    addAndEditForm.examinationPdf = e.examinationPdfs.map((e: any) => {
+                        return { fileNam: e.fileName, fileUrl: e.fileUrl }
+                    })
+                } else {
+                    addAndEditForm.examinationPdfs[index] = e.examinationPdfs
+                }
+            })
+            addAndEditForm.tableList = equipTableList.value
+            if (type != 2 && type != 4) {
+                for (let i = 0; i < addAndEditForm.tableList.length; i++) {
+                    const row = addAndEditForm.tableList[i]
+                    for (const key in row) {
+                        if (
+                            row.hasOwnProperty(key) &&
+                            (row[key] === null || row[key] === '' || row[key]?.length === 0) &&
+                            key !== 'name2' &&
+                            key !== 'name6' &&
+                            key !== 'id' &&
+                            key !== 'insurancePdf'
+                        ) {
+                            if (key == 'identifyCode') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'唯一标识符'} 字段不能为空`,
+                                })
+                            } else if (key == 'checkMan') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'检修人'} 字段不能为空`,
+                                })
+                            } else if (key == 'checkDate') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'检修日期'} 字段不能为空`,
+                                })
+                            } else if (key == 'nextCheckDate') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'下次检修日期'} 字段不能为空`,
+                                })
+                            } else {
+                                console.log(`第 ${i + 1} 行的 ${key} 字段不能为空`)
+                            }
+                            return // 如果有任何字段为空，直接返回，不进行提交
+                        }
+
+                        console.log(row, '-->提交')
+                        if (row.examinationPdf.length === 0) {
+                            ElMessage({
+                                type: 'error',
+                                message: `请上传第 ${i + 1} 行的检测证明`,
+                            })
+                            return
+                        }
+                    }
+                }
+            }
+
+            if (isDescription) return
+            addAndEditForm.mainFileList = Array.from(
+                new Set([...addAndEditForm.mainFileList, ...addAndEditForm.mainFileTempList]),
+            )
+            console.log(
+                '🚀 ~ submitFun ~ addAndEditForm.mainFileList:',
+                addAndEditForm.mainFileList,
+            )
+            addAndEditForm.detailsFileList = Array.from(
+                new Set([...addAndEditForm.detailsFileList, ...addAndEditForm.detailsFileTempList]),
+            )
+            console.log(
+                '🚀 ~ submitFun ~ addAndEditForm.detailsFileList:',
+                addAndEditForm.detailsFileList,
+            )
+
+            addAndEditForm.devInfoProperties = propertyNames.value
+            addAndEditForm.typeId =
+                addAndEditForm.deviceTypeList[addAndEditForm.deviceTypeList.length - 1]
+
+            let SEND_FUN_API: any = null
+            if (type == 1) {
+                SEND_FUN_API = equipmentAddApiNew
+                addAndEditForm.maStatus = 1
+                addAndEditForm.type = 1
+            }
+            if (type == 2) {
+                SEND_FUN_API = equipmentAddApiNew
+                addAndEditForm.maStatus = 0
+                addAndEditForm.type = 2
+            }
+            if (type == 3) {
+                SEND_FUN_API = equipmentEditApiNew
+                addAndEditForm.maStatus = 1
+                addAndEditForm.type = 3
+            }
+            if (type == 4) {
+                SEND_FUN_API = equipmentEditApi
+                addAndEditForm.maStatus = 0
+                addAndEditForm.type = 4
+            }
+            let res = null
+            try {
+                if (!orderId.value) {
+                    getEquipmentAddIdApi().then(async (result: any) => {
+                        orderId.value = result.data.id
+                        addAndEditForm.orderId = orderId.value
+                        queryParams.value.orderId = orderId.value
+                        res = await SEND_FUN_API(addAndEditForm)
+                        if (res.code === 200) {
+                            ElMessage({
+                                type: 'success',
+                                message: '保存成功',
+                                duration: 1000,
+                            })
+                            propertyNames.value = []
+                            dialogFormVisibleSettlein.value = false
+                            getList()
+                        }
+                    })
+                } else {
+                    addAndEditForm.orderId = orderId.value
+                    queryParams.value.orderId = orderId.value
+                    res = await SEND_FUN_API(addAndEditForm)
+                    if (res.code === 200) {
+                        ElMessage({
+                            type: 'success',
+                            message: '保存成功',
+                            duration: 1000,
+                        })
+                        propertyNames.value = []
+                        dialogFormVisibleSettlein.value = false
+                        getList()
+                    }
+                }
+            } catch (error) {
+                console.log('error', error)
+            }
+
+            // 组装参数
+        } else {
+            console.log('校验失败')
+        }
+    })
+}
+//草稿
+const saveTemp = async () => {
+    submitFun(isMaStatus.value ? 4 : 2)
+    if (true) return
+}
+
+/* 关闭按钮 */
+const closeDialogBtn = () => {
+    // ruleFormRef.value.resetFields()
+    propertyNames.value = []
+    // 获取装备树
+    getTypeTreeData()
+    dialogFormVisibleSettlein.value = false
+}
+/* 关闭对话框 */
+const handleClose = (done: () => void) => {
+    // ruleFormRef.value.resetFields()
+    done()
+    propertyNames.value = []
+    dialogFormVisibleSettlein.value = false
+}
+
+/* 检测信息图片地址 */
+const successResultCallBackFnjc = (val: any) => {
+    equipmentDeploymentParams.value.detectionList = []
+    equipmentDeploymentParams.value.detectionList.push(val.msg)
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '28',
+        fileUrl: val.msg,
+    })
+}
+/* 保险信息图片地址 */
+const successResultCallBackFnbs = (val: any) => {
+    equipmentDeploymentParams.value.insureList = []
+    equipmentDeploymentParams.value.insureList.push(val.msg)
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '29',
+        fileUrl: val.msg,
+    })
+}
+/* 设备图片信息地址 */
+const successResultCallBackFnDevicePic = (val: any) => {
+    equipmentDeploymentParams.value.picList = []
+    equipmentDeploymentParams.value.picList.push(val.msg)
+    if (!equipmentDeploymentParams.value.picUrl) {
+        equipmentDeploymentParams.value.picUrl = val.msg
+    }
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '20',
+        fileUrl: val.msg,
+    })
+}
+
+const mainFileList: any = ref([]) //主展示
+const detailsFileList: any = ref([]) //详情展示
+const maTypeProperties: any = ref([]) //属性
+const insurancePdf: any = ref([]) //合格证
+const examinationPdf: any = ref([]) //检测证明
+//图片查看弹窗
+const dialogVisible: any = ref(false)
+const dialogImageUrl = ref('')
+//上传地址+header
+const imgUploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
+const actionUrl = ref(imgUploadUrl)
+const headerInfo = reactive({
+    Authorization: 'Bearer ' + store2.token,
+})
+// 文件上传前处理-上传大小
+const beforeUpload = (file: any) => {
+    if (file.size / 1024 / 1024 > 10) {
+        ElMessage({
+            type: 'error',
+            message: '上传文件大小不能超过10M!',
+        })
+        return false
+    }
+}
+// 文件上传失败
+const uploadError = () => {
+    ElMessage({
+        type: 'error',
+        message: '上传文件失败!',
+    })
+    // this.$message.error({message: `上传文件失败!`});
+}
+// 文件上传成功处理
+const handleFileSuccess = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        mainFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(mainFileList.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess2 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        detailsFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(detailsFileList.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess3 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        insurancePdf.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(insurancePdf.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess4 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        examinationPdf.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(examinationPdf.value)
+    }
+}
+//文件下载
+const handleDownload = (file: any) => {
+    const windowName = file.name
+    window.open(file.fileUrl, windowName)
+}
+//文件查看
+const picturePreview = (file: any) => {
+    dialogImageUrl.value = file.fileUrl
+    dialogVisible.value = true
+}
+
+const onBatchUpload = () => {
+    console.log('下载')
+}
+
+const onAddDescription = () => {
+    const newId = Date.now()
+    descriptionFormList.value.push({
+        newId,
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+}
+
+const typeDisabled = ref(false)
+
+const addAndEditForm = reactive<any>({
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    originaValue: '',
+    itemTypeModel: '',
+    deviceType: '',
+    buyPrice: '',
+    unitName: '',
+    code: '',
+    brand: '',
+    typeId: '',
+    companyId: '',
+    productionDate: '',
+    dayLeasePrice: '',
+    person: '',
+    personPhone: '',
+    deviceWeight: '',
+    checkDate: '',
+    checkCycle: '',
+    mainFileList: [],
+    detailsFileList: [],
+    mainFileTempList: [],
+    detailsFileTempList: [],
+    insurancePdf: [],
+    examinationPdf: [],
+    insurancePdfs: [],
+    examinationPdfs: [],
+    devInfoProperties: [],
+    tableList: [],
+    isZone: true, // 是否上架专区
+    zoneId: '', // 专区id
+    expirationTime: '',
+    orderId: '',
+})
+// const addAndEditFormTemp = reactive<any>()
+const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
+const uploadUrl2 = import.meta.env.VITE_API_URL + '/material-mall/dev/importData'
+const addAndEditFormRef = ref()
+// 装备描述表单
+const descriptionFormList = ref<any>([
+    {
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    },
+])
+const descriptionFormRefList = ref<any>([])
+// 移除
+const onDeleteDescription = (index: number) => {
+    descriptionFormList.value.splice(index, 1)
+    descriptionFormRefList.value.splice(index, 1)
+}
+
+const onMainFileChange = (fileList: any) => {
+    addAndEditForm.mainFileTempList = []
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    addAndEditFormRef.value.clearValidate('mainFileList')
+    addAndEditForm.mainFileTempList.push(...fileListTemp)
+}
+const onDetailsFileChange = (fileList: any) => {
+    addAndEditForm.detailsFileTempList = []
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    addAndEditFormRef.value.clearValidate('detailsFileList')
+    addAndEditForm.detailsFileTempList.push(...fileListTemp)
+}
+
+const onInsurancePdfChange = (fileList: any, index: number) => {
+    descriptionFormList.value[index].insuranceATempPdf = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+        }
+    })
+    descriptionFormRefList.value[index].clearValidate('insurancePdf')
+    descriptionFormList.value[index].insuranceATempPdf.push(...fileListTemp)
+}
+const onExaminationPdfChange = (fileList: any, index: number) => {
+    descriptionFormList.value[index].examinationTempPdf = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+        }
+    })
+    descriptionFormRefList.value[index].clearValidate('examinationPdf')
+    descriptionFormList.value[index].examinationTempPdf.push(...fileListTemp)
+}
+
+//文件查看
+const handlePreview = (e: any) => {
+    console.log('🚀 ~ handlePreview ~ handlePreview:', e.fileUrl)
+    // 点击跳转展示
+    window.open(e.fileUrl, '_blank')
+}
+// 删除附件
+const handleRemove = (file: any, row: any, type: Number) => {
+    console.log('🚀 ~ handleRemove ~ handleRemove:', file)
+
+    if (row.id) {
+        if (type == 1) {
+            const index = row.examinationPdf.findIndex((e: any) => e.fileUrl == file.fileUrl)
+            if (index > -1) {
+                row.examinationPdf.splice(index, 1)
+            }
+        } else {
+            const index = row.insurancePdf.findIndex((e: any) => e.fileUrl == file.fileUrl)
+            if (index > -1) {
+                row.insurancePdf.splice(index, 1)
+            }
+        }
+    } else {
+        if (type == 1) {
+            const index = row.examinationPdf.findIndex(
+                (e: any) => e.fileUrl == file.response.data.url,
+            )
+            if (index > -1) {
+                row.examinationPdf.splice(index, 1)
+            }
+        } else {
+            const index = row.insurancePdf.findIndex(
+                (e: any) => e.fileUrl == file.response.data.url,
+            )
+            if (index > -1) {
+                row.insurancePdf.splice(index, 1)
+            }
+        }
+    }
+    console.log('🚀 ~ handleRemove ~ row:', row.examinationPdf)
+}
+// 上传附件
+const handleSuccess = (uploadFile: any, row: any, type: Number) => {
+    console.log('🚀 ~ handleSuccess ~ uploadFile:', uploadFile)
+    if (uploadFile.code == 200) {
+        let fileUrl = ''
+        console.log('输出env.VITE_API_URL', import.meta.env.VITE_API_URL)
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            console.log('走入公司测试环境----------', uploadFile.data.url)
+            fileUrl = uploadFile.data.url // 公司-测试环境
+        } else {
+            console.log('走入宏源测试环境----------', uploadFile.data.url)
+            fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + uploadFile.data.url // 宏源-测试环境
+        }
+        console.log('输出fileUrl----------', fileUrl)
+        if (type == 1) {
+            row.examinationPdf.push({
+                fileName: uploadFile.data.name,
+                fileUrl: fileUrl,
+            })
+        } else {
+            row.insurancePdf.push({
+                fileName: uploadFile.data.name,
+                fileUrl: fileUrl,
+            })
+        }
+    }
+    console.log('🚀 ~ handleSuccess ~ row:', row)
+}
+
+// 超限提示
+const handleExceed = () => {
+    ElMessage({
+        type: 'error',
+        message: '最多只能上传5个文件',
+    })
+}
+
+// 上传附件
+const onFileChangeEquip = (fileList: any, row: any, index: number, type: number) => {
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+    if (type == 1) {
+        equipTableList.value[index].insurancePdf = []
+    } else {
+        equipTableList.value[index].examinationPdf = []
+    }
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    console.log('11111', fileListTemp[0].fileUrl)
+    if (type == 1) {
+        equipTableList.value[index].name2 = fileListTemp[0].fileUrl
+        equipTableList.value[index].insurancePdf.push(fileListTemp[0])
+    } else {
+        equipTableList.value[index].name6 = fileListTemp[0].fileUrl
+        equipTableList.value[index].examinationPdf.push(fileListTemp[0])
+    }
+}
+
+// const onDeleteImgInDetails = () => {}
+
+const onDeleteImgInMain = (index: any) => {
+    addAndEditForm.mainFileList.splice(index, 1)
+}
+const onDeleteImgInDetails = (index: any) => {
+    addAndEditForm.detailsFileList.splice(index, 1)
+}
+const onDeleteImgInsurancePdf = (j: any, index: any) => {
+    descriptionFormList.value[j].insurancePdfs.splice(index, 1)
+}
+const onDeleteImgExaminationPdf = (j: any, index: any) => {
+    descriptionFormList.value[j].examinationPdfs.splice(index, 1)
+}
+
+const onDialogClose = () => {
+    addAndEditFormRef.value.resetFields()
+    Object.assign(addAndEditForm, {
+        deviceName: '',
+        deviceTypeList: [],
+        deviceCount: 1,
+        originaValue: '',
+        itemTypeModel: '',
+        deviceType: '',
+        buyPrice: '',
+        unitName: '',
+        code: '',
+        brand: '',
+        typeId: '',
+        companyId: '',
+        productionDate: '',
+        dayLeasePrice: '',
+        person: '',
+        personPhone: '',
+        deviceWeight: '',
+        checkDate: '',
+        checkCycle: '',
+        mainFileList: [],
+        detailsFileList: [],
+        mainFileTempList: [],
+        detailsFileTempList: [],
+        insurancePdf: [],
+        examinationPdf: [],
+        insurancePdfs: [],
+        examinationPdfs: [],
+    })
+}
+const propertyNames = ref<any>([])
+const propertyNamesTwo = ref<any>([])
+const options = ref<any>([])
+
+const onPreviewImg = (fileUrl: any) => {
+    previewDialogImageUrl.value = fileUrl
+    previewDialogVisible.value = true
+}
+// 计算所有装备
+const chunkedItems = computed(() => {
+    let result = []
+    for (let i = 0; i < propertyNames.value.length; i += 2) {
+        result.push(propertyNames.value.slice(i, i + 2))
+    }
+    return result
+})
+
+const equipTableList = ref<any>([])
+
+const handleAddBack = () => {
+    let obj = {
+        identifyCode: '',
+        name2: '',
+        checkMan: '',
+        checkDate: '',
+        nextCheckDate: '',
+        name6: '',
+        insurancePdf: [],
+        examinationPdf: [],
+    }
+    equipTableList.value.push(obj)
+}
+const handleDeleteBack = (index: number) => {
+    equipTableList.value.splice(index, 1)
+}
+
+const fileListEquip = ref<any>([])
+
+const viewCertificate = (url: string) => {
+    window.open(url, '_blank')
+}
+const changeDate = (row: any, index: number) => {
+    console.log('3333', row)
+    const currentDate = new Date(row.checkDate)
+    console.log('1111', currentDate)
+    // console.log('🚀 ~ 告警时间 ~ warningDays.value:', warningDays.value)
+    // 获取当前时间一年后的天数
+    const nextYearDate = dayjs(currentDate).add(1, 'year').subtract(1, 'day').toDate()
+    console.log('🚀 ~ changeDate ~ nextDate:', nextYearDate)
+    // currentDate.setDate(currentDate.getDate() + Number(warningDays.value))
+    equipTableList.value[index].nextCheckDate = dayjs(nextYearDate).format('YYYY-MM-DD')
+}
+
+// 下次检修时间不能早于检修时间
+const changeNextDate = (row: any) => {
+    if (row.checkDate && row.nextCheckDate) {
+        if (dayjs(row.checkDate).isAfter(row.nextCheckDate)) {
+            ElMessage({
+                type: 'error',
+                message: '下次检修时间不能早于检修时间',
+            })
+            row.nextCheckDate = ''
+        }
+    }
+}
+
+const getUpdateTimeBgColor = (row: any) => {
+    // 将字符串日期转换为 Date 对象
+    const checkDate = new Date()
+    const nextCheckDate = new Date(row.nextCheckDate)
+
+    // 计算两个日期之间的差值（以毫秒为单位）
+    const diffTime = Math.abs(nextCheckDate - checkDate)
+    // 将差值转换为天数
+    const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+
+    if (checkDate < nextCheckDate && diffDays <= 30) {
+        return '#FFFFCC' // 黄色背景
+    } else if (checkDate > nextCheckDate) {
+        return '#FFCCCC' // 红色背景
+    }
+    return '' // 返回空字符串，让背景色保持默认
+}
+
+const handleBatchAddVisible = () => {
+    batchAddData.value = []
+    batchAddVisible.value = true
+}
+
+const selectColumn = ref<any>([])
+const selectionChange = (val: any) => {
+    console.log('🚀 ~ selectionChange ~ val:', val)
+    selectColumn.value = val
+}
+
+const handleUpload = (file: any, fileList: any) => {
+    console.log('🚀 ~ handleUpload ~ file:', file)
+    console.log('🚀 ~ handleUpload ~ fileList:', fileList)
+    if (file.code == 200) {
+        batchAddData.value = file.data
+    } else {
+        ElMessage({
+            message: file.msg,
+            type: 'error',
+        })
+    }
+}
+
+const handleBatchDel = () => {
+    if (selectColumn.value.length == 0) {
+        ElMessage({
+            message: '请选择要删除的数据',
+            type: 'error',
+        })
+        return
+    }
+    ElMessageBox.confirm('是否确认删除所选数据', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        batchAddData.value = batchAddData.value.filter(
+            (item: any) => !selectColumn.value.includes(item),
+        )
+    })
+}
+
+const handleDel = (index: any) => {
+    ElMessageBox.confirm('是否确认删除所选数据', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        batchAddData.value.splice(index, 1)
+    })
+}
+
+// 返回列表
+const emits = defineEmits(['backList'])
+const onHandleBackList = () => {
+    emits('backList')
+}
+
+onMounted(() => {
+    if (props.orderIds) {
+        queryParams.value.orderId = props.orderIds
+        addAndEditForm.orderId = props.orderIds
+        getList()
+    }
+})
+
+// 提交申请
+const onHandleSubmit = async () => {
+    if (!queryParams.value.orderId) {
+        ElMessage({
+            message: '请先添加设备',
+            type: 'error',
+        })
+        return
+    }
+    // 调接口
+    const res: any = await equipmentSubmitApiNew({ id: queryParams.value.orderId, status: 0 })
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '提交成功',
+        })
+        emits('backList')
+    }
+}
+
+const onHandleAllPass = async () => {
+    if (selectColumn.value.length == 0) {
+        ElMessage({
+            message: '请选择要通过的数据',
+            type: 'error',
+        })
+        return
+    }
+    console.log('onHandleAllPass')
+
+    const data = {
+        devIds: selectColumn.value.map((item: any) => item.maId).join(','),
+        status: 1,
+        id: queryParams.value.orderId,
+    }
+
+    const res: any = await equipmentPassAndRejectApiNew(data)
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '通过成功',
+        })
+        emits('backList')
+    }
+}
+const onHandleAllReject = async () => {
+    if (selectColumn.value.length == 0) {
+        ElMessage({
+            message: '请选择要驳回的数据',
+            type: 'error',
+        })
+        return
+    }
+    console.log('onHandleAllReject')
+
+    const data = {
+        devIds: selectColumn.value.map((item: any) => item.maId).join(','),
+        status: 2,
+        id: queryParams.value.orderId,
+    }
+
+    const res: any = await equipmentPassAndRejectApiNew(data)
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '驳回成功',
+        })
+        emits('backList')
+    }
+}
+
+const onSelectionChange = (selection: any) => {
+    console.log('🚀 ~ onSelectionChange ~ selection:', selection)
+    selectColumn.value = selection
+}
+
+// 通过
+const onHandlePass = async (row: any) => {
+    const data = {
+        devIds: row.maId,
+        status: 1,
+        id: queryParams.value.orderId,
+    }
+
+    const res: any = await equipmentPassAndRejectApiNew(data)
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '通过成功',
+        })
+        emits('backList')
+    }
+}
+// 驳回
+const onHandleReject = async (row: any) => {
+    const data = {
+        devIds: row.maId,
+        status: 2,
+        id: queryParams.value.orderId,
+    }
+
+    const res: any = await equipmentPassAndRejectApiNew(data)
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '驳回成功',
+        })
+        emits('backList')
+    }
+}
+</script>
+
+<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="deviceName">
+                        <el-input
+                            v-model.trim="queryParams.deviceName"
+                            style="width: 100%"
+                            clearable
+                            placeholder="请输入装备名称"
+                        />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="18">
+                    <el-form-item>
+                        <el-button class="primary-lease" type="primary" @click="queryTableList">
+                            查询
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="resetTableList(queryFormRef)"
+                        >
+                            重置
+                        </el-button>
+                        <el-button class="primary-lease" type="primary" @click="onHandleAllPass">
+                            全部通过
+                        </el-button>
+                        <el-button class="primary-lease" type="primary" @click="onHandleAllReject">
+                            全部驳回
+                        </el-button>
+
+                        <el-button @click="onHandleBackList" class="primary-lease" type="primary">
+                            返回列表
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+        <!-- 表格 -->
+        <el-table
+            :data="tableData"
+            style="width: auto"
+            row-key="maId"
+            show-overflow-tooltip
+            @selection-change="onSelectionChange"
+            :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
+            <el-table-column align="center" label="装备名称">
+                <template #default="{ row }">
+                    {{ `${row.deviceName}` }}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="code" label="装备编号" />
+            <el-table-column align="center" prop="typeName" label="装备类目">
+                <template #default="{ row }">
+                    <span
+                        >{{ row.firstName }} <span v-show="row.firstName">></span>
+                        {{ row.secondName }}<span v-show="row.secondName">></span
+                        >{{ row.thirdName }}</span
+                    >
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="装备型号" />
+            <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
+                <template #default="{ row }">
+                    <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
+                        row.nextCheckDate
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" label="装备状态">
+                <template #default="{ row }">
+                    <el-tag v-if="row.maStatus == 0" size="small" type="info">草稿状态</el-tag>
+                    <el-tag v-if="row.maStatus == 1" size="small" type="warning">待上架</el-tag>
+                    <el-tag v-if="row.maStatus == 2" size="small" type="success">上架</el-tag>
+                    <el-tag v-if="row.maStatus == 3" size="small" type="danger">在租</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="name"
+                label="操作"
+                min-width="160px"
+                align="center"
+                v-if="!props.isView"
+            >
+                <template #default="{ row }">
+                    <el-button size="small" type="primary" @click="editRowInfo(row)">
+                        查看
+                    </el-button>
+                    <el-button size="small" type="primary" @click="onHandlePass(row)">
+                        通过
+                    </el-button>
+                    <el-button size="small" type="primary" @click="onHandleReject(row)">
+                        驳回
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <PagingComponent
+            @getListChange="getList"
+            v-model:pageSize="queryParams.pageSize"
+            v-model:currentPage="queryParams.pageNum"
+            :total="total"
+        />
+
+        <!-- 装备弹框 -->
+        <el-dialog
+            v-model="dialogFormVisibleSettlein"
+            :title="settleinTitle"
+            width="80%"
+            destroy-on-close
+            class="centered-dialog"
+            :close-on-click-modal="false"
+            :before-close="handleClose"
+            @close="onDialogClose"
+        >
+            <el-row
+                :gutter="20"
+                class="mb8"
+                style="display: flex; justify-content: flex-end; align-items: center"
+            >
+                <el-button type="primary" class="primary-lease" @click="closeDialogBtn">
+                    关闭
+                </el-button>
+                <!-- <el-button
+                    type="primary"
+                    class="primary-lease"
+                    @click="saveTemp"
+                    v-if="
+                        (!equipmentDeploymentParams.maStatus ||
+                            equipmentDeploymentParams.maStatus == 0) &&
+                        !isViewForm
+                    "
+                >
+                    保存草稿
+                </el-button> -->
+                <!-- <el-button
+                    type="primary"
+                    class="primary-lease"
+                    @click="submitBtn"
+                    v-if="!disabledForm || isEditDisabled"
+                >
+                    提交
+                </el-button> -->
+            </el-row>
+
+            <!-- <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">基本信息</span>
+        </div> -->
+            <TitleTip :titleText="`基本信息`" />
+            <el-form
+                label-width="180px"
+                ref="addAndEditFormRef"
+                label-position="right"
+                :model="addAndEditForm"
+                :rules="equipRules"
+                :disabled="true"
+            >
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="装备名称：" prop="deviceName">
+                            <el-input
+                                autocomplete="off"
+                                maxlength="30"
+                                v-model="addAndEditForm.deviceName"
+                                clearable
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备类目：" prop="deviceTypeList">
+                            <el-cascader
+                                v-model="addAndEditForm.deviceTypeList"
+                                :show-all-levels="true"
+                                :options="deviceTypeTree"
+                                :props="partTypeTreeProps"
+                                filterable
+                                clearable
+                                collapse-tags
+                                placeholder="请选择装备类目"
+                                ref="dialogTypeCascader"
+                                @change="dialogTypeChange"
+                                style="width: 100%"
+                            ></el-cascader>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="装备单位：" prop="unitName">
+                            <el-input
+                                autocomplete="off"
+                                maxlength="20"
+                                v-model="addAndEditForm.unitName"
+                                clearable
+                                :disabled="isDisabled || isEditForm"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备品牌" prop="brand">
+                            <el-input
+                                v-model="addAndEditForm.brand"
+                                autocomplete="off"
+                                maxlength="20"
+                                clearable
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="出厂日期：" prop="productionDate">
+                            <el-date-picker
+                                v-model="addAndEditForm.productionDate"
+                                placeholder="请选择出厂日期"
+                                value-format="YYYY-MM-DD"
+                                type="date"
+                                style="width: 100%"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="租赁价格(天/元)：" prop="dayLeasePrice">
+                            <el-input
+                                @input="
+                                    (v:any) => (addAndEditForm.dayLeasePrice = v.replace(/[^\d.]/g, ''))
+                                "
+                                clearable
+                                maxlength="20"
+                                placeholder="请输入租赁价格"
+                                v-model="addAndEditForm.dayLeasePrice"
+                                :disabled="settleinTitle == '新增详情'"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="联系人：" prop="person">
+                            <el-input
+                                v-model="addAndEditForm.person"
+                                placeholder="请输入联系人"
+                                clearable
+                                maxlength="10"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话：" prop="personPhone">
+                            <el-input
+                                v-model="addAndEditForm.personPhone"
+                                placeholder="请输入联系电话"
+                                clearable
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="上架数量：" prop="deviceCount">
+                            <el-input
+                                v-model="addAndEditForm.deviceCount"
+                                placeholder="请输入上架数量"
+                                type="number"
+                                clearable
+                                maxlength="10"
+                                :disabled="typeDisabled"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <!-- 临时录入使用 - start -->
+                    <el-col :span="12">
+                        <el-form-item label="原值：" prop="buyPrice">
+                            <el-input-number
+                                v-model="addAndEditForm.buyPrice"
+                                placeholder="请输入原值"
+                                clearable
+                                maxlength="20"
+                                :controls="false"
+                                align="left"
+                                style="width: 100%"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="规格型号：" prop="itemTypeModel">
+                            <el-input
+                                v-model="addAndEditForm.itemTypeModel"
+                                placeholder="请输入规格型号"
+                                clearable
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="规格型号：" prop="deviceType">
+                            <!-- 0 编码 1 数量 -->
+                            <el-select
+                                v-model="addAndEditForm.deviceType"
+                                placeholder="请选择管理方式"
+                                clearable
+                                style="width: 100%"
+                                :disabled="!isAdd"
+                            >
+                                <el-option label="编码" :value="0" />
+                                <el-option label="数量" :value="1" />
+                            </el-select>
+                            <span style="color: red"
+                                >说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span
+                            >
+                        </el-form-item>
+                    </el-col>
+                    <!-- 临时录入使用 - end -->
+                </el-row>
+
+                <!-- 9.15新增 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="标准使用时间：" prop="expirationTime">
+                            <el-date-picker
+                                type="date"
+                                style="width: 100%"
+                                value-format="YYYY-MM-DD"
+                                placeholder="请选择标准使用时间"
+                                v-model="addAndEditForm.expirationTime"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 1.13 需求变动要求隐藏 -->
+                <!-- <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="校验日期：" prop="checkDate">
+                            <el-date-picker
+                                v-model="addAndEditForm.checkDate"
+                                placeholder="请选择校验日期"
+                                value-format="YYYY-MM-DD"
+                                type="date"
+                                style="width: 100%"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="校验周期：" prop="checkCycle">
+                            <el-input
+                                @input="
+                                    (v) => (addAndEditForm.checkCycle = v.replace(/[^\d.]/g, ''))
+                                "
+                                v-model="addAndEditForm.checkCycle"
+                                placeholder="请输入校验周期（数字）"
+                                clearable
+                                maxlength="20"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+                <!-- <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="整机重量(KG)：">
+                            <el-input
+                                @input="
+                                    (v) => (addAndEditForm.deviceWeight = v.replace(/[^\d.]/g, ''))
+                                "
+                                v-model="addAndEditForm.deviceWeight"
+                                placeholder="请输入整机重量"
+                                clearable
+                                maxlength="20"
+                                style="width: 350px"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+                <!-- 临时录入暂时隐藏 - 2025年09月13日 -->
+                <!-- 临时录入又需要隐藏 - 2025年09月15日 -->
+                <div>
+                    <el-row
+                        v-for="(item, index) in chunkedItems"
+                        :key="index"
+                        :model="item"
+                        class="dynamic-item"
+                        :gutter="20"
+                        style="display: flex; margin-top: 10px; justify-content: left"
+                    >
+                        <el-col v-for="(itemTemp, indexTemp) in item" :key="indexTemp" :span="12">
+                            <el-form-item :label="itemTemp.propertyName + '：'">
+                                <el-input
+                                    v-model="itemTemp.propertyValue"
+                                    placeholder="请输入"
+                                    maxlength="20"
+                                >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </div>
+
+                <TitleTip :titleText="`装备图片`" />
+                <el-row :gutter="20" v-if="!isViewForm">
+                    <el-col :span="24">
+                        <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                            <div class="tipBox">
+                                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例1:1
+                            </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-row :gutter="20" v-if="!isViewForm">
+                    <el-col :span="24">
+                        <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                            <div class="tipBox">
+                                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例16:9
+                            </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="detailsFileList"
+                        >
+                            <div
+                                class="img-list"
+                                v-if="addAndEditForm.detailsFileList.length > 0 && !isAdd"
+                            >
+                                <div
+                                    v-for="(j, i) in addAndEditForm.detailsFileList"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInDetails(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.detailsFileList.length"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onDetailsFileChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa">
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 暂时不展示 -->
+                <!-- <TitleTip :titleText="`专区`" />
+                <el-form-item label="是否上架专区" prop="isZone">
+                    <el-radio-group v-model="addAndEditForm.isZone">
+                        <el-radio :value="true" :label="true">是</el-radio>
+                        <el-radio :value="false" :label="false">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="关联公司" prop="zoneId">
+                    <el-select
+                        v-model="addAndEditForm.zoneId"
+                        clearable
+                        filterable
+                        placeholder="请选择关联公司"
+                        :disabled="!addAndEditForm.isZone"
+                    >
+                        <el-option
+                            v-for="item in companyDataList"
+                            :key="item.companyId"
+                            :label="item.companyName"
+                            :value="item.companyId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item> -->
+                <div style="display: flex; align-items: center">
+                    <TitleTip :titleText="`装备证书`" />
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleAddBack"
+                        style="margin-left: 20px; margin-top: 20px"
+                        :disabled="!addAndEditForm.deviceTypeList"
+                        v-if="settleinTitle == '新增装备'"
+                        >添加
+                    </el-button>
+                </div>
+                <!-- <el-row :gutter="20" v-if="!isEditForm && !isViewForm">
+                    <el-col :span="24">
+                        <el-button class="primary-lease" type="primary" @click="onAddDescription">
+                            添加装备证书
+                        </el-button>
+                    </el-col>
+                </el-row> -->
+            </el-form>
+
+            <!-- <el-form
+                label-width="140px"
+                label-position="right"
+                :rules="descriptionRules"
+                v-for="(item, index) in descriptionFormList"
+                :ref="
+                ($event:any) => {
+                    descriptionFormRefList[index] = $event
+                }
+            "
+                :model="item"
+                :key="item.newId"
+            >
+                <el-row :gutter="20" style="margin-top: 12px">
+                    <el-col :span="12">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="装备唯一标识符："
+                            prop="identifyCode"
+                        >
+                            <el-input
+                                v-model="item.identifyCode"
+                                placeholder="请输入"
+                                maxlength="20"
+                            />
+                        </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">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+            <!-- <el-row :gutter="20">
+                    <el-col :span="24">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="合格证："
+                            prop="insurancePdfs"
+                        >
+                            <div class="img-list" v-if="addAndEditForm.detailsFileList.length > 0">
+                                <div
+                                    v-for="(j, i) in item.insurancePdfs"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img" v-if="!isViewForm">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInMain(i)"
+                                            >
+                                                <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"
+                                :actionUrl="uploadUrl"
+                                :maxSize="5"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :currentIndex="index"
+                                :autoUpload="true"
+                                :multiple="true"
+                                :minLimit="item.insurancePdfs.length"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onInsurancePdfChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </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">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M,
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row
+                    :gutter="20"
+                    :style="
+                        index != descriptionFormList.length - 1
+                            ? 'border-bottom: 1px solid #ccc'
+                            : ''
+                    "
+                >
+                    <el-col :span="20">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="检测证明："
+                            prop="examinationPdfs"
+                        >
+                            <div class="img-list" v-if="addAndEditForm.detailsFileList.length > 0">
+                                <div
+                                    v-for="(j, i) in item.examinationPdfs"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img" v-if="!isViewForm">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInMain(i)"
+                                            >
+                                                <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"
+                                :actionUrl="uploadUrl"
+                                :maxSize="5"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :autoUpload="true"
+                                :multiple="true"
+                                :minLimit="item.examinationPdfs.length"
+                                :currentIndex="index"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onExaminationPdfChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" v-if="index != 0">
+                        <el-button
+                            size="small"
+                            type="danger"
+                            class="primary-lease"
+                            @click="onDeleteDescription(index)"
+                        >
+                            移除
+                        </el-button>
+                    </el-col>
+                </el-row> -->
+            <!-- </el-form> -->
+
+            <el-table :data="equipTableList" width="100%" height="450px" border>
+                <el-table-column label="序号" type="index" width="55" align="center" />
+                <el-table-column
+                    prop="identifyCode"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                    width="260"
+                >
+                    <template #header>
+                        <div style="display: flex; flex-direction: column; align-items: center">
+                            <span>唯一标识符</span>
+                            <span style="font-size: 10px; color: #999">
+                                WHMY-DLSSJ-JSD5B-2025070101：<br />
+                                公司简称首字母-设备名称首字母-设备型号-YYYYMMDD序号
+                            </span>
+                        </div>
+                    </template>
+                    <template #default="{ row, $index }">
+                        <el-input
+                            v-model="row.identifyCode"
+                            style="width: 100%"
+                            placeholder="请输入唯一标识符"
+                            maxlength="20"
+                            :disabled="disabledForm"
+                        ></el-input>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column
+                    label="合格证"
+                    prop="name2"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <div v-if="row.name2 == ''">
+                            <UploadComponentNew
+                                :maxSize="10"
+                                :max-limit="1"
+                                width="100%"
+                                height="100%"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :actionUrl="uploadUrl"
+                                :minLimit="row.insurancePdf.length"
+                                listType="text"
+                                :justifyContent="`flex-start`"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="
+                                    (fileList) => onFileChangeEquip(fileList, row, $index, 1)
+                                "
+                            >
+                                <div
+                                    style="
+                                        display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                    "
+                                >
+                                    <el-button
+                                        type="text"
+                                        style="color: #00a288; text-decoration: underline"
+                                        >上传</el-button
+                                    >
+                                </div>
+                            </UploadComponentNew>
+                        </div>
+                        <div v-else>
+                            <el-button
+                                type="text"
+                                style="color: #00a288; text-decoration: underline"
+                                @click="viewCertificate(row.insurancePdf[0].fileUrl)"
+                                >查看</el-button
+                            >
+                        </div>
+                    </template>
+                </el-table-column> -->
+                <el-table-column
+                    label="检修人"
+                    prop="checkMan"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-input
+                            v-model="row.checkMan"
+                            controls-position="right"
+                            style="width: 100%"
+                            placeholder="请输入检修人"
+                            :disabled="disabledForm"
+                        ></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="检修时间"
+                    prop="checkDate"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-date-picker
+                            v-model="row.checkDate"
+                            value-format="YYYY-MM-DD"
+                            type="date"
+                            placeholder="请选择"
+                            @change="changeDate(row, $index)"
+                            style="width: 100%"
+                            :disabled="disabledForm"
+                        ></el-date-picker>
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="下次检测时间"
+                    prop="nextCheckDate"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-date-picker
+                            v-model="row.nextCheckDate"
+                            value-format="YYYY-MM-DD"
+                            type="date"
+                            placeholder="请选择"
+                            style="width: 100%"
+                            @change="changeNextDate(row)"
+                            :disabled="disabledForm"
+                        ></el-date-picker>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="合格证(最多5个)" prop="name2" align="center" width="220">
+                    <template #default="{ row, $index }">
+                        <el-upload
+                            :file-list="row.insurancePdf"
+                            class="upload-demo"
+                            :action="uploadUrl"
+                            :headers="headerInfo"
+                            :before-upload="beforeUpload"
+                            :on-preview="handlePreview"
+                            :on-remove="(file: any) => handleRemove(file, row, 2)"
+                            :on-exceed="handleExceed"
+                            :limit="5"
+                            :on-success="(file: any) => handleSuccess(file, row, 2)"
+                            accept=".jpg,.png,.pdf, .doc, .docx"
+                            :disabled="settleinTitle == '装备详情'"
+                        >
+                            <el-button
+                                type="primary"
+                                size="small"
+                                v-if="settleinTitle != '装备详情'"
+                            >
+                                上传
+                            </el-button>
+                        </el-upload>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="检测证明(最多5个)" prop="name6" align="center" width="220">
+                    <template #default="{ row, $index }">
+                        <el-upload
+                            class="upload-demo"
+                            :action="uploadUrl"
+                            :headers="headerInfo"
+                            :file-list="row.examinationPdf"
+                            :before-upload="beforeUpload"
+                            :on-preview="handlePreview"
+                            :on-remove="(file: any) => handleRemove(file, row, 1)"
+                            :on-exceed="handleExceed"
+                            :limit="5"
+                            :on-success="(file: any) => handleSuccess(file, row, 1)"
+                            accept=".jpg,.png,.pdf, .doc, .docx"
+                            :disabled="settleinTitle == '装备详情'"
+                        >
+                            <el-button
+                                size="small"
+                                type="primary"
+                                v-if="settleinTitle != '装备详情'"
+                            >
+                                上传
+                            </el-button>
+                        </el-upload>
+                        <!-- <div v-if="row.name6 == ''">
+                            <UploadComponentNew
+                                :maxSize="10"
+                                :max-limit="1"
+                                width="100%"
+                                height="100%"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :actionUrl="uploadUrl"
+                                :minLimit="row.examinationPdf.length"
+                                listType="text"
+                                :justifyContent="`flex-start`"
+                                :acceptTypeList="['.jpg', '.png','.pdf']"
+                                @onFileChange="
+                                    (fileList) => onFileChangeEquip(fileList, row, $index, 2)
+                                "
+                            >
+                                <div
+                                    style="
+                                        display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                    "
+                                >
+                                    <el-button
+                                        type="text"
+                                        style="color: #00a288; text-decoration: underline"
+                                        >上传</el-button
+                                    >
+                                </div>
+                            </UploadComponentNew>
+                        </div>
+                        <div v-else>
+                            <el-button
+                                type="text"
+                                style="color: #00a288; text-decoration: underline"
+                                @click="viewCertificate(row.examinationPdf[0].fileUrl)"
+                                >查看</el-button
+                            >
+                        </div> -->
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    width="100px"
+                    v-if="settleinTitle == '新增装备'"
+                >
+                    <template #default="{ row, $index }">
+                        <div
+                            style="
+                                width: 100%;
+                                height: 40px;
+                                display: flex;
+                                align-items: center;
+                                justify-content: center;
+                            "
+                        >
+                            <el-button
+                                size="small"
+                                type="danger"
+                                @click="handleDeleteBack($index)"
+                                v-show="$index != 0"
+                                >删除
+                            </el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <!-- 图片查看弹窗 -->
+        <el-dialog center width="60%" destroy-on-close v-model="previewDialogVisible">
+            <el-image
+                style="width: 100%; height: 50%"
+                :src="previewDialogImageUrl"
+                fit="cover"
+                :z-index="9999999999"
+            />
+        </el-dialog>
+
+        <!-- 批量新增弹框 -->
+        <el-dialog
+            v-model="batchAddVisible"
+            title="批量新增"
+            width="80%"
+            destroy-on-close
+            :close-on-click-modal="false"
+        >
+            <el-row :gutter="20">
+                <el-col :span="1.5" :offset="0">
+                    <a :href="uploadUrlTemp" download="模板">
+                        <el-button class="primary-lease" type="primary" style="margin-left: 20px"
+                            >模板下载
+                        </el-button>
+                    </a>
+                </el-col>
+                <el-col :span="1.5" :offset="0">
+                    <el-upload
+                        class="upload-demo"
+                        :action="uploadUrl2"
+                        :headers="headerInfo"
+                        :show-file-list="false"
+                        accept=".xlsx"
+                        :on-success="handleUpload"
+                    >
+                        <el-button type="primary">上传文件</el-button>
+                    </el-upload>
+                </el-col>
+                <el-col :span="5" :offset="0">
+                    <div style="color: #ccc; font-size: small; line-height: 30px">
+                        备注: 一次上传装备数量不能超过50条
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20">
+                <el-col :span="12" :offset="0">
+                    <TitleTip titleText="资料不全装备清单" />
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20" style="margin-bottom: 10px">
+                <el-col :span="1.5" :offset="0">
+                    <el-button type="primary" @click="handleBatchDel">删除</el-button>
+                </el-col>
+            </el-row>
+
+            <el-table
+                :data="batchAddData"
+                row-key="typeId"
+                show-overflow-tooltip
+                :header-cell-style="{ background: '#00a288', color: '#fff' }"
+                style="width: 100%"
+                @selection-change="selectionChange"
+            >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="序号" align="center" width="80px">
+                    <template #default="{ row, $index }">
+                        {{ $index + 1 }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    v-for="(column, index) in batchAddColumn"
+                    :key="index"
+                    :prop="column.prop"
+                    :label="column.label"
+                    :width="column.width"
+                    align="center"
+                ></el-table-column>
+                <!-- 操作 -->
+                <el-table-column label="操作" align="center" width="180px">
+                    <template #default="{ row, $index }">
+                        <el-button type="primary" @click="handleDel($index)">删除</el-button>
+                        <el-button type="primary" @click="equipmentDeployment(row)">调整</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.el-form {
+    // margin: 15px 0;
+}
+
+.title {
+    margin: 10px;
+    margin-left: 20px;
+    display: flex;
+    align-items: center;
+}
+
+.title-sign {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #00a288;
+}
+
+.title-text {
+    font-weight: 700;
+    margin-left: 10px;
+}
+
+.uploadBox {
+    margin: 20px 40px;
+}
+
+.labelBox {
+    width: auto;
+    height: auto;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+}
+
+.imgsBox {
+    width: 100%;
+    height: auto;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-bottom: 30px;
+    margin-left: 20px;
+
+    .imgItem {
+        width: 150px;
+        height: 150px;
+        margin-right: 20px;
+        margin-bottom: 30px;
+        border: 1px dashed #bbb;
+        position: relative;
+
+        .picture-card {
+            width: 150px;
+            height: 150px;
+        }
+
+        .icon-list {
+            width: 60px;
+            height: 20px;
+            position: absolute;
+            top: 70px;
+            left: 30px;
+            display: flex;
+            align-items: center;
+        }
+
+        .imgItem__icon {
+            margin: 0 5px;
+            cursor: pointer;
+        }
+
+        .file-name {
+            font-size: 10px;
+            width: 100%;
+            word-break: break-all;
+        }
+    }
+
+    .hide {
+        display: none;
+    }
+
+    .imgItem:hover .hide {
+        display: block;
+    }
+}
+
+.tipBox {
+    color: red;
+    font-size: 12px;
+    margin-left: 20px;
+}
+
+:deep.el-form--inline .el-form-item {
+    margin-right: 6px;
+    width: 95%;
+}
+
+:deep.upload-tip .el-form-item__label {
+    color: transparent;
+}
+
+.img-list {
+    display: flex;
+    align-items: center;
+
+    .img-items {
+        width: 100px;
+        height: 100px;
+        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;
+            }
+        }
+    }
+
+    .img-items:hover .mask-img {
+        visibility: visible;
+    }
+}
+
+.centered-dialog {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+// :deep(.el-dialog) {
+//     margin: 0 !important;
+//     display: flex;
+//     flex-direction: column;
+//     max-height: 90%;
+//     max-width: 90%;
+// }
+
+// :deep(.el-dialog__body) {
+//     flex: 1;
+//     overflow: auto;
+// }
+
+// .dialog-content {
+//     padding: 20px;
+// }
+
+.app-container-content {
+    :deep(.el-dialog) {
+        display: flex !important;
+        flex-direction: column !important;
+        margin: 0 !important;
+        position: absolute !important;
+        top: 5vh !important;
+        left: 50% !important;
+        transform: translate(-50%, 0%) !important;
+        /* max-height: 100vh !important; */
+        height: 90vh;
+
+        .el-dialog__body {
+            flex: 1;
+            overflow-y: scroll !important;
+
+            .el-table__header-wrapper .el-checkbox {
+                display: none !important;
+            }
+        }
+
+        .dialog-content {
+            padding: 20px;
+        }
+    }
+}
+
+:deep(.el-button--primary) {
+    background-color: #3cb4a6 !important;
+    border-color: #3cb4a6 !important;
+}
+
+:deep(.el-button--primary:hover),
+:deep(.el-button--primary:focus),
+:deep(.el-button--primary:active) {
+    background-color: #2fa18f !important;
+    border-color: #2fa18f !important;
+}
+::v-deep .el-input-number .el-input__inner {
+    text-align: left !important;
+}
+</style>
diff --git a/src/views/user/goodsAuditing/index_new.vue b/src/views/user/goodsAuditing/index_new.vue
new file mode 100644
index 0000000..de1cd28
--- /dev/null
+++ b/src/views/user/goodsAuditing/index_new.vue
@@ -0,0 +1,210 @@
+<template>
+    <template v-if="!isEquipmentInputShow">
+        <el-form :model="queryParams" ref="queryFormRef" inline size="default" label-width="0">
+            <!-- 表单搜索 -->
+            <el-row>
+                <el-col :span="5">
+                    <el-form-item prop="keyWord">
+                        <el-input
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入关键字"
+                            v-model.trim="queryParams.keyWord"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                    <el-form-item prop="status">
+                        <el-select
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择审批状态"
+                            v-model="queryParams.status"
+                        >
+                            <el-option label="待审批" value="0" />
+                            <el-option label="已审批" value="1" />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                    <el-form-item prop="applyTime">
+                        <el-date-picker
+                            type="date"
+                            style="width: 100%"
+                            value-format="YYYY-MM-DD"
+                            placeholder="请选择申请时间"
+                            v-model="queryParams.applyTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                    <el-form-item prop="code">
+                        <el-button class="primary-lease" type="primary" @click="onHandleSQuery()">
+                            查询
+                        </el-button>
+                        <el-button class="primary-lease" type="primary" @click="onHandleReset()">
+                            重置
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="onHandleBatchImport()"
+                        >
+                            批量导入
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <!-- 表格 -->
+            <el-table :data="tableData">
+                <el-table-column label="序号" align="center" width="55" type="index" />
+                <el-table-column prop="createUser" label="申请人" align="center" />
+                <el-table-column prop="createTime" label="申请时间" align="center" />
+                <el-table-column prop="devCount" label="设备数量" align="center" />
+                <el-table-column prop="status" align="center" label="审批状态">
+                    <template #default="{ row }">
+                        <el-tag v-if="row.status == 0" size="small" type="info">待审批</el-tag>
+                        <el-tag v-if="row.status == 1" size="small" type="warning">已完成</el-tag>
+                        <el-tag v-if="row.status == 3" size="small" type="success">草稿</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template #default="{ row }">
+                        <el-button type="primary" size="small" @click="onHandleView(row)">
+                            查看
+                        </el-button>
+                        <el-button type="primary" size="small" @click="onHandleAuditing(row)">
+                            审批
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!-- 分页 -->
+            <!-- <el-pagination
+            v-model:current-page="queryParams.pageNum"
+            v-model:page-size="queryParams.pageSize"
+            :page-sizes="[10, 20, 30, 40]"
+            :small="small"
+            :disabled="disabled"
+            :background="background"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        /> -->
+        </el-form>
+    </template>
+
+    <EquipmentInput :orderIds="orderIds" :isView="isView" v-else @backList="onHandleBackList" />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+import { getEquipmentApplyListApi, equipmentDelApiNew } from 'http/api/usercenter/goodsmang'
+import EquipmentInput from './equipmentInput/index.vue'
+
+const router = useRouter()
+const total = ref(0)
+const orderIds = ref('')
+const isView = ref(false)
+const isEquipmentInputShow = ref(false)
+const queryParams = ref({
+    keyWord: '',
+    status: '0',
+    applyTime: '',
+    pageNum: 1,
+    pageSize: 10,
+})
+const tableData = ref([
+    {
+        applicant: '张三',
+        applyTime: '2021-01-01',
+        deviceCount: 10,
+        status: '待审批',
+    },
+    {
+        applicant: '李四',
+        applyTime: '2021-01-02',
+        deviceCount: 20,
+        status: '已审批',
+    },
+])
+const queryFormRef = ref<FormInstance>()
+
+// 获取装备申请列表
+const getEquipmentApplyList = async () => {
+    const res: any = await getEquipmentApplyListApi(queryParams.value)
+    console.log('获取装备申请列表***', res)
+    tableData.value = res.data.rows
+    total.value = res.data.total
+}
+
+const onHandleSQuery = () => {
+    console.log('onHandleSQuery')
+    getEquipmentApplyList()
+}
+const onHandleReset = () => {
+    console.log('onHandleReset')
+}
+const onHandleEquipmentInput = () => {
+    orderIds.value = ''
+    isView.value = false
+    isEquipmentInputShow.value = true
+}
+const onHandleBatchImport = () => {
+    console.log('onHandleBatchImport')
+}
+const onHandleView = (row: any) => {
+    console.log('onHandleView')
+    orderIds.value = row.id
+    isView.value = true
+    isEquipmentInputShow.value = true
+}
+const onHandleAuditing = (row: any) => {
+    orderIds.value = row.id
+    isView.value = false
+    isEquipmentInputShow.value = true
+    console.log('onHandleEdit')
+}
+const onHandleDelete = (row: any) => {
+    // console.log('onHandleDelete')
+    ElMessageBox.confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        console.log('onHandleDelete')
+
+        equipmentDelApiNew({ id: row.id }).then((res: any) => {
+            console.log('onHandleDelete', res)
+            if (res.code == 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功',
+                    duration: 1000,
+                })
+                getEquipmentApplyList()
+            } else {
+                ElMessage({
+                    type: 'error',
+                    message: '删除失败',
+                    duration: 1000,
+                })
+            }
+        })
+    })
+}
+
+const onHandleBackList = () => {
+    isEquipmentInputShow.value = false
+    getEquipmentApplyList()
+}
+
+onMounted(() => {
+    getEquipmentApplyList()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/user/goodsManagement/equipmentInput/index.vue b/src/views/user/goodsManagement/equipmentInput/index.vue
new file mode 100644
index 0000000..e97986b
--- /dev/null
+++ b/src/views/user/goodsManagement/equipmentInput/index.vue
@@ -0,0 +1,2917 @@
+<script setup lang="ts">
+import PagingComponent from 'components/PagingComponent/index.vue'
+import UploadComponentNew from 'components/uploadComponentNew/index.vue'
+import TitleTip from 'components/TitleTip/index.vue'
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, watch } from 'vue'
+import { useStore } from 'store/user'
+import { mainStore } from 'store/main'
+import dayjs from 'dayjs'
+import {
+    equipmentAddApi,
+    equipmentEditApi,
+    getCompanyListApi,
+    getDetailApi,
+    getEquipmentListApi,
+    getEquipmentTypeApi,
+    removeDeviceApi,
+    updateUpDownApi,
+    getEquipmentAddIdApi,
+    equipmentAddApiNew,
+    equipmentEditApiNew,
+    equipmentDraftListApiNew,
+    equipmentSubmitApiNew,
+} from 'http/api/usercenter/goodsmang'
+
+const props = defineProps({
+    orderIds: {
+        type: [String, Number],
+        default: '',
+    },
+    isView: {
+        type: Boolean,
+        default: false,
+    },
+})
+
+const store = useStore()
+const store2 = mainStore()
+const isViewForm = ref(false)
+
+const isDisabled = ref(false)
+const isMaStatus = ref(false)
+const isAdd = ref(false)
+
+const previewDialogVisible = ref(false)
+const previewDialogImageUrl = ref('')
+const orderId = ref('')
+
+const batchAddVisible: any = ref(false) // 批量新增
+const batchAddData: any = ref([]) // 批量新增
+const batchAddColumn: any = ref([
+    { label: '装备名称', prop: 'deviceName' },
+    { label: '装备型号', prop: 'typeName' },
+    { label: '上传人', prop: 'uploadUser' },
+    { label: '上传时间', prop: 'uploadTime' },
+])
+
+const uploadUrlTemp = window.location.origin + '/iws/mall-view/MaDevTemplate.xlsx'
+
+// 注册地址拼装
+const AssemblyRegisterAddress: any = reactive([])
+const deviceType: any = reactive([])
+
+onMounted(() => {
+    // 获取装备树
+    getTypeTreeData()
+    // 获取下拉
+    getCompanyList()
+    // 获取省级数据
+    // store.getprovinceList()
+    // 获取设备类型
+    // store.getDeviceTypeList()
+})
+// 设备类型树
+const deviceTypeTree: any = ref([])
+const partTypeTreeProps: any = ref({
+    children: 'children',
+    label: 'name',
+    multiple: false,
+    value: 'id',
+})
+// 获取装备树
+const getTypeTreeData = async () => {
+    const res: any = await getEquipmentTypeApi()
+    console.log('treeData==========', res)
+    deviceTypeTree.value = res.data
+}
+//装备类目-change
+const deviceTypeChange = (val: any) => {
+    console.log('ssssssssssssssssssssssssss', val)
+    if (val != null && val.length > 0) {
+        queryParams.value.typeId = val[3]
+    } else {
+        queryParams.value.typeId = ''
+    }
+}
+//反显 树结构数据获取父
+const getSelectId = (list: any, id: any) => {
+    for (let i in list) {
+        if (list[i].id == id) {
+            //查询到就返回该数组对象的value
+            return [list[i].id]
+        }
+        if (list[i].children) {
+            let node: any = getSelectId(list[i].children, id)
+            if (node !== undefined) {
+                //查询到把父节把父节点加到数组前面
+                node.unshift(list[i].id)
+                return node
+            }
+        }
+    }
+}
+
+/* 装备树选中数组 */
+const deviceTypeList: any = ref([])
+//日期周期
+const dateRange: any = ref([])
+/* 查询参数 */
+const queryParams: any = ref({
+    deviceName: '',
+    code: '',
+    maStatus: '',
+    typeId: '',
+    pageSize: 10,
+    pageNum: 1,
+    startTime: '',
+    endTime: '',
+    orderId: '',
+})
+const queryFormRef = ref<FormInstance>()
+const total: any = ref(0)
+const tableData: any = ref([])
+/* 查询按钮 */
+const queryTableList = () => {
+    queryParams.value.pageNum = 1
+    getList()
+}
+// 重置
+const resetTableList = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    dateRange.value = []
+    queryParams.value.startTime = ''
+    queryParams.value.endTime = ''
+    deviceTypeList.value = []
+    queryParams.value.typeId = null
+    queryTableList()
+}
+// 获取数据列表
+const getList = async () => {
+    console.log(queryParams.value.pageNum, '***9999', queryParams.value.pageSize)
+
+    if (dateRange.value.length > 0) {
+        queryParams.value.startTime = dateRange.value[0]
+        queryParams.value.endTime = dateRange.value[1]
+    }
+
+    const res: any = await equipmentDraftListApiNew(queryParams.value)
+    console.log(res, '列表数据**--**')
+    total.value = res?.data?.total
+    // tableData.value = res.rows.filter((item: any) => item !== null)
+
+    tableData.value = res?.data?.rows
+}
+// 获取数据列表
+getList()
+
+//---列表按钮事件---
+// 装备新增按钮
+const equipmentDeployment = (row: any) => {
+    isAdd.value = true
+    settleinTitle.value = '新增装备'
+    isMaStatus.value = false
+    isViewForm.value = false
+    isEditForm.value = false
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+    disabledForm.value = false
+    isEditDisabled.value = true
+    equipmentDeploymentParams.value = {
+        deviceName: '',
+        deviceTypeList: [],
+        deviceCount: 1,
+        originaValue: '',
+        itemTypeModel: '',
+        deviceType: '',
+        buyPrice: '',
+        unitName: '',
+        code: '',
+        brand: '',
+        typeId: '',
+        companyId: '',
+        productionDate: '',
+        dayLeasePrice: '',
+        person: '',
+        personPhone: '',
+        deviceWeight: '',
+        checkDate: '',
+        checkCycle: '',
+    }
+    mainFileList.value = []
+    detailsFileList.value = []
+    insurancePdf.value = []
+    examinationPdf.value = []
+
+    //装备证书table
+    equipTableList.value = []
+
+    if (row) {
+        console.log('🚀 ~ equipmentDeployment ~ row:', row)
+        getTypeTreeData()
+        // addAndEditForm.value = row
+        Object.assign(addAndEditForm, row)
+        // equipTableList.value = [...row.tableList]
+        if (row.tableList && row.tableList.length) {
+            equipTableList.value = row.tableList.map((item: any) => {
+                return {
+                    identifyCode: item.identifyCode,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                }
+            })
+        }
+
+        addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
+    }
+    // 打开入驻弹框
+    dialogFormVisibleSettlein.value = true
+}
+const isEditForm = ref(false)
+const maId: any = ref('')
+const warningDays: any = ref(0)
+// 编辑按钮
+const editRowInfo = (row: any) => {
+    isAdd.value = false
+    settleinTitle.value = '装备编辑'
+    getDetailData(row)
+    isMaStatus.value = true
+    disabledForm.value = false
+    isEditDisabled.value = true
+    isViewForm.value = false
+    isEditForm.value = true
+}
+/* 查看按钮 */
+const previewRowInfo = (row: any) => {
+    isAdd.value = false
+    settleinTitle.value = '装备详情'
+    getDetailData(row)
+    disabledForm.value = true
+    isEditDisabled.value = false
+    isViewForm.value = true
+    isEditForm.value = false
+}
+// 删除按钮
+const deleteRowInfo = async (row: any) => {
+    ElMessageBox.confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(() => {
+            return removeDeviceApi([row.maId])
+        })
+        .then((res) => {
+            if (res.code === 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功',
+                })
+                getList()
+            }
+        })
+        .catch(() => {})
+}
+//获取详情接口
+const getDetailData = async (row: any) => {
+    await getTypeTreeData()
+    const { data: res }: any = await getDetailApi(row.maId)
+    const {
+        deviceName,
+        // deviceTypeList,
+        deviceCount,
+        originaValue,
+        itemTypeModel,
+        deviceType,
+        buyPrice,
+        unitName,
+        code,
+        brand,
+        typeId,
+        companyId,
+        productionDate,
+        dayLeasePrice,
+        person,
+        personPhone,
+        deviceWeight,
+        checkDate,
+        checkCycle,
+        mainFileList,
+        detailsFileList,
+        insurancePdf,
+        examinationPdf,
+        devInfoProperties,
+        tableList,
+        maintenanceAlarmDay,
+        isZone,
+        zoneId,
+        expirationTime,
+    } = res
+
+    Object.assign(addAndEditForm, {
+        deviceName,
+        deviceCount,
+        originaValue,
+        itemTypeModel,
+        deviceType,
+        buyPrice,
+        unitName,
+        code,
+        brand,
+        typeId,
+        companyId,
+        productionDate,
+        dayLeasePrice,
+        person,
+        personPhone,
+        deviceWeight,
+        checkDate,
+        checkCycle,
+        mainFileList,
+        detailsFileList,
+        insurancePdf,
+        examinationPdf,
+        devInfoProperties,
+        tableList,
+        maintenanceAlarmDay,
+        isZone,
+        zoneId,
+        expirationTime,
+    })
+
+    if (settleinTitle.value == '装备编辑') {
+        Object.assign(addAndEditForm, {
+            maId: row.maId,
+        })
+    }
+
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+    descriptionFormList.value[0].insurancePdfs = insurancePdf
+    descriptionFormList.value[0].examinationPdfs = examinationPdf
+    options.value = []
+    addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
+    warningDays.value = addAndEditForm.maintenanceAlarmDay
+    // warningDays.value =  addAndEditForm.deviceTypeList[addAndEditForm.deviceTypeList.length-1].data.maintenanceAlarmDay
+    //  warningDays.value = addAndEditForm.deviceTypeList.maintenanceAlarmDay
+    propertyNames.value = addAndEditForm.devInfoProperties
+    equipTableList.value = []
+    if (isEditForm.value == true) {
+        if (addAndEditForm.tableList != null) {
+            addAndEditForm.tableList.forEach((item: any) => {
+                console.log('🚀 ~ addAndEditForm.tableList.forEach ~ item:', item)
+                if (item.examinationPdf && item.examinationPdf.length > 0) {
+                    item.examinationPdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                if (item.insurancePdf && item.insurancePdf.length > 0) {
+                    item.insurancePdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                equipTableList.value.push({
+                    id: item.id,
+                    identifyCode: item.identifyCode,
+                    name2: item.insurancePdf[0]?.fileUrl,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                    name6: item.examinationPdf[0]?.fileUrl,
+                    insurancePdf: item.insurancePdf,
+                    examinationPdf: item.examinationPdf,
+                })
+            })
+            console.log(equipTableList.value, '--->>>addAndEditForm.tableList')
+        } else {
+            equipTableList.value = [
+                {
+                    id: '',
+                    identifyCode: '',
+                    name2: '',
+                    checkMan: '',
+                    checkDate: '',
+                    nextCheckDate: '',
+                    name6: '',
+                    insurancePdf: [],
+                    examinationPdf: [],
+                },
+            ]
+        }
+    } else {
+        console.log('详情--->?>')
+        if (addAndEditForm.tableList != null) {
+            addAndEditForm.tableList.forEach((item: any) => {
+                if (item.examinationPdf && item.examinationPdf.length > 0) {
+                    item.examinationPdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                if (item.insurancePdf && item.insurancePdf.length > 0) {
+                    item.insurancePdf.forEach((e: any) => {
+                        e.url = e.fileUrl
+                        e.name = e.fileName
+                    })
+                }
+                equipTableList.value.push({
+                    id: item.id,
+                    identifyCode: item.identifyCode,
+                    name2: item.insurancePdf[0]?.fileUrl,
+                    checkMan: item.checkMan,
+                    checkDate: item.checkDate,
+                    nextCheckDate: item.nextCheckDate,
+                    name6: item.examinationPdf[0]?.fileUrl,
+                    insurancePdf: item.insurancePdf,
+                    examinationPdf: item.examinationPdf,
+                })
+            })
+        } else {
+            equipTableList.value = []
+        }
+    }
+    console.log('tt23123', equipTableList.value)
+    // addAndEditForm.deviceTypeList[0].data.propertyNames.forEach((item:any) =>{
+    //     options.value.push({'label':item,'value':item})
+    //  })
+    dialogFormVisibleSettlein.value = true
+
+    console.log(res, '详情接口')
+
+    // console.log(row, '----row----')
+    // maId.value = row.maId
+    // const res: any = await getDetailApi(row.maId)
+    // console.log(res, '----detail----')
+    // equipmentDeploymentParams.value = res.data
+    // equipmentDeploymentParams.value.companyId = Number(res.data.companyId)
+    // mainFileList.value = res.data.mainFileList
+    // detailsFileList.value = res.data.detailsFileList
+    // insurancePdf.value = res.data.insurancePdf
+    // examinationPdf.value = res.data.examinationPdf
+    // //反显 装备树
+    // equipmentDeploymentParams.value.deviceTypeList = getSelectId(
+    //     deviceTypeTree.value,
+    //     equipmentDeploymentParams.value.typeId,
+    // )
+    // dialogFormVisibleSettlein.value = true
+    // equipmentDeploymentParams.value.cityId = String(equipmentDeploymentParams.value.cityId)
+    // equipmentDeploymentParams.value.areaId = String(equipmentDeploymentParams.value.areaId)
+    // equipmentDeploymentParams.value.provinceId = String(
+    //     equipmentDeploymentParams.value.provinceId
+    // )
+    // equipmentDeploymentParams.value.leaseScope = String(
+    //     equipmentDeploymentParams.value.leaseScope
+    // )
+    // equipmentDeploymentParams.value.groupId = Number(equipmentDeploymentParams.value.groupId)
+    // equipmentDeploymentParams.value.typeId = Number(equipmentDeploymentParams.value.typeId)
+    // store.getprovinceList()
+    // store.getmarketList(row.provinceId)
+    // store.getareaList(row.cityId)
+    // store.getDeviceTypeList()
+    // store.getDeviceTypeSonList(row.companyId)
+    // store.getDeviceTypeSunList(row.groupId)
+}
+
+const ids: any = ref([])
+const handleSelectionChange = (selection: any) => {
+    // ids.value = selection.map((item: any) => item.maId)
+    ids.value = selection
+}
+// 上下架（批量）
+const handleUpdateUpDown = (row: any, maStatus: any) => {
+    ElMessageBox.confirm('是否确定操作', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(() => {
+            let maIds = []
+            if (!row) {
+                maIds = ids.value
+            } else {
+                maIds.push(row.maId)
+            }
+            if (maIds.length == 0) {
+                ElMessage({ type: 'error', message: '请选择要操作的数据' })
+                return
+            }
+            return updateUpDownApi({ maIds, maStatus })
+        })
+        .then((res) => {
+            if (res.code == 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '操作成功',
+                })
+                getList()
+            }
+        })
+        .catch(() => {})
+}
+
+/*
+        ----装备弹窗-----
+    */
+/* 查看 */
+const disabledForm = ref(false)
+/* 编辑 */
+const isEditDisabled = ref(false)
+/* 入驻框的标题 */
+const settleinTitle = ref('')
+//所属公司
+const companyDataList: any = ref([])
+/*
+ *  商品入驻弹框参数
+ */
+const equipmentDeploymentParams: any = ref({
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    originaValue: '',
+    itemTypeModel: '',
+    deviceType: '',
+    buyPrice: '',
+    unitName: '',
+    code: '',
+    brand: '',
+    typeId: '',
+    companyId: '',
+    productionDate: '',
+    dayLeasePrice: '',
+    person: '',
+    personPhone: '',
+    deviceWeight: '',
+    checkDate: '',
+    checkCycle: '',
+})
+//编码类型禁止修改数目
+const countDisabled = ref(false)
+//装备类目-change
+const dialogTypeCascader = ref()
+//装备类目-change
+const dialogTypeChange = async () => {
+    options.value = []
+    const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
+    console.log('deviceTypeList', deviceTypeList[0].data)
+    warningDays.value = deviceTypeList[0].data.maintenanceAlarmDay
+    if (deviceTypeList[0].data.deviceType == 0) {
+        addAndEditForm.deviceCount = 1
+        typeDisabled.value = true
+    } else {
+        addAndEditForm.deviceCount = 1
+        typeDisabled.value = false
+    }
+    if (deviceTypeList[0].data.maTypeProperties == null) {
+        propertyNames.value = []
+    } else {
+        propertyNames.value = []
+        deviceTypeList[0].data.maTypeProperties.forEach((item: any) => {
+            propertyNames.value.push({ propertyName: item.propertyName, propertyValue: '' })
+        })
+        deviceTypeList[0].data.maTypeProperties.forEach((item: any) => {
+            options.value.push({ label: item.propertyName, value: item.propertyName })
+        })
+        console.log(propertyNames.value)
+    }
+    isDisabled.value = true
+    addAndEditForm.unitName = deviceTypeList[0].data.unitName
+    addAndEditForm.dayLeasePrice = deviceTypeList[0].data.leasePrice
+    addAndEditFormRef.value.clearValidate(['unitName', 'dayLeasePrice'])
+    equipTableList.value = []
+    equipTableList.value.push({
+        id: '',
+        identifyCode: '',
+        name2: '',
+        checkMan: '',
+        checkDate: '',
+        nextCheckDate: '',
+        name6: '',
+        insurancePdf: [],
+        examinationPdf: [],
+    })
+}
+
+//获取所属公司下拉数据
+const getCompanyList = async () => {
+    const res: any = await getCompanyListApi()
+    console.log(res, '列表数据**--**-----------')
+    companyDataList.value = res.data
+}
+// 装备弹框显示隐藏
+const dialogFormVisibleSettlein: any = ref(false)
+const ruleFormRef: any = ref(null)
+//表单校验规则
+const equipRules = ref({
+    originaValue: [
+        {
+            required: true,
+            message: '请输入原值',
+            trigger: 'blur',
+        },
+    ],
+    buyPrice: [
+        {
+            required: true,
+            message: '请输入原值',
+            trigger: 'blur',
+        },
+    ],
+    itemTypeModel: [
+        {
+            required: true,
+            message: '请输入规格型号',
+            trigger: 'blur',
+        },
+    ],
+    deviceType: [
+        {
+            required: false,
+            message: '请选择管理方式',
+            trigger: 'change',
+        },
+    ],
+    deviceName: [
+        {
+            required: true,
+            message: '请输入装备名称',
+            trigger: 'blur',
+        },
+    ],
+    deviceTypeList: [
+        {
+            required: true,
+            message: '请选择装备类目',
+            trigger: 'change',
+        },
+    ],
+    deviceCount: [
+        {
+            required: true,
+            message: '请输入上架数量',
+            trigger: 'blur',
+        },
+    ],
+    unitName: [
+        {
+            required: true,
+            message: '装备单位不可为空',
+            trigger: 'blur',
+        },
+    ],
+    brand: [
+        {
+            required: true,
+            message: '请输入装备品牌',
+            trigger: 'blur',
+        },
+    ],
+    code: [
+        {
+            required: true,
+            message: '请输入装备编号',
+            trigger: 'change',
+        },
+    ],
+    companyId: [
+        {
+            required: true,
+            message: '请选择所属公司',
+            trigger: 'change',
+        },
+    ],
+    productionDate: [
+        {
+            required: true,
+            message: '请选择出厂日期',
+            trigger: 'change',
+        },
+    ],
+    dayLeasePrice: [
+        {
+            required: true,
+            message: '请输入日租金',
+            trigger: 'blur',
+        },
+    ],
+    expirationTime: [
+        {
+            required: true,
+            trigger: 'change',
+            message: '请选择标准使用时间',
+        },
+    ],
+
+    person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+    checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }],
+    checkCycle: [{ required: true, message: '校验周期不能为空', trigger: 'blur' }],
+    personPhone: [
+        { required: true, message: '联系电话不能为空', trigger: 'blur' },
+        {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur',
+        },
+    ],
+    mainFileList: [{ required: true, message: '请上传主展示图', trigger: 'change' }],
+    detailsFileList: [{ required: true, message: '请上传详情展示图', trigger: 'change' }],
+})
+
+const getProertyNameRules = (item: any) => {
+    if (item.mustHave == 1) {
+        return [{ required: true, message: '请输入属性描述', trigger: 'blur' }]
+    } else {
+        return []
+    }
+}
+
+const getProertyValueRules = (item: any) => {
+    if (item.mustHave == 1) {
+        return [{ required: true, message: '请输入属性值', trigger: 'blur' }]
+    } else {
+        return []
+    }
+}
+
+const descriptionRules = ref({
+    identifyCode: [{ required: true, message: '请填写装备唯一标识符', trigger: 'blur' }],
+    insurancePdfs: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+    examinationPdfs: [{ required: true, message: '请上传检测证明', trigger: 'change' }],
+})
+// 弹框保存提交
+const submitBtn = async () => {
+    submitFun(isEditForm.value ? 3 : 1)
+}
+const submitFun = (type: any) => {
+    //  type 1 提交(新增时) 2 存草稿(新增时) 3 编辑时的提交 4 编辑时存草稿
+    console.log('🚀 ~ submitFun ~ addAndEditForm:', addAndEditForm)
+    console.log(isAdd.value, isEditForm.value)
+    if (isAdd.value || isEditForm.value) {
+        addAndEditForm.mainFileList = Array.from(
+            new Set([...addAndEditForm.mainFileList, ...addAndEditForm.mainFileTempList]),
+        )
+        addAndEditForm.detailsFileList = Array.from(
+            new Set([...addAndEditForm.detailsFileList, ...addAndEditForm.detailsFileTempList]),
+        )
+    }
+    if (type === 2 || type === 4) {
+        equipRules.value.mainFileList = [] // 清空规则，相当于不校验
+        equipRules.value.detailsFileList = [] // 清空规则，相当于不校验
+    } else {
+        equipRules.value.mainFileList = [
+            { required: true, message: '请上传主展示图', trigger: 'change' },
+        ] // 清空规则，相当于不校验
+        equipRules.value.detailsFileList = [
+            { required: true, message: '请上传详情展示图', trigger: 'change' },
+        ] // 清空规则，相当于不校验
+    }
+
+    addAndEditFormRef.value.validate(async (valid: any) => {
+        if (valid) {
+            let isDescription = false
+
+            descriptionFormList.value.forEach((e: any, index: number) => {
+                e.insurancePdfs = [...e.insurancePdfs, ...e.insuranceATempPdf]
+                e.examinationPdfs = [...e.examinationPdfs, ...e.examinationTempPdf]
+
+                if (type == 3 || type == 4) {
+                    addAndEditForm.examinationPdf = e.examinationPdfs.map((e: any) => {
+                        return { fileNam: e.fileName, fileUrl: e.fileUrl }
+                    })
+                } else {
+                    addAndEditForm.examinationPdfs[index] = e.examinationPdfs
+                }
+            })
+            addAndEditForm.tableList = equipTableList.value
+            if (type != 2 && type != 4) {
+                for (let i = 0; i < addAndEditForm.tableList.length; i++) {
+                    const row = addAndEditForm.tableList[i]
+                    for (const key in row) {
+                        if (
+                            row.hasOwnProperty(key) &&
+                            (row[key] === null || row[key] === '' || row[key]?.length === 0) &&
+                            key !== 'name2' &&
+                            key !== 'name6' &&
+                            key !== 'id' &&
+                            key !== 'insurancePdf'
+                        ) {
+                            if (key == 'identifyCode') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'唯一标识符'} 字段不能为空`,
+                                })
+                            } else if (key == 'checkMan') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'检修人'} 字段不能为空`,
+                                })
+                            } else if (key == 'checkDate') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'检修日期'} 字段不能为空`,
+                                })
+                            } else if (key == 'nextCheckDate') {
+                                ElMessage({
+                                    type: 'error',
+                                    message: `第 ${i + 1} 行的 ${'下次检修日期'} 字段不能为空`,
+                                })
+                            } else {
+                                console.log(`第 ${i + 1} 行的 ${key} 字段不能为空`)
+                            }
+                            return // 如果有任何字段为空，直接返回，不进行提交
+                        }
+
+                        console.log(row, '-->提交')
+                        if (row.examinationPdf.length === 0) {
+                            ElMessage({
+                                type: 'error',
+                                message: `请上传第 ${i + 1} 行的检测证明`,
+                            })
+                            return
+                        }
+                    }
+                }
+            }
+
+            if (isDescription) return
+            addAndEditForm.mainFileList = Array.from(
+                new Set([...addAndEditForm.mainFileList, ...addAndEditForm.mainFileTempList]),
+            )
+            console.log(
+                '🚀 ~ submitFun ~ addAndEditForm.mainFileList:',
+                addAndEditForm.mainFileList,
+            )
+            addAndEditForm.detailsFileList = Array.from(
+                new Set([...addAndEditForm.detailsFileList, ...addAndEditForm.detailsFileTempList]),
+            )
+            console.log(
+                '🚀 ~ submitFun ~ addAndEditForm.detailsFileList:',
+                addAndEditForm.detailsFileList,
+            )
+
+            addAndEditForm.devInfoProperties = propertyNames.value
+            addAndEditForm.typeId =
+                addAndEditForm.deviceTypeList[addAndEditForm.deviceTypeList.length - 1]
+
+            let SEND_FUN_API: any = null
+            if (type == 1) {
+                SEND_FUN_API = equipmentAddApiNew
+                addAndEditForm.maStatus = 1
+                addAndEditForm.type = 1
+            }
+            if (type == 2) {
+                SEND_FUN_API = equipmentAddApiNew
+                addAndEditForm.maStatus = 0
+                addAndEditForm.type = 2
+            }
+            if (type == 3) {
+                SEND_FUN_API = equipmentEditApiNew
+                addAndEditForm.maStatus = 1
+                addAndEditForm.type = 3
+            }
+            if (type == 4) {
+                SEND_FUN_API = equipmentEditApi
+                addAndEditForm.maStatus = 0
+                addAndEditForm.type = 4
+            }
+            let res = null
+            try {
+                if (!orderId.value) {
+                    getEquipmentAddIdApi().then(async (result: any) => {
+                        orderId.value = result.data.id
+                        addAndEditForm.orderId = orderId.value
+                        queryParams.value.orderId = orderId.value
+                        res = await SEND_FUN_API(addAndEditForm)
+                        if (res.code === 200) {
+                            ElMessage({
+                                type: 'success',
+                                message: '保存成功',
+                                duration: 1000,
+                            })
+                            propertyNames.value = []
+                            dialogFormVisibleSettlein.value = false
+                            getList()
+                        }
+                    })
+                } else {
+                    addAndEditForm.orderId = orderId.value
+                    queryParams.value.orderId = orderId.value
+                    res = await SEND_FUN_API(addAndEditForm)
+                    if (res.code === 200) {
+                        ElMessage({
+                            type: 'success',
+                            message: '保存成功',
+                            duration: 1000,
+                        })
+                        propertyNames.value = []
+                        dialogFormVisibleSettlein.value = false
+                        getList()
+                    }
+                }
+            } catch (error) {
+                console.log('error', error)
+            }
+
+            // 组装参数
+        } else {
+            console.log('校验失败')
+        }
+    })
+}
+//草稿
+const saveTemp = async () => {
+    submitFun(isMaStatus.value ? 4 : 2)
+    if (true) return
+}
+
+/* 关闭按钮 */
+const closeDialogBtn = () => {
+    // ruleFormRef.value.resetFields()
+    propertyNames.value = []
+    // 获取装备树
+    getTypeTreeData()
+    dialogFormVisibleSettlein.value = false
+}
+/* 关闭对话框 */
+const handleClose = (done: () => void) => {
+    // ruleFormRef.value.resetFields()
+    done()
+    propertyNames.value = []
+    dialogFormVisibleSettlein.value = false
+}
+
+/* 检测信息图片地址 */
+const successResultCallBackFnjc = (val: any) => {
+    equipmentDeploymentParams.value.detectionList = []
+    equipmentDeploymentParams.value.detectionList.push(val.msg)
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '28',
+        fileUrl: val.msg,
+    })
+}
+/* 保险信息图片地址 */
+const successResultCallBackFnbs = (val: any) => {
+    equipmentDeploymentParams.value.insureList = []
+    equipmentDeploymentParams.value.insureList.push(val.msg)
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '29',
+        fileUrl: val.msg,
+    })
+}
+/* 设备图片信息地址 */
+const successResultCallBackFnDevicePic = (val: any) => {
+    equipmentDeploymentParams.value.picList = []
+    equipmentDeploymentParams.value.picList.push(val.msg)
+    if (!equipmentDeploymentParams.value.picUrl) {
+        equipmentDeploymentParams.value.picUrl = val.msg
+    }
+    equipmentDeploymentParams.value.fileList.push({
+        dicId: '20',
+        fileUrl: val.msg,
+    })
+}
+
+const mainFileList: any = ref([]) //主展示
+const detailsFileList: any = ref([]) //详情展示
+const maTypeProperties: any = ref([]) //属性
+const insurancePdf: any = ref([]) //合格证
+const examinationPdf: any = ref([]) //检测证明
+//图片查看弹窗
+const dialogVisible: any = ref(false)
+const dialogImageUrl = ref('')
+//上传地址+header
+const imgUploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
+const actionUrl = ref(imgUploadUrl)
+const headerInfo = reactive({
+    Authorization: 'Bearer ' + store2.token,
+})
+// 文件上传前处理-上传大小
+const beforeUpload = (file: any) => {
+    if (file.size / 1024 / 1024 > 10) {
+        ElMessage({
+            type: 'error',
+            message: '上传文件大小不能超过10M!',
+        })
+        return false
+    }
+}
+// 文件上传失败
+const uploadError = () => {
+    ElMessage({
+        type: 'error',
+        message: '上传文件失败!',
+    })
+    // this.$message.error({message: `上传文件失败!`});
+}
+// 文件上传成功处理
+const handleFileSuccess = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        mainFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(mainFileList.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess2 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        detailsFileList.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(detailsFileList.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess3 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        insurancePdf.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(insurancePdf.value)
+    }
+}
+// 文件上传成功处理
+const handleFileSuccess4 = (response: any) => {
+    if (response.code == 200) {
+        let obj = {
+            modelId: maId.value,
+            fileName: response.data.name.split('/')[4],
+            fileUrl: response.data.url,
+        }
+        console.log(obj)
+        examinationPdf.value.push(obj)
+        ElMessage({
+            type: 'success',
+            message: '上传成功！',
+        })
+        console.log(examinationPdf.value)
+    }
+}
+//文件下载
+const handleDownload = (file: any) => {
+    const windowName = file.name
+    window.open(file.fileUrl, windowName)
+}
+//文件查看
+const picturePreview = (file: any) => {
+    dialogImageUrl.value = file.fileUrl
+    dialogVisible.value = true
+}
+
+const onBatchUpload = () => {
+    console.log('下载')
+}
+
+const onAddDescription = () => {
+    const newId = Date.now()
+    descriptionFormList.value.push({
+        newId,
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
+}
+
+const typeDisabled = ref(false)
+
+const addAndEditForm = reactive<any>({
+    deviceName: '',
+    deviceTypeList: [],
+    deviceCount: 1,
+    originaValue: '',
+    itemTypeModel: '',
+    deviceType: '',
+    buyPrice: '',
+    unitName: '',
+    code: '',
+    brand: '',
+    typeId: '',
+    companyId: '',
+    productionDate: '',
+    dayLeasePrice: '',
+    person: '',
+    personPhone: '',
+    deviceWeight: '',
+    checkDate: '',
+    checkCycle: '',
+    mainFileList: [],
+    detailsFileList: [],
+    mainFileTempList: [],
+    detailsFileTempList: [],
+    insurancePdf: [],
+    examinationPdf: [],
+    insurancePdfs: [],
+    examinationPdfs: [],
+    devInfoProperties: [],
+    tableList: [],
+    isZone: true, // 是否上架专区
+    zoneId: '', // 专区id
+    expirationTime: '',
+    orderId: '',
+})
+// const addAndEditFormTemp = reactive<any>()
+const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
+const uploadUrl2 = import.meta.env.VITE_API_URL + '/material-mall/dev/importData'
+const addAndEditFormRef = ref()
+// 装备描述表单
+const descriptionFormList = ref<any>([
+    {
+        newId: Date.now(),
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    },
+])
+const descriptionFormRefList = ref<any>([])
+// 移除
+const onDeleteDescription = (index: number) => {
+    descriptionFormList.value.splice(index, 1)
+    descriptionFormRefList.value.splice(index, 1)
+}
+
+const onMainFileChange = (fileList: any) => {
+    addAndEditForm.mainFileTempList = []
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    addAndEditFormRef.value.clearValidate('mainFileList')
+    addAndEditForm.mainFileTempList.push(...fileListTemp)
+}
+const onDetailsFileChange = (fileList: any) => {
+    addAndEditForm.detailsFileTempList = []
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    addAndEditFormRef.value.clearValidate('detailsFileList')
+    addAndEditForm.detailsFileTempList.push(...fileListTemp)
+}
+
+const onInsurancePdfChange = (fileList: any, index: number) => {
+    descriptionFormList.value[index].insuranceATempPdf = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+        }
+    })
+    descriptionFormRefList.value[index].clearValidate('insurancePdf')
+    descriptionFormList.value[index].insuranceATempPdf.push(...fileListTemp)
+}
+const onExaminationPdfChange = (fileList: any, index: number) => {
+    descriptionFormList.value[index].examinationTempPdf = []
+    const fileListTemp = fileList.map((e: any) => {
+        return {
+            fileName: e.name,
+            fileUrl: e.url,
+        }
+    })
+    descriptionFormRefList.value[index].clearValidate('examinationPdf')
+    descriptionFormList.value[index].examinationTempPdf.push(...fileListTemp)
+}
+
+//文件查看
+const handlePreview = (e: any) => {
+    console.log('🚀 ~ handlePreview ~ handlePreview:', e.fileUrl)
+    // 点击跳转展示
+    window.open(e.fileUrl, '_blank')
+}
+// 删除附件
+const handleRemove = (file: any, row: any, type: Number) => {
+    console.log('🚀 ~ handleRemove ~ handleRemove:', file)
+
+    if (row.id) {
+        if (type == 1) {
+            const index = row.examinationPdf.findIndex((e: any) => e.fileUrl == file.fileUrl)
+            if (index > -1) {
+                row.examinationPdf.splice(index, 1)
+            }
+        } else {
+            const index = row.insurancePdf.findIndex((e: any) => e.fileUrl == file.fileUrl)
+            if (index > -1) {
+                row.insurancePdf.splice(index, 1)
+            }
+        }
+    } else {
+        if (type == 1) {
+            const index = row.examinationPdf.findIndex(
+                (e: any) => e.fileUrl == file.response.data.url,
+            )
+            if (index > -1) {
+                row.examinationPdf.splice(index, 1)
+            }
+        } else {
+            const index = row.insurancePdf.findIndex(
+                (e: any) => e.fileUrl == file.response.data.url,
+            )
+            if (index > -1) {
+                row.insurancePdf.splice(index, 1)
+            }
+        }
+    }
+    console.log('🚀 ~ handleRemove ~ row:', row.examinationPdf)
+}
+// 上传附件
+const handleSuccess = (uploadFile: any, row: any, type: Number) => {
+    console.log('🚀 ~ handleSuccess ~ uploadFile:', uploadFile)
+    if (uploadFile.code == 200) {
+        let fileUrl = ''
+        console.log('输出env.VITE_API_URL', import.meta.env.VITE_API_URL)
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            console.log('走入公司测试环境----------', uploadFile.data.url)
+            fileUrl = uploadFile.data.url // 公司-测试环境
+        } else {
+            console.log('走入宏源测试环境----------', uploadFile.data.url)
+            fileUrl = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + uploadFile.data.url // 宏源-测试环境
+        }
+        console.log('输出fileUrl----------', fileUrl)
+        if (type == 1) {
+            row.examinationPdf.push({
+                fileName: uploadFile.data.name,
+                fileUrl: fileUrl,
+            })
+        } else {
+            row.insurancePdf.push({
+                fileName: uploadFile.data.name,
+                fileUrl: fileUrl,
+            })
+        }
+    }
+    console.log('🚀 ~ handleSuccess ~ row:', row)
+}
+
+// 超限提示
+const handleExceed = () => {
+    ElMessage({
+        type: 'error',
+        message: '最多只能上传5个文件',
+    })
+}
+
+// 上传附件
+const onFileChangeEquip = (fileList: any, row: any, index: number, type: number) => {
+    const origin = window.location.origin
+    const isProd = origin.indexOf('sgwpdm.ah.sgcc.com.cn') > -1
+    if (type == 1) {
+        equipTableList.value[index].insurancePdf = []
+    } else {
+        equipTableList.value[index].examinationPdf = []
+    }
+    const fileListTemp = fileList.map((e: any) => {
+        let testUrl = ''
+        if (import.meta.env.VITE_API_URL == '/proxyApi') {
+            testUrl = e.url // 公司-测试环境
+        } else {
+            testUrl = origin + '/ahbns/' + e.url // 宏源-测试环境
+        }
+        return {
+            fileName: e.name,
+            fileUrl: isProd ? 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + e.url : testUrl,
+        }
+    })
+    console.log('11111', fileListTemp[0].fileUrl)
+    if (type == 1) {
+        equipTableList.value[index].name2 = fileListTemp[0].fileUrl
+        equipTableList.value[index].insurancePdf.push(fileListTemp[0])
+    } else {
+        equipTableList.value[index].name6 = fileListTemp[0].fileUrl
+        equipTableList.value[index].examinationPdf.push(fileListTemp[0])
+    }
+}
+
+// const onDeleteImgInDetails = () => {}
+
+const onDeleteImgInMain = (index: any) => {
+    addAndEditForm.mainFileList.splice(index, 1)
+}
+const onDeleteImgInDetails = (index: any) => {
+    addAndEditForm.detailsFileList.splice(index, 1)
+}
+const onDeleteImgInsurancePdf = (j: any, index: any) => {
+    descriptionFormList.value[j].insurancePdfs.splice(index, 1)
+}
+const onDeleteImgExaminationPdf = (j: any, index: any) => {
+    descriptionFormList.value[j].examinationPdfs.splice(index, 1)
+}
+
+const onDialogClose = () => {
+    addAndEditFormRef.value.resetFields()
+    Object.assign(addAndEditForm, {
+        deviceName: '',
+        deviceTypeList: [],
+        deviceCount: 1,
+        originaValue: '',
+        itemTypeModel: '',
+        deviceType: '',
+        buyPrice: '',
+        unitName: '',
+        code: '',
+        brand: '',
+        typeId: '',
+        companyId: '',
+        productionDate: '',
+        dayLeasePrice: '',
+        person: '',
+        personPhone: '',
+        deviceWeight: '',
+        checkDate: '',
+        checkCycle: '',
+        mainFileList: [],
+        detailsFileList: [],
+        mainFileTempList: [],
+        detailsFileTempList: [],
+        insurancePdf: [],
+        examinationPdf: [],
+        insurancePdfs: [],
+        examinationPdfs: [],
+    })
+}
+const propertyNames = ref<any>([])
+const propertyNamesTwo = ref<any>([])
+const options = ref<any>([])
+
+const onPreviewImg = (fileUrl: any) => {
+    previewDialogImageUrl.value = fileUrl
+    previewDialogVisible.value = true
+}
+// 计算所有装备
+const chunkedItems = computed(() => {
+    let result = []
+    for (let i = 0; i < propertyNames.value.length; i += 2) {
+        result.push(propertyNames.value.slice(i, i + 2))
+    }
+    return result
+})
+
+const equipTableList = ref<any>([])
+
+const handleAddBack = () => {
+    let obj = {
+        identifyCode: '',
+        name2: '',
+        checkMan: '',
+        checkDate: '',
+        nextCheckDate: '',
+        name6: '',
+        insurancePdf: [],
+        examinationPdf: [],
+    }
+    equipTableList.value.push(obj)
+}
+const handleDeleteBack = (index: number) => {
+    equipTableList.value.splice(index, 1)
+}
+
+const fileListEquip = ref<any>([])
+
+const viewCertificate = (url: string) => {
+    window.open(url, '_blank')
+}
+const changeDate = (row: any, index: number) => {
+    console.log('3333', row)
+    const currentDate = new Date(row.checkDate)
+    console.log('1111', currentDate)
+    // console.log('🚀 ~ 告警时间 ~ warningDays.value:', warningDays.value)
+    // 获取当前时间一年后的天数
+    const nextYearDate = dayjs(currentDate).add(1, 'year').subtract(1, 'day').toDate()
+    console.log('🚀 ~ changeDate ~ nextDate:', nextYearDate)
+    // currentDate.setDate(currentDate.getDate() + Number(warningDays.value))
+    equipTableList.value[index].nextCheckDate = dayjs(nextYearDate).format('YYYY-MM-DD')
+}
+
+// 下次检修时间不能早于检修时间
+const changeNextDate = (row: any) => {
+    if (row.checkDate && row.nextCheckDate) {
+        if (dayjs(row.checkDate).isAfter(row.nextCheckDate)) {
+            ElMessage({
+                type: 'error',
+                message: '下次检修时间不能早于检修时间',
+            })
+            row.nextCheckDate = ''
+        }
+    }
+}
+
+const getUpdateTimeBgColor = (row: any) => {
+    // 将字符串日期转换为 Date 对象
+    const checkDate = new Date()
+    const nextCheckDate = new Date(row.nextCheckDate)
+
+    // 计算两个日期之间的差值（以毫秒为单位）
+    const diffTime = Math.abs(nextCheckDate - checkDate)
+    // 将差值转换为天数
+    const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+
+    if (checkDate < nextCheckDate && diffDays <= 30) {
+        return '#FFFFCC' // 黄色背景
+    } else if (checkDate > nextCheckDate) {
+        return '#FFCCCC' // 红色背景
+    }
+    return '' // 返回空字符串，让背景色保持默认
+}
+
+const handleBatchAddVisible = () => {
+    batchAddData.value = []
+    batchAddVisible.value = true
+}
+
+const selectColumn = ref<any>([])
+const selectionChange = (val: any) => {
+    console.log('🚀 ~ selectionChange ~ val:', val)
+    selectColumn.value = val
+}
+
+const handleUpload = (file: any, fileList: any) => {
+    console.log('🚀 ~ handleUpload ~ file:', file)
+    console.log('🚀 ~ handleUpload ~ fileList:', fileList)
+    if (file.code == 200) {
+        batchAddData.value = file.data
+    } else {
+        ElMessage({
+            message: file.msg,
+            type: 'error',
+        })
+    }
+}
+
+const handleBatchDel = () => {
+    if (selectColumn.value.length == 0) {
+        ElMessage({
+            message: '请选择要删除的数据',
+            type: 'error',
+        })
+        return
+    }
+    ElMessageBox.confirm('是否确认删除所选数据', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        batchAddData.value = batchAddData.value.filter(
+            (item: any) => !selectColumn.value.includes(item),
+        )
+    })
+}
+
+const handleDel = (index: any) => {
+    ElMessageBox.confirm('是否确认删除所选数据', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        batchAddData.value.splice(index, 1)
+    })
+}
+
+// 返回列表
+const emits = defineEmits(['backList'])
+const onHandleBackList = () => {
+    emits('backList')
+}
+
+onMounted(() => {
+    if (props.orderIds) {
+        queryParams.value.orderId = props.orderIds
+        addAndEditForm.orderId = props.orderIds
+        getList()
+    }
+})
+
+// 提交申请
+const onHandleSubmit = async () => {
+    if (!queryParams.value.orderId) {
+        ElMessage({
+            message: '请先添加设备',
+            type: 'error',
+        })
+        return
+    }
+    // 调接口
+    const res: any = await equipmentSubmitApiNew({ id: queryParams.value.orderId, status: 0 })
+
+    console.log('res', res)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '提交成功',
+        })
+        emits('backList')
+    }
+}
+</script>
+
+<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="deviceName">
+                        <el-input
+                            v-model.trim="queryParams.deviceName"
+                            style="width: 100%"
+                            clearable
+                            placeholder="请输入装备名称"
+                        />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="18">
+                    <el-form-item>
+                        <el-button class="primary-lease" type="primary" @click="queryTableList">
+                            查询
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="resetTableList(queryFormRef)"
+                        >
+                            重置
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="equipmentDeployment"
+                            v-if="!props.isView"
+                        >
+                            装备录入
+                        </el-button>
+                        <el-button class="primary-lease" type="primary" v-if="!props.isView">
+                            批量导入
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="onHandleSubmit"
+                            v-if="!props.isView"
+                        >
+                            提交申请
+                        </el-button>
+                        <el-button @click="onHandleBackList" class="primary-lease" type="primary">
+                            返回列表
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+        <!-- 表格 -->
+        <el-table
+            :data="tableData"
+            style="width: auto"
+            row-key="maId"
+            show-overflow-tooltip
+            :header-cell-style="{ background: '#00a288', color: '#fff' }"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
+            <el-table-column align="center" label="装备名称">
+                <template #default="{ row }">
+                    {{ `${row.deviceName}` }}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="code" label="装备编号" />
+            <el-table-column align="center" prop="typeName" label="装备类目">
+                <template #default="{ row }">
+                    <span
+                        >{{ row.firstName }} <span v-show="row.firstName">></span>
+                        {{ row.secondName }}<span v-show="row.secondName">></span
+                        >{{ row.thirdName }}</span
+                    >
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="typeName" label="装备型号" />
+            <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
+                <template #default="{ row }">
+                    <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
+                        row.nextCheckDate
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" label="装备状态">
+                <template #default="{ row }">
+                    <el-tag v-if="row.maStatus == 0" size="small" type="info">草稿状态</el-tag>
+                    <el-tag v-if="row.maStatus == 1" size="small" type="warning">待上架</el-tag>
+                    <el-tag v-if="row.maStatus == 2" size="small" type="success">上架</el-tag>
+                    <el-tag v-if="row.maStatus == 3" size="small" type="danger">在租</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="name"
+                label="操作"
+                min-width="160px"
+                align="center"
+                v-if="!props.isView"
+            >
+                <template #default="{ row }">
+                    <el-button
+                        v-if="row.maStatus == 0 || row.maStatus == 1"
+                        size="small"
+                        type="primary"
+                        @click="editRowInfo(row)"
+                    >
+                        编辑
+                    </el-button>
+                    <el-button
+                        v-if="row.maStatus == 0 || row.maStatus == 1"
+                        size="small"
+                        type="danger"
+                        @click="deleteRowInfo(row)"
+                    >
+                        删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <PagingComponent
+            @getListChange="getList"
+            v-model:pageSize="queryParams.pageSize"
+            v-model:currentPage="queryParams.pageNum"
+            :total="total"
+        />
+
+        <!-- 装备弹框 -->
+        <el-dialog
+            v-model="dialogFormVisibleSettlein"
+            :title="settleinTitle"
+            width="80%"
+            destroy-on-close
+            class="centered-dialog"
+            :close-on-click-modal="false"
+            :before-close="handleClose"
+            @close="onDialogClose"
+        >
+            <el-row
+                :gutter="20"
+                class="mb8"
+                style="display: flex; justify-content: flex-end; align-items: center"
+            >
+                <el-button type="primary" class="primary-lease" @click="closeDialogBtn">
+                    关闭
+                </el-button>
+                <!-- <el-button
+                    type="primary"
+                    class="primary-lease"
+                    @click="saveTemp"
+                    v-if="
+                        (!equipmentDeploymentParams.maStatus ||
+                            equipmentDeploymentParams.maStatus == 0) &&
+                        !isViewForm
+                    "
+                >
+                    保存草稿
+                </el-button> -->
+                <el-button
+                    type="primary"
+                    class="primary-lease"
+                    @click="submitBtn"
+                    v-if="!disabledForm || isEditDisabled"
+                >
+                    提交
+                </el-button>
+            </el-row>
+
+            <!-- <div class="title">
+            <span class="title-sign"></span>
+            <span class="title-text">基本信息</span>
+        </div> -->
+            <TitleTip :titleText="`基本信息`" />
+            <el-form
+                label-width="180px"
+                ref="addAndEditFormRef"
+                label-position="right"
+                :model="addAndEditForm"
+                :rules="equipRules"
+                :disabled="disabledForm"
+            >
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="装备名称：" prop="deviceName">
+                            <el-input
+                                autocomplete="off"
+                                maxlength="30"
+                                v-model="addAndEditForm.deviceName"
+                                clearable
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备类目：" prop="deviceTypeList">
+                            <el-cascader
+                                v-model="addAndEditForm.deviceTypeList"
+                                :show-all-levels="true"
+                                :options="deviceTypeTree"
+                                :props="partTypeTreeProps"
+                                filterable
+                                clearable
+                                collapse-tags
+                                placeholder="请选择装备类目"
+                                ref="dialogTypeCascader"
+                                @change="dialogTypeChange"
+                                style="width: 100%"
+                            ></el-cascader>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="装备单位：" prop="unitName">
+                            <el-input
+                                autocomplete="off"
+                                maxlength="20"
+                                v-model="addAndEditForm.unitName"
+                                clearable
+                                :disabled="isDisabled || isEditForm"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备品牌" prop="brand">
+                            <el-input
+                                v-model="addAndEditForm.brand"
+                                autocomplete="off"
+                                maxlength="20"
+                                clearable
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="出厂日期：" prop="productionDate">
+                            <el-date-picker
+                                v-model="addAndEditForm.productionDate"
+                                placeholder="请选择出厂日期"
+                                value-format="YYYY-MM-DD"
+                                type="date"
+                                style="width: 100%"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="租赁价格(天/元)：" prop="dayLeasePrice">
+                            <el-input
+                                @input="
+                                    (v:any) => (addAndEditForm.dayLeasePrice = v.replace(/[^\d.]/g, ''))
+                                "
+                                clearable
+                                maxlength="20"
+                                placeholder="请输入租赁价格"
+                                v-model="addAndEditForm.dayLeasePrice"
+                                :disabled="settleinTitle == '新增详情'"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="联系人：" prop="person">
+                            <el-input
+                                v-model="addAndEditForm.person"
+                                placeholder="请输入联系人"
+                                clearable
+                                maxlength="10"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话：" prop="personPhone">
+                            <el-input
+                                v-model="addAndEditForm.personPhone"
+                                placeholder="请输入联系电话"
+                                clearable
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="上架数量：" prop="deviceCount">
+                            <el-input
+                                v-model="addAndEditForm.deviceCount"
+                                placeholder="请输入上架数量"
+                                type="number"
+                                clearable
+                                maxlength="10"
+                                :disabled="typeDisabled"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <!-- 临时录入使用 - start -->
+                    <el-col :span="12">
+                        <el-form-item label="原值：" prop="buyPrice">
+                            <el-input-number
+                                v-model="addAndEditForm.buyPrice"
+                                placeholder="请输入原值"
+                                clearable
+                                maxlength="20"
+                                :controls="false"
+                                align="left"
+                                style="width: 100%"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="规格型号：" prop="itemTypeModel">
+                            <el-input
+                                v-model="addAndEditForm.itemTypeModel"
+                                placeholder="请输入规格型号"
+                                clearable
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="规格型号：" prop="deviceType">
+                            <!-- 0 编码 1 数量 -->
+                            <el-select
+                                v-model="addAndEditForm.deviceType"
+                                placeholder="请选择管理方式"
+                                clearable
+                                style="width: 100%"
+                                :disabled="!isAdd"
+                            >
+                                <el-option label="编码" :value="0" />
+                                <el-option label="数量" :value="1" />
+                            </el-select>
+                            <span style="color: red"
+                                >说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span
+                            >
+                        </el-form-item>
+                    </el-col>
+                    <!-- 临时录入使用 - end -->
+                </el-row>
+
+                <!-- 9.15新增 -->
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="标准使用时间：" prop="expirationTime">
+                            <el-date-picker
+                                type="date"
+                                style="width: 100%"
+                                value-format="YYYY-MM-DD"
+                                placeholder="请选择标准使用时间"
+                                v-model="addAndEditForm.expirationTime"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 1.13 需求变动要求隐藏 -->
+                <!-- <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="校验日期：" prop="checkDate">
+                            <el-date-picker
+                                v-model="addAndEditForm.checkDate"
+                                placeholder="请选择校验日期"
+                                value-format="YYYY-MM-DD"
+                                type="date"
+                                style="width: 100%"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="校验周期：" prop="checkCycle">
+                            <el-input
+                                @input="
+                                    (v) => (addAndEditForm.checkCycle = v.replace(/[^\d.]/g, ''))
+                                "
+                                v-model="addAndEditForm.checkCycle"
+                                placeholder="请输入校验周期（数字）"
+                                clearable
+                                maxlength="20"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+                <!-- <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="整机重量(KG)：">
+                            <el-input
+                                @input="
+                                    (v) => (addAndEditForm.deviceWeight = v.replace(/[^\d.]/g, ''))
+                                "
+                                v-model="addAndEditForm.deviceWeight"
+                                placeholder="请输入整机重量"
+                                clearable
+                                maxlength="20"
+                                style="width: 350px"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+                <!-- 临时录入暂时隐藏 - 2025年09月13日 -->
+                <!-- 临时录入又需要隐藏 - 2025年09月15日 -->
+                <div>
+                    <el-row
+                        v-for="(item, index) in chunkedItems"
+                        :key="index"
+                        :model="item"
+                        class="dynamic-item"
+                        :gutter="20"
+                        style="display: flex; margin-top: 10px; justify-content: left"
+                    >
+                        <el-col v-for="(itemTemp, indexTemp) in item" :key="indexTemp" :span="12">
+                            <el-form-item :label="itemTemp.propertyName + '：'">
+                                <el-input
+                                    v-model="itemTemp.propertyValue"
+                                    placeholder="请输入"
+                                    maxlength="20"
+                                >
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </div>
+
+                <TitleTip :titleText="`装备图片`" />
+                <el-row :gutter="20" v-if="!isViewForm">
+                    <el-col :span="24">
+                        <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                            <div class="tipBox">
+                                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例1:1
+                            </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-row :gutter="20" v-if="!isViewForm">
+                    <el-col :span="24">
+                        <el-form-item label="1" style="margin-bottom: 0" class="upload-tip">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                            <div class="tipBox">
+                                *注:图片排序为平台展示顺序，不得少于1张，不得多于6张，建议使用图片比例16:9
+                            </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="detailsFileList"
+                        >
+                            <div
+                                class="img-list"
+                                v-if="addAndEditForm.detailsFileList.length > 0 && !isAdd"
+                            >
+                                <div
+                                    v-for="(j, i) in addAndEditForm.detailsFileList"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInDetails(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.detailsFileList.length"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onDetailsFileChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa">
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 暂时不展示 -->
+                <!-- <TitleTip :titleText="`专区`" />
+                <el-form-item label="是否上架专区" prop="isZone">
+                    <el-radio-group v-model="addAndEditForm.isZone">
+                        <el-radio :value="true" :label="true">是</el-radio>
+                        <el-radio :value="false" :label="false">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="关联公司" prop="zoneId">
+                    <el-select
+                        v-model="addAndEditForm.zoneId"
+                        clearable
+                        filterable
+                        placeholder="请选择关联公司"
+                        :disabled="!addAndEditForm.isZone"
+                    >
+                        <el-option
+                            v-for="item in companyDataList"
+                            :key="item.companyId"
+                            :label="item.companyName"
+                            :value="item.companyId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item> -->
+                <div style="display: flex; align-items: center">
+                    <TitleTip :titleText="`装备证书`" />
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleAddBack"
+                        style="margin-left: 20px; margin-top: 20px"
+                        :disabled="!addAndEditForm.deviceTypeList"
+                        v-if="settleinTitle == '新增装备'"
+                        >添加
+                    </el-button>
+                </div>
+                <!-- <el-row :gutter="20" v-if="!isEditForm && !isViewForm">
+                    <el-col :span="24">
+                        <el-button class="primary-lease" type="primary" @click="onAddDescription">
+                            添加装备证书
+                        </el-button>
+                    </el-col>
+                </el-row> -->
+            </el-form>
+
+            <!-- <el-form
+                label-width="140px"
+                label-position="right"
+                :rules="descriptionRules"
+                v-for="(item, index) in descriptionFormList"
+                :ref="
+                ($event:any) => {
+                    descriptionFormRefList[index] = $event
+                }
+            "
+                :model="item"
+                :key="item.newId"
+            >
+                <el-row :gutter="20" style="margin-top: 12px">
+                    <el-col :span="12">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="装备唯一标识符："
+                            prop="identifyCode"
+                        >
+                            <el-input
+                                v-model="item.identifyCode"
+                                placeholder="请输入"
+                                maxlength="20"
+                            />
+                        </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">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M
+                        </el-form-item>
+                    </el-col>
+                </el-row> -->
+            <!-- <el-row :gutter="20">
+                    <el-col :span="24">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="合格证："
+                            prop="insurancePdfs"
+                        >
+                            <div class="img-list" v-if="addAndEditForm.detailsFileList.length > 0">
+                                <div
+                                    v-for="(j, i) in item.insurancePdfs"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img" v-if="!isViewForm">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInMain(i)"
+                                            >
+                                                <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"
+                                :actionUrl="uploadUrl"
+                                :maxSize="5"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :currentIndex="index"
+                                :autoUpload="true"
+                                :multiple="true"
+                                :minLimit="item.insurancePdfs.length"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onInsurancePdfChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </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">
+                            支持格式：.jpg、.png 单个文件大小不能超过5M,
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row
+                    :gutter="20"
+                    :style="
+                        index != descriptionFormList.length - 1
+                            ? 'border-bottom: 1px solid #ccc'
+                            : ''
+                    "
+                >
+                    <el-col :span="20">
+                        <el-form-item
+                            style="font-weight: bold"
+                            label="检测证明："
+                            prop="examinationPdfs"
+                        >
+                            <div class="img-list" v-if="addAndEditForm.detailsFileList.length > 0">
+                                <div
+                                    v-for="(j, i) in item.examinationPdfs"
+                                    :key="j.fileUrl"
+                                    class="img-items"
+                                >
+                                    <img :src="j.fileUrl" alt="" />
+
+                                    <div class="mask-img" v-if="!isViewForm">
+                                        <div>
+                                            <el-icon
+                                                class="delete-icon"
+                                                @click="onDeleteImgInMain(i)"
+                                            >
+                                                <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"
+                                :actionUrl="uploadUrl"
+                                :maxSize="5"
+                                :max-limit="4"
+                                width="100px"
+                                height="100px"
+                                :autoUpload="true"
+                                :multiple="true"
+                                :minLimit="item.examinationPdfs.length"
+                                :currentIndex="index"
+                                listType="picture-card"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="onExaminationPdfChange"
+                            >
+                                <template v-slot:default>
+                                    <el-icon size="42" color="#aaa"><Plus /></el-icon>
+                                </template>
+                            </UploadComponentNew>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" v-if="index != 0">
+                        <el-button
+                            size="small"
+                            type="danger"
+                            class="primary-lease"
+                            @click="onDeleteDescription(index)"
+                        >
+                            移除
+                        </el-button>
+                    </el-col>
+                </el-row> -->
+            <!-- </el-form> -->
+
+            <el-table :data="equipTableList" width="100%" height="450px" border>
+                <el-table-column label="序号" type="index" width="55" align="center" />
+                <el-table-column
+                    prop="identifyCode"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                    width="260"
+                >
+                    <template #header>
+                        <div style="display: flex; flex-direction: column; align-items: center">
+                            <span>唯一标识符</span>
+                            <span style="font-size: 10px; color: #999">
+                                WHMY-DLSSJ-JSD5B-2025070101：<br />
+                                公司简称首字母-设备名称首字母-设备型号-YYYYMMDD序号
+                            </span>
+                        </div>
+                    </template>
+                    <template #default="{ row, $index }">
+                        <el-input
+                            v-model="row.identifyCode"
+                            style="width: 100%"
+                            placeholder="请输入唯一标识符"
+                            maxlength="20"
+                            :disabled="disabledForm"
+                        ></el-input>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column
+                    label="合格证"
+                    prop="name2"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <div v-if="row.name2 == ''">
+                            <UploadComponentNew
+                                :maxSize="10"
+                                :max-limit="1"
+                                width="100%"
+                                height="100%"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :actionUrl="uploadUrl"
+                                :minLimit="row.insurancePdf.length"
+                                listType="text"
+                                :justifyContent="`flex-start`"
+                                :acceptTypeList="['.jpg', '.png']"
+                                @onFileChange="
+                                    (fileList) => onFileChangeEquip(fileList, row, $index, 1)
+                                "
+                            >
+                                <div
+                                    style="
+                                        display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                    "
+                                >
+                                    <el-button
+                                        type="text"
+                                        style="color: #00a288; text-decoration: underline"
+                                        >上传</el-button
+                                    >
+                                </div>
+                            </UploadComponentNew>
+                        </div>
+                        <div v-else>
+                            <el-button
+                                type="text"
+                                style="color: #00a288; text-decoration: underline"
+                                @click="viewCertificate(row.insurancePdf[0].fileUrl)"
+                                >查看</el-button
+                            >
+                        </div>
+                    </template>
+                </el-table-column> -->
+                <el-table-column
+                    label="检修人"
+                    prop="checkMan"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-input
+                            v-model="row.checkMan"
+                            controls-position="right"
+                            style="width: 100%"
+                            placeholder="请输入检修人"
+                            :disabled="disabledForm"
+                        ></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="检修时间"
+                    prop="checkDate"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-date-picker
+                            v-model="row.checkDate"
+                            value-format="YYYY-MM-DD"
+                            type="date"
+                            placeholder="请选择"
+                            @change="changeDate(row, $index)"
+                            style="width: 100%"
+                            :disabled="disabledForm"
+                        ></el-date-picker>
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="下次检测时间"
+                    prop="nextCheckDate"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    <template #default="{ row, $index }">
+                        <el-date-picker
+                            v-model="row.nextCheckDate"
+                            value-format="YYYY-MM-DD"
+                            type="date"
+                            placeholder="请选择"
+                            style="width: 100%"
+                            @change="changeNextDate(row)"
+                            :disabled="disabledForm"
+                        ></el-date-picker>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="合格证(最多5个)" prop="name2" align="center" width="220">
+                    <template #default="{ row, $index }">
+                        <el-upload
+                            :file-list="row.insurancePdf"
+                            class="upload-demo"
+                            :action="uploadUrl"
+                            :headers="headerInfo"
+                            :before-upload="beforeUpload"
+                            :on-preview="handlePreview"
+                            :on-remove="(file: any) => handleRemove(file, row, 2)"
+                            :on-exceed="handleExceed"
+                            :limit="5"
+                            :on-success="(file: any) => handleSuccess(file, row, 2)"
+                            accept=".jpg,.png,.pdf, .doc, .docx"
+                            :disabled="settleinTitle == '装备详情'"
+                        >
+                            <el-button
+                                type="primary"
+                                size="small"
+                                v-if="settleinTitle != '装备详情'"
+                            >
+                                上传
+                            </el-button>
+                        </el-upload>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="检测证明(最多5个)" prop="name6" align="center" width="220">
+                    <template #default="{ row, $index }">
+                        <el-upload
+                            class="upload-demo"
+                            :action="uploadUrl"
+                            :headers="headerInfo"
+                            :file-list="row.examinationPdf"
+                            :before-upload="beforeUpload"
+                            :on-preview="handlePreview"
+                            :on-remove="(file: any) => handleRemove(file, row, 1)"
+                            :on-exceed="handleExceed"
+                            :limit="5"
+                            :on-success="(file: any) => handleSuccess(file, row, 1)"
+                            accept=".jpg,.png,.pdf, .doc, .docx"
+                            :disabled="settleinTitle == '装备详情'"
+                        >
+                            <el-button
+                                size="small"
+                                type="primary"
+                                v-if="settleinTitle != '装备详情'"
+                            >
+                                上传
+                            </el-button>
+                        </el-upload>
+                        <!-- <div v-if="row.name6 == ''">
+                            <UploadComponentNew
+                                :maxSize="10"
+                                :max-limit="1"
+                                width="100%"
+                                height="100%"
+                                :multiple="true"
+                                :autoUpload="true"
+                                :actionUrl="uploadUrl"
+                                :minLimit="row.examinationPdf.length"
+                                listType="text"
+                                :justifyContent="`flex-start`"
+                                :acceptTypeList="['.jpg', '.png','.pdf']"
+                                @onFileChange="
+                                    (fileList) => onFileChangeEquip(fileList, row, $index, 2)
+                                "
+                            >
+                                <div
+                                    style="
+                                        display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                    "
+                                >
+                                    <el-button
+                                        type="text"
+                                        style="color: #00a288; text-decoration: underline"
+                                        >上传</el-button
+                                    >
+                                </div>
+                            </UploadComponentNew>
+                        </div>
+                        <div v-else>
+                            <el-button
+                                type="text"
+                                style="color: #00a288; text-decoration: underline"
+                                @click="viewCertificate(row.examinationPdf[0].fileUrl)"
+                                >查看</el-button
+                            >
+                        </div> -->
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    width="100px"
+                    v-if="settleinTitle == '新增装备'"
+                >
+                    <template #default="{ row, $index }">
+                        <div
+                            style="
+                                width: 100%;
+                                height: 40px;
+                                display: flex;
+                                align-items: center;
+                                justify-content: center;
+                            "
+                        >
+                            <el-button
+                                size="small"
+                                type="danger"
+                                @click="handleDeleteBack($index)"
+                                v-show="$index != 0"
+                                >删除
+                            </el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <!-- 图片查看弹窗 -->
+        <el-dialog center width="60%" destroy-on-close v-model="previewDialogVisible">
+            <el-image
+                style="width: 100%; height: 50%"
+                :src="previewDialogImageUrl"
+                fit="cover"
+                :z-index="9999999999"
+            />
+        </el-dialog>
+
+        <!-- 批量新增弹框 -->
+        <el-dialog
+            v-model="batchAddVisible"
+            title="批量新增"
+            width="80%"
+            destroy-on-close
+            :close-on-click-modal="false"
+        >
+            <el-row :gutter="20">
+                <el-col :span="1.5" :offset="0">
+                    <a :href="uploadUrlTemp" download="模板">
+                        <el-button class="primary-lease" type="primary" style="margin-left: 20px"
+                            >模板下载
+                        </el-button>
+                    </a>
+                </el-col>
+                <el-col :span="1.5" :offset="0">
+                    <el-upload
+                        class="upload-demo"
+                        :action="uploadUrl2"
+                        :headers="headerInfo"
+                        :show-file-list="false"
+                        accept=".xlsx"
+                        :on-success="handleUpload"
+                    >
+                        <el-button type="primary">上传文件</el-button>
+                    </el-upload>
+                </el-col>
+                <el-col :span="5" :offset="0">
+                    <div style="color: #ccc; font-size: small; line-height: 30px">
+                        备注: 一次上传装备数量不能超过50条
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20">
+                <el-col :span="12" :offset="0">
+                    <TitleTip titleText="资料不全装备清单" />
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20" style="margin-bottom: 10px">
+                <el-col :span="1.5" :offset="0">
+                    <el-button type="primary" @click="handleBatchDel">删除</el-button>
+                </el-col>
+            </el-row>
+
+            <el-table
+                :data="batchAddData"
+                row-key="typeId"
+                show-overflow-tooltip
+                :header-cell-style="{ background: '#00a288', color: '#fff' }"
+                style="width: 100%"
+                @selection-change="selectionChange"
+            >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="序号" align="center" width="80px">
+                    <template #default="{ row, $index }">
+                        {{ $index + 1 }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    v-for="(column, index) in batchAddColumn"
+                    :key="index"
+                    :prop="column.prop"
+                    :label="column.label"
+                    :width="column.width"
+                    align="center"
+                ></el-table-column>
+                <!-- 操作 -->
+                <el-table-column label="操作" align="center" width="180px">
+                    <template #default="{ row, $index }">
+                        <el-button type="primary" @click="handleDel($index)">删除</el-button>
+                        <el-button type="primary" @click="equipmentDeployment(row)">调整</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.el-form {
+    // margin: 15px 0;
+}
+
+.title {
+    margin: 10px;
+    margin-left: 20px;
+    display: flex;
+    align-items: center;
+}
+
+.title-sign {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #00a288;
+}
+
+.title-text {
+    font-weight: 700;
+    margin-left: 10px;
+}
+
+.uploadBox {
+    margin: 20px 40px;
+}
+
+.labelBox {
+    width: auto;
+    height: auto;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+}
+
+.imgsBox {
+    width: 100%;
+    height: auto;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-bottom: 30px;
+    margin-left: 20px;
+
+    .imgItem {
+        width: 150px;
+        height: 150px;
+        margin-right: 20px;
+        margin-bottom: 30px;
+        border: 1px dashed #bbb;
+        position: relative;
+
+        .picture-card {
+            width: 150px;
+            height: 150px;
+        }
+
+        .icon-list {
+            width: 60px;
+            height: 20px;
+            position: absolute;
+            top: 70px;
+            left: 30px;
+            display: flex;
+            align-items: center;
+        }
+
+        .imgItem__icon {
+            margin: 0 5px;
+            cursor: pointer;
+        }
+
+        .file-name {
+            font-size: 10px;
+            width: 100%;
+            word-break: break-all;
+        }
+    }
+
+    .hide {
+        display: none;
+    }
+
+    .imgItem:hover .hide {
+        display: block;
+    }
+}
+
+.tipBox {
+    color: red;
+    font-size: 12px;
+    margin-left: 20px;
+}
+
+:deep.el-form--inline .el-form-item {
+    margin-right: 6px;
+    width: 95%;
+}
+
+:deep.upload-tip .el-form-item__label {
+    color: transparent;
+}
+
+.img-list {
+    display: flex;
+    align-items: center;
+
+    .img-items {
+        width: 100px;
+        height: 100px;
+        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;
+            }
+        }
+    }
+
+    .img-items:hover .mask-img {
+        visibility: visible;
+    }
+}
+
+.centered-dialog {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+// :deep(.el-dialog) {
+//     margin: 0 !important;
+//     display: flex;
+//     flex-direction: column;
+//     max-height: 90%;
+//     max-width: 90%;
+// }
+
+// :deep(.el-dialog__body) {
+//     flex: 1;
+//     overflow: auto;
+// }
+
+// .dialog-content {
+//     padding: 20px;
+// }
+
+.app-container-content {
+    :deep(.el-dialog) {
+        display: flex !important;
+        flex-direction: column !important;
+        margin: 0 !important;
+        position: absolute !important;
+        top: 5vh !important;
+        left: 50% !important;
+        transform: translate(-50%, 0%) !important;
+        /* max-height: 100vh !important; */
+        height: 90vh;
+
+        .el-dialog__body {
+            flex: 1;
+            overflow-y: scroll !important;
+
+            .el-table__header-wrapper .el-checkbox {
+                display: none !important;
+            }
+        }
+
+        .dialog-content {
+            padding: 20px;
+        }
+    }
+}
+
+:deep(.el-button--primary) {
+    background-color: #3cb4a6 !important;
+    border-color: #3cb4a6 !important;
+}
+
+:deep(.el-button--primary:hover),
+:deep(.el-button--primary:focus),
+:deep(.el-button--primary:active) {
+    background-color: #2fa18f !important;
+    border-color: #2fa18f !important;
+}
+::v-deep .el-input-number .el-input__inner {
+    text-align: left !important;
+}
+</style>
diff --git a/src/views/user/goodsManagement/index_new.vue b/src/views/user/goodsManagement/index_new.vue
new file mode 100644
index 0000000..dbc7832
--- /dev/null
+++ b/src/views/user/goodsManagement/index_new.vue
@@ -0,0 +1,225 @@
+<template>
+    <template v-if="!isEquipmentInputShow">
+        <el-form :model="queryParams" ref="queryFormRef" inline size="default" label-width="0">
+            <!-- 表单搜索 -->
+            <el-row>
+                <el-col :span="5">
+                    <el-form-item prop="keyWord">
+                        <el-input
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入关键字"
+                            v-model.trim="queryParams.keyWord"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                    <el-form-item prop="status">
+                        <el-select
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择审批状态"
+                            v-model="queryParams.status"
+                        >
+                            <el-option label="待审批" value="1" />
+                            <el-option label="已审批" value="2" />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                    <el-form-item prop="applyTime">
+                        <el-date-picker
+                            type="date"
+                            style="width: 100%"
+                            value-format="YYYY-MM-DD"
+                            placeholder="请选择申请时间"
+                            v-model="queryParams.applyTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="9">
+                    <el-form-item prop="code">
+                        <el-button class="primary-lease" type="primary" @click="onHandleSQuery()">
+                            查询
+                        </el-button>
+                        <el-button class="primary-lease" type="primary" @click="onHandleReset()">
+                            重置
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="onHandleEquipmentInput()"
+                        >
+                            装备录入
+                        </el-button>
+                        <el-button
+                            class="primary-lease"
+                            type="primary"
+                            @click="onHandleBatchImport()"
+                        >
+                            批量导入
+                        </el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <!-- 表格 -->
+            <el-table :data="tableData">
+                <el-table-column label="序号" align="center" width="55" type="index" />
+                <el-table-column prop="createUser" label="申请人" align="center" />
+                <el-table-column prop="createTime" label="申请时间" align="center" />
+                <el-table-column prop="devCount" label="设备数量" align="center" />
+                <el-table-column prop="status" align="center" label="审批状态">
+                    <template #default="{ row }">
+                        <el-tag v-if="row.status == 0" size="small" type="info">待审批</el-tag>
+                        <el-tag v-if="row.status == 1" size="small" type="warning">已完成</el-tag>
+                        <el-tag v-if="row.status == 3" size="small" type="success">草稿</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template #default="{ row }">
+                        <el-button type="primary" size="small" @click="onHandleView(row)">
+                            查看
+                        </el-button>
+                        <el-button
+                            type="primary"
+                            size="small"
+                            @click="onHandleEdit(row)"
+                            v-if="row.status == 3"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button type="primary" size="small" @click="onHandleDelete(row)">
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!-- 分页 -->
+            <!-- <el-pagination
+            v-model:current-page="queryParams.pageNum"
+            v-model:page-size="queryParams.pageSize"
+            :page-sizes="[10, 20, 30, 40]"
+            :small="small"
+            :disabled="disabled"
+            :background="background"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        /> -->
+        </el-form>
+    </template>
+
+    <EquipmentInput :orderIds="orderIds" :isView="isView" v-else @backList="onHandleBackList" />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+import { getEquipmentApplyListApi, equipmentDelApiNew } from 'http/api/usercenter/goodsmang'
+import EquipmentInput from './equipmentInput/index.vue'
+
+const router = useRouter()
+const total = ref(0)
+const orderIds = ref('')
+const isView = ref(false)
+const isEquipmentInputShow = ref(false)
+const queryParams = ref({
+    keyWord: '',
+    status: '',
+    applyTime: '',
+    pageNum: 1,
+    pageSize: 10,
+})
+const tableData = ref([
+    {
+        applicant: '张三',
+        applyTime: '2021-01-01',
+        deviceCount: 10,
+        status: '待审批',
+    },
+    {
+        applicant: '李四',
+        applyTime: '2021-01-02',
+        deviceCount: 20,
+        status: '已审批',
+    },
+])
+const queryFormRef = ref<FormInstance>()
+
+// 获取装备申请列表
+const getEquipmentApplyList = async () => {
+    const res: any = await getEquipmentApplyListApi(queryParams.value)
+    console.log('获取装备申请列表***', res)
+    tableData.value = res.data.rows
+    total.value = res.data.total
+}
+
+const onHandleSQuery = () => {
+    console.log('onHandleSQuery')
+    getEquipmentApplyList()
+}
+const onHandleReset = () => {
+    console.log('onHandleReset')
+}
+const onHandleEquipmentInput = () => {
+    orderIds.value = ''
+    isView.value = false
+    isEquipmentInputShow.value = true
+}
+const onHandleBatchImport = () => {
+    console.log('onHandleBatchImport')
+}
+const onHandleView = (row: any) => {
+    console.log('onHandleView')
+    orderIds.value = row.id
+    isView.value = true
+    isEquipmentInputShow.value = true
+}
+const onHandleEdit = (row: any) => {
+    orderIds.value = row.id
+    isView.value = false
+    isEquipmentInputShow.value = true
+    console.log('onHandleEdit')
+}
+const onHandleDelete = (row: any) => {
+    // console.log('onHandleDelete')
+    ElMessageBox.confirm('是否确定删除？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(() => {
+        console.log('onHandleDelete')
+
+        equipmentDelApiNew({ id: row.id }).then((res: any) => {
+            console.log('onHandleDelete', res)
+            if (res.code == 200) {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功',
+                    duration: 1000,
+                })
+                getEquipmentApplyList()
+            } else {
+                ElMessage({
+                    type: 'error',
+                    message: '删除失败',
+                    duration: 1000,
+                })
+            }
+        })
+    })
+}
+
+const onHandleBackList = () => {
+    isEquipmentInputShow.value = false
+    getEquipmentApplyList()
+}
+
+onMounted(() => {
+    getEquipmentApplyList()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index b558dae..c0f1365 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -55,14 +55,15 @@ interface MenuItem {
 // 按角色分组定义菜单---出租方
 const lessorMenus: MenuItem[] = [
     { title: '装备管理', name: 'goodsManagement', permission: ['1'] },
+    { title: '装备审核', name: 'goodsAuditing', permission: ['1'] },
     { title: '出租订单', name: 'orderManagementCz', permission: ['1'] },
     { title: '接单管理', name: 'accept-orders', permission: ['1'] },
     { title: '装备维保', name: 'quality-manage', permission: ['1'] },
     { title: '合同管理', name: 'contract-manage', permission: ['1'] },
-	/* { title: '自有装备管理', name: 'owned-manage', permission: ['1'] }, */
-	{ title: '外租装备管理', name: 'rent-manage', permission: ['1'] },
+    /* { title: '自有装备管理', name: 'owned-manage', permission: ['1'] }, */
+    { title: '外租装备管理', name: 'rent-manage', permission: ['1'] },
     { title: '机械化施工装备配置率', name: 'rent-facility', permission: ['1'] },
-	{ title: '后台管理', name: 'admin', permission: ['1'] },
+    { title: '后台管理', name: 'admin', permission: ['1'] },
 ]
 // 按角色分组定义菜单---承租方
 const lesseeMenus: MenuItem[] = [