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

添加检修工单指定检修人并添加工程师验证功能

master
ljlong_2630 7 months ago
parent
437342da91
commit
392cc800c3
6 changed files with 292 additions and 14 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. 6
      src/api/eam/device/deviceInspectionMain/index.ts
  2. 6
      src/api/eam/mold/moldInspectionMain/index.ts
  3. 66
      src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts
  4. 80
      src/views/eam/device/deviceinspectionjob/index.vue
  5. 85
      src/views/eam/mold/moldinspectionjob/index.vue
  6. 63
      src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts

6
src/api/eam/device/deviceInspectionMain/index.ts
View File

@ -67,4 +67,10 @@ export const finishInspection = (id: number) => {
// 查询检修工单主列表
export const getDeviceInspectionMainNoPage = async (params) => {
return await request.get({ url: `/eam/device-inspection-job-main/noPage`, params })
}
//验证
export const verifyOrder = async (id: number,verifyContent: string) => {
return await request.get({ url: `/eam/device-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent })
}

6
src/api/eam/mold/moldInspectionMain/index.ts
View File

@ -61,4 +61,10 @@ export const importTemplate = () => {
// 查询检修工单主列表
export const getMoldInspectionMainNoPage = async (params) => {
return await request.get({ url: `/eam/device-inspection-job-main/noPage`, params })
}
//验证
export const verifyOrder = async (id: number,verifyContent: string) => {
return await request.get({ url: `/eam/device-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent })
}

66
src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts
View File

@ -35,7 +35,6 @@ export const DeviceInspectionMainRules = reactive({
maintenancePhone: [
{ validator: validateHanset, message: '输入电话格式不正确', trigger: 'blur' }
],
status: [required],
type: [required],
faultType: [required],
@ -192,7 +191,7 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select',
api: () => userListAll,
componentProps: {
disabled: true,
disabled: false,
optionsAlias: {
labelField: 'nickname',
valueField: 'id'
@ -236,7 +235,7 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
width: '150',
},
isSearch: true,
dictType: DICT_TYPE.JX_STATUS,
dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
dictClass: 'string',
form: {
component: 'Select',
@ -308,6 +307,65 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '验证人',
field: 'verifyer',
sort: 'custom',
isDetail: false,
isSearch: false,
isForm: false,
table: {
width: '150',
},
api: () => userList,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userListAll.find((account) => account.id == cellValue)?.nickname
},
search: {
show: true,
component: 'Select',
api: () => dutyUserList,
componentProps: {
optionsAlias: {
labelField: 'name',
valueField: 'id'
},
filterable: true,
}
},
form: {
component: 'Select',
api: () => dutyUserList,
componentProps: {
// disabled: true,
optionsAlias: {
labelField: 'name',
valueField: 'id'
},
filterable: true,
placeholder: "请选择维修人"
},
}
},
{
label: '验证人',
field: 'verifyerDetail',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail: true
},
{
label: '验证意见',
field: 'verifyContent',
sort: 'custom',
isSearch: false,
isForm: false,
table: {
width: '230',
},
},
{
label: '操作',
field: 'action',
@ -336,7 +394,9 @@ export const DeviceInspectionDetailRules = reactive({
{ validator: validateNum, message: '请输入正整数', trigger: 'blur' },
],
number: [required],
status: [required],
actualMinutes: [
required,
{ validator: validateNum, message: '请输入正整数', trigger: 'blur' },
],
maintenance: [required],

80
src/views/eam/device/deviceinspectionjob/index.vue
View File

@ -78,6 +78,36 @@
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/device-inspection-job-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
<Dialog
ref="verifyDialog"
title="验证意见"
v-model="verifyDialogVisible"
:width="600"
:maxHeight="700"
:style="{height:'450px'}"
:before-close="handleBeforeVerifyClose"
>
<el-form :model="verifyFormValue" class="demo-form-inline">
<el-form-item label="验证意见">
<el-input
type="textarea"
v-model="verifyFormValue.verifyContent"
placeholder="请填写验证意见"
clearable
:rows="12"
/>
</el-form-item>
</el-form>
<template #footer>
<div style="text-align: center;">
<el-button type="primary" @click="verifyCancel">取消</el-button>
<el-button type="primary" @click="verifySubmit">提交</el-button>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
@ -108,6 +138,11 @@ const tableColumns = ref(DeviceInspectionMain.allSchemas.tableColumns)
const Echo = []
const tableData = ref([])
const formRef = ref()
const verifyDialogVisible = ref(false)
const verifyFormValue = ref({
verifyContent: '',
})
const openRowValue = ref()
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
@ -176,7 +211,7 @@ const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
DeviceInspectionMain.allSchemas.formSchema.find(item => {
return item.field == 'status'
}).value = 'PROCCED'
}).value = 'PECEIVED'
DeviceInspectionMain.allSchemas.formSchema.find(item => {
return item.field == 'type'
}).value = 'DEVICE'
@ -199,8 +234,11 @@ const butttondata = (row) => {
// defaultButtons.mainListEditBtn({hasPermi:'eam:deviceInspectionMain:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:deviceInspectionMain:delete'}), // 删除
// defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成
defaultButtons.verifyOrderBtn({
hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row))
}), // 验证
]
}
@ -212,6 +250,8 @@ const buttonTableClick = async (val, row) => {
openDetail(row, '代码', row.number)
} else if (val == 'finishOrder') { // 完成
handleFinishOrder(row)
} else if (val == 'verifyOrder') { // 验证
verifyOrder(row)
}
}
@ -284,6 +324,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
const userListAll = await UserApi.getSimpleUserList()
row.factoryAreaNumber1 = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name
row.maintenance1 = userListAll.find((account) => account.id == row.maintenance)?.nickname
row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
detailRef.value.openDetail(row, titleName, titleValue, 'basicDeviceInspectionMain')
}
@ -592,6 +633,39 @@ function isReceiver(orderPerson) {
}
// 验证
function verifyOrder(row) {
openRowValue.value = row
verifyDialogVisible.value = true
}
// 验证
function verifySubmit() {
const row = openRowValue.value
DeviceInspectionMainApi.verifyOrder(row.id,verifyFormValue.value.verifyContent).then(res => {
verifyDialogVisible.value = false
getList()
message.success('操作成功')
})
}
// 验证取消
function verifyCancel(row) {
verifyDialogVisible.value = false
}
const judgeIsTheClassEngineer = (row) => {
const rolesOk = userStore.roles.find(item => {
return item == 'device_class_Engineer_role'
})
if (rolesOk != undefined && rolesOk != null) {
return true
} else {
return false
}
}
/** 初始化 **/
onMounted(async () => {
getList()

85
src/views/eam/mold/moldinspectionjob/index.vue
View File

@ -78,6 +78,36 @@
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/mold-inspection-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
<Dialog
ref="verifyDialog"
title="验证意见"
v-model="verifyDialogVisible"
:width="600"
:maxHeight="700"
:style="{height:'450px'}"
:before-close="handleBeforeVerifyClose"
>
<el-form :model="verifyFormValue" class="demo-form-inline">
<el-form-item label="验证意见">
<el-input
type="textarea"
v-model="verifyFormValue.verifyContent"
placeholder="请填写验证意见"
clearable
:rows="12"
/>
</el-form-item>
</el-form>
<template #footer>
<div style="text-align: center;">
<el-button type="primary" @click="verifyCancel">取消</el-button>
<el-button type="primary" @click="verifySubmit">提交</el-button>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
@ -118,6 +148,11 @@ const tableColumns = ref(MoldInspectionMain.allSchemas.tableColumns)
const Echo = []
const tableData = ref([])
const formRef = ref()
const verifyDialogVisible = ref(false)
const verifyFormValue = ref({
verifyContent: '',
})
const openRowValue = ref()
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
@ -207,8 +242,11 @@ const butttondata = (row) => {
// defaultButtons.mainListEditBtn({hasPermi:'eam:moldInspectionMain:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldInspectionMain:delete'}), // 删除
// defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PROCCED' && (userStore.getUser.id == row.maintenance)) }), //完成
defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修
defaultButtons.finishOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成
defaultButtons.verifyOrderBtn({
hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row))
}), // 验证
]
}
@ -220,6 +258,8 @@ const buttonTableClick = async (val, row) => {
openDetail(row, '代码', row.number)
} else if (val == 'finishOrder') { // 完成
handleFinishOrder(row)
} else if (val == 'verifyOrder') { // 验证
verifyOrder(row)
}
}
@ -290,6 +330,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
const userListAll = await UserApi.getSimpleUserList()
row.factoryAreaNumber1 = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name
row.maintenance1 = userListAll.find((account) => account.id == row.maintenance)?.nickname
row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
detailRef.value.openDetail(row, titleName, titleValue, 'basicMoldInspectionMain')
}
@ -382,13 +423,13 @@ function handleFinishOrder(row) {
const onChange = (field, cur, item) => {
// 当有效天数 和 生效时间 发生变化
if (field == 'deviceNumber') {
basicFormRef.value.formRef.formModel.factoryAreaNumber = Number(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
basicFormRef.value.formRef.formModel.maintenance = String(userStore?.getUser?.id)
basicFormRef.value.formRef.formModel.factoryAreaNumber = String(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
basicFormRef.value.formRef.formModel.maintenance = Number(userStore?.getUser?.id)
basicFormRef.value.formRef.formModel.maintenanceNumber = ''
} else if (field == 'maintenanceNumber') {
basicFormRef.value.formRef.formModel.deviceNumber = item.componentProps.options.find(element => element.number == cur).deviceNumber
basicFormRef.value.formRef.formModel.factoryAreaNumber = Number(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
basicFormRef.value.formRef.formModel.maintenance = String(userStore?.getUser?.id)
basicFormRef.value.formRef.formModel.factoryAreaNumber = String(item.componentProps.options.find(element => element.number == cur).factoryAreaNumber)
basicFormRef.value.formRef.formModel.maintenance = Number(userStore?.getUser?.id)
}
}
@ -595,6 +636,38 @@ function isReceiver(orderPerson) {
}
}
// 验证
function verifyOrder(row) {
openRowValue.value = row
verifyDialogVisible.value = true
}
// 验证
function verifySubmit() {
const row = openRowValue.value
MoldInspectionMainApi.verifyOrder(row.id,verifyFormValue.value.verifyContent).then(res => {
verifyDialogVisible.value = false
getList()
message.success('操作成功')
})
}
// 验证取消
function verifyCancel(row) {
verifyDialogVisible.value = false
}
const judgeIsTheClassEngineer = (row) => {
const rolesOk = userStore.roles.find(item => {
return item == 'mold_class_Engineer_role'
})
if (rolesOk != undefined && rolesOk != null) {
return true
} else {
return false
}
}
/** 初始化 **/
onMounted(async () => {
getList()

63
src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts
View File

@ -198,7 +198,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select',
api: () => dutyUserList,
componentProps: {
disabled: true,
// disabled: true,
optionsAlias: {
labelField: 'name',
valueField: 'id'
@ -230,7 +230,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
width: '150',
},
isSearch: true,
dictType: DICT_TYPE.JX_STATUS,
dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
dictClass: 'string',
form: {
component: 'Select',
@ -299,6 +299,65 @@ export const MoldInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '验证人',
field: 'verifyer',
sort: 'custom',
isDetail: false,
isSearch: false,
isForm: false,
table: {
width: '150',
},
api: () => userList,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userListAll.find((account) => account.id == cellValue)?.nickname
},
search: {
show: true,
component: 'Select',
api: () => dutyUserList,
componentProps: {
optionsAlias: {
labelField: 'name',
valueField: 'id'
},
filterable: true,
}
},
form: {
component: 'Select',
api: () => dutyUserList,
componentProps: {
// disabled: true,
optionsAlias: {
labelField: 'name',
valueField: 'id'
},
filterable: true,
placeholder: "请选择维修人"
},
}
},
{
label: '验证人',
field: 'verifyerDetail',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail: true
},
{
label: '验证意见',
field: 'verifyContent',
sort: 'custom',
isSearch: false,
isForm: false,
table: {
width: '230',
},
},
{
label: '操作',
field: 'action',

Write Preview
Loading…
Cancel
Save