物资接口调整

src/api/material/blacklist/index.ts

@@ -18,29 +18,29 @@ export interface BlacklistVO {
 
 // 查询黑名单列表
 export const listBlacklist = async (params: BlacklistQuery) => {
-  return await request.get({ url: '/iscs/blacklist/getIsBlacklistPage', params })
+  return await request.get({ url: '/iscs/blacklist/getBlacklistPage', params })
 }
 
 // 查询黑名单详情
 export const getBlacklistInfo = async (id: number) => {
-  return await request.get({ url: '/iscs/blacklist/selectIsBlacklistById', params: { recordId: id } })
+  return await request.get({ url: '/iscs/blacklist/selectBlacklistById', params: { id: id } })
 }
 
 // 新增黑名单
 export const addBlacklist = async (data: BlacklistVO) => {
-  return await request.post({ url: '/iscs/blacklist/insertIsBlacklist', data })
+  return await request.post({ url: '/iscs/blacklist/insertBlacklist', data })
 }
 
 // 修改黑名单
 export const updateBlacklist = async (data: BlacklistVO) => {
-  return await request.post({ url: '/iscs/blacklist/updateIsBlacklist', data })
+  return await request.put({ url: '/iscs/blacklist/updateBlacklist', data })
 }
 
 // 删除黑名单
-export const delBlacklist = async (id: number) => {
+export const delBlacklist = async (ids: number) => {
   return await request.post({
-    url: '/iscs/blacklist/deleteIsBlacklistByRecordIds',
-    params: { recordIds: id }
+    url: '/iscs/blacklist/deleteBlacklistList?ids='+ids,
+
   })
 }
 

src/api/material/checkRecord/index.ts

@@ -24,31 +24,30 @@ export interface CheckRecordVO {
 
 // 查询物资检查记录列表
 export const listCheckRecord = async (params: CheckRecordQuery) => {
-  return await request.get({ url: '/iscs/check/getIsMaterialsCheckRecordPage', params })
+  return await request.get({ url: '/iscs/materials-check-record/getMaterialsCheckRecordPage', params })
 }
 
 // 查询物资检查记录详情
 export const getCheckRecordInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/check/selectIsMaterialsCheckRecordById',
-    params: { recordId: id }
+    url: '/iscs/materials-check-record/selectMaterialsCheckRecordById',
+    params: { id: id }
   })
 }
 
 // 新增物资检查记录
 export const addCheckRecord = async (data: CheckRecordVO) => {
-  return await request.post({ url: '/iscs/check/insertIsMaterialsCheckRecord', data })
+  return await request.post({ url: '/iscs/materials-check-record/insertMaterialsCheckRecord', data })
 }
 
 // 修改物资检查记录
 export const updateCheckRecord = async (data: CheckRecordVO) => {
-  return await request.post({ url: '/iscs/check/updateIsMaterialsCheckRecord', data })
+  return await request.post({ url: '/iscs/materials-check-record/updateMaterialsCheckRecord', data })
 }
 
 // 删除物资检查记录
-export const deleteCheckRecord = async (id: number) => {
+export const deleteCheckRecord = async (ids: number) => {
   return await request.post({
-    url: '/iscs/check/deleteIsMaterialsCheckRecordByRecordIds',
-    params: { recordIds: id }
+    url: '/iscs/materials-check-record/deleteMaterialsCheckRecordList?ids='+ids
   })
 }

src/api/material/exception/index.ts

@@ -15,7 +15,7 @@ export interface ExceptionQuery {
 // 查询物资异常列表 (传递参数exceptionType是1就是柜门异常 现在是归还异常)
 export const returnExceptionPage = async (params: ExceptionQuery) => {
   return await request.get({
-    url: '/iscs/exception/getIsMaterialsLoanExceptionPage',
+    url: '/iscs/exception/getExceptionPage',
     params
   })
 }

src/api/material/information/index.ts

@@ -59,32 +59,32 @@ export interface MaterialsCheckVO {
 
 // 查询物资信息列表
 export const listMaterials = async (params: MaterialsQuery) => {
-  return await request.get({ url: '/iscs/materials/getIsMaterialsPage', params })
+  return await request.get({ url: '/iscs/materials/getMaterialsPage', params })
 }
 
 // 查询物资信息详情
 export const getMaterialsInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/materials/selectIsMaterialsById',
-    params: { materialsId: id }
+    url: '/iscs/materials/selectMaterialsById',
+    params: { id: id }
   })
 }
 
 // 新增物资信息
 export const addMaterials = async (data: MaterialsVO) => {
-  return await request.post({ url: '/iscs/materials/insertIsMaterials', data })
+  return await request.post({ url: '/iscs/materials/insertMaterials', data })
 }
 
 // 修改物资信息
 export const updateMaterials = async (data: MaterialsVO) => {
-  return await request.post({ url: '/iscs/materials/updateIsMaterials', data })
+  return await request.put({ url: '/iscs/materials/updateMaterials', data })
 }
 
 // 删除物资信息
-export const deleteMaterials = async (id: number) => {
-  return await request.post({
-    url: '/iscs/materials/deleteIsMaterialsByMaterialsIds',
-    params: { materialsIds: id }
+export const deleteMaterials = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/materials/deleteMaterialsList?ids='+ids,
+
   })
 }
 

src/api/material/instructions/index.ts

@@ -22,31 +22,31 @@ export interface InstructionsVO {
 
 // 查询物资使用说明列表
 export const listInstructions = async (params: InstructionsQuery) => {
-  return await request.get({ url: '/iscs/instructions/getIsMaterialsInstructionsPage', params })
+  return await request.get({ url: '/iscs/materials-instructions/getMaterialsInstructionsPage', params })
 }
 
 // 查询物资使用说明详情
 export const getInstructionsInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/instructions/selectIsMaterialsInstructionsById',
-    params: { instructionsId: id }
+    url: '/iscs/materials-instructions/selectMaterialsInstructionsById',
+    params: { id: id }
   })
 }
 
 // 新增物资使用说明
 export const addInstructions = async (data: InstructionsVO) => {
-  return await request.post({ url: '/iscs/instructions/insertIsMaterialsInstructions', data })
+  return await request.post({ url: '/iscs/materials-instructions/insertMaterialsInstructions', data })
 }
 
 // 修改物资使用说明
 export const updateInstructions = async (data: InstructionsVO) => {
-  return await request.post({ url: '/iscs/instructions/updateIsMaterialsInstructions', data })
+  return await request.put({ url: '/iscs/materials-instructions/updateMaterialsInstructions', data })
 }
 
 // 删除物资使用说明
-export const delInstructions = async (id: number) => {
+export const delInstructions = async (ids: number) => {
   return await request.post({
-    url: '/iscs/instructions/deleteIsMaterialsInstructionsByInstructionsIds',
-    params: { instructionsIds: id }
+    url: '/iscs/materials-instructions/deleteMaterialsInstructionsList?ids='+ids,
+
   })
 }

src/api/material/loan/index.ts

@@ -42,39 +42,11 @@ export interface ReturnReminderVO {
 
 // 查询物资借还列表
 export const listLoan = async (params: LoanQuery) => {
-  return await request.get({ url: '/iscs/loan/getIsMaterialsLoanPage', params })
+  return await request.get({ url: '/iscs/materials-loan/getMaterialsLoanPage', params })
 }
 
-// 查询物资借还详情
-export const getLoanInfo = async (id: number) => {
-  return await request.get({
-    url: '/iscs/loan/selectIsMaterialsLoanById',
-    params: { materialsLoanId: id }
-  })
-}
 
-// 新增归还提醒
-export const addReturnReminder = async (data: ReturnReminderVO) => {
-  return await request.post({ url: '/iscs/loan/insertIsMaterialsReturnReminder', data })
-}
 
-// 修改归还提醒
-export const updateReturnReminder = async (data: ReturnReminderVO) => {
-  return await request.post({ url: '/iscs/loan/updateIsMaterialsReturnReminder', data })
-}
 
-// 删除物资借还记录
-export const deleteLoan = async (id: number) => {
-  return await request.post({
-    url: '/iscs/loan/deleteIsMaterialsLoanByMaterialsLoanIds',
-    params: { materialsLoanIds: id }
-  })
-}
 
-// 查询归还提醒详情
-export const getReturnReminderInfo = async (id: number) => {
-  return await request.get({
-    url: '/iscs/loan/selectIsMaterialsReturnReminderById',
-    params: { reminderId: id }
-  })
-}
+

src/api/material/plan/index.ts

@@ -34,38 +34,38 @@ export interface AutoConfigVO {
 
 // 查询物资检查计划列表
 export const listPlan = async (params: PlanQuery) => {
-  return await request.get({ url: '/iscs/plan/getIsMaterialsCheckPlanPage', params })
+  return await request.get({ url: '/iscs/materials-check-plan/updateMaterialsCheckPlan', params })
 }
 
 // 查询物资检查计划详情
 export const getPlanInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/plan/selectIsMaterialsCheckPlanById',
-    params: { planId: id }
+    url: '/iscs/materials-check-plan/insertMaterialsCheckPlan',
+    params: { id: id }
   })
 }
 
 // 新增物资检查计划
 export const addPlan = async (data: PlanVO) => {
-  return await request.post({ url: '/iscs/plan/insertIsMaterialsCheckPlan', data })
+  return await request.post({ url: '/iscs/materials-check-plan/insertMaterialsCheckPlan', data })
 }
 
 // 修改物资检查计划
 export const updatePlan = async (data: PlanVO) => {
-  return await request.post({ url: '/iscs/plan/updateIsMaterialsCheckPlan', data })
+  return await request.put({ url: '/iscs/materials-check-plan/updateMaterialsCheckPlan', data })
 }
 
 // 删除物资检查计划
-export const deletePlan = async (id: number) => {
+export const deletePlan = async (ids: number) => {
   return await request.post({
-    url: '/iscs/plan/deleteIsMaterialsCheckPlanByPlanIds',
-    params: { planIds: id }
+    url: '/iscs/materials-check-plan/deleteMaterialsCheckPlanList?ids='+ids,
+
   })
 }
 
 // 查询检查计划物资柜列表
 export const getCheckPlanCabinetList = async (params: PlanQuery) => {
-  return await request.get({ url: '/iscs/plan/getCheckPlanCabinetList', params })
+  return await request.get({ url: '/iscs/materials-plan-cabinet/getMaterialsPlanCabinetPage', params })
 }
 
 // 更新自动创建检查计划配置

src/api/material/replace/index.ts

@@ -24,14 +24,14 @@ export interface ChangeRecordVO {
 
 // 查询物资更换记录列表
 export const listChangeRecord = async (params: ChangeRecordQuery) => {
-  return await request.get({ url: '/iscs/change/getIsMaterialsChangeRecordPage', params })
+  return await request.get({ url: '/iscs/materials-change-record/getMaterialsChangeRecordPage', params })
 }
 
 // 查询物资更换记录详情
 export const getChangeRecordInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/change/selectIsMaterialsChangeRecordById',
-    params: { changeId: id }
+    url: '/iscs/materials-change-record/selectMaterialsChangeRecordById',
+    params: { id: id }
   })
 }
 
@@ -42,13 +42,13 @@ export const addChangeRecord = async (data: ChangeRecordVO) => {
 
 // 修改物资更换记录
 export const updateChangeRecord = async (data: ChangeRecordVO) => {
-  return await request.post({ url: '/iscs/check/updateIsMaterialsChangeRecord', data })
+  return await request.put({ url: '/iscs/materials-change-record/updateMaterialsChangeRecord', data })
 }
 
 // 删除物资更换记录
-export const deleteChangeRecord = async (id: number) => {
+export const deleteChangeRecord = async (ids: number) => {
   return await request.post({
-    url: '/iscs/change/deleteIsMaterialsChangeRecordByChangeIds',
-    params: { changeIds: id }
+    url: '/iscs/materials-change-record/deleteMaterialsChangeRecordList?ids='+ids,
+
   })
 }

src/api/material/standard/index.ts

@@ -23,31 +23,31 @@ export interface PropertyVO {
 
 // 查询物资属性项列表
 export const PropertyPage = async (params: PropertyQuery) => {
-  return await request.get({ url: '/iscs/property/getIsMaterialsPropertyPage', params })
+  return await request.get({ url: '/iscs/materials-property/getMaterialsPropertyPage', params })
 }
 
 // 查询物资属性项详情
 export const selectPropertyById = async (id: number) => {
   return await request.get({
-    url: '/iscs/property/selectIsMaterialsPropertyById',
-    params: { propertyId: id }
+    url: '/iscs/materials-property/selectMaterialsPropertyById',
+    params: { id: id }
   })
 }
 
 // 新增物资属性项
 export const addProperty = async (data: PropertyVO) => {
-  return await request.post({ url: '/iscs/property/insertIsMaterialsProperty', data })
+  return await request.post({ url: '/iscs/materials-property/insertMaterialsProperty', data })
 }
 
 // 修改物资属性项
 export const updateProperty = async (data: PropertyVO) => {
-  return await request.post({ url: '/iscs/property/updateIsMaterialsProperty', data })
+  return await request.put({ url: '/iscs/materials-property/updateMaterialsProperty', data })
 }
 
 // 删除物资属性项
-export const deleteProperty = async (id: number) => {
-  return await request.post({
-    url: '/iscs/property/deleteIsMaterialsPropertyByPropertyIds',
-    params: { propertyIds: id }
+export const deleteProperty = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/materials-property/deleteMaterialsPropertyList?ids='+ids,
+
   })
 }

src/api/material/standard/propertyValue.ts

@@ -23,31 +23,31 @@ export interface PropertyValueVO {
 
 // 查询物资属性值列表
 export const PropertyValuePage = async (params: PropertyValueQuery) => {
-  return await request.get({ url: '/iscs/propvalue/getIsMaterialsPropertyValuePage', params })
+  return await request.get({ url: '/iscs/materials-property-value/getMaterialsPropertyValuePage', params })
 }
 
 // 查询物资属性值详情
 export const selectPropertyValueById = async (id: number) => {
   return await request.get({
-    url: '/iscs/propvalue/selectIsMaterialsPropertyValueById',
-    params: { recordId: id }
+    url: '/iscs/materials-property-value/selectMaterialsPropertyValueById',
+    params: { id: id }
   })
 }
 
 // 新增物资属性值
 export const addPropertyValue = async (data: PropertyValueVO) => {
-  return await request.post({ url: '/iscs/propvalue/insertIsMaterialsPropertyValue', data })
+  return await request.post({ url: '/iscs/materials-property-value/insertMaterialsPropertyValue', data })
 }
 
 // 修改物资属性值
 export const updatePropertyValue = async (data: PropertyValueVO) => {
-  return await request.post({ url: '/iscs/propvalue/updateIsMaterialsPropertyValue', data })
+  return await request.put({ url: '/iscs/materials-property-value/updateMaterialsPropertyValue', data })
 }
 
 // 删除物资属性值
-export const deletePropertyValue = async (id: number) => {
+export const deletePropertyValue = async (ids: number) => {
   return await request.post({
-    url: '/iscs/propvalue/deleteIsMaterialsPropertyValueByRecordIds',
-    params: { recordIds: id }
+    url: '/iscs/materials-property-value/deleteMaterialsPropertyValueList?ids='+ids,
+
   })
 }

src/api/material/type/index.ts

@@ -23,31 +23,31 @@ export interface TypeVO {
 
 // 查询物资类型列表
 export const listType = async (params: TypeQuery) => {
-  return await request.get({ url: '/iscs/type/getIsMaterialsTypePage', params })
+  return await request.get({ url: '/iscs/materials-type/getMaterialsTypePage', params })
 }
 
 // 查询物资类型详情
 export const getTypeInfo = async (id: number) => {
   return await request.get({
-    url: '/iscs/type/selectIsMaterialsTypeById',
-    params: { materialsTypeId: id }
+    url: '/iscs/materials-type/selectMaterialsTypeById',
+    params: { id: id }
   })
 }
 
 // 新增物资类型
 export const addType = async (data: TypeVO) => {
-  return await request.post({ url: '/iscs/type/insertIsMaterialsType', data })
+  return await request.post({ url: '/iscs/materials-type/insertMaterialsType', data })
 }
 
 // 修改物资类型
 export const updateType = async (data: TypeVO) => {
-  return await request.post({ url: '/iscs/type/updateIsMaterialsType', data })
+  return await request.put({ url: '/iscs/materials-type/updateMaterialsType', data })
 }
 
 // 删除物资类型
-export const deleteType = async (id: number) => {
-  return await request.post({
-    url: '/iscs/type/deleteIsMaterialsTypeByMaterialsTypeIds',
-    params: { materialsTypeIds: id }
+export const deleteType = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/materials-type/deleteMaterialsTypeList?ids='+ids,
+
   })
 }

src/views/dv/lotoStation/LotoStationForm.vue

@@ -71,8 +71,8 @@ import * as LotoStationApi from '@/api/dv/lotoStation/index'
 // import { genCode } from '@/api/system/autocode/rule'
 import { getIsMapPage } from '@/api/basic/mapconfig/index'
 import { listHardware } from '@/api/hw/hardware/information/index'
-// import { listMarsDept } from '@/api/system/marsdept'
-
+import { listMarsDept } from '@/api/system/marsdept'
+import {  handleTree } from '@/utils/tree'
 defineOptions({ name: 'LotoStationForm' })
 
 const { t } = useI18n() // 国际化
@@ -120,16 +120,16 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 获取岗位数据
-  const deptRes = await listMarsDept({ current: 1, size: -1 })
-  marsOptions.value = handleTree(deptRes.data.records, 'workstationId', 'parentId')
+  const deptRes = await listMarsDept({ pageNo: 1, pageSize: 99 })
+  marsOptions.value = handleTree(deptRes.list)
 
   // 获取地图数据
-  const mapRes = await getIsMapPage({ current: 1, size: -1 })
-  mapOptions.value = mapRes.data.records
+  const mapRes = await getIsMapPage({ pageNo: 1, pageSize: 99 })
+  mapOptions.value = mapRes.list
 
   // 获取硬件数据
-  const hwRes = await listHardware({ current: 1, size: -1 })
-  hardWareList.value = hwRes.data.records.map(item => ({
+  const hwRes = await listHardware({ pageNo: 1, pageSize: 99 })
+  hardWareList.value = hwRes.list.map(item => ({
     value: item.serialNumber,
     label: item.hardwareName
   }))

src/views/hw/hardware/information/HardwareForm.vue

@@ -17,17 +17,17 @@
 <!--            />-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="3">
-          <el-form-item label-width="80">
-            <el-switch
-              v-model="autoGenFlag"
-              active-color="#13ce66"
-              active-text="自动生成"
-              @change="handleAutoGenChange"
-              v-if="formType !== 'view'"
-            />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="3">-->
+<!--          <el-form-item label-width="80">-->
+<!--            <el-switch-->
+<!--              v-model="autoGenFlag"-->
+<!--              active-color="#13ce66"-->
+<!--              active-text="自动生成"-->
+<!--              @change="handleAutoGenChange"-->
+<!--              v-if="formType !== 'view'"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="11">
           <el-form-item label="硬件类型" prop="hardwareTypeId">
             <el-tree-select
@@ -150,7 +150,7 @@ import { ref, reactive } from 'vue'
 import { handleTree } from '@/utils/tree'
 import * as HardwareApi from '@/api/hw/hardware/information/index'
 import * as HardwareTypeApi from '@/api/hw/type/hardwaretype/index'
-import {listHardwareType} from "@/api/hw/type/hardwaretype/index";
+
 // import * as AutocodeApi from '@/api/system/autocode/rule'
 
 defineOptions({ name: 'HardwareForm' })

src/views/hw/hardware/information/index.vue

@@ -173,6 +173,7 @@ import { handleTree } from '@/utils/tree'
 import * as HardwareApi from '@/api/hw/hardware/information/index'
 import * as HardwareTypeApi from '@/api//hw/type/hardwaretype/index'
 import HardwareForm from './HardwareForm.vue'
+import {listHardwareType} from "@/api//hw/type/hardwaretype/index";
 
 defineOptions({ name: 'HardwareInfo' })
 
@@ -217,7 +218,7 @@ const getList = async () => {
       queryParams.endTime = dateFormatter(createTime.value[1])
     }
     const data = await HardwareApi.listHardware(queryParams)
-    list.value = data.records
+    list.value = data.list
     total.value = data.total
   } finally {
     loading.value = false
@@ -265,8 +266,8 @@ const handleDelete = async (id?: number) => {
 /** 获取硬件类型树形数据 */
 const getHardwareTypeTree = async () => {
   const data = { pageNo: 1, pageSize: 10000 }
-  const response = await HardwareTypeApi.listHanrwareType(data)
-  hardwareTypeOption.value = handleTree(response.records)
+  const response = await HardwareTypeApi.listHardwareType(data)
+  hardwareTypeOption.value = handleTree(response.list)
 }
 
 /** 初始化 **/

src/views/hw/type/hardwaretype/HardwareTypeForm.vue

@@ -13,60 +13,44 @@
             <el-tree-select
               v-model="formData.parentTypeId"
               :data="typeOptions"
-              :props="defaultProps"
+              :props="{ value: 'id', label: 'hardwareTypeName', children: 'children' }"
               placeholder="请选择父类型"
             />
           </el-form-item>
         </el-col>
       </el-row>
-
-<!--      <el-row>-->
-<!--        <el-col :span="18">-->
-<!--          <el-form-item label="硬件编号" prop="hardwareTypeCode">-->
-<!--            <el-input-->
-<!--              v-model="formData.hardwareTypeCode"-->
-<!--              placeholder="请输入硬件编号"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="6">-->
-<!--          <el-form-item label-width="30">-->
-<!--            <el-switch-->
-<!--              v-model="autoGenFlag"-->
-<!--              active-text="自动生成"-->
-<!--              @change="handleAutoGenChange"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="硬件名称" prop="hardwareTypeName">
-            <el-input
-              v-model="formData.hardwareTypeName"
-              placeholder="请输入硬件名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="状态" prop="enableFlag">
-            <el-radio-group v-model="formData.enableFlag">
-              <el-radio label="y">启用</el-radio>
-              <el-radio label="n">禁用</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
+      <!--      <el-row>-->
+      <!--        <el-col :span="18">-->
+      <!--          <el-form-item label="硬件编号" prop="hardwareTypeCode">-->
+      <!--            <el-input-->
+      <!--              v-model="formData.hardwareTypeCode"-->
+      <!--              placeholder="请输入硬件编号"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="6">-->
+      <!--          <el-form-item label-width="30">-->
+      <!--            <el-switch-->
+      <!--              v-model="autoGenFlag"-->
+      <!--              active-text="自动生成"-->
+      <!--              @change="handleAutoGenChange"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-form-item label="硬件名称" prop="hardwareTypeName">
+        <el-input v-model="formData.hardwareTypeName" placeholder="请输入硬件名称" />
+      </el-form-item>
+      <el-form-item label="状态" prop="enableFlag">
+        <el-radio-group v-model="formData.enableFlag">
+          <el-radio label="y">启用</el-radio>
+          <el-radio label="n">禁用</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input
-              v-model="formData.remark"
-              type="textarea"
-              placeholder="请输入内容"
-            />
+            <el-input v-model="formData.remark" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -81,7 +65,7 @@
 <script lang="ts" setup>
 import * as HardwareTypeApi from '@/api/hw/type/hardwaretype/index'
 // import { genCode } from '@/api/system/autocode/rule'
-
+import { handleTree } from '@/utils/tree'
 defineOptions({ name: 'HardwareTypeForm' })
 
 const { t } = useI18n() // 国际化
@@ -95,7 +79,7 @@ const formData = ref({
   id: undefined,
   parentTypeId: 0,
   ancestors: null,
-  enableFlag: 'n',
+  enableFlag: 'y',
   remark: null,
   createBy: null,
   createTime: null,
@@ -112,29 +96,30 @@ const formRef = ref() // 表单 Ref
 
 // 类型树相关
 const typeOptions = ref([])
-const defaultProps = {
-  children: 'children',
-  label: 'hardwareTypeName'
-}
+
 
 // 自动生成编码
 const autoGenFlag = ref(false)
 
-/** 获取类型树 */
+  /** 获取类型树 */
 const getTypeTree = async () => {
-  const res = await HardwareTypeApi.listHanrwareType({
-    pageNo: 1,
-    pageSize: -1
-  })
-  typeOptions.value = res.data.records
+  try {
+    const data = await HardwareTypeApi.listHardwareType({ pageNo: 1, pageSize: -1 })
+    typeOptions.value  = handleTree(data.list)
+  } catch (error) {
+    console.error('获取岗位树选项失败:', error)
+  }
 }
-
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, parentTypeId?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  // 设置父级ID
+  if (parentTypeId) {
+    formData.value.parentTypeId = parentTypeId
+  }
   await getTypeTree()
   // 修改时，设置数据
   if (id) {
@@ -190,7 +175,7 @@ const resetForm = () => {
     id: undefined,
     parentTypeId: 0,
     ancestors: null,
-    enableFlag: 'n',
+    enableFlag: 'y',
     remark: null,
     createBy: null,
     createTime: null,

src/views/hw/type/hardwaretype/index.vue

@@ -8,15 +8,15 @@
       :inline="true"
       label-width="100px"
     >
-      <el-form-item label="硬件编号" prop="hardwareTypeCode">
-        <el-input
-          v-model="queryParams.hardwareTypeCode"
-          placeholder="请输入硬件编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+<!--      <el-form-item label="硬件编号" prop="hardwareTypeCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.hardwareTypeCode"-->
+<!--          placeholder="请输入硬件编号"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="类型名称" prop="hardwareTypeName">
         <el-input
           v-model="queryParams.hardwareTypeName"
@@ -69,20 +69,20 @@
       v-if="refreshTable"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column
-        prop="hardwareTypeCode"
-        label="硬件编号"
-        width="220"
-        align="center"
-      />
+<!--      <el-table-column-->
+<!--        prop="hardwareTypeCode"-->
+<!--        label="硬件编号"-->
+<!--        width="220"-->
+<!--        align="center"-->
+<!--      />-->
       <el-table-column
         prop="hardwareTypeName"
         label="类型名称"
-        width="150"
+
         align="center"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="状态" align="center" prop="enableFlag" width="100">
+      <el-table-column label="状态" align="center" prop="enableFlag" >
         <template #default="{ row }">
           <el-tag :type="row.enableFlag === 'y' ? 'success' : 'danger'">
             {{ row.enableFlag === 'y' ? '启用' : '禁用' }}
@@ -91,11 +91,11 @@
       </el-table-column>
       <el-table-column prop="remark" label="备注" align="center" />
       <el-table-column label="操作" align="center" width="200">
-        <template #default="{ row }">
+        <template #default="scope">
           <el-button
             link
             type="primary"
-            @click="openForm('update', row.id)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:hw:type:update']"
           >
             修改
@@ -103,16 +103,16 @@
           <el-button
             link
             type="primary"
-            @click="openForm('create', row.id)"
+            @click="openForm('create',undefined, scope.row.id)"
             v-hasPermi="['mes:hw:type:create']"
           >
             新增
           </el-button>
           <el-button
-            v-if="row.parentTypeId !== 0"
+            v-if="scope.row.parentTypeId !== 0"
             link
             type="danger"
-            @click="handleDelete(row.id)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:hw:type:delete']"
           >
             删除
@@ -155,7 +155,8 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await HardwareTypeApi.listHardwareType(queryParams)
-    list.value = handleTree(data.data.records, 'id', 'parentTypeId')
+
+    list.value = handleTree(data.list,'id', 'parentTypeId')
   } finally {
     loading.value = false
   }
@@ -184,8 +185,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, id?: number,parentTypeId?: number) => {
+  formRef.value.open(type, id,parentTypeId)
 }
 
 /** 删除按钮操作 */

src/views/hw/type/locksettype/LockSetTypeForm.vue

@@ -7,85 +7,50 @@
       :rules="formRules"
       label-width="150px"
     >
-      <el-row>
-        <el-col :span="18">
-          <el-form-item label="父级" prop="parentTypeId">
-            <el-tree-select
-              v-model="formData.parentTypeId"
-              :data="typeOptions"
-              :props="defaultProps"
-              placeholder="选择父级"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-<!--      <el-row>-->
-<!--        <el-col :span="19">-->
-<!--          <el-form-item label="锁具机构类型编码" prop="locksetTypeCode">-->
-<!--            <el-input-->
-<!--              v-model="formData.locksetTypeCode"-->
-<!--              placeholder="请输入锁具机构类型编码"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="3">-->
-<!--          <el-form-item label-width="80">-->
-<!--            <el-switch-->
-<!--              v-model="autoGenFlag"-->
-<!--              active-text="自动生成"-->
-<!--              @change="handleAutoGenChange"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-
-      <el-row>
-        <el-col :span="18">
-          <el-form-item label="锁具机构类型名称" prop="locksetTypeName">
-            <el-input
-              v-model="formData.locksetTypeName"
-              placeholder="请输入锁具机构类型名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="锁具机构类型图标" prop="locksetTypeIcon">
-            <ImageUploadSingle
-              :limit="1"
-              :value="formData.locksetTypeIcon"
-              :fileSize="5"
-              @onUploaded="handleIconUploaded"
-              @onRemoved="handleIconRemoved"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="锁具机构类型图片" prop="locksetTypeImg">
-            <ImageUploadSingle
-              :limit="1"
-              :value="formData.locksetTypeImg"
-              :fileSize="5"
-              @onUploaded="handleImgUploaded"
-              @onRemoved="handleImgRemoved"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="10">
-          <el-form-item label="锁具机构类型规格" prop="locksetTypeSpec">
-            <el-input
-              v-model="formData.locksetTypeSpec"
-              placeholder="请输入锁具机构类型规格"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="父级" prop="parentTypeId" v-if="formData.parentTypeId !== 0">
+        <el-tree-select
+          v-model="formData.parentTypeId"
+          :data="typeOptions"
+          :props="{ value: 'id', label: 'locksetTypeName', children: 'children' }"
+          placeholder="选择父级"
+        />
+      </el-form-item>
+
+      <!--      <el-row>-->
+      <!--        <el-col :span="19">-->
+      <!--          <el-form-item label="锁具机构类型编码" prop="locksetTypeCode">-->
+      <!--            <el-input-->
+      <!--              v-model="formData.locksetTypeCode"-->
+      <!--              placeholder="请输入锁具机构类型编码"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="3">-->
+      <!--          <el-form-item label-width="80">-->
+      <!--            <el-switch-->
+      <!--              v-model="autoGenFlag"-->
+      <!--              active-text="自动生成"-->
+      <!--              @change="handleAutoGenChange"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+
+      <el-form-item label="锁具机构类型名称" prop="locksetTypeName">
+        <el-input v-model="formData.locksetTypeName" placeholder="请输入锁具机构类型名称" />
+      </el-form-item>
+
+      <el-form-item label="锁具机构类型图标" prop="locksetTypeIcon">
+        <UploadImg :limit="1" v-model="formData.locksetTypeIcon" :fileSize="5" />
+      </el-form-item>
+
+      <el-form-item label="锁具机构类型图片" prop="locksetTypeImg">
+        <UploadImg :limit="1" v-model="formData.locksetTypeImg" :fileSize="5" />
+      </el-form-item>
+
+      <el-form-item label="锁具机构类型规格" prop="locksetTypeSpec">
+        <el-input v-model="formData.locksetTypeSpec" placeholder="请输入锁具机构类型规格" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -96,13 +61,8 @@
 
 <script lang="ts" setup>
 import * as LockSetTypeApi from '@/api/hw/type/locksettype/index'
-import {
-  addLocksetType,
-  getLocksetTypeInfo,
-  listLocksetType,
-  updateLocksetType
-} from "@/api/hw/type/locksettype/index";
 // import { genCode } from '@/api/system/autocode/rule'
+import { handleTree } from '@/utils/tree'
 
 defineOptions({ name: 'LockSetTypeForm' })
 
@@ -130,10 +90,6 @@ const formRef = ref() // 表单 Ref
 
 // 类型树相关
 const typeOptions = ref([])
-const defaultProps = {
-  children: 'children',
-  label: 'locksetTypeName'
-}
 
 // 自动生成编码
 const autoGenFlag = ref(false)
@@ -144,24 +100,25 @@ const getTypeTree = async () => {
     pageNo: 1,
     pageSize: -1
   })
-  typeOptions.value = handleTree(res.data.records, 'locksetTypeId', 'parentTypeId')
+  typeOptions.value = handleTree(res.list, 'id', 'parentTypeId')
 }
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, parentTypeId?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  // 设置父级ID
+  if (parentTypeId) {
+    formData.value.parentTypeId = parentTypeId
+  }
   await getTypeTree()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await LockSetTypeApi.getLocksetTypeInfo(id)
-      if (formData.value.parentTypeId === 0) {
-        formData.value.parentTypeId = undefined
-      }
     } finally {
       formLoading.value = false
     }
@@ -205,26 +162,6 @@ const submitForm = async () => {
 //   }
 // }
 
-/** 图标上传成功 */
-const handleIconUploaded = (imgUrl: any[]) => {
-  formData.value.locksetTypeIcon = imgUrl[0].url
-}
-
-/** 图标移除 */
-const handleIconRemoved = () => {
-  formData.value.locksetTypeIcon = undefined
-}
-
-/** 图片上传成功 */
-const handleImgUploaded = (imgUrl: any[]) => {
-  formData.value.locksetTypeImg = imgUrl[0].url
-}
-
-/** 图片移除 */
-const handleImgRemoved = () => {
-  formData.value.locksetTypeImg = undefined
-}
-
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {

src/views/hw/type/locksettype/index.vue

@@ -53,7 +53,7 @@
     <el-table
       v-loading="loading"
       :data="list"
-      row-key="locksetTypeId"
+      row-key="id"
       :default-expand-all="isExpandAll"
       v-if="refreshTable"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -97,11 +97,11 @@
         align="center"
       />
       <el-table-column label="操作" align="center" width="200">
-        <template #default="{ row }">
+        <template #default="scope">
           <el-button
             link
             type="primary"
-            @click="openForm('update', row.locksetTypeId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:md:locksettype:update']"
           >
             修改
@@ -109,16 +109,16 @@
           <el-button
             link
             type="primary"
-            @click="openForm('create', row.locksetTypeId)"
+            @click="openForm('create',undefined,scope.row.id)"
             v-hasPermi="['mes:md:locksettype:create']"
           >
             新增
           </el-button>
           <el-button
-            v-if="row.parentTypeId !== 0"
+            v-if="scope.row.parentTypeId !== 0"
             link
             type="danger"
-            @click="handleDelete(row.locksetTypeId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:md:locksettype:delete']"
           >
             删除
@@ -135,7 +135,7 @@
 <script lang="ts" setup>
 import { handleTree } from '@/utils/tree'
 import * as LockSetTypeApi from '@/api/hw/type/locksettype/index'
-import {delLocksetType, listLocksetType} from "@/api/hw/type/locksettype/index";
+import LockSetTypeForm from "./LockSetTypeForm.vue"
 
 defineOptions({ name: 'LockSetType' })
 
@@ -160,7 +160,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await LockSetTypeApi.listLocksetType(queryParams)
-    list.value = handleTree(data.data.records, 'locksetTypeId', 'parentTypeId')
+    list.value = handleTree(data.list, 'id', 'parentTypeId')
   } finally {
     loading.value = false
   }
@@ -189,8 +189,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, id?: number,parentTypeId?: number) => {
+  formRef.value.open(type, id,parentTypeId)
 }
 
 /** 删除按钮操作 */

src/views/hw/type/padlocktype/index.vue

@@ -49,7 +49,7 @@
     <el-table
       v-loading="loading"
       :data="list"
-      row-key="lockTypeId"
+      row-key="id"
       :default-expand-all="isExpandAll"
       v-if="refreshTable"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -78,11 +78,11 @@
       </el-table-column>
       <el-table-column prop="lockTypeSpec" label="挂锁型号" width="260" align="center" />
       <el-table-column label="操作" align="center" width="200">
-        <template #default="{ row }">
+        <template #default="scope">
           <el-button
             link
             type="primary"
-            @click="openForm('update', row.lockTypeId)"
+            @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:md:locktype:update']"
           >
             修改
@@ -90,16 +90,16 @@
           <el-button
             link
             type="primary"
-            @click="openForm('create', row.lockTypeId)"
+            @click="openForm('create',undefined, scope.row.id)"
             v-hasPermi="['mes:md:locktype:create']"
           >
             新增
           </el-button>
           <el-button
-            v-if="row.parentTypeId !== 0"
+            v-if="scope.row.parentTypeId !== 0"
             link
             type="danger"
-            @click="handleDelete(row.lockTypeId)"
+            @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:md:locktype:delete']"
           >
             删除
@@ -141,7 +141,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await padLockTypeApi.listpadLockTypeApi(queryParams)
-    list.value = handleTree(data.data.records, 'lockTypeId', 'parentTypeId')
+    list.value = handleTree(data.list, 'id', 'parentTypeId')
   } finally {
     loading.value = false
   }
@@ -170,8 +170,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, id?: number,parentTypeId?:number) => {
+  formRef.value.open(type, id,parentTypeId)
 }
 
 /** 删除按钮操作 */

src/views/hw/type/padlocktype/padLockTypeForm.vue

@@ -7,94 +7,50 @@
       :rules="formRules"
       label-width="120px"
     >
-      <el-row>
-        <el-col :span="18">
-          <el-form-item label="父类型" prop="parentTypeId">
-            <el-tree-select
-              v-model="formData.parentTypeId"
-              :data="typeOptions"
-              :props="defaultProps"
-              placeholder="选择父级"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-form-item label="硬件类型" prop="hardwareTypeId">
+      <el-form-item label="父类型" prop="parentTypeId" v-if="formData.parentTypeId !== 0">
         <el-tree-select
-          v-model="formData.hardwareTypeId"
-          :data="hardwareTypeOptions"
-          :props="hardwareTypeProps"
-          placeholder="请选择硬件类型"
+          v-model="formData.parentTypeId"
+          :data="typeOptions"
+          :props="{ value: 'id', label: 'lockTypeName', children: 'children' }"
+          placeholder="选择父级"
         />
       </el-form-item>
 
-      <el-row>
-        <el-col :span="18">
-          <el-form-item label="挂锁类型名称" prop="lockTypeName">
-            <el-input
-              v-model="formData.lockTypeName"
-              placeholder="请输入挂锁类型名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="挂锁类型名称" prop="lockTypeName">
+        <el-input v-model="formData.lockTypeName" placeholder="请输入挂锁类型名称" />
+      </el-form-item>
 
-<!--      <el-row>-->
-<!--        <el-col :span="19">-->
-<!--          <el-form-item label="挂锁类型编码" prop="lockTypeCode">-->
-<!--            <el-input-->
-<!--              v-model="formData.lockTypeCode"-->
-<!--              placeholder="请输入挂锁类型编码"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--        <el-col :span="3">-->
-<!--          <el-form-item label-width="80">-->
-<!--            <el-switch-->
-<!--              v-model="autoGenFlag"-->
-<!--              active-text="自动生成"-->
-<!--              @change="handleAutoGenChange"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
+      <!--      <el-row>-->
+      <!--        <el-col :span="19">-->
+      <!--          <el-form-item label="挂锁类型编码" prop="lockTypeCode">-->
+      <!--            <el-input-->
+      <!--              v-model="formData.lockTypeCode"-->
+      <!--              placeholder="请输入挂锁类型编码"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="3">-->
+      <!--          <el-form-item label-width="80">-->
+      <!--            <el-switch-->
+      <!--              v-model="autoGenFlag"-->
+      <!--              active-text="自动生成"-->
+      <!--              @change="handleAutoGenChange"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+
+      <el-form-item label="挂锁型号" prop="lockTypeSpec">
+        <el-input v-model="formData.lockTypeSpec" placeholder="请输入挂锁型号" />
+      </el-form-item>
 
-      <el-row>
-        <el-col :span="10">
-          <el-form-item label="挂锁型号" prop="lockTypeSpec">
-            <el-input
-              v-model="formData.lockTypeSpec"
-              placeholder="请输入挂锁型号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="挂锁类型图标" prop="lockTypeIcon">
+        <UploadImg :limit="1" v-model="formData.lockTypeIcon" :fileSize="5" />
+      </el-form-item>
 
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="挂锁类型图标" prop="lockTypeIcon">
-            <ImageUploadSingle
-              :limit="1"
-              :value="formData.lockTypeIcon"
-              :fileSize="5"
-              @onUploaded="handleIconUploaded"
-              @onRemoved="handleIconRemoved"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="挂锁类型图片" prop="lockTypeImg">
-            <ImageUploadSingle
-              :limit="1"
-              :value="formData.lockTypeImg"
-              :fileSize="5"
-              @onUploaded="handleImgUploaded"
-              @onRemoved="handleImgRemoved"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="挂锁类型图片" prop="lockTypeImg">
+        <UploadImg :limit="1" v-model="formData.lockTypeImg" :fileSize="5" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -104,8 +60,11 @@
 </template>
 
 <script lang="ts" setup>
+import { handleTree } from '@/utils/tree'
 import * as padLockTypeApi from '@/api/hw/type/padLockType/index'
 import * as HardwareTypeApi from '@/api/hw/type/hardwaretype/index'
+import {listHardwareType} from "@/api/hw/type/hardwaretype/index";
+
 // import { genCode } from '@/api/system/autocode/rule'
 
 defineOptions({ name: 'LockTypeForm' })
@@ -135,17 +94,10 @@ const formRef = ref() // 表单 Ref
 
 // 类型树相关
 const typeOptions = ref([])
-const defaultProps = {
-  children: 'children',
-  label: 'lockTypeName'
-}
+
 
 // 硬件类型树相关
 const hardwareTypeOptions = ref([])
-const hardwareTypeProps = {
-  children: 'children',
-  label: 'hardwareTypeName'
-}
 
 // 自动生成编码
 const autoGenFlag = ref(false)
@@ -156,33 +108,38 @@ const getTypeTree = async () => {
     pageNo: 1,
     pageSize: -1
   })
-  typeOptions.value = handleTree(res.data.records, 'lockTypeId', 'parentTypeId')
+  typeOptions.value = handleTree(res.list, 'id', 'parentTypeId')
 }
 
 /** 获取硬件类型树 */
 const getHardwareTypeTree = async () => {
-  const res = await HardwareTypeApi.listHanrwareType({
+  const res = await HardwareTypeApi.listHardwareType({
     pageNo: 1,
     pageSize: -1
   })
-  hardwareTypeOptions.value = handleTree(res.data.records, 'id', 'parentTypeId')
+  hardwareTypeOptions.value = handleTree(res.list, 'id', 'parentTypeId')
 }
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number,parentTypeId?:number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  // 设置父级ID
+  if (parentTypeId) {
+    formData.value.parentTypeId = parentTypeId
+  }
+
   await Promise.all([getTypeTree(), getHardwareTypeTree()])
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await padLockTypeApi.getpadLockTypeInfoAPI(id)
-      if (formData.value.parentTypeId === 0) {
-        formData.value.parentTypeId = undefined
-      }
+      // if (formData.value.parentTypeId === 0) {
+      //   formData.value.parentTypeId = undefined
+      // }
     } finally {
       formLoading.value = false
     }

src/views/system/marsdept/MarsForm.vue

@@ -100,7 +100,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 获取岗位树选项 */
 const getDeptOptions = async () => {
   try {
-    const data = await MarsApi.listMarsDept({ current: 1, size: -1 })
+    const data = await MarsApi.listMarsDept({ pageNo: 1, pageSize: -1 })
     deptOptions.value = handleTree(data.list)
   } catch (error) {
     console.error('获取岗位树选项失败:', error)

src/views/system/marsdept/index.vue

@@ -55,12 +55,12 @@
     <el-table
       v-loading="loading"
       :data="list"
-      row-key="workstationId"
+      row-key="id"
       :default-expand-all="isExpandAll"
       v-if="refreshTable"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="id" label="岗位编号" width="130" />
+<!--      <el-table-column prop="id" label="岗位编号" width="130" />-->
       <el-table-column prop="workstationName" label="岗位名称" width="260" />
       <el-table-column prop="orderNum" label="排序" width="200" />
       <el-table-column prop="status" label="状态" width="150">
@@ -101,6 +101,7 @@
             新增
           </el-button>
           <el-button
+            v-if="scope.row.parentId !== 0"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
@@ -134,8 +135,8 @@ const router = useRouter() // 路由
 const loading = ref(true) // 列表的加载中
 const list = ref() // 列表的数据
 const queryParams = reactive({
-  current: 1,
-  size: -1,
+  pageNo: 1,
+  pageSize: -1,
   workstationName: undefined,
   status: undefined,
   userId: undefined