From 287ed98f2eaf016934a57635f75ceb533ea51ea6 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 5 Jul 2024 13:27:32 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7/?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E6=96=B0=E5=A2=9E=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts    |  9 ++
 .../deliverRequestMain.data.ts                |  4 +-
 .../deliverPlanMain/deliverPlanMain.data.ts   | 86 +++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 8b51c9881..7db799ca6 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -465,6 +465,15 @@ 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: '操作',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 2e481c612..b9c9fbe01 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -6,7 +6,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
 import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
-import { DeliverPlanMain ,DeliverPlanDetail} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+import { DeliverPlanMain ,DeliverPlanDetail,DeliverPlanDetailRequest} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
 
 import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
@@ -190,7 +190,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '发货计划信息', // 查询弹窗标题
-        searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: DeliverPlanDetailRequest.allSchemas, // 查询弹窗所需类
         searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 753350d31..fac92203b 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -873,3 +873,89 @@ export const DeliverPlanDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
+
+/**
+ * @returns {Array} 发货计划子表
+ */
+export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+ {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '客户物料基础信息',
+      searchAllSchemas: Customeritem.allSchemas,
+      searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '客户物料基础信息',
+        searchAllSchemas: Customeritem.allSchemas,
+        searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
+      }
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
\ No newline at end of file

From ff1a7a039f36b94cc980305e318a3eeb3f15339a Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 13:41:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0type?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrap/productreceiptscrapJobMain/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 345042c99..ce5ab9968 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -299,7 +299,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':'predict'
+    'value':'scrap'
   }
   searchData.filters.push(cmd)
   tableObject.params = {

From 7187d0348eba2e215cb8c77d85ef11506d371287 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 13:45:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=B2=A1=E4=BC=A0type=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRecordMain/index.vue                 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index 84962d800..e5f369ecc 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -208,6 +208,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'scrap'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From 592d773f69544168254a3e4166f9fa88d19844bb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 5 Jul 2024 13:45:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/disposition/defaultButtons.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index edb8b8d7e..7f637131d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1154,7 +1154,7 @@ export function mainCopyBtn(option: any) {
 // 主列表-部件
 export function componentBtn(option: any) {
   return __defaultBtnOption(option, {
-    label: '部件',
+    label: '关联部件',
     name: 'component',
     hide: false,
     type: 'primary',
@@ -1166,7 +1166,7 @@ export function componentBtn(option: any) {
 // 主列表-备件
 export function sparePartBtn(option: any) {
   return __defaultBtnOption(option, {
-    label: '备件',
+    label: '关联备件',
     name: 'sparePart',
     hide: false,
     type: 'primary',

From 3879353b0229401bfd676b8e8f1ca332184d7ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 5 Jul 2024 13:57:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/equipmentAccounts/index.vue | 368 ++++++++++++----------
 src/views/eam/toolAccounts/index.vue      | 350 +++++++++++---------
 2 files changed, 413 insertions(+), 305 deletions(-)

diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index e17ae39a8..7196e45b5 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="EquipmentAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="EquipmentAccounts.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="EquipmentAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,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" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -51,68 +55,105 @@
   />
 
   <!-- 详情 -->
-  <DetailLedger 
-    ref="detailRef" 
-    :isBasic="true" 
-    :allSchemas="EquipmentAccounts.allSchemas" 
-    :subTabs="subTabList" 
-    :operationRecordList="operationRecordList" 
-    @handleOperationTabsChange="handleOperationTabsChange" 
+  <DetailLedger
+    ref="detailRef"
+    :isBasic="true"
+    :allSchemas="EquipmentAccounts.allSchemas"
+    :subTabs="subTabList"
+    :operationRecordList="operationRecordList"
+    @handleOperationTabsChange="handleOperationTabsChange"
     :detailAllSchemas="detailAllSchemas"
     :apiPage="apiPage"
     :dialogApiPage="dialogApiPage"
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
     funcCode="device_mould_file"
-    />
+  />
   <!-- 主要部件 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/device/equipment-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    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 DetailLedger from '@/components/Detail/src/DetailLedger.vue'
-import { RelationMainPart,RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
+import { RelationMainPart, RelationMainPartRules } from '../relationMainPart/relationMainPart.data'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
+import {
+  EquipmentMainPart,
+  EquipmentMainPartRules
+} from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
-import * as SparePartApi from '@/api/eam/sparePart'
-import { EquipmentToolSparePart,EquipmentToolSparePartRules } from '../equipmentToolSparePart/equipmentToolSparePart.data'
+import { Item, ItemRules } from '../item/item.data'
+import * as ItemApi from '@/api/eam/item'
+import {
+  EquipmentToolSparePart,
+  EquipmentToolSparePartRules
+} from '../equipmentToolSparePart/equipmentToolSparePart.data'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import {
+  EquipmentReportRepairRequest,
+  EquipmentReportRepairRequestRules
+} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import {
+  EquipmentSpotCheckRecordMain,
+  EquipmentSpotCheckRecordMainRules
+} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import {
+  EquipmentSpotCheckRecordDetail,
+  EquipmentSpotCheckRecordDetailRules
+} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import {
+  EquipmentInspectionRecordMain,
+  EquipmentInspectionRecordMainRules
+} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import {
+  EquipmentInspectionRecordDetail,
+  EquipmentInspectionRecordDetailRules
+} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import {
+  EquipmentRepairRecordMain,
+  EquipmentRepairRecordMainRules
+} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import {
+  EquipmentRepairRecordDetail,
+  EquipmentRepairRecordDetailRules
+} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import {
+  EquipmentMaintenanceRecordMain,
+  EquipmentMaintenanceRecordMainRules
+} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import {
+  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() // 消息弹窗
@@ -123,8 +164,8 @@ const routeName = ref()
 const deviceNumber = ref()
 routeName.value = route.name
 const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string; }[]>([])
-const subTabList = ref([]);
+const tabs = ref<{ label: string; prop: string }[]>([])
+const subTabList = ref([])
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
@@ -134,16 +175,16 @@ 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']
     }
@@ -152,24 +193,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 
 const operationRecordList = ref([
-  {label:'报修记录',value:'report'},
-  {label:'维修记录',value:'repair'},
-  {label:'保养记录',value:'maintenance'},
-  {label:'巡检记录',value:'inspection'},
-  {label:'点检记录',value:'spot_check'},
-
+  { label: '报修记录', value: 'report' },
+  { label: '维修记录', value: 'repair' },
+  { label: '保养记录', value: 'maintenance' },
+  { label: '巡检记录', value: 'inspection' },
+  { label: '点检记录', value: 'spot_check' }
 ])
 
-
 const dynamicInfoFields = ref([
-    "totalRunningTime",
-    "maintenanceRunningTime",
-    "usageTimes",
-    "lastInspectionDate",
-    "outageRate",
-    "breakdownRecover",
-    "purchaseInterval"
-]);
+  'totalRunningTime',
+  'maintenanceRunningTime',
+  'usageTimes',
+  'lastInspectionDate',
+  'outageRate',
+  'breakdownRecover',
+  'purchaseInterval'
+])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -185,12 +224,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-accounts:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-accounts:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'eam:equipment-accounts:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'eam:equipment-accounts:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'eam:equipment-accounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -203,37 +242,47 @@ 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 { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-accounts:update'}), // 编辑
-  defaultButtons.componentBtn({hasPermi:'eam:equipment-accounts:component'}), // 部件
-  defaultButtons.sparePartBtn({hasPermi:'eam:equipment-accounts:item'}), // 备件
+  defaultButtons.mainListEditBtn({ hasPermi: 'eam:equipment-accounts:update' }), // 编辑
+  defaultButtons.componentBtn({ hasPermi: 'eam:equipment-accounts:component' }), // 部件
+  defaultButtons.sparePartBtn({ hasPermi: 'eam:equipment-accounts:item' }) // 备件
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 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)
   }
 }
@@ -241,46 +290,37 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if(type == 'update'){
-    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+  if (type == 'update') {
+    const equipmentManufacturerNoPage =
+      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
-    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
-    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
-
-    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'status') {
-        item.componentProps.disabled = false
-
-      }
-    })
-  }else{
-    EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'status') {
-        item.componentProps.disabled = true
-        item.value = 'TOACCEPT'
-      }
-    })
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
+    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
+    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(
+      (item) => item.number == row.manufactureCode
+    )?.name
+    row.supplierName = equipmentSupplierNoPage?.find(
+      (item) => item.number == row.supplierCode
+    )?.name
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =EquipmentAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = EquipmentAccounts.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
       message.error('失效时间要大于生效时间')
-      return;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await EquipmentAccountsApi.createEquipmentAccounts(data)
     message.success(t('common.createSuccess'))
@@ -351,45 +391,49 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
 const searchTableRef = ref()
 const searchSparePartTableRef = ref()
 const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'DEVICE'  }).then(async (res) => {
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'DEVICE' }).then(response => {
-      searchTableSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
+  await RelationMainPartApi.getRelationMainPartNoPage({
+    equipmentCode: row.code,
+    type: 'DEVICE'
+  }).then(async (res) => {
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'DEVICE' }).then((response) => {
+      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({ equipmentToolCode: row.code}).then(async (res) => {
-    await SparePartApi.getSparePartNoPage({}).then(response => {
-      searchTableSparePartSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
+    equipmentToolCode: row.code
+  }).then(async (res) => {
+    await SparePartApi.getSparePartNoPage({}).then((response) => {
+      searchTableSparePartSelections.value = response.filter((element) => {
+        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(
     '选择部件',
@@ -398,9 +442,9 @@ const openComponent = async (row : any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
-    {type: 'DEVICE'},
+    { type: 'DEVICE' },
     null,
     null,
     null,
@@ -408,16 +452,16 @@ const openComponent = async (row : any) => {
   )
 }
 
-const openSparePart = async (row : any) => {
+const openSparePart = async (row: any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    SparePart.allSchemas,
-    SparePartApi.getSparePartPage,
-    'sparePartPart',
-    SparePart.allSchemas.searchSchema,
+    Item.allSchemas,
+    ItemApi.getItemPage,
+    'item',
+    Item.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
     null,
     null,
@@ -427,37 +471,38 @@ const openSparePart = async (row : any) => {
   )
 }
 
-const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
   const deviceMainPartRelList = val.map((element) => ({
-      mainPartCode: element.code,
-      equipmentCode: rowRef.code,
-      type: 'DEVICE'
-    }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
+    mainPartCode: element.number,
+    equipmentCode: rowRef.code,
+    type: 'DEVICE'
+  }))
+  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 = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogApiPage.value =
+      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
@@ -465,16 +510,18 @@ const handleOperationTabsChange = (val) => {
   }
 }
 
-const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
   const equipmentToolSparePartRelList = val.map((element) => ({
-      sparePartCode: element.code,
-      equipmentToolCode: rowRef.code,
-      type: 'DEVICE'
-    }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
-    message.success(t('common.createSuccess'))
-    getList()
-  })
+    sparePartCode: element.number,
+    equipmentToolCode: rowRef.code,
+    type: 'DEVICE'
+  }))
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+    (res) => {
+      message.success(t('common.createSuccess'))
+      getList()
+    }
+  )
 }
 
 /** 初始化 **/
@@ -482,5 +529,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
 })
-
 </script>
diff --git a/src/views/eam/toolAccounts/index.vue b/src/views/eam/toolAccounts/index.vue
index 0442cbfe7..27ebebe3f 100644
--- a/src/views/eam/toolAccounts/index.vue
+++ b/src/views/eam/toolAccounts/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ToolAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ToolAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ToolAccounts.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ToolAccounts.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,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" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -51,19 +55,19 @@
   />
 
   <!-- 详情 -->
-  <DetailLedger 
-    ref="detailRef" 
-    :isBasic="true" 
+  <DetailLedger
+    ref="detailRef"
+    :isBasic="true"
     :allSchemas="ToolAccounts.allSchemas"
-    :subTabs="subTabList" 
-    :operationRecordList="operationRecordList" 
-    @handleOperationTabsChange="handleOperationTabsChange" 
+    :subTabs="subTabList"
+    :operationRecordList="operationRecordList"
+    @handleOperationTabsChange="handleOperationTabsChange"
     :detailAllSchemas="detailAllSchemas"
     :apiPage="apiPage"
     :dialogApiPage="dialogApiPage"
     :dialogAllSchemas="dialogAllSchemas"
     :dynamicInfoFields="dynamicInfoFields"
-    funcCode="tool_mould_file" 
+    funcCode="tool_mould_file"
   />
 
   <!-- 主要部件 -->
@@ -71,40 +75,75 @@
   <!-- 备件 -->
   <SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/tool/tool-accounts/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/tool/tool-accounts/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ToolAccounts,ToolAccountsRules } from './toolAccounts.data'
+import { ToolAccounts, ToolAccountsRules } from './toolAccounts.data'
 import * as ToolAccountsApi from '@/api/eam/toolAccounts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as RelationMainPartApi from '@/api/eam/relationMainPart'
-import { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
+import {
+  EquipmentMainPart,
+  EquipmentMainPartRules
+} from '../equipmentMainPart/equipmentMainPart.data'
 import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
-import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
-import * as SparePartApi from '@/api/eam/sparePart'
+import { Item, ItemRules } from '../item/item.data'
+import * as ItemApi from '@/api/eam/item'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
-import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import {
+  EquipmentReportRepairRequest,
+  EquipmentReportRepairRequestRules
+} from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
-import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import {
+  EquipmentSpotCheckRecordMain,
+  EquipmentSpotCheckRecordMainRules
+} from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
 import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
-import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import {
+  EquipmentSpotCheckRecordDetail,
+  EquipmentSpotCheckRecordDetailRules
+} from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
 import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
-import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import {
+  EquipmentInspectionRecordMain,
+  EquipmentInspectionRecordMainRules
+} from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
 import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
-import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import {
+  EquipmentInspectionRecordDetail,
+  EquipmentInspectionRecordDetailRules
+} from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
 import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
-import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import {
+  EquipmentRepairRecordMain,
+  EquipmentRepairRecordMainRules
+} from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
-import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import {
+  EquipmentRepairRecordDetail,
+  EquipmentRepairRecordDetailRules
+} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
-import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import {
+  EquipmentMaintenanceRecordMain,
+  EquipmentMaintenanceRecordMainRules
+} from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
-import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import {
+  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'
@@ -120,18 +159,18 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ToolAccounts.allSchemas.tableColumns)
-const tabs = ref<{ label: string; prop: string; }[]>([])
-const subTabList = ref([]);
+const tabs = ref<{ label: string; prop: string }[]>([])
+const subTabList = ref([])
 const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
 const dialogAllSchemas = ref()
 const operationRecordList = ref([
-  {label:'报修记录',value:'report'},
-  {label:'维修记录',value:'repair'},
-  {label:'保养记录',value:'maintenance'},
-  {label:'巡检记录',value:'inspection'},
-  {label:'点检记录',value:'spot_check'},
+  { label: '报修记录', value: 'report' },
+  { label: '维修记录', value: 'repair' },
+  { label: '保养记录', value: 'maintenance' },
+  { label: '巡检记录', value: 'inspection' },
+  { label: '点检记录', value: 'spot_check' }
 ])
 
 // 查询页面返回
@@ -139,16 +178,16 @@ 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']
     }
@@ -170,12 +209,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:tool-accounts:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:tool-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:tool-accounts:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'eam:tool-accounts:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'eam:tool-accounts:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'eam:tool-accounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -188,37 +227,47 @@ 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 { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'eam:tool-accounts:update'}), // 编辑
-  defaultButtons.componentBtn({hasPermi:'eam:tool-accounts:component'}), // 部件
-  defaultButtons.sparePartBtn({hasPermi:'eam:tool-accounts:item'}), // 备件
+  defaultButtons.mainListEditBtn({ hasPermi: 'eam:tool-accounts:update' }), // 编辑
+  defaultButtons.componentBtn({ hasPermi: 'eam:tool-accounts:component' }), // 部件
+  defaultButtons.sparePartBtn({ hasPermi: 'eam:tool-accounts:item' }) // 备件
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:tool-accounts:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 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)
   }
 }
@@ -226,32 +275,37 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
-  if(type == 'update'){
-    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+  if (type == 'update') {
+    const equipmentManufacturerNoPage =
+      await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
     const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
     const workshopNoPage = await WorkshopApi.getWorkshopNoPage({})
-    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({});
-    row.workshopName = workshopNoPage?.find(item=>item.code == row.workshopCode)?.name
-    row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name
-    row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name
-    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
+    const productionlineNoPage = await ProductionlineApi.getProductionlineNoPage({})
+    row.workshopName = workshopNoPage?.find((item) => item.code == row.workshopCode)?.name
+    row.lineName = productionlineNoPage?.find((item) => item.code == row.lineCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(
+      (item) => item.number == row.manufactureCode
+    )?.name
+    row.supplierName = equipmentSupplierNoPage?.find(
+      (item) => item.number == row.supplierCode
+    )?.name
   }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ToolAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = ToolAccounts.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime'
+  })
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
       message.error('失效时间要大于生效时间')
-      return;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await ToolAccountsApi.createToolAccounts(data)
     message.success(t('common.createSuccess'))
@@ -266,14 +320,14 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const dynamicInfoFields = ref([
-    "totalRunningTime",
-    "maintenanceRunningTime",
-    "usageTimes",
-    "lastInspectionDate",
-    "outageRate",
-    "breakdownRecover",
-    "purchaseInterval"
-]);
+  'totalRunningTime',
+  'maintenanceRunningTime',
+  'usageTimes',
+  'lastInspectionDate',
+  'outageRate',
+  'breakdownRecover',
+  'purchaseInterval'
+])
 
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicToolAccounts')
@@ -332,27 +386,27 @@ const searchFormClick = (searchData) => {
   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 = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogApiPage.value =
+      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
@@ -366,38 +420,45 @@ const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'EQUIPMENT' }).then(async (res) => {
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'EQUIPMENT'}).then(response => {
-      searchTableSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
-          if (element.code == item.mainPartCode) {
-            flag = true;
-          }
-        });
-        return flag;
-      });
-    });
-  });
-};
+  await RelationMainPartApi.getRelationMainPartNoPage({
+    equipmentCode: row.code,
+    type: 'EQUIPMENT'
+  }).then(async (res) => {
+    await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'EQUIPMENT' }).then(
+      (response) => {
+        searchTableSelections.value = response.filter((element) => {
+          let flag = false
+          res.forEach((item) => {
+            if (element.code == item.mainPartCode) {
+              flag = true
+            }
+          })
+          return flag
+        })
+      }
+    )
+  })
+}
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
-    await SparePartApi.getSparePartNoPage({}).then(response => {
-      searchTableSparePartSelections.value = response.filter(element => {
-        let flag = false;
-        res.forEach(item => {
-          if (element.code == item.sparePartCode) {
-            flag = true;
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
+    equipmentToolCode: row.code
+  }).then(async (res) => {
+    await ItemApi.getItemNoPage({}).then((response) => {
+      searchTableSparePartSelections.value = response.filter((element) => {
+        let flag = false
+        res.forEach((item) => {
+          if (element.number == item.sparePartCode) {
+            flag = true
           }
-        });
-        return flag;
-      });
-    });
-  });
-};
+        })
+        return flag
+      })
+    })
+  })
+}
 /** 绑定备件操作 */
-const openComponent = async (row : any) => {
+const openComponent = async (row: any) => {
   await syncData(row)
   searchTableRef.value.open(
     '选择部件',
@@ -406,9 +467,9 @@ const openComponent = async (row : any) => {
     'equipmentMainPart',
     EquipmentMainPart.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
-    {type: 'EQUIPMENT'},
+    { type: 'EQUIPMENT' },
     null,
     null,
     null,
@@ -416,16 +477,16 @@ const openComponent = async (row : any) => {
   )
 }
 
-const openSparePart = async (row : any) => {
+const openSparePart = async (row: any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    SparePart.allSchemas,
-    SparePartApi.getSparePartPage,
-    'sparePartPart',
-    SparePart.allSchemas.searchSchema,
+    Item.allSchemas,
+    ItemApi.getItemPage,
+    'item',
+    Item.allSchemas.searchSchema,
     true,
-    null,//type
+    null, //type
     row,
     null,
     null,
@@ -435,33 +496,34 @@ const openSparePart = async (row : any) => {
   )
 }
 
-const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
   const deviceMainPartRelList = val.map((element) => ({
-      mainPartCode: element.code,
-      equipmentCode: rowRef.code,
-      type: 'EQUIPMENT'
-    }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
+    mainPartCode: element.number,
+    equipmentCode: rowRef.code,
+    type: 'EQUIPMENT'
+  }))
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
     message.success(t('common.createSuccess'))
     getList()
   })
 }
 
-const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
+const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
   const equipmentToolSparePartRelList = val.map((element) => ({
-      sparePartCode: element.code,
-      equipmentToolCode: rowRef.code,
-      type: 'EQUIPMENT'
-    }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
-    message.success(t('common.createSuccess'))
-    getList()
-  })
+    sparePartCode: element.number,
+    equipmentToolCode: rowRef.code,
+    type: 'EQUIPMENT'
+  }))
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+    (res) => {
+      message.success(t('common.createSuccess'))
+      getList()
+    }
+  )
 }
 /** 初始化 **/
 onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ToolAccountsApi.importTemplate()
 })
-
 </script>

From 7c56de3a2c9917375ef1d8926369609c1914df81 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 5 Jul 2024 14:04:54 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=B2=A1=E4=BC=A0type=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputaway/productputawayJobMain/index.vue        | 8 +++++++-
 .../productputaway/productputawayRecordMain/index.vue     | 6 ++++++
 .../productputaway/productputawayRequestMain/index.vue    | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index b8f15698c..83e25ee9b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -129,7 +129,7 @@ const getSwitchStatus = async ()=>{
   console.log('getSwitchStatus',res)
   if(res&&res.list){
     switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
-    
+
   }
 }
 // 列表头部按钮
@@ -255,6 +255,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index bbe6e11a9..9778c239b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -165,6 +165,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index aa88d864f..9cfa44045 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -421,6 +421,12 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters