Browse Source

SBBJ-812保养项配置逻辑修改:所有的设备或模具列出是所有保养项,保养计划按照每个设备或模具分周期或次数去选择保养项

master
张立 2 months ago
parent
commit
3dad9bbd72
  1. 97
      src/components/BasicForm/src/BasicForm.vue
  2. 137
      src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
  3. 59
      src/views/eam/basic/moldMaintenanceConfig/index.vue

97
src/components/BasicForm/src/BasicForm.vue

@ -241,6 +241,87 @@ const props = defineProps({
required: false,
default: false
},
// or
isShowFooterButtton: {
type: Boolean,
required: false,
default: true
},
//
tableFormDataLength: {
type: Boolean,
required: false,
default: true
},
//
footButttondata: {
type: Array,
required: false,
default: null
},
//
isOpenSearchTable: {
type: Boolean,
required: false,
default: false
},
fieldTableColumn: {
type: String,
required: false,
default: ''
},
//searchTable
/***[{
formField:form中对应的field,
tableField:searchtable中对应的field,
}]*/
sumFormDataField: {
type: Array,
required: false,
default: null
},
sumFormDataByForm: {
type: Function,
required: false,
default: null
},
sumFormDataByTableCustom: {
type: Function,
required: false,
default: null
},
showSearchTableQueryFields: {
type: Array,
required: false,
default: ()=>[]
},
hiddenFilterBtnFields:{
type: Array,
required: false,
default:()=>[]
},
// //
isJiaoyan: {
type: Boolean,
required: false,
default: false
},
// true ; false
isCheckStrictly:{
type:Boolean,
default:false
},
// true ; false
includeCollectionTable:{
type:Boolean,
default:false
},
//
fixedScrollHieght:{
type:Boolean,
default:false
}
})
const { t } = useI18n() //
@ -526,7 +607,21 @@ const handleDeleteTable = (row, index) => {
}
//
const handleAddTable = () => {
emit('handleAddTable')
if (props.isOpenSearchTable) {
const tableFormKeys = {}
tableAllSchemas.value.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
if (props.fieldTableColumn != '') {
inpuFocus(
tableAllSchemas.value.tableFormColumns.find((item) => item.field == props.fieldTableColumn),
tableFormKeys,
0
)
}
} else {
emit('handleAddTable')
}
}
//
const inpuFocus = (headerItem, row, index) => {

137
src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts

@ -231,3 +231,140 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
}
}
]))
export const DeviceMaintenanceTwo = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '保养内容',
field: 'name',
sort: 'custom',
isSearch: true,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择设备保养项', // 输入框占位文本
searchField: 'name', // 查询弹窗赋值字段
searchTitle: '设备保养项信息', // 查询弹窗标题
searchAllSchemas: DeviceMaintenance.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getDeviceMoldItemsPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "DEVICE",
isMainValue: false
}
]
}
},
tableForm: {
multiple: true,
isInpuFocusShow: false, // 开启查询弹窗
disabled:true,
searchListPlaceholder: '请选择设备保养项',
searchField: 'name',
searchTitle: '设备保养项信息',
searchAllSchemas: DeviceMaintenance.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getDeviceMoldItemsPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "DEVICE",
isMainValue: false
}
]
},
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
value: 'DEVICE',
componentProps: {
disabled: true,
}
},
tableForm: {
type:'Select',
disabled: true,
}
},
{
label: '设备保养部位',
field: 'equipmentParts',
sort: 'custom',
isSearch: true,
tableForm: {
disabled: true,
}
},
{
label: '项类型',
field: 'status',
dictType: DICT_TYPE.DEVICEMOLDITEMS_STATUS,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select',
value: 'MAINTAIN',
componentProps: {
disabled: true
}
},
tableForm: {
type: 'Select',
disabled: true,
}
},
{
label: '人数',
field: 'peoples',
sort: 'custom',
isSearch: false,
table: {
width: 150,
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
max: 100,
precision: 0
}
},
tableForm: {
disabled: true,
}
},
{
label: '保养所需时间(分钟)',
field: 'estimatedMinutes',
sort: 'custom',
isSearch: false,
table: {
width: 200,
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 0
}
},
tableForm: {
disabled: true,
}
},
]))

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

@ -42,11 +42,11 @@
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="fromPackingNumber"
fieldTableColumn="name"
@success="getList"
:rules="MoldMaintenanceConfigRules"
:formAllSchemas="MoldMaintenanceConfig.allSchemas"
:tableAllSchemas="DeviceMaintenance.allSchemas"
:tableAllSchemas="DeviceMaintenanceTwo.allSchemas"
:tableFormRules="DeviceMaintenanceRules"
:tableData="tableData"
:apiUpdate="MoldMaintenanceConfigApi.updateMoldMaintenanceConfig"
@ -88,7 +88,7 @@ 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 {DeviceMaintenance, DeviceMaintenanceRules} from '@/views/eam/basic/deviceMaintenance/deviceMaintenance.data'
import {DeviceMaintenance, DeviceMaintenanceTwo,DeviceMaintenanceRules} from '@/views/eam/basic/deviceMaintenance/deviceMaintenance.data'
import * as DeviceMaintenanceApi from '@/api/eam/basic/deviceMaintenance'
defineOptions({ name: 'DeviceMoldMaintenanceConfig' })
@ -127,19 +127,60 @@ routeName.value = route.name
const tableColumns = ref(MoldMaintenanceConfig.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
if(formField == 'deviceNumber'){
setV['deviceName'] = val[0].name
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 == 'deviceName') {
setV['deviceName'] = val[0].name
}
formRef.setValues(setV)
}
formRef.setValues(setV)
})
}
//
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
formRef.value.formLoading = true
try {
if (formType === 'create') {
console.log(data)
await InventorychangeRequestMainApi.createInventorychangeRequestMain(data)
message.success(t('common.createSuccess'))
} else {
console.log('data',data);
data.id = data.masterId
await InventorychangeRequestMainApi.updateInventorychangeRequestMain(data)
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
//
if (formType === 'create') {
getList()
}else{
buttonBaseClick('refresh',null)
}
} finally {
formRef.value.formLoading = false
}
}
//

Loading…
Cancel
Save