Browse Source

SBBJ-812保养项配置逻辑修改

master
zhaoyiran 1 week ago
parent
commit
75bcd3274b
  1. 428
      src/views/eam/basic/deviceMaintenanceConfig/index.vue
  2. 112
      src/views/eam/basic/deviceMaintenanceConfig/moldMaintenanceConfig.data.ts
  3. 2
      src/views/eam/basic/moldMaintenance/index.vue
  4. 92
      src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
  5. 8
      src/views/eam/basic/moldMaintenanceConfig/index.vue
  6. 12
      src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts

428
src/views/eam/basic/deviceMaintenanceConfig/index.vue

@ -0,0 +1,428 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="MoldMaintenanceConfig.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="MoldMaintenanceConfig.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #deviceNumber="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.deviceNumber)">
<span>{{ row.deviceNumber }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="name"
@success="getList"
:rules="MoldMaintenanceConfigRules"
:formAllSchemas="MoldMaintenanceConfig.allSchemas"
:tableAllSchemas="DeviceMaintenanceTwo.allSchemas"
:tableFormRules="DeviceMaintenanceRules"
:tableData="tableData"
:apiUpdate="MoldMaintenanceConfigApi.updateMoldMaintenanceConfig"
:apiCreate="MoldMaintenanceConfigApi.createMoldMaintenanceConfig"
:isBusiness="true"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
:isShowReduceButtonSelection="true"
@tableSelectionDelete="tableSelectionDelete"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="MoldMaintenanceConfig.allSchemas"
:detailAllSchemas="DeviceMaintenanceTwo.allSchemas"
:apiCreate="DeviceMaintenanceApi.createDeviceMoldItems"
:apiUpdate="DeviceMaintenanceApi.updateDeviceMoldItems"
:apiPage="MoldMaintenanceConfigApi.getDeviceMoldItemsPage"
:apiDelete="DeviceMaintenanceApi.deleteDeviceMoldItems"
@searchTableSuccessDetail="searchTableSuccessDetail"
:isNewFuction='true'
@openFormNewFuction="openFormNewFuction"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="true"
:isNewDetele="true"
@deteleNewFuction="deteleNewFuction"
/>
<!-- 详情 -->
<!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="MoldMaintenanceConfig.allSchemas" /> -->
<SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/device/mold-maintenance-config/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { MoldMaintenanceConfig,MoldMaintenanceConfigRules } from './moldMaintenanceConfig.data'
import * as MoldMaintenanceConfigApi from '@/api/eam/basic/moldMaintenanceConfig'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
import { SearchTable } from '@/components/SearchTable'
import {DeviceMaintenance, DeviceMaintenanceTwo,DeviceMaintenanceRules} from '@/views/eam/basic/deviceMaintenance/deviceMaintenance.data'
import * as DeviceMaintenanceApi from '@/api/eam/basic/deviceMaintenance'
// import { DeviceAccounts } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
// import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
defineOptions({ name: 'DeviceMaintenanceConfig' })
/**
* tableForm方法
*/
const tableFormKeys = {}
DeviceMaintenance.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
const tableData = ref([])
//
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
let itemIndex = tableData.value.indexOf(item)
if(itemIndex>-1){
tableData.value.splice(itemIndex, 1)
}
}
const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(MoldMaintenanceConfig.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => {
if (type == 'tableForm') {
//
if (formField == 'name') {
val = val.filter(item => !tableData.value.find(item1 => item1['id'] == item['id']))
if (val.length == 0) return
val.forEach(item => {
const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
tableData.value.push(newRow)
})
} else {
row[formField] = val[0][searchField]
}
} else {
const setV = {}
setV[formField] = val[0][searchField]
if (formField == 'deviceNumber') {
setV['deviceName'] = val[0].name
}
formRef.setValues(setV)
}
})
}
//
const submitForm = async (formType, submitData) => {
let data = {...submitData}
data.type = 'DEVICE'
formRef.value.formLoading = true
try {
if (formType === 'create') {
data.subList = tableData.value //
data.maintenanceItemId = data.subList.map(item=>item.id).join(',')
console.log(data)
await MoldMaintenanceConfigApi.createMoldMaintenanceConfig(data)
message.success(t('common.createSuccess'))
} else {
console.log('data',data);
await MoldMaintenanceConfigApi.updateMoldMaintenanceConfig(data)
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
//
if (formType === 'create') {
getList()
}else{
buttonBaseClick('refresh',null)
}
} finally {
formRef.value.formLoading = false
}
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
if(formField == 'fromPackingNumber') {
setV['fromPackingNumber'] = val[0]['packingNumber']
setV['itemCode'] = val[0]['itemCode']
setV['fromBatch'] = val[0]['batch']
setV['toBatch'] = val[0]['batch']
setV['locationCode'] = val[0]['locationCode']
setV['fromQty'] = val[0]['qty']
setV['fromInventoryStatus'] = val[0]['inventoryStatus']
setV['uom'] = val[0]['uom']
} else {
setV[formField] = val[0][searchField]
}
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: MoldMaintenanceConfigApi.getMoldMaintenanceConfigPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), //
defaultButtons.defaultImportBtn({hasPermi:'eam:moldMaintenanceConfig:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'eam:moldMaintenanceConfig:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn(null), //
defaultButtons.mainListDeleteBtn(null), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm =async (type: string, row?: number) => {
tableData.value = [] //
formRef.value.open(type, row)
}
// // form
// const formsSuccess = async (formType,data) => {
// var isHave =MoldMaintenanceConfig.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;
// }
// }
// if(data.activeTime==0)data.activeTime = null;
// if(data.expireTime==0)data.expireTime = null;
// data.type = 'DEVICE'
// if (formType === 'create') {
// await MoldMaintenanceConfigApi.createMoldMaintenanceConfig(data)
// message.success(t('common.createSuccess'))
// } else {
// await MoldMaintenanceConfigApi.updateMoldMaintenanceConfig(data)
// message.success(t('common.updateSuccess'))
// }
// basicFormRef.value.dialogVisible = false
// getList()
// }
/** 详情操作 */
const detailRef = ref()
const masterId = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
masterId.value = row.id
detailRef.value.openDetail(row, titleName, titleValue, 'basicMoldMaintenanceConfig')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await MoldMaintenanceConfigApi.deleteMoldMaintenanceConfig(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await MoldMaintenanceConfigApi.exportMoldMaintenanceConfig(tableObject.params)
download.excel(data, '设备模具保养项配置.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '设备模具保养项配置导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
const searchTableRef = ref()
const openFormNewFuction = ()=>{
searchTableRef.value.open(
'选择设备保养项',
DeviceMaintenance.allSchemas,
DeviceMaintenanceApi.getDeviceMoldItemsPage,
null,
DeviceMaintenance.allSchemas.searchSchema,
true,
null,
null,
null,
null,
null
// searchTableSelections.value
)
}
const submitItem = async (formType, data, val, tableList) => {
console.log('formType',formType)
console.log('data',data)
console.log('val',val)
console.log('tableList',tableList)
let maintenanceItemId = val.map(item=>item.id).join(',')
let data1 = {
maintenanceItemId : maintenanceItemId,
masterId : masterId.value
}
await MoldMaintenanceConfigApi.addMaintenanceItem(data1)
message.success(t('common.createSuccess'))
await detailRef.value.getList()
searchTableRef.value.searchDialogVisible=false
}
const deteleNewFuction =async (row)=>{
console.log('row',row)
try {
//
await message.delConfirm()
//
let data1 = {
detailId : row.id,
masterId : masterId.value
}
await MoldMaintenanceConfigApi.delMaintenanceItem(data1)
message.success(t('common.delSuccess'))
//
await detailRef.value.getList()
} catch {}
}
/** 初始化 **/
onMounted(async () => {
tableObject.params = {
available: 'TRUE',
type: 'DEVICE'
}
getList()
importTemplateData.templateUrl = await MoldMaintenanceConfigApi.importTemplate()
})
</script>

112
src/views/eam/basic/deviceMaintenanceConfig/moldMaintenanceConfig.data.ts

@ -0,0 +1,112 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
// 表单校验
export const MoldMaintenanceConfigRules = reactive({
deviceNumber: [required],
executionCycle: [required],
})
export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '编号',
field: 'number',
sort: 'custom',
isForm: false,
table: {
width: 180,
fixed: 'left'
},
},
{
label: '名称',
field: 'name',
sort: 'custom',
},
{
label: '规格型号',
field: 'specification',
sort: 'custom',
},
]))
export const MoldMaintenanceConfig = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '设备编号',
field: 'deviceNumber',
sort: 'custom',
isSearch: true,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择设备', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: '设备信息', // 查询弹窗标题
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "DEVICE",
isMainValue: false
}
]
}
}
},
{
label: '设备名称',
field: 'deviceName',
sort: 'custom',
isSearch: true,
form: {
componentProps: {
disabled: true
}
},
},
{
label: '保养周期',
field: 'executionCycle',
dictType: DICT_TYPE.EXECUTION_CYCLE,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
{
label: '类型',
field: 'type',
isTable: false,
isForm: false,
isSearch: false,
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

2
src/views/eam/basic/moldMaintenance/index.vue

@ -235,6 +235,8 @@ const formsSuccess = async (formType,data) => {
if (formType === 'create') { if (formType === 'create') {
await MoldMaintenanceApi.createDeviceMoldItems(data) await MoldMaintenanceApi.createDeviceMoldItems(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
basicFormRef.value.dialogVisible = false
getList()
} else { } else {
openDataNew.value = data openDataNew.value = data
if(judgeSame()){ if(judgeSame()){

92
src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

@ -68,41 +68,41 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
}, },
{ // {
label: '模具编号', // label: '模具编号',
field: 'deviceNumber', // field: 'deviceNumber',
sort: 'custom', // sort: 'custom',
isSearch: true, // isSearch: true,
form: { // form: {
// labelMessage: '信息提示说明!!!', // // labelMessage: '信息提示说明!!!',
componentProps: { // componentProps: {
isSearchList: true, // 开启查询弹窗 // isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择模具编号', // 输入框占位文本 // searchListPlaceholder: '请选择模具编号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 // searchField: 'number', // 查询弹窗赋值字段
searchTitle: '模具信息', // 查询弹窗标题 // searchTitle: '模具信息', // 查询弹窗标题
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 // searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 // searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [ // searchCondition: [
{ // {
key: 'available', // key: 'available',
value: "TRUE", // value: "TRUE",
isMainValue: false // isMainValue: false
}, { // }, {
key: 'type', // key: 'type',
value: "MOLD", // value: "MOLD",
isMainValue: false // isMainValue: false
} // }
] // ]
} // }
} // }
}, // },
{ // {
label: '模具名称', // label: '模具名称',
field: 'deviceName', // field: 'deviceName',
sort: 'custom', // sort: 'custom',
isSearch: true, // isSearch: true,
isForm: false, // isForm: false,
}, // },
{ {
label: '项类型', label: '项类型',
field: 'status', field: 'status',
@ -118,17 +118,17 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
{ // {
label: '保养周期', // label: '保养周期',
field: 'executionCycle', // field: 'executionCycle',
dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE, // dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE,
dictClass: 'string', // dictClass: 'string',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
form: { // form: {
component: 'Select' // component: 'Select'
}, // },
}, // },
// { // {
// label: '涂装保养周期-月份', // label: '涂装保养周期-月份',
// field: 'executionCycleMonth', // field: 'executionCycleMonth',

8
src/views/eam/basic/moldMaintenanceConfig/index.vue

@ -101,7 +101,7 @@ import * as DeviceMaintenanceApi from '@/api/eam/basic/deviceMaintenance'
// import { DeviceAccounts } from '@/views/eam/device/deviceAccounts/deviceAccounts.data' // import { DeviceAccounts } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
// import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts' // import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
defineOptions({ name: 'DeviceMoldMaintenanceConfig' }) defineOptions({ name: 'MoldMaintenanceConfig' })
/** /**
* tableForm方法 * tableForm方法
@ -166,7 +166,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// //
const submitForm = async (formType, submitData) => { const submitForm = async (formType, submitData) => {
let data = {...submitData} let data = {...submitData}
data.type = 'DEVICE' data.type = 'MOLD'
formRef.value.formLoading = true formRef.value.formLoading = true
try { try {
if (formType === 'create') { if (formType === 'create') {
@ -417,6 +417,10 @@ const deteleNewFuction =async (row)=>{
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
tableObject.params = {
available: 'TRUE',
type: 'MOLD'
}
getList() getList()
importTemplateData.templateUrl = await MoldMaintenanceConfigApi.importTemplate() importTemplateData.templateUrl = await MoldMaintenanceConfigApi.importTemplate()
}) })

12
src/views/eam/basic/moldMaintenanceConfig/moldMaintenanceConfig.data.ts

@ -35,17 +35,17 @@ export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
export const MoldMaintenanceConfig = useCrudSchemas(reactive<CrudSchema[]>([ export const MoldMaintenanceConfig = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '设备编号', label: '模具编号',
field: 'deviceNumber', field: 'deviceNumber',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: true,
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择单号', // 输入框占位文本 searchListPlaceholder: '请选择模具', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
searchTitle: '单号信息', // 查询弹窗标题 searchTitle: '模具信息', // 查询弹窗标题
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
@ -55,7 +55,7 @@ export const MoldMaintenanceConfig = useCrudSchemas(reactive<CrudSchema[]>([
isMainValue: false isMainValue: false
}, { }, {
key: 'type', key: 'type',
value: "DEVICE", value: "MOLD",
isMainValue: false isMainValue: false
} }
] ]
@ -63,7 +63,7 @@ export const MoldMaintenanceConfig = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '设备名称', label: '模具名称',
field: 'deviceName', field: 'deviceName',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,

Loading…
Cancel
Save