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

修复bug

master
ljlong_2630 5 months ago
parent
364663da44
commit
aee4e4bdb8
12 changed files with 464 additions and 58 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. 1
      src/api/eam/device/deviceRepair/index.ts
  2. 1
      src/api/eam/device/techRepair/index.ts
  3. 1
      src/api/eam/mold/moldRepair/index.ts
  4. 45
      src/views/eam/device/deviceRepair/deviceRepair.data.ts
  5. 121
      src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts
  6. 5
      src/views/eam/device/devicemaintenancejob/index.vue
  7. 45
      src/views/eam/device/techRepair/techRepair.data.ts
  8. 5
      src/views/eam/device/techmaintenancejob/index.vue
  9. 110
      src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts
  10. 70
      src/views/eam/mold/moldRepair/moldRepair.data.ts
  11. 5
      src/views/eam/mold/moldmaintenancejob/index.vue
  12. 109
      src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts

1
src/api/eam/device/deviceRepair/index.ts
View File

@ -17,6 +17,7 @@ export interface DeviceRepairVO {
// 查询报修申请列表
export const getDeviceRepairPage = async (params) => {
params.type = 'DEVICE'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }

1
src/api/eam/device/techRepair/index.ts
View File

@ -17,6 +17,7 @@ export interface DeviceRepairVO {
// 查询报修申请列表
export const getDeviceRepairPage = async (params) => {
params.type = 'TECH'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }

1
src/api/eam/mold/moldRepair/index.ts
View File

@ -16,6 +16,7 @@ export interface MoldRepairVO {
// 查询报修申请列表
export const getMoldRepairPage = async (params) => {
params.type = 'MOLD'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }

45
src/views/eam/device/deviceRepair/deviceRepair.data.ts
View File

@ -85,20 +85,20 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
},
isSearch: true,
search: {
component: 'Select',
componentProps: {
options: deviceMoldTypeList,
optionsAlias: {
labelField: 'label',
valueField: 'value'
},
// disabled: true,
filterable: true,
placeholder: "请选择类型"
}
},
isSearch: false,
// search: {
// component: 'Select',
// componentProps: {
// options: deviceMoldTypeList,
// optionsAlias: {
// labelField: 'label',
// valueField: 'value'
// },
// // disabled: true,
// filterable: true,
// placeholder: "请选择类型"
// }
// },
form: {
component: 'Select',
componentProps: {
@ -107,10 +107,11 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
labelField: 'label',
valueField: 'value'
},
// disabled: true,
disabled: true,
filterable: true,
placeholder: "请选择设备"
}
},
value: 'DEVICE',
},
},
{
@ -182,6 +183,18 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
},
},
},
{
label: '报修时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
table: {
width: '200',
},
},
// {
// label: '故障类型',
// field: 'faultType',

121
src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts
View File

@ -1,4 +1,5 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { selectAllFactoryArea } from '@/api/system/dept'
import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
import { useUserStore } from '@/store/modules/user'
@ -151,7 +152,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '维修人',
label: '接单人',
field: 'maintenance',
sort: 'custom',
isDetail: false,
@ -191,7 +192,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '维修人',
label: '接单人',
field: 'maintenanceDetail',
sort: 'custom',
isDetail: true,
@ -203,6 +204,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '接单时间',
field: 'receivingTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '接单时间',
field: 'receivingTimeDetail',
sort: 'custom',
isSearch: false,
isDetail: true,
isTableForm: false,
isForm: false,
isTable: false,
table: {
width: '200',
},
},
{
label: '类型',
field: 'type',
@ -216,6 +243,17 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
},
// dictType: DICT_TYPE.APP_DEVICE_MOLD_TYPE,
isSearch: true,
search: {
component: 'Select',
componentProps: {
options: deviceMoldTypeList,
optionsAlias: {
labelField: 'label',
valueField: 'value'
},
filterable: true,
},
},
form: {
component: 'Select',
componentProps: {
@ -323,6 +361,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.ORDER_COMPLETE_RESULT,
dictClass: 'string',
},
{
label: '完成时间',
field: 'completionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '完成时间',
field: 'completionTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '报修人',
field: 'declarer',
@ -373,6 +437,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '确认时间',
field: 'applyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '确认时间',
field: 'applyTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '验证人',
field: 'verifyer',
@ -423,7 +513,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '验证时间',
field: 'verifyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '验证时间',
field: 'verifyTimeDetail',
sort: 'custom',
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
isTable: false,
table: {
width: '200',
},
},
{
label: '操作',
field: 'action',

5
src/views/eam/device/devicemaintenancejob/index.vue
View File

@ -236,6 +236,7 @@ import * as ItemApi from '@/api/eam/basic/item'
import { emit } from 'process'
import { verify } from 'crypto'
import { watch } from 'vue';
import dayjs from 'dayjs'
const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD')
defineOptions({ name: 'DeviceMaintenanceMain' })
@ -784,6 +785,10 @@ const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss');
row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss');
row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss');
row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss');
row.classes = row.classes+''
operatRecord.value = row;
detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain')

45
src/views/eam/device/techRepair/techRepair.data.ts
View File

@ -85,20 +85,20 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
},
isSearch: true,
search: {
component: 'Select',
componentProps: {
options: deviceMoldTypeList,
optionsAlias: {
labelField: 'label',
valueField: 'value'
},
// disabled: true,
filterable: true,
placeholder: "请选择类型"
}
},
isSearch: false,
// search: {
// component: 'Select',
// componentProps: {
// options: deviceMoldTypeList,
// optionsAlias: {
// labelField: 'label',
// valueField: 'value'
// },
// // disabled: true,
// filterable: true,
// placeholder: "请选择类型"
// },
// },
form: {
component: 'Select',
componentProps: {
@ -107,10 +107,11 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
labelField: 'label',
valueField: 'value'
},
// disabled: true,
disabled: true,
filterable: true,
placeholder: "请选择类型"
}
},
value: 'TECH'
},
},
{
@ -182,6 +183,18 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
},
},
},
{
label: '报修时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
table: {
width: '200',
},
},
// {
// label: '故障类型',
// field: 'faultType',

5
src/views/eam/device/techmaintenancejob/index.vue
View File

@ -236,6 +236,7 @@ import * as ItemApi from '@/api/eam/basic/item'
import { emit } from 'process'
import { verify } from 'crypto'
import { watch } from 'vue';
import dayjs from 'dayjs'
const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD')
defineOptions({ name: 'TechMaintenanceMain' })
@ -763,6 +764,10 @@ const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss');
row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss');
row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss');
row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss');
row.classes = row.classes+''
operatRecord.value = row;
detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain')

110
src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts
View File

@ -7,6 +7,7 @@ import * as ItemApi from '@/api/eam/basic/item'
import * as UserApi from '@/api/system/user'
import { getStrDictOptions } from '@/utils/dict'
import { selecUserByType } from '@/api/system/dept'
import { dateFormatter } from '@/utils/formatTime'
const userStore = useUserStore()
const factoryList = await selectAllFactoryArea()
const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
@ -151,7 +152,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '维修人',
label: '接单人',
field: 'maintenance',
sort: 'custom',
isDetail: false,
@ -191,7 +192,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '维修人',
label: '接单人',
field: 'maintenanceDetail',
sort: 'custom',
isDetail: true,
@ -203,6 +204,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '接单时间',
field: 'receivingTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '接单时间',
field: 'receivingTimeDetail',
sort: 'custom',
isSearch: false,
isDetail: true,
isTableForm: false,
isForm: false,
isTable: false,
table: {
width: '200',
},
},
{
label: '类型',
field: 'type',
@ -335,6 +362,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.ORDER_COMPLETE_RESULT,
dictClass: 'string',
},
{
label: '完成时间',
field: 'completionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '完成时间',
field: 'completionTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '报修人',
field: 'declarer',
@ -385,6 +438,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '确认时间',
field: 'applyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '确认时间',
field: 'applyTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '验证人',
field: 'verifyer',
@ -435,7 +514,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '验证时间',
field: 'verifyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '验证时间',
field: 'verifyTimeDetail',
sort: 'custom',
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
isTable: false,
table: {
width: '200',
},
},
{
label: '操作',
field: 'action',

70
src/views/eam/mold/moldRepair/moldRepair.data.ts
View File

@ -88,20 +88,20 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
},
isSearch: true,
search: {
component: 'Select',
componentProps: {
options: deviceMoldTypeList,
optionsAlias: {
labelField: 'label',
valueField: 'value'
},
// disabled: true,
filterable: true,
placeholder: "请选择类型"
}
},
isSearch: false,
// search: {
// component: 'Select',
// componentProps: {
// options: deviceMoldTypeList,
// optionsAlias: {
// labelField: 'label',
// valueField: 'value'
// },
// // disabled: true,
// filterable: true,
// placeholder: "请选择类型"
// }
// },
form: {
component: 'Select',
componentProps: {
@ -110,10 +110,11 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
labelField: 'label',
valueField: 'value'
},
// disabled: true,
disabled: true,
filterable: true,
placeholder: "请选择类型"
}
},
value: 'MOLD'
},
},
{
@ -151,6 +152,7 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
},
}
},
{
label: '报修人电话',
field: 'declarerPhone',
@ -159,6 +161,42 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
width: '150',
},
},
{
label: '报修人',
field: 'declarer',
sort: 'custom',
table: {
width: '150',
},
isForm: false,
isDetail: false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userListAll.find((account) => account.id == cellValue)?.nickname
},
search: {
component: 'Select',
componentProps: {
options: userListAll,
optionsAlias: {
labelField: 'nickname',
valueField: 'id'
},
filterable: true,
},
},
},
{
label: '报修时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
table: {
width: '200',
},
},
// {
// label: '故障类型',
// field: 'faultType',

5
src/views/eam/mold/moldmaintenancejob/index.vue
View File

@ -230,6 +230,7 @@ import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
import * as MoldAccountsApi from '@/api/eam/mold/moldAccounts'
import * as UserApi from '@/api/system/user'
import { selectAllFactoryArea } from '@/api/system/dept'
import dayjs from 'dayjs'
const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
const moldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'MOLD')
defineOptions({ name: 'MoldMaintenanceMain' })
@ -547,6 +548,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss');
row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss');
row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss');
row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss');
row.classes = row.classes+''
operatRecord.value = row;
detailRef.value.openDetail(row, titleName, titleValue,'MoldMaintenanceMain')

109
src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts
View File

@ -7,6 +7,7 @@ import { ItemSearchTable } from '../../basic/item/item.data'
import * as ItemApi from '@/api/eam/basic/item'
import * as UserApi from '@/api/system/user'
import { getStrDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
const userListAll = await UserApi.getSimpleUserList()
console.log(userListAll)
const userStore = useUserStore()
@ -201,7 +202,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
},
{
label: '维修人',
label: '接单人',
field: 'maintenance',
sort: 'custom',
table: {
@ -241,7 +242,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '维修人',
label: '接单人',
field: 'maintenanceDetail',
sort: 'custom',
isDetail: true,
@ -250,6 +251,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
isTableForm: false,
},
{
label: '接单时间',
field: 'receivingTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '接单时间',
field: 'receivingTimeDetail',
sort: 'custom',
isSearch: false,
isDetail: true,
isTableForm: false,
isForm: false,
isTable: false,
table: {
width: '200',
},
},
{
label: '班次',
field: 'classes',
@ -331,6 +358,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.ORDER_COMPLETE_RESULT,
dictClass: 'string',
},
{
label: '完成时间',
field: 'completionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '完成时间',
field: 'completionTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '报修人',
field: 'declarer',
@ -381,6 +434,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '确认时间',
field: 'applyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '确认时间',
field: 'applyTimeDetail',
sort: 'custom',
isTable: false,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
table: {
width: '200',
},
},
{
label: '验证人',
field: 'verifyer',
@ -431,6 +510,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
}
},
{
label: '验证时间',
field: 'verifyTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: false,
table: {
width: '200',
},
},
{
label: '验证时间',
field: 'verifyTimeDetail',
sort: 'custom',
isSearch: false,
isTableForm: false,
isForm: false,
isDetail: true,
isTable: false,
table: {
width: '200',
},
},
{
label: '操作',
field: 'action',

Write Preview
Loading…
Cancel
Save