sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master_hella_20240701
zhang_li 5 months ago
parent
d72fbd5e0c 7c56de3a2c
commit
ee1c420cae
11 changed files with 538 additions and 311 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/utils/disposition/defaultButtons.ts
  2. 368
      src/views/eam/equipmentAccounts/index.vue
  3. 350
      src/views/eam/toolAccounts/index.vue
  4. 9
      src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
  5. 4
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  6. 86
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  7. 8
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  8. 6
      src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
  9. 6
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  10. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  11. 6
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

4
src/utils/disposition/defaultButtons.ts
View File

@ -1154,7 +1154,7 @@ export function mainCopyBtn(option: any) {
// 主列表-部件 // 主列表-部件
export function componentBtn(option: any) { export function componentBtn(option: any) {
return __defaultBtnOption(option, { return __defaultBtnOption(option, {
label: '部件', label: '关联部件',
name: 'component', name: 'component',
hide: false, hide: false,
type: 'primary', type: 'primary',
@ -1166,7 +1166,7 @@ export function componentBtn(option: any) {
// 主列表-备件 // 主列表-备件
export function sparePartBtn(option: any) { export function sparePartBtn(option: any) {
return __defaultBtnOption(option, { return __defaultBtnOption(option, {
label: '备件', label: '关联备件',
name: 'sparePart', name: 'sparePart',
hide: false, hide: false,
type: 'primary', type: 'primary',

368
src/views/eam/equipmentAccounts/index.vue
View File

@ -1,18 +1,22 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="EquipmentAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search
:schema="EquipmentAccounts.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead
:HeadButttondata="HeadButttondata" :HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick" @button-base-click="buttonBaseClick"
:routeName="routeName" :routeName="routeName"
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="EquipmentAccounts.allSchemas" :allSchemas="EquipmentAccounts.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
@ -27,13 +31,13 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #code="{ row }">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span> <span>{{ row.code }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)"/> <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -51,68 +55,105 @@
/> />
<!-- 详情 --> <!-- 详情 -->
<DetailLedger <DetailLedger
ref="detailRef" ref="detailRef"
:isBasic="true" :isBasic="true"
:allSchemas="EquipmentAccounts.allSchemas" :allSchemas="EquipmentAccounts.allSchemas"
:subTabs="subTabList" :subTabs="subTabList"
:operationRecordList="operationRecordList" :operationRecordList="operationRecordList"
@handleOperationTabsChange="handleOperationTabsChange" @handleOperationTabsChange="handleOperationTabsChange"
:detailAllSchemas="detailAllSchemas" :detailAllSchemas="detailAllSchemas"
:apiPage="apiPage" :apiPage="apiPage"
:dialogApiPage="dialogApiPage" :dialogApiPage="dialogApiPage"
:dialogAllSchemas="dialogAllSchemas" :dialogAllSchemas="dialogAllSchemas"
:dynamicInfoFields="dynamicInfoFields" :dynamicInfoFields="dynamicInfoFields"
funcCode="device_mould_file" funcCode="device_mould_file"
/> />
<!-- 主要部件 --> <!-- 主要部件 -->
<SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" /> <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
<!-- 备件 --> <!-- 备件 -->
<SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" /> <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> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' 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 EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import DetailLedger from '@/components/Detail/src/DetailLedger.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 * 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 * 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 { EquipmentToolSparePart,EquipmentToolSparePartRules } from '../equipmentToolSparePart/equipmentToolSparePart.data' import {
EquipmentToolSparePart,
EquipmentToolSparePartRules
} from '../equipmentToolSparePart/equipmentToolSparePart.data'
import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart' 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
import * as WorkshopApi from '@/api/wms/workshop' import * as WorkshopApi from '@/api/wms/workshop'
import * as ProductionlineApi from '@/api/wms/productionline' import * as ProductionlineApi from '@/api/wms/productionline'
import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier' import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer' import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
defineOptions({ name: 'EquipmentAccounts' }) defineOptions({ name: 'EquipmentAccounts' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -123,8 +164,8 @@ const routeName = ref()
const deviceNumber = ref() const deviceNumber = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns) const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
const tabs = ref<{ label: string; prop: string; }[]>([]) const tabs = ref<{ label: string; prop: string }[]>([])
const subTabList = ref([]); const subTabList = ref([])
const detailAllSchemas = ref() const detailAllSchemas = ref()
const apiPage = ref() const apiPage = ref()
const dialogApiPage = ref() const dialogApiPage = ref()
@ -134,16 +175,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField == 'workshopName'){ if (formField == 'workshopName') {
setV['workshopCode'] = val[0]['code'] setV['workshopCode'] = val[0]['code']
setV['workshopName'] = val[0]['name'] setV['workshopName'] = val[0]['name']
}else if(formField == 'lineName'){ } else if (formField == 'lineName') {
setV['lineCode'] = val[0]['code'] setV['lineCode'] = val[0]['code']
setV['lineName'] = val[0]['name'] setV['lineName'] = val[0]['name']
}else if(formField == 'manufactureName'){ } else if (formField == 'manufactureName') {
setV['manufactureCode'] = val[0]['number'] setV['manufactureCode'] = val[0]['number']
setV['manufactureName'] = val[0]['name'] setV['manufactureName'] = val[0]['name']
}else if(formField == 'supplierName'){ } else if (formField == 'supplierName') {
setV['supplierCode'] = val[0]['number'] setV['supplierCode'] = val[0]['number']
setV['supplierName'] = val[0]['name'] setV['supplierName'] = val[0]['name']
} }
@ -152,24 +193,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
} }
const operationRecordList = ref([ const operationRecordList = ref([
{label:'报修记录',value:'report'}, { label: '报修记录', value: 'report' },
{label:'维修记录',value:'repair'}, { label: '维修记录', value: 'repair' },
{label:'保养记录',value:'maintenance'}, { label: '保养记录', value: 'maintenance' },
{label:'巡检记录',value:'inspection'}, { label: '巡检记录', value: 'inspection' },
{label:'点检记录',value:'spot_check'}, { label: '点检记录', value: 'spot_check' }
]) ])
const dynamicInfoFields = ref([ const dynamicInfoFields = ref([
"totalRunningTime", 'totalRunningTime',
"maintenanceRunningTime", 'maintenanceRunningTime',
"usageTimes", 'usageTimes',
"lastInspectionDate", 'lastInspectionDate',
"outageRate", 'outageRate',
"breakdownRecover", 'breakdownRecover',
"purchaseInterval" 'purchaseInterval'
]); ])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -185,12 +224,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-accounts:create'}), // 新增 defaultButtons.defaultAddBtn({ hasPermi: 'eam:equipment-accounts:create' }), // 新增
defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-accounts:import'}), // 导入 defaultButtons.defaultImportBtn({ hasPermi: 'eam:equipment-accounts:import' }), // 导入
defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-accounts:export'}), // 导出 defaultButtons.defaultExportBtn({ hasPermi: 'eam:equipment-accounts:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null) // 设置
// { // {
// label: '自定义扩展按钮', // label: '自定义扩展按钮',
// name: 'zdy', // name: 'zdy',
@ -203,37 +242,47 @@ const HeadButttondata = [
// 头部按钮事件 // 头部按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增 if (val == 'add') {
// 新增
openForm('create') openForm('create')
} else if (val == 'import') { // 导入 } else if (val == 'import') {
// 导入
handleImport() handleImport()
} else if (val == 'export') { // 导出 } else if (val == 'export') {
// 导出
handleExport() handleExport()
} else if (val == 'refresh') { // 刷新 } else if (val == 'refresh') {
// 刷新
getList() getList()
} else if (val == 'filtrate') { // 筛选 } else if (val == 'filtrate') {
} else { // 其他按钮 // 筛选
} else {
// 其他按钮
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-accounts:update'}), // 编辑 defaultButtons.mainListEditBtn({ hasPermi: 'eam:equipment-accounts:update' }), // 编辑
defaultButtons.componentBtn({hasPermi:'eam:equipment-accounts:component'}), // 部件 defaultButtons.componentBtn({ hasPermi: 'eam:equipment-accounts:component' }), // 部件
defaultButtons.sparePartBtn({hasPermi:'eam:equipment-accounts:item'}), // 备件 defaultButtons.sparePartBtn({ hasPermi: 'eam:equipment-accounts:item' }) // 备件
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-accounts:delete'}), // 删除
] ]
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑 if (val == 'edit') {
// 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') {
// 删除
handleDelete(row.id) handleDelete(row.id)
} else if (val == 'component') { // 部件 } else if (val == 'component') {
// 部件
openComponent(row) openComponent(row)
} else if (val == 'sparePart') { // 备件 } else if (val == 'sparePart') {
// 备件
openSparePart(row) openSparePart(row)
} }
} }
@ -241,46 +290,37 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
if(type == 'update'){ if (type == 'update') {
const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({}) const equipmentManufacturerNoPage =
await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({}) const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
const workshopNoPage = await WorkshopApi.getWorkshopNoPage({}) 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
EquipmentAccounts.allSchemas.formSchema.forEach((item) => { row.supplierName = equipmentSupplierNoPage?.find(
if (item.field == 'status') { (item) => item.number == row.supplierCode
item.componentProps.disabled = false )?.name
}
})
}else{
EquipmentAccounts.allSchemas.formSchema.forEach((item) => {
if (item.field == 'status') {
item.componentProps.disabled = true
item.value = 'TOACCEPT'
}
})
} }
basicFormRef.value.open(type, row) basicFormRef.value.open(type, row)
} }
// form表单提交 // form表单提交
const formsSuccess = async (formType,data) => { const formsSuccess = async (formType, data) => {
var isHave =EquipmentAccounts.allSchemas.formSchema.some(function (item) { var isHave = EquipmentAccounts.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime'; return item.field === 'activeTime' || item.field === 'expireTime'
}); })
if(isHave){ if (isHave) {
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
message.error('失效时间要大于生效时间') 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') { if (formType === 'create') {
await EquipmentAccountsApi.createEquipmentAccounts(data) await EquipmentAccountsApi.createEquipmentAccounts(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
@ -351,45 +391,49 @@ const searchFormClick = (searchData) => {
getList() // 刷新当前列表 getList() // 刷新当前列表
} }
const searchTableRef = ref() const searchTableRef = ref()
const searchSparePartTableRef = ref() const searchSparePartTableRef = ref()
const searchTableSelections = ref([]) const searchTableSelections = ref([])
const searchTableSparePartSelections = ref([]) const searchTableSparePartSelections = ref([])
const syncData = async (row) => { const syncData = async (row) => {
searchTableSparePartSelections.value = [] searchTableSparePartSelections.value = []
await RelationMainPartApi.getRelationMainPartNoPage({ equipmentCode: row.code,type: 'DEVICE' }).then(async (res) => { await RelationMainPartApi.getRelationMainPartNoPage({
await EquipmentMainPartApi.getEquipmentMainPartNoPage({type: 'DEVICE' }).then(response => { equipmentCode: row.code,
searchTableSelections.value = response.filter(element => { type: 'DEVICE'
let flag = false; }).then(async (res) => {
res.forEach(item => { await EquipmentMainPartApi.getEquipmentMainPartNoPage({ type: 'DEVICE' }).then((response) => {
searchTableSelections.value = response.filter((element) => {
let flag = false
res.forEach((item) => {
if (element.code == item.mainPartCode) { if (element.code == item.mainPartCode) {
flag = true; flag = true
} }
}); })
return flag; return flag
}); })
}); })
}); })
}; }
const syncSparePartData = async (row) => { const syncSparePartData = async (row) => {
searchTableSparePartSelections.value = [] 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 SparePartApi.getSparePartNoPage({}).then((response) => {
res.forEach(item => { searchTableSparePartSelections.value = response.filter((element) => {
let flag = false
res.forEach((item) => {
if (element.code == item.sparePartCode) { 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) await syncData(row)
searchTableRef.value.open( searchTableRef.value.open(
'选择部件', '选择部件',
@ -398,9 +442,9 @@ const openComponent = async (row : any) => {
'equipmentMainPart', 'equipmentMainPart',
EquipmentMainPart.allSchemas.searchSchema, EquipmentMainPart.allSchemas.searchSchema,
true, true,
null,//type null, //type
row, row,
{type: 'DEVICE'}, { type: 'DEVICE' },
null, null,
null, 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) await syncSparePartData(row)
searchSparePartTableRef.value.open( searchSparePartTableRef.value.open(
'选择备件', '选择备件',
SparePart.allSchemas, Item.allSchemas,
SparePartApi.getSparePartPage, ItemApi.getItemPage,
'sparePartPart', 'item',
SparePart.allSchemas.searchSchema, Item.allSchemas.searchSchema,
true, true,
null,//type null, //type
row, row,
null, null,
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) => ({ const deviceMainPartRelList = val.map((element) => ({
mainPartCode: element.code, mainPartCode: element.number,
equipmentCode: rowRef.code, equipmentCode: rowRef.code,
type: 'DEVICE' type: 'DEVICE'
})) }))
RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => { RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
getList() getList()
}) })
} }
const handleOperationTabsChange = (val) => { const handleOperationTabsChange = (val) => {
if(val == 'report'){ if (val == 'report') {
apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
}else if(val == 'repair'){ } else if (val == 'repair') {
apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
}else if(val == 'maintenance'){ } else if (val == 'maintenance') {
apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage dialogApiPage.value =
EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
}else if(val == 'inspection'){ } else if (val == 'inspection') {
apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
}else if(val == 'spot_check'){ } else if (val == 'spot_check') {
apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage 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) => ({ const equipmentToolSparePartRelList = val.map((element) => ({
sparePartCode: element.code, sparePartCode: element.number,
equipmentToolCode: rowRef.code, equipmentToolCode: rowRef.code,
type: 'DEVICE' type: 'DEVICE'
})) }))
EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => { EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
message.success(t('common.createSuccess')) (res) => {
getList() message.success(t('common.createSuccess'))
}) getList()
}
)
} }
/** 初始化 **/ /** 初始化 **/
@ -482,5 +529,4 @@ onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate() importTemplateData.templateUrl = await EquipmentAccountsApi.importTemplate()
}) })
</script> </script>

350
src/views/eam/toolAccounts/index.vue
View File

@ -1,18 +1,22 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="ToolAccounts.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search
:schema="ToolAccounts.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead
:HeadButttondata="HeadButttondata" :HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick" @button-base-click="buttonBaseClick"
:routeName="routeName" :routeName="routeName"
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="ToolAccounts.allSchemas" :allSchemas="ToolAccounts.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
@ -27,13 +31,13 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #code="{ row }">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span> <span>{{ row.code }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -51,19 +55,19 @@
/> />
<!-- 详情 --> <!-- 详情 -->
<DetailLedger <DetailLedger
ref="detailRef" ref="detailRef"
:isBasic="true" :isBasic="true"
:allSchemas="ToolAccounts.allSchemas" :allSchemas="ToolAccounts.allSchemas"
:subTabs="subTabList" :subTabs="subTabList"
:operationRecordList="operationRecordList" :operationRecordList="operationRecordList"
@handleOperationTabsChange="handleOperationTabsChange" @handleOperationTabsChange="handleOperationTabsChange"
:detailAllSchemas="detailAllSchemas" :detailAllSchemas="detailAllSchemas"
:apiPage="apiPage" :apiPage="apiPage"
:dialogApiPage="dialogApiPage" :dialogApiPage="dialogApiPage"
:dialogAllSchemas="dialogAllSchemas" :dialogAllSchemas="dialogAllSchemas"
:dynamicInfoFields="dynamicInfoFields" :dynamicInfoFields="dynamicInfoFields"
funcCode="tool_mould_file" funcCode="tool_mould_file"
/> />
<!-- 主要部件 --> <!-- 主要部件 -->
@ -71,40 +75,75 @@
<!-- 备件 --> <!-- 备件 -->
<SearchTable ref="searchSparePartTableRef" @searchTableSuccess="submitSparePartRelation" /> <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> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' 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 ToolAccountsApi from '@/api/eam/toolAccounts'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import * as RelationMainPartApi from '@/api/eam/relationMainPart' 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
import * as WorkshopApi from '@/api/wms/workshop' import * as WorkshopApi from '@/api/wms/workshop'
import * as ProductionlineApi from '@/api/wms/productionline' import * as ProductionlineApi from '@/api/wms/productionline'
@ -120,18 +159,18 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(ToolAccounts.allSchemas.tableColumns) 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 detailAllSchemas = ref()
const apiPage = ref() const apiPage = ref()
const dialogApiPage = ref() const dialogApiPage = ref()
const dialogAllSchemas = ref() const dialogAllSchemas = ref()
const operationRecordList = ref([ const operationRecordList = ref([
{label:'报修记录',value:'report'}, { label: '报修记录', value: 'report' },
{label:'维修记录',value:'repair'}, { label: '维修记录', value: 'repair' },
{label:'保养记录',value:'maintenance'}, { label: '保养记录', value: 'maintenance' },
{label:'巡检记录',value:'inspection'}, { label: '巡检记录', value: 'inspection' },
{label:'点检记录',value:'spot_check'}, { label: '点检记录', value: 'spot_check' }
]) ])
// 查询页面返回 // 查询页面返回
@ -139,16 +178,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField == 'workshopName'){ if (formField == 'workshopName') {
setV['workshopCode'] = val[0]['code'] setV['workshopCode'] = val[0]['code']
setV['workshopName'] = val[0]['name'] setV['workshopName'] = val[0]['name']
}else if(formField == 'lineName'){ } else if (formField == 'lineName') {
setV['lineCode'] = val[0]['code'] setV['lineCode'] = val[0]['code']
setV['lineName'] = val[0]['name'] setV['lineName'] = val[0]['name']
}else if(formField == 'manufactureName'){ } else if (formField == 'manufactureName') {
setV['manufactureCode'] = val[0]['number'] setV['manufactureCode'] = val[0]['number']
setV['manufactureName'] = val[0]['name'] setV['manufactureName'] = val[0]['name']
}else if(formField == 'supplierName'){ } else if (formField == 'supplierName') {
setV['supplierCode'] = val[0]['number'] setV['supplierCode'] = val[0]['number']
setV['supplierName'] = val[0]['name'] setV['supplierName'] = val[0]['name']
} }
@ -170,12 +209,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'eam:tool-accounts:create'}), // 新增 defaultButtons.defaultAddBtn({ hasPermi: 'eam:tool-accounts:create' }), // 新增
defaultButtons.defaultImportBtn({hasPermi:'eam:tool-accounts:import'}), // 导入 defaultButtons.defaultImportBtn({ hasPermi: 'eam:tool-accounts:import' }), // 导入
defaultButtons.defaultExportBtn({hasPermi:'eam:tool-accounts:export'}), // 导出 defaultButtons.defaultExportBtn({ hasPermi: 'eam:tool-accounts:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null) // 设置
// { // {
// label: '自定义扩展按钮', // label: '自定义扩展按钮',
// name: 'zdy', // name: 'zdy',
@ -188,37 +227,47 @@ const HeadButttondata = [
// 头部按钮事件 // 头部按钮事件
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增 if (val == 'add') {
// 新增
openForm('create') openForm('create')
} else if (val == 'import') { // 导入 } else if (val == 'import') {
// 导入
handleImport() handleImport()
} else if (val == 'export') { // 导出 } else if (val == 'export') {
// 导出
handleExport() handleExport()
} else if (val == 'refresh') { // 刷新 } else if (val == 'refresh') {
// 刷新
getList() getList()
} else if (val == 'filtrate') { // 筛选 } else if (val == 'filtrate') {
} else { // 其他按钮 // 筛选
} else {
// 其他按钮
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'eam:tool-accounts:update'}), // 编辑 defaultButtons.mainListEditBtn({ hasPermi: 'eam:tool-accounts:update' }), // 编辑
defaultButtons.componentBtn({hasPermi:'eam:tool-accounts:component'}), // 部件 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'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:tool-accounts:delete'}), // 删除
] ]
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑 if (val == 'edit') {
// 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') {
// 删除
handleDelete(row.id) handleDelete(row.id)
} else if (val == 'component') { // 部件 } else if (val == 'component') {
// 部件
openComponent(row) openComponent(row)
} else if (val == 'sparePart') { // 备件 } else if (val == 'sparePart') {
// 备件
openSparePart(row) openSparePart(row)
} }
} }
@ -226,32 +275,37 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
if(type == 'update'){ if (type == 'update') {
const equipmentManufacturerNoPage = await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({}) const equipmentManufacturerNoPage =
await EquipmentManufacturerApi.getEquipmentManufacturerNoPage({})
const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({}) const equipmentSupplierNoPage = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
const workshopNoPage = await WorkshopApi.getWorkshopNoPage({}) 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) basicFormRef.value.open(type, row)
} }
// form表单提交 // form表单提交
const formsSuccess = async (formType,data) => { const formsSuccess = async (formType, data) => {
var isHave =ToolAccounts.allSchemas.formSchema.some(function (item) { 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 (isHave) {
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
message.error('失效时间要大于生效时间') 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') { if (formType === 'create') {
await ToolAccountsApi.createToolAccounts(data) await ToolAccountsApi.createToolAccounts(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
@ -266,14 +320,14 @@ const formsSuccess = async (formType,data) => {
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const dynamicInfoFields = 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) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicToolAccounts') detailRef.value.openDetail(row, titleName, titleValue, 'basicToolAccounts')
@ -332,27 +386,27 @@ const searchFormClick = (searchData) => {
getList() // 刷新当前列表 getList() // 刷新当前列表
} }
const handleOperationTabsChange = (val) => { const handleOperationTabsChange = (val) => {
if(val == 'report'){ if (val == 'report') {
apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
}else if(val == 'repair'){ } else if (val == 'repair') {
apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
}else if(val == 'maintenance'){ } else if (val == 'maintenance') {
apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage dialogApiPage.value =
EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
}else if(val == 'inspection'){ } else if (val == 'inspection') {
apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
}else if(val == 'spot_check'){ } else if (val == 'spot_check') {
apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
@ -366,38 +420,45 @@ const searchTableSelections = ref([])
const searchTableSparePartSelections = ref([]) const searchTableSparePartSelections = ref([])
const syncData = async (row) => { const syncData = async (row) => {
searchTableSparePartSelections.value = [] 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(
if (element.code == item.mainPartCode) { (response) => {
flag = true; searchTableSelections.value = response.filter((element) => {
} let flag = false
}); res.forEach((item) => {
return flag; if (element.code == item.mainPartCode) {
}); flag = true
}); }
}); })
}; return flag
})
}
)
})
}
const syncSparePartData = async (row) => { const syncSparePartData = async (row) => {
searchTableSparePartSelections.value = [] 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) => { const openComponent = async (row: any) => {
await syncData(row) await syncData(row)
searchTableRef.value.open( searchTableRef.value.open(
'选择部件', '选择部件',
@ -406,9 +467,9 @@ const openComponent = async (row : any) => {
'equipmentMainPart', 'equipmentMainPart',
EquipmentMainPart.allSchemas.searchSchema, EquipmentMainPart.allSchemas.searchSchema,
true, true,
null,//type null, //type
row, row,
{type: 'EQUIPMENT'}, { type: 'EQUIPMENT' },
null, null,
null, 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) await syncSparePartData(row)
searchSparePartTableRef.value.open( searchSparePartTableRef.value.open(
'选择备件', '选择备件',
SparePart.allSchemas, Item.allSchemas,
SparePartApi.getSparePartPage, ItemApi.getItemPage,
'sparePartPart', 'item',
SparePart.allSchemas.searchSchema, Item.allSchemas.searchSchema,
true, true,
null,//type null, //type
row, row,
null, null,
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) => ({ const deviceMainPartRelList = val.map((element) => ({
mainPartCode: element.code, mainPartCode: element.number,
equipmentCode: rowRef.code, equipmentCode: rowRef.code,
type: 'EQUIPMENT' type: 'EQUIPMENT'
})) }))
RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then(res => { RelationMainPartApi.createRelationMainPartBatch(deviceMainPartRelList).then((res) => {
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
getList() getList()
}) })
} }
const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => {
const equipmentToolSparePartRelList = val.map((element) => ({ const equipmentToolSparePartRelList = val.map((element) => ({
sparePartCode: element.code, sparePartCode: element.number,
equipmentToolCode: rowRef.code, equipmentToolCode: rowRef.code,
type: 'EQUIPMENT' type: 'EQUIPMENT'
})) }))
EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(res => { EquipmentToolSparePartApi.createEquipmentToolSparePartBatch(equipmentToolSparePartRelList).then(
message.success(t('common.createSuccess')) (res) => {
getList() message.success(t('common.createSuccess'))
}) getList()
}
)
} }
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await ToolAccountsApi.importTemplate() importTemplateData.templateUrl = await ToolAccountsApi.importTemplate()
}) })
</script> </script>

9
src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
View File

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

4
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
View File

@ -6,7 +6,7 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' 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 * as CustomerItemApi from '@/api/wms/customeritem'
import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
@ -190,7 +190,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
searchTitle: '发货计划信息', // 查询弹窗标题 searchTitle: '发货计划信息', // 查询弹窗标题
searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类 searchAllSchemas: DeliverPlanDetailRequest.allSchemas, // 查询弹窗所需类
searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法 searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
key: 'available', key: 'available',

86
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
View File

@ -873,3 +873,89 @@ export const DeliverPlanDetailRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { 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
}
}
},
]))

8
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
View File

@ -129,7 +129,7 @@ const getSwitchStatus = async ()=>{
console.log('getSwitchStatus',res) console.log('getSwitchStatus',res)
if(res&&res.list){ if(res&&res.list){
switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE' switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
} }
} }
// 列表头部按钮 // 列表头部按钮
@ -255,6 +255,12 @@ const handleExport = async () => {
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

6
src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
View File

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

6
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
View File

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

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
View File

@ -299,7 +299,7 @@ const searchFormClick = (searchData) => {
const cmd = { const cmd = {
'column':'type', 'column':'type',
'action':'==', 'action':'==',
'value':'predict' 'value':'scrap'
} }
searchData.filters.push(cmd) searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {

6
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
View File

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

Write Preview
Loading…
Cancel
Save