eam
/
eam-ui
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
曾庆源 6 days ago
parent
4bab29beea 589d571d2c
commit
ac496b8bca
6 changed files with 600 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

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

@ -68,41 +68,41 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
},
{
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: "MOLD",
isMainValue: false
}
]
}
}
},
{
label: '模具名称',
field: 'deviceName',
sort: 'custom',
isSearch: true,
isForm: false,
},
// {
// 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: "MOLD",
// isMainValue: false
// }
// ]
// }
// }
// },
// {
// label: '模具名称',
// field: 'deviceName',
// sort: 'custom',
// isSearch: true,
// isForm: false,
// },
{
label: '项类型',
field: 'status',
@ -118,17 +118,17 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '保养周期',
field: 'executionCycle',
dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE,
dictClass: 'string',
sort: 'custom',
isSearch: false,
form: {
component: 'Select'
},
},
// {
// label: '保养周期',
// field: 'executionCycle',
// dictType: DICT_TYPE.MOLD_EXECUTION_CYCLE,
// dictClass: 'string',
// sort: 'custom',
// isSearch: false,
// form: {
// component: 'Select'
// },
// },
// {
// label: '涂装保养周期-月份',
// field: 'executionCycleMonth',

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

@ -101,7 +101,7 @@ 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: 'DeviceMoldMaintenanceConfig' })
defineOptions({ name: 'MoldMaintenanceConfig' })
/**
* tableForm方法
@ -166,7 +166,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// 主子数据 提交
const submitForm = async (formType, submitData) => {
let data = {...submitData}
data.type = 'DEVICE'
data.type = 'MOLD'
formRef.value.formLoading = true
try {
if (formType === 'create') {
@ -417,6 +417,10 @@ const deteleNewFuction =async (row)=>{
/** 初始化 **/
onMounted(async () => {
tableObject.params = {
available: 'TRUE',
type: 'MOLD'
}
getList()
importTemplateData.templateUrl = await MoldMaintenanceConfigApi.importTemplate()
})

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

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

Write Preview
Loading…
Cancel
Save