Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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/TableForm/src/TableForm.vue

@@ -406,7 +406,9 @@
           routeName == 'DeliverPlanMain' ||
           routeName == 'DeliverRequestMain' ||
           routeName == 'ZZBJDeliverRequestMain' ||
-          routeName == 'UnplannedreceiptRequestMain'
+          routeName == 'UnplannedreceiptRequestMain'||
+          routeName == 'RepleinshRequestMain'
+          
         "
       >
         <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />

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/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',

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

@@ -33,7 +33,7 @@
         </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>
@@ -50,6 +50,8 @@
     :isBusiness="false"
   />
 
+  <AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
+
   <!-- 详情 -->
   <DetailLedger 
     ref="detailRef" 
@@ -80,14 +82,13 @@ 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 { 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 * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
 import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
 import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
@@ -129,6 +130,7 @@ const detailAllSchemas = ref()
 const apiPage = ref()
 const dialogApiPage = ref()
 const dialogAllSchemas = ref()
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -217,13 +219,30 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
+  return [
     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'}), // 删除
+    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) => {
@@ -235,6 +254,10 @@ const buttonTableClick = async (val, row) => {
     openComponent(row)
   } else if (val == 'sparePart') { // 备件
     openSparePart(row)
+  } else if (val == 'enable') { // 启用/禁用
+    openables(row,val)
+  } else if (val == 'disable') { // 启用/禁用
+    openables(row,val)
   }
 }
 
@@ -351,6 +374,21 @@ 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()

src/views/eam/toolAccounts/index.vue

@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ToolAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="ToolAccounts.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -71,7 +75,12 @@
   <!-- 备件 -->
   <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">
@@ -83,28 +92,58 @@ 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 { Item, ItemRules } from '../item/item.data'
-import * as SparePartApi from '@/api/eam/sparePart'
+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,8 +159,8 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ToolAccounts.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()
@@ -131,7 +170,7 @@ const operationRecordList = ref([
   { label: '维修记录', value: 'repair' },
   { label: '保养记录', value: 'maintenance' },
   { label: '巡检记录', value: 'inspection' },
-  {label:'点检记录',value:'spot_check'},
+  { label: '点检记录', value: 'spot_check' }
 ])
 
 // 查询页面返回
@@ -175,7 +214,7 @@ const HeadButttondata = [
   defaultButtons.defaultExportBtn({ hasPermi: 'eam:tool-accounts:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -188,16 +227,22 @@ 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)
   }
 }
@@ -206,19 +251,23 @@ const buttonBaseClick = (val, 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.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)
   }
 }
@@ -227,14 +276,19 @@ const buttonTableClick = async (val, row) => {
 const basicFormRef = ref()
 const openForm = async (type: string, row?: any) => {
   if (type == 'update') {
-    const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
+    const equipmentManufacturerNoPage =
+      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(item=>item.number == row.manufactureCode)?.name
+    row.manufactureName = equipmentManufacturerNoPage?.find(
-    row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name
+      (item) => item.number == row.manufactureCode
+    )?.name
+    row.supplierName = equipmentSupplierNoPage?.find(
+      (item) => item.number == row.supplierCode
+    )?.name
   }
   basicFormRef.value.open(type, row)
 }
@@ -242,16 +296,16 @@ const openForm = async (type: string, row?: any) => {
 // form表单提交
 const formsSuccess = async (formType, data) => {
   var isHave = ToolAccounts.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
+    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.activeTime == 0) data.activeTime = null
-  if(data.expireTime==0)data.expireTime = 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",
+  'totalRunningTime',
-    "maintenanceRunningTime",
+  'maintenanceRunningTime',
-    "usageTimes",
+  'usageTimes',
-    "lastInspectionDate",
+  'lastInspectionDate',
-    "outageRate",
+  'outageRate',
-    "breakdownRecover",
+  'breakdownRecover',
-    "purchaseInterval"
+  'purchaseInterval'
-]);
+])
 
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicToolAccounts')
@@ -332,7 +386,6 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
 const handleOperationTabsChange = (val) => {
   if (val == 'report') {
     apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
@@ -345,7 +398,8 @@ const handleOperationTabsChange = (val) => {
   } 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') {
     apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
@@ -366,36 +420,43 @@ const searchTableSelections = ref([])
 const searchTableSparePartSelections = ref([])
 const syncData = async (row) => {
   searchTableSparePartSelections.value = []
-  await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'EQUIPMENT' }).then(async (res) => {
+  await RelationMainPartApi.getRelationMainPartNoPage({
-    await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'EQUIPMENT'}).then(response => {
+    equipmentCode: row.code,
-      searchTableSelections.value = response.filter(element => {
+    type: 'EQUIPMENT'
-        let flag = false;
+  }).then(async (res) => {
-        res.forEach(item => {
+    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;
+              flag = true
-          }
+            }
-        });
+          })
-        return flag;
+          return flag
-      });
+        })
-    });
+      }
-  });
+    )
-};
+  })
+}
 const syncSparePartData = async (row) => {
   searchTableSparePartSelections.value = []
-  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({ equipmentToolCode: row.code}).then(async (res) => {
+  await EquipmentToolSparePartApi.getEquipmentToolSparePartNoPage({
-    await SparePartApi.getSparePartNoPage({}).then(response => {
+    equipmentToolCode: row.code
-      searchTableSparePartSelections.value = response.filter(element => {
+  }).then(async (res) => {
-        let flag = false;
+    await ItemApi.getItemNoPage({}).then((response) => {
-        res.forEach(item => {
+      searchTableSparePartSelections.value = response.filter((element) => {
-          if (element.code == item.sparePartCode) {
+        let flag = false
-            flag = true;
+        res.forEach((item) => {
-          }
+          if (element.number == item.sparePartCode) {
-        });
+            flag = true
-        return flag;
+          }
-      });
+        })
-    });
+        return flag
-  });
+      })
-};
+    })
+  })
+}
 /** 绑定备件操作 */
 const openComponent = async (row: any) => {
   await syncData(row)
@@ -420,10 +481,10 @@ const openSparePart = async (row : any) => {
   await syncSparePartData(row)
   searchSparePartTableRef.value.open(
     '选择备件',
-    SparePart.allSchemas,
+    Item.allSchemas,
-    SparePartApi.getSparePartPage,
+    ItemApi.getItemPage,
-    'sparePartPart',
+    'item',
-    SparePart.allSchemas.searchSchema,
+    Item.allSchemas.searchSchema,
     true,
     null, //type
     row,
@@ -437,11 +498,11 @@ const openSparePart = async (row : any) => {
 
 const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
   const deviceMainPartRelList = val.map((element) => ({
-      mainPartCode: element.code,
+    mainPartCode: element.number,
     equipmentCode: rowRef.code,
     type: 'EQUIPMENT'
   }))
-  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
+  RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
     message.success(t('common.createSuccess'))
     getList()
   })
@@ -449,19 +510,20 @@ const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, r
 
 const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
   const equipmentToolSparePartRelList = val.map((element) => ({
-      sparePartCode: element.code,
+    sparePartCode: element.number,
     equipmentToolCode: rowRef.code,
     type: 'EQUIPMENT'
   }))
-  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
+  EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
+    (res) => {
       message.success(t('common.createSuccess'))
       getList()
-  })
+    }
+  )
 }
 /** 初始化 **/
 onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ToolAccountsApi.importTemplate()
 })
-
 </script>

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

@@ -153,7 +153,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

src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts

@@ -429,7 +429,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -439,7 +439,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -480,7 +480,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortSearchDefault:3,
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -491,7 +491,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortSearchDefault:4,
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -512,6 +512,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault:2,
   },
@@ -522,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault:3,
   },
@@ -529,6 +531,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -690,6 +693,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -740,6 +744,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
 
   },
@@ -750,6 +755,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
 
   },

src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@@ -51,6 +51,8 @@
     :apiUpdate="RepleinshRequestMainApi.updateRepleinshRequestMain"
     :apiCreate="RepleinshRequestMainApi.createRepleinshRequestMain"
     :isBusiness="true"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
@@ -108,8 +110,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['code']
+        // row['itemCode'] = val[0]['code']
-        row['uom'] = val[0]['uom']
+        // row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['itemCode'] = item['code']
+          newRow['uom'] = item['uom']
+          newRow['id'] = item['id']
+          tableData.value.push(newRow)
+        })
       } else {
         row[formField] = val[0][searchField]
       }
@@ -366,6 +376,9 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  tableData.value.forEach(item=>{
+    item.toLocationCode = data.toLocationCode
+  })
   data.subList = tableData.value // 拼接子表数据参数
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -208,44 +208,86 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
   {
-    label: '从仓库代码',
+    label: '到库位代码',
-    field: 'fromWarehouseCode',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    hiddenInMain:true,
+    sortSearchDefault:1000,
+    isSearch: true,
+    sortTableDefault:1100,
+    // isTableForm: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
+        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
         searchCondition:[{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
         }]
       }
-    }
     },
-  {
+    tableForm:{
-    label: '到仓库代码',
+      isInpuFocusShow: true,
-    field: 'toWarehouseCode',
+      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-    sort: 'custom',
+      searchField: 'code', // 查询弹窗赋值字段
-    table: {
+      searchTitle: '库位信息', // 查询弹窗标题
-      width: 150
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
-    isTable: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+  // {
+  //   label: '从仓库代码',
+  //   field: 'fromWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '到仓库代码',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '自动提交',
     field: 'autoCommit',
@@ -498,8 +540,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
-      enterSearch:true,
       isInpuFocusShow: true,
+      multiple:true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
@@ -587,48 +629,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+ 
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    sortSearchDefault:1000,
-    isSearch: true,
-    sortTableDefault:1100,
-    // isTableForm: false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '库位信息', // 查询弹窗标题
-      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-  },
   // {
   //   label: '包装号',
   //   field: 'packingNumber',

src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@@ -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

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

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

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 = {

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

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '上传质检报告',
+    label: '上传质量报告',
     field: 'uploadFile',
     sort: 'custom',
     isTable:false,
@@ -16,7 +16,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableName: 'SupplierdeliverInspectionDetail',
         },
         fileType:['pdf','png','jpg','jpeg'],
-        fileSize:100
+        fileSize:100,
+        limit:20000
       }
     },
   },