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

BUG修改

master
yejiaxing 10 months ago
parent
2f1a3399c9
commit
a66e058b91
7 changed files with 498 additions and 84 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. 5
      src/api/eam/basic/deviceMoldItems/index.ts
  2. 3
      src/utils/dict.ts
  3. 78
      src/views/eam/basic/deviceMoldItems/deviceMoldItems.data.ts
  4. 134
      src/views/eam/basic/inspection/deviceMoldItems.data.ts
  5. 7
      src/views/eam/basic/inspection/index.vue
  6. 133
      src/views/eam/basic/maintenance/deviceMoldItems.data.ts
  7. 222
      src/views/eam/basic/maintenance/index.vue

5
src/api/eam/basic/deviceMoldItems/index.ts
View File

@ -26,6 +26,11 @@ export const getDeviceMoldItems = async (id: number) => {
return await request.get({ url: `/eam/device-mold-items/get?id=` + id }) return await request.get({ url: `/eam/device-mold-items/get?id=` + id })
} }
// 查询供应商发票申请主详情
export const getNumber = async (params) => {
return await request.get({ url: `/eam/device-mold-items/getNumber`, params})
}
// 新增项记录表（设备 模具 保养 维修 巡检点检） // 新增项记录表（设备 模具 保养 维修 巡检点检）
export const createDeviceMoldItems = async (data: DeviceMoldItemsVO) => { export const createDeviceMoldItems = async (data: DeviceMoldItemsVO) => {
return await request.post({ url: `/eam/device-mold-items/create`, data }) return await request.post({ url: `/eam/device-mold-items/create`, data })

3
src/utils/dict.ts
View File

@ -273,4 +273,7 @@ export enum DICT_TYPE {
BIND_TYPE = 'bind_type', // 器具绑定类型 BIND_TYPE = 'bind_type', // 器具绑定类型
CONTAINER_STATUS = 'container_status', // 容器状态 CONTAINER_STATUS = 'container_status', // 容器状态
LOCATION_AREA_TYPE = 'location_area_type', // 库区类型 LOCATION_AREA_TYPE = 'location_area_type', // 库区类型
DEVICEMOLDITEMS_STATUS = 'devicemolditems_status', // 项类型
DEVICE_MOLD_TYPE = 'device_mold_type', // 设备/模具类型
} }

78
src/views/eam/basic/deviceMoldItems/deviceMoldItems.data.ts
View File

@ -1,78 +0,0 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const DeviceMoldItemsRules = reactive({
name: [required],
deviceNumber: [required],
type: [required],
status: [required],
concurrencyStamp: [required],
})
export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '保养项名称',
field: 'name',
sort: 'custom',
isSearch: true,
},
{
label: '设备模具编号',
field: 'deviceNumber',
sort: 'custom',
isSearch: true,
},
{
label: '类型',
field: 'type',
sort: 'custom',
isSearch: true,
form: {
component: 'Select'
},
},
{
label: '项类型',
field: 'status',
sort: 'custom',
isSearch: true,
form: {
component: 'Select'
},
},
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
inactiveValue: 'FALSE',
disabled: true
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

134
src/views/eam/basic/inspection/deviceMoldItems.data.ts
View File

@ -0,0 +1,134 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
// 表单校验
export const DeviceMoldItemsRules = reactive({
name: [required],
deviceNumber: [required],
type: [required],
status: [required],
concurrencyStamp: [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 DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '保养项名称',
field: 'name',
sort: 'custom',
isSearch: true,
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select'
},
},
{
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: 'type',
isMainValue: true
}
]
}
}
},
{
label: '项类型',
field: 'status',
dictType: DICT_TYPE.DEVICEMOLDITEMS_STATUS,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select',
value: 'INSPECTION',
componentProps: {
disabled: true
}
},
},
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
inactiveValue: 'FALSE',
disabled: true
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

7
src/views/eam/basic/deviceMoldItems/index.vue → src/views/eam/basic/inspection/index.vue
View File

@ -53,8 +53,6 @@
<!-- 详情 --> <!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMoldItems.allSchemas" /> <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMoldItems.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/device-mold-items/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -66,11 +64,10 @@ 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'
defineOptions({ name: 'DeviceMoldItems' }) defineOptions({ name: 'Inspection' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息 const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
@ -119,8 +116,6 @@ const HeadButttondata = [
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增 if (val == 'add') { // 新增
openForm('create') openForm('create')
} else if (val == 'import') { // 导入
handleImport()
} else if (val == 'export') { // 导出 } else if (val == 'export') { // 导出
handleExport() handleExport()
} else if (val == 'refresh') { // 刷新 } else if (val == 'refresh') { // 刷新

133
src/views/eam/basic/maintenance/deviceMoldItems.data.ts
View File

@ -0,0 +1,133 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
// 表单校验
export const DeviceMoldItemsRules = reactive({
name: [required],
deviceNumber: [required],
type: [required],
status: [required],
concurrencyStamp: [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 DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '保养项名称',
field: 'name',
sort: 'custom',
isSearch: true,
},
{
label: '类型',
field: 'type',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select'
},
},
{
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: 'type',
isMainValue: true
}
]
}
}
},
{
label: '项类型',
field: 'status',
dictType: DICT_TYPE.DEVICEMOLDITEMS_STATUS,
dictClass: 'string',
sort: 'custom',
isSearch: true,
form: {
component: 'Select',
value: 'MAINTAIN',
componentProps: {
disabled: true
}
},
},
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
inactiveValue: 'FALSE',
disabled: true
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

222
src/views/eam/basic/maintenance/index.vue
View File

@ -0,0 +1,222 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeviceMoldItems.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeviceMoldItems.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 #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="DeviceMoldItemsRules"
:formAllSchemas="DeviceMoldItems.allSchemas"
:apiUpdate="DeviceMoldItemsApi.updateDeviceMoldItems"
:apiCreate="DeviceMoldItemsApi.createDeviceMoldItems"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMoldItems.allSchemas" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { DeviceMoldItems,DeviceMoldItemsRules } from './deviceMoldItems.data'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'Maintenance' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(DeviceMoldItems.allSchemas.tableColumns)
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: DeviceMoldItemsApi.getDeviceMoldItemsPage // 分页接口
})
// 获得表格的各种操作
const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增
defaultButtons.defaultImportBtn(null), // 导入
defaultButtons.defaultExportBtn(null), // 导出
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 == '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 basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form表单提交
const formsSuccess = async (formType,data) => {
var isHave =DeviceMoldItems.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;
if (formType === 'create') {
await DeviceMoldItemsApi.createDeviceMoldItems(data)
message.success(t('common.createSuccess'))
} else {
await DeviceMoldItemsApi.updateDeviceMoldItems(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicDeviceMoldItems')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await DeviceMoldItemsApi.deleteDeviceMoldItems(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 DeviceMoldItemsApi.exportDeviceMoldItems(tableObject.params)
download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
// 筛选提交
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() // 刷新当前列表
}
/** 初始化 **/
onMounted(async () => {
getList()
})
</script>
Write Preview
Loading…
Cancel
Save