Merge branch 'master_hella' into master_hella_20240701

src/api/eam/basicEamWorkshop/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
 
 export interface BasicEamWorkshopVO {
   id: number

src/api/eam/documentTypeSelectSet/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {BasicSpotCheckSelectSetVO} from "@/api/eam/spotCheckSelectSet";
 
 export interface DocumentTypeSelectSetVO {
   id: number

src/api/eam/equipmentAccounts/index.ts

@@ -15,6 +15,7 @@ export interface EquipmentAccountsVO {
   principal: string
   principalTelephone: string
   status: string
+  changeReason: string
   startDate: Date
   supplierCode: string
   purchaseTime: Date
@@ -82,3 +83,8 @@ export const importTemplate = () => {
 export const getEquipmentAccountsNoPage = async (params) => {
   return await request.get({ url: `/eam/device/equipment-accounts/noPage`, params })
 }
+
+//停用启用
+export const ableEquipmentAccountsMain = async (data: EquipmentAccountsVO) => {
+  return await request.post({ url: `/eam/device/equipment-accounts/ables`, data })
+}

src/api/eam/inspectionItem/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet";
 
 export interface InspectionItemVO {
   id: number

src/components/UploadFile/src/UploadFile.vue

@@ -80,7 +80,7 @@ const uploadHeaders = ref({
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
-    message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
+    message.error(`${t('ts.上传文件数量不能超过').replace('ts.','')}${props.limit}!`)
     return false
   }
   let fileExtension = ''

src/views/eam/equipmentAccounts/equipmentAccounts.data.ts

@@ -631,7 +631,7 @@ export const EquipmentAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 200,
+      width: 250,
       fixed: 'right'
     }
   }

src/views/eam/equipmentAccounts/index.vue

@@ -1,22 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search
+    <Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-      :schema="EquipmentAccounts.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
   </ContentWrap>
 
-  <!-- 列表头部 -->
+    <!-- 列表头部 -->
-  <TableHead
+    <TableHead
-    :HeadButttondata="HeadButttondata"
+      :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
+      @button-base-click="buttonBaseClick"
-    :routeName="routeName"
+      :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
+      @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
+      @searchFormClick="searchFormClick"
-    :allSchemas="EquipmentAccounts.allSchemas"
+      :allSchemas="EquipmentAccounts.allSchemas"
-  />
+    />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -31,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{ row }">
+      <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBase  :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)"/>
       </template>
     </Table>
   </ContentWrap>
@@ -54,6 +50,8 @@
     :isBusiness="false"
   />
 
+  <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
+
   <!-- 详情 -->
   <DetailLedger 
     ref="detailRef" 
@@ -68,92 +66,54 @@
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
     funcCode="device_mould_file"
-  />
+    />
   <!-- 主要部件 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm
+  <ImportForm ref="importFormRef" url="/eam/device/equipment-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-    ref="importFormRef"
-    url="/eam/device/equipment-accounts/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { EquipmentAccounts, EquipmentAccountsRules } from './equipmentAccounts.data'
+import { EquipmentAccounts,EquipmentAccountsRules } from './equipmentAccounts.data'
 import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import AblesForm from '@/views/eam/equipmentAccounts/ablesForm.vue'
 import DetailLedger from '@/components/Detail/src/DetailLedger.vue'
-import { RelationMainPart, RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import {
+import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
-  EquipmentMainPart,
-  EquipmentMainPartRules
-} from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { Item, ItemRules } from '../item/item.data'
+import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
-import * as ItemApi from '@/api/eam/item'
+import * as SparePartApi from '@/api/eam/sparePart'
-import {
-  EquipmentToolSparePart,
-  EquipmentToolSparePartRules
-} from '../equipmentToolSparePart/equipmentToolSparePart.data'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import {
+import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
-  EquipmentReportRepairRequest,
-  EquipmentReportRepairRequestRules
-} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import {
+import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
-  EquipmentSpotCheckRecordMain,
-  EquipmentSpotCheckRecordMainRules
-} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import {
+import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
-  EquipmentSpotCheckRecordDetail,
-  EquipmentSpotCheckRecordDetailRules
-} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import {
+import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
-  EquipmentInspectionRecordMain,
-  EquipmentInspectionRecordMainRules
-} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import {
+import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
-  EquipmentInspectionRecordDetail,
-  EquipmentInspectionRecordDetailRules
-} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import {
+import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
-  EquipmentRepairRecordMain,
-  EquipmentRepairRecordMainRules
-} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import {
+import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
-  EquipmentRepairRecordDetail,
-  EquipmentRepairRecordDetailRules
-} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import {
+import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
-  EquipmentMaintenanceRecordMain,
-  EquipmentMaintenanceRecordMainRules
-} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import {
+import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
-  EquipmentMaintenanceRecordDetail,
-  EquipmentMaintenanceRecordDetailRules
-} from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 
+
 defineOptions({ name: 'EquipmentAccounts' })
 
 const message = useMessage() // 消息弹窗
@@ -164,27 +124,28 @@ const routeName = ref()
 const deviceNumber = ref()
 routeName.value = route.name
 const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string }[]>([])
+const tabs = ref<{ label: string; prop: string; }[]>([])
-const subTabList = ref([])
+const subTabList = ref([]);
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
 const dialogAllSchemas = ref()
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    if (formField == 'workshopName') {
+    if(formField == 'workshopName'){
       setV['workshopCode'] = val[0]['code']
       setV['workshopName'] = val[0]['name']
-    } else if (formField == 'lineName') {
+    }else if(formField == 'lineName'){
       setV['lineCode'] = val[0]['code']
       setV['lineName'] = val[0]['name']
-    } else if (formField == 'manufactureName') {
+    }else if(formField == 'manufactureName'){
       setV['manufactureCode'] = val[0]['number']
       setV['manufactureName'] = val[0]['name']
-    } else if (formField == 'supplierName') {
+    }else if(formField == 'supplierName'){
       setV['supplierCode'] = val[0]['number']
       setV['supplierName'] = val[0]['name']
     }
@@ -193,22 +154,24 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 
 const operationRecordList = ref([
-  { label: '报修记录', value: 'report' },
+  {label:'报修记录',value:'report'},
-  { label: '维修记录', value: 'repair' },
+  {label:'维修记录',value:'repair'},
-  { label: '保养记录', value: 'maintenance' },
+  {label:'保养记录',value:'maintenance'},
-  { label: '巡检记录', value: 'inspection' },
+  {label:'巡检记录',value:'inspection'},
-  { label: '点检记录', value: 'spot_check' }
+  {label:'点检记录',value:'spot_check'},
+
 ])
 
+
 const dynamicInfoFields = ref([
-  'totalRunningTime',
+    "totalRunningTime",
-  'maintenanceRunningTime',
+    "maintenanceRunningTime",
-  'usageTimes',
+    "usageTimes",
-  'lastInspectionDate',
+    "lastInspectionDate",
-  'outageRate',
+    "outageRate",
-  'breakdownRecover',
+    "breakdownRecover",
-  'purchaseInterval'
+    "purchaseInterval"
-])
+]);
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -224,12 +187,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'eam:equipment-accounts:create' }), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-accounts:create'}), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'eam:equipment-accounts:import' }), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'eam:equipment-accounts:export' }), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-accounts:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -242,85 +205,105 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') {
+  if (val == 'add') { // 新增
-    // 新增
     openForm('create')
-  } else if (val == 'import') {
+  } else if (val == 'import') { // 导入
-    // 导入
     handleImport()
-  } else if (val == 'export') {
+  } else if (val == 'export') { // 导出
-    // 导出
     handleExport()
-  } else if (val == 'refresh') {
+  } else if (val == 'refresh') { // 刷新
-    // 刷新
     getList()
-  } else if (val == 'filtrate') {
+  } else if (val == 'filtrate') { // 筛选
-    // 筛选
+  } else { // 其他按钮
-  } else {
-    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'eam:equipment-accounts:update' }), // 编辑
+  return [
-  defaultButtons.componentBtn({ hasPermi: 'eam:equipment-accounts:component' }), // 部件
+    defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-accounts:update'}), // 编辑
-  defaultButtons.sparePartBtn({ hasPermi: 'eam:equipment-accounts:item' }) // 备件
+    defaultButtons.componentBtn({hasPermi:'eam:equipment-accounts:component'}), // 部件
-  // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除
+    defaultButtons.sparePartBtn({hasPermi:'eam:equipment-accounts:item'}), // 备件
-]
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicFaultType:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicFaultType:update'}),
+  ]
+}
+
+//启用禁用
+const ablesFormRef = ref()
+function openables(row, val) {
+  ablesFormRef.value.open(val,row);
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
+  if (val == 'edit') { // 编辑
-    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') {
+  } else if (val == 'delete') { // 删除
-    // 删除
     handleDelete(row.id)
-  } else if (val == 'component') {
+  } else if (val == 'component') { // 部件
-    // 部件
     openComponent(row)
-  } else if (val == 'sparePart') {
+  } else if (val == 'sparePart') { // 备件
-    // 备件
     openSparePart(row)
+  } else if (val == 'enable') { // 启用/禁用
+    openables(row,val)
+  } else if (val == 'disable') { // 启用/禁用
+    openables(row,val)
   }
 }
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if (type == 'update') {
+  if(type == 'update'){
-    const equipmentManufacturerNoPage =
+    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
-      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
-    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
+    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
+    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(
+    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
-      (item) => item.number == row.manufactureCode
+    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
-    )?.name
+
-    row.supplierName = equipmentSupplierNoPage?.find(
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
-      (item) => item.number == row.supplierCode
+      if (item.field == 'status') {
-    )?.name
+        item.componentProps.disabled = false
+
+      }
+    })
+  }else{
+    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'status') {
+        item.componentProps.disabled = true
+        item.value = 'TOACCEPT'
+      }
+    })
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType, data) => {
+const formsSuccess = async (formType,data) => {
-  var isHave = EquipmentAccounts.allSchemas.formSchema.some(function (item) {
+  var isHave =EquipmentAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime'
+    return item.field === 'activeTime' || item.field === 'expireTime';
-  })
+  });
-  if (isHave) {
+  if(isHave){
-    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
       message.error('失效时间要大于生效时间')
-      return
+      return;
     }
   }
-  if (data.activeTime == 0) data.activeTime = null
+  if(data.activeTime==0)data.activeTime = null;
-  if (data.expireTime == 0) data.expireTime = null
+  if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
     await EquipmentAccountsApi.createEquipmentAccounts(data)
     message.success(t('common.createSuccess'))
@@ -391,49 +374,60 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+//ablesForm 提交按钮回传
+const getData=(val)=> {
+  nextTick?.(async () => {
+    await getList()
+  })
+}
+
+//ablesForm 关闭按钮回传
+const getClosed=(val)=> {
+  nextTick?.(() => {
+    console.log(val)
+    getList()
+  })
+}
+
+
 const searchTableRef = ref()
 const searchSparePartTableRef = ref()
 const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({
+  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'DEVICE'  }).then(async (res) => {
-    equipmentCode: row.code,
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'DEVICE' }).then(response => {
-    type: 'DEVICE'
+      searchTableSelections.value = response.filter(element => {
-  }).then(async (res) => {
+        let flag = false;
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'DEVICE' }).then((response) => {
+        res.forEach(item => {
-      searchTableSelections.value = response.filter((element) => {
-        let flag = false
-        res.forEach((item) => {
           if (element.code == item.mainPartCode) {
-            flag = true
+            flag = true;
           }
-        })
+        });
-        return flag
+        return flag;
-      })
+      });
-    })
+    });
-  })
+  });
-}
+};
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
-    equipmentToolCode: row.code
+    await SparePartApi.getSparePartNoPage({}).then(response => {
-  }).then(async (res) => {
+      searchTableSparePartSelections.value = response.filter(element => {
-    await SparePartApi.getSparePartNoPage({}).then((response) => {
+        let flag = false;
-      searchTableSparePartSelections.value = response.filter((element) => {
+        res.forEach(item => {
-        let flag = false
-        res.forEach((item) => {
           if (element.code == item.sparePartCode) {
-            flag = true
+            flag = true;
           }
-        })
+        });
-        return flag
+        return flag;
-      })
+      });
-    })
+    });
-  })
+  });
-}
+};
 /** 绑定备件操作 */
-const openComponent = async (row: any) => {
+const openComponent = async (row : any) => {
   await syncData(row)
   searchTableRef.value.open(
     '选择部件',
@@ -442,9 +436,9 @@ const openComponent = async (row: any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null, //type
+    null,//type
     row,
-    { type: 'DEVICE' },
+    {type: 'DEVICE'},
     null,
     null,
     null,
@@ -452,16 +446,16 @@ const openComponent = async (row: any) => {
   )
 }
 
-const openSparePart = async (row: any) => {
+const openSparePart = async (row : any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    Item.allSchemas,
+    SparePart.allSchemas,
-    ItemApi.getItemPage,
+    SparePartApi.getSparePartPage,
-    'item',
+    'sparePartPart',
-    Item.allSchemas.searchSchema,
+    SparePart.allSchemas.searchSchema,
     true,
-    null, //type
+    null,//type
     row,
     null,
     null,
@@ -473,36 +467,35 @@ const openSparePart = async (row: any) => {
 
 const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
   const deviceMainPartRelList = val.map((element) => ({
-    mainPartCode: element.number,
+      mainPartCode: element.code,
-    equipmentCode: rowRef.code,
+      equipmentCode: rowRef.code,
-    type: 'DEVICE'
+      type: 'DEVICE'
-  }))
+    }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
     message.success(t('common.createSuccess'))
     getList()
   })
 }
 const handleOperationTabsChange = (val) => {
-  if (val == 'report') {
+  if(val == 'report'){
     apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
     detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
-  } else if (val == 'repair') {
+  }else if(val == 'repair'){
     apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
     detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
     dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
     dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
-  } else if (val == 'maintenance') {
+  }else if(val == 'maintenance'){
     apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
     detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
-    dialogApiPage.value =
+    dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
-      EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
     dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
-  } else if (val == 'inspection') {
+  }else if(val == 'inspection'){
     apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
     detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
     dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
     dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
-  } else if (val == 'spot_check') {
+  }else if(val == 'spot_check'){
     apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
     detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
     dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
@@ -512,16 +505,14 @@ const handleOperationTabsChange = (val) => {
 
 const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
   const equipmentToolSparePartRelList = val.map((element) => ({
-    sparePartCode: element.number,
+      sparePartCode: element.code,
-    equipmentToolCode: rowRef.code,
+      equipmentToolCode: rowRef.code,
-    type: 'DEVICE'
+      type: 'DEVICE'
-  }))
+    }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
-    (res) => {
+    message.success(t('common.createSuccess'))
-      message.success(t('common.createSuccess'))
+    getList()
-      getList()
+  })
-    }
-  )
 }
 
 /** 初始化 **/
@@ -529,4 +520,5 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
 })
+
 </script>

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -337,6 +337,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '产品类',
+    field: 'prodCla',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -465,15 +474,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable: false
   },
-  {
-    label: '产品类',
-    field: 'prodCla',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 100
-    } ,
-  },
   { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   {
     label: '操作',

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -154,7 +154,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
-  // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue

@@ -237,6 +237,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'INITIAL'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

@@ -475,6 +475,12 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'INITIAL'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters