Browse Source

Merge branch 'master_hella' into master_hella_20240701

master_hella_20240701
陈薪名 3 months ago
parent
commit
4f7e4ee662
  1. 1
      src/api/eam/basicEamWorkshop/index.ts
  2. 1
      src/api/eam/documentTypeSelectSet/index.ts
  3. 6
      src/api/eam/equipmentAccounts/index.ts
  4. 1
      src/api/eam/inspectionItem/index.ts
  5. 2
      src/components/UploadFile/src/UploadFile.vue
  6. 2
      src/views/eam/equipmentAccounts/equipmentAccounts.data.ts
  7. 358
      src/views/eam/equipmentAccounts/index.vue
  8. 18
      src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
  9. 2
      src/views/wms/basicDataManage/itemManage/itempackage/index.vue
  10. 6
      src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
  11. 6
      src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

1
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

1
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

6
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 })
}

1
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

2
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 = ''

2
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'
}
}

358
src/views/eam/equipmentAccounts/index.vue

@ -1,11 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search
:schema="EquipmentAccounts.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
<Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -31,13 +27,13 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{ row }">
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)"/>
</template>
</Table>
</ContentWrap>
@ -54,6 +50,8 @@
:isBusiness="false"
/>
<AblesForm ref="ablesFormRef" @success="getData" @close="getClosed"/>
<!-- 详情 -->
<DetailLedger
ref="detailRef"
@ -74,86 +72,48 @@
<!-- 备件 -->
<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 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 { EquipmentMainPart,EquipmentMainPartRules } from '../equipmentMainPart/equipmentMainPart.data'
import * as EquipmentMainPartApi from '@/api/eam/equipmentMainPart'
import { Item, ItemRules } from '../item/item.data'
import * as ItemApi from '@/api/eam/item'
import {
EquipmentToolSparePart,
EquipmentToolSparePartRules
} from '../equipmentToolSparePart/equipmentToolSparePart.data'
import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
import * as SparePartApi from '@/api/eam/sparePart'
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() //
@ -164,27 +124,28 @@ const routeName = ref()
const deviceNumber = ref()
routeName.value = route.name
const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
const tabs = ref<{ label: string; prop: string }[]>([])
const 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 searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
if (formField == 'workshopName') {
if(formField == 'workshopName'){
setV['workshopCode'] = val[0]['code']
setV['workshopName'] = val[0]['name']
} else if (formField == 'lineName') {
}else if(formField == 'lineName'){
setV['lineCode'] = val[0]['code']
setV['lineName'] = val[0]['name']
} else if (formField == 'manufactureName') {
}else if(formField == 'manufactureName'){
setV['manufactureCode'] = val[0]['number']
setV['manufactureName'] = val[0]['name']
} else if (formField == 'supplierName') {
}else if(formField == 'supplierName'){
setV['supplierCode'] = val[0]['number']
setV['supplierName'] = val[0]['name']
}
@ -193,22 +154,24 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
}
const operationRecordList = ref([
{ label: '报修记录', value: 'report' },
{ label: '维修记录', value: '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) => {
@ -224,12 +187,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',
@ -242,85 +205,105 @@ const HeadButttondata = [
//
const buttonBaseClick = (val, item) => {
if (val == 'add') {
//
if (val == 'add') { //
openForm('create')
} else if (val == 'import') {
//
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') {
//
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') {
//
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') {
//
} else {
//
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
const isShowMainButton = (row,val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
return true
}
}
// -
const butttondata = [
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 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.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicFaultType:update'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicFaultType:update'}),
]
}
//
const ablesFormRef = ref()
function openables(row, val) {
ablesFormRef.value.open(val,row);
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') {
//
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') {
//
} else if (val == 'delete') { //
handleDelete(row.id)
} else if (val == 'component') {
//
} else if (val == 'component') { //
openComponent(row)
} else if (val == 'sparePart') {
//
} else if (val == 'sparePart') { //
openSparePart(row)
} else if (val == 'enable') { // /
openables(row,val)
} else if (val == 'disable') { // /
openables(row,val)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = async (type: string, row?: any) => {
if (type == 'update') {
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
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'
}
})
}
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'))
@ -391,49 +374,60 @@ const searchFormClick = (searchData) => {
getList() //
}
//ablesForm
const getData=(val)=> {
nextTick?.(async () => {
await getList()
})
}
//ablesForm
const getClosed=(val)=> {
nextTick?.(() => {
console.log(val)
getList()
})
}
const searchTableRef = ref()
const searchSparePartTableRef = ref()
const searchTableSelections = ref([])
const searchTableSparePartSelections = ref([])
const syncData = async (row) => {
searchTableSparePartSelections.value = []
await RelationMainPartApi.getRelationMainPartNoPage({
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(
'选择部件',
@ -442,9 +436,9 @@ const openComponent = async (row: any) => {
'equipmentMainPart',
EquipmentMainPart.allSchemas.searchSchema,
true,
null, //type
null,//type
row,
{ type: 'DEVICE' },
{type: 'DEVICE'},
null,
null,
null,
@ -452,16 +446,16 @@ const openComponent = async (row: any) => {
)
}
const openSparePart = async (row: any) => {
const openSparePart = async (row : any) => {
await syncSparePartData(row)
searchSparePartTableRef.value.open(
'选择备件',
Item.allSchemas,
ItemApi.getItemPage,
'item',
Item.allSchemas.searchSchema,
SparePart.allSchemas,
SparePartApi.getSparePartPage,
'sparePartPart',
SparePart.allSchemas.searchSchema,
true,
null, //type
null,//type
row,
null,
null,
@ -473,36 +467,35 @@ const openSparePart = async (row: any) => {
const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, rowRef) => {
const deviceMainPartRelList = val.map((element) => ({
mainPartCode: element.number,
mainPartCode: element.code,
equipmentCode: rowRef.code,
type: 'DEVICE'
}))
RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => {
message.success(t('common.createSuccess'))
getList()
})
}
const handleOperationTabsChange = (val) => {
if (val == 'report') {
if(val == 'report'){
apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
} else if (val == 'repair') {
}else if(val == 'repair'){
apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
} else if (val == 'maintenance') {
}else if(val == 'maintenance'){
apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
dialogApiPage.value =
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
@ -512,16 +505,14 @@ const handleOperationTabsChange = (val) => {
const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
const equipmentToolSparePartRelList = val.map((element) => ({
sparePartCode: element.number,
sparePartCode: element.code,
equipmentToolCode: rowRef.code,
type: 'DEVICE'
}))
EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
(res) => {
EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => {
message.success(t('common.createSuccess'))
getList()
}
)
})
}
/** 初始化 **/
@ -529,4 +520,5 @@ onMounted(async () => {
getList()
importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
})
</script>

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

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

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

@ -154,7 +154,7 @@ const buttonBaseClick = (val, item) => {
// -
const butttondata = [
defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), //
// defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) //
defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) //
]
// -

6
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

6
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

Loading…
Cancel
Save