mes/nalinv-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(PMS)：修复1.5

Browse Source
This commit is contained in:
chengzhaofeng 2025-03-12 10:42:17 +08:00
parent 0157551003
commit 2f53e5773b
8 changed files with 165 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/mes/pms/repair-failure-reporting.js
View File

@ -9,6 +9,14 @@ export function fetchList(query) {
})
}
export function getFaultPage(query) {
return request({
url: mom_pms('/pmsReportOrder/fault/page'),
method: 'get',
params: query
})
}
export function getLocation(query) {
return request({
url: mom_pms('/pmsReportOrder/getLocation'),

2
src/const/crud/mes/pms/repair/repair-order-execution.js
View File

@ -90,7 +90,7 @@ export const tableOption = {
display: true,
search: true,
row: true,
dicUrl: '/admin/dict/type/MAINTENANCE_OPERATION_STATUS',
dicUrl: '/admin/dict/type/PMS_REPAIR_ORDER_CATEGORY',
},
{
type: "datetime",

92
src/views/mes/pms/maintenance/execute/order-implement/index.vue
View File

@ -158,52 +158,52 @@
</el-col>
</el-row>
<!-- 图片上传 -->
<el-row>
<el-col :span="12">
<el-form-item label="安全许可证:" label-width="17.5%" prop="text">
<el-upload
ref="upload"
:action="actionUrl"
:auto-upload="true"
:show-file-list="true"
:headers="headers"
:on-success="uploadSuccess"
:on-error="uploadError"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-upload="beforeAvatarUpload"
:file-list="uploadSecureList"
:data="uploadData"
:disabled="isEdit">
<el-button v-if="!isEdit" size="small" type="primary"
@click="clickUpload(formObj.handle, 'MAINTENANCE_SECURE')">点击上传
</el-button>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="完成图片:" label-width="17.5%">
<el-upload
ref="upload"
:action="actionUrl"
:auto-upload="true"
:show-file-list="true"
:headers="headers"
:on-success="uploadSuccess"
:on-error="uploadError"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-upload="beforeAvatarUpload"
:file-list="uploadCompleteList"
:data="uploadData"
:disabled="isEdit">
<el-button v-if="!isEdit" size="small" type="primary"
@click="clickUpload(formObj.handle, 'MAINTENANCE_COMPLETE')">点击上传
</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="安全许可证:" label-width="17.5%" prop="text">-->
<!-- <el-upload-->
<!-- ref="upload"-->
<!-- :action="actionUrl"-->
<!-- :auto-upload="true"-->
<!-- :show-file-list="true"-->
<!-- :headers="headers"-->
<!-- :on-success="uploadSuccess"-->
<!-- :on-error="uploadError"-->
<!-- :on-preview="handlePreview"-->
<!-- :on-remove="handleRemove"-->
<!-- :before-upload="beforeAvatarUpload"-->
<!-- :file-list="uploadSecureList"-->
<!-- :data="uploadData"-->
<!-- :disabled="isEdit">-->
<!-- <el-button v-if="!isEdit" size="small" type="primary"-->
<!-- @click="clickUpload(formObj.handle, 'MAINTENANCE_SECURE')">点击上传-->
<!-- </el-button>-->
<!-- </el-upload>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="完成图片:" label-width="17.5%">-->
<!-- <el-upload-->
<!-- ref="upload"-->
<!-- :action="actionUrl"-->
<!-- :auto-upload="true"-->
<!-- :show-file-list="true"-->
<!-- :headers="headers"-->
<!-- :on-success="uploadSuccess"-->
<!-- :on-error="uploadError"-->
<!-- :on-preview="handlePreview"-->
<!-- :on-remove="handleRemove"-->
<!-- :before-upload="beforeAvatarUpload"-->
<!-- :file-list="uploadCompleteList"-->
<!-- :data="uploadData"-->
<!-- :disabled="isEdit">-->
<!-- <el-button v-if="!isEdit" size="small" type="primary"-->
<!-- @click="clickUpload(formObj.handle, 'MAINTENANCE_COMPLETE')">点击上传-->
<!-- </el-button>-->
<!-- </el-upload>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row v-if="isCheck || isHistory || isView">
<el-col :span="12">
<el-form-item prop="opinion">

9
src/views/mes/pms/maintenance/plan/index.vue
View File

@ -399,9 +399,6 @@
</a>
</el-button>
</template>
<template slot-scope="scope">
</template>
</avue-crud>
</basic-container>
</div>
@ -424,6 +421,7 @@ import {mapGetters} from 'vuex'
import customData from "@/components/custom-data/main.vue";
import {getPartPage} from "@/api/mes/pms/report-order-consum";
import {hideLoading, showLoading} from "@/const/loading";
import {getStore} from "@/util/store";
export default {
components: {customData},
@ -436,9 +434,9 @@ export default {
openList: getPartPage,
openGroupList: getEquipGroup,
partDialogObj: {
condition: 'id',
condition: 'partId',
tableColumn: [
{prop: 'id', label: '备品编号'},
{prop: 'partId', label: '备品编号'},
{prop: 'partName', label: '备品名称'},
{prop: 'partCategoryId', label: '备品类别'},
{prop: 'specNo', label: '规格型号'},
@ -853,6 +851,7 @@ export default {
},
showDialog(type) {
if (type === 'part') {
this.partDialogObj.queryParam.site = getStore({name: 'tenantId'})
this.partDialogVisible = true
}
if (type === 'group') {

87
src/views/mes/pms/repair/repair-failure-reporting/index.vue
View File

@ -4,6 +4,10 @@
<input-select-dialog :modal-obj="categoryDialogObj" :modal-show.sync="categoryDialogVisible"
:modal-fetch-fun='openList'
@inputDialogSelected="dialogSelected"></input-select-dialog>
<!-- 故障代码 開窗 -->
<input-select-dialog :modal-obj="faultDialogObj" :modal-show.sync="faultDialogVisible"
:modal-fetch-fun='getFaultPage'
@inputDialogSelected="faultDialogSelected"></input-select-dialog>
<!-- 文件预览 -->
<FileView :open.sync="dialogImgVisible" :url="previewUrl"/>
<!--设备编号开窗-->
@ -17,22 +21,22 @@
label-width="150px">
<el-tabs v-model="tabActiveName">
<el-tab-pane label="报修内容" name="main">
<el-row>
<el-col :span="24">
<el-form-item label="设备识别方式:" prop="isEquipmentCode" label-width="200px">
<el-radio-group v-model="formObj.isEquipmentCode" :disabled="onlyView">
<el-radio
v-for="item in options"
:key="item.value"
:label="item.value"
:disabled="onlyView || isUpdate"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="设备识别方式:" prop="isEquipmentCode" label-width="200px">-->
<!-- <el-radio-group v-model="formObj.isEquipmentCode" :disabled="onlyView">-->
<!-- <el-radio-->
<!-- v-for="item in options"-->
<!-- :key="item.value"-->
<!-- :label="item.value"-->
<!-- :disabled="onlyView || isUpdate"-->
<!-- >-->
<!-- {{ item.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="12">
<el-form-item label="设备编号:" prop="zPmsResrceExtBo">
@ -86,14 +90,15 @@
:disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="故障说明:" prop="faultDescription">
<div v-if="onlyView">
{{ formObj.faultDescription }}
</div>
<el-input v-else v-model="formObj.faultDescription" type="textarea" :readonly="isUpdate"></el-input>
<el-input v-else v-model="formObj.faultDescription" :readonly="isUpdate">
<i slot="suffix" class="el-input__icon el-icon-copy-document" @click.stop="showFaultDialog()"
v-if="!isUpdate"></i>
</el-input>
</el-form-item>
</el-col>
</el-row>
@ -179,7 +184,8 @@ import {
getDevices,
getDeptByUserByNotParam,
getReportOrderFile,
deleteReportOrderFileBind
deleteReportOrderFileBind,
getFaultPage
} from '@/api/mes/pms/repair-failure-reporting'
import {showLoading, hideLoading} from '@/const/loading'
import {tableOption} from '@/const/crud/mes/pms/repair/repair-failure-reporting'
@ -279,6 +285,16 @@ export default {
titleText: '',
tabActiveName: 'main',
site: getStore({name: 'tenantId'}),
// 故障代码
faultDialogObj: {
condition: 'faultName',
tableColumn: [
{prop: 'faultName', label: '故障点'},
],
queryParam: {},
},
faultDialogVisible: false,
getFaultPage: getFaultPage
}
},
computed: {
@ -304,17 +320,18 @@ export default {
}
},
watch: {
'formObj.isEquipmentCode'(newValue, oldValue) {
let me = this;
if (newValue === 'O') {
me.rule.isEquipmentCode = [{required: true, message: '请选择设备识别方式', trigger: 'change'}];
} else if (newValue === 'N') {
me.formObj.zPmsResrceExtBo = ''
}
}
// 'formObj.isEquipmentCode'(newValue, oldValue) {
// let me = this;
// if (newValue === 'O') {
// me.rule.isEquipmentCode = [{required: true, message: '请选择设备识别方式', trigger: 'change'}];
// } else if (newValue === 'N') {
// me.formObj.zPmsResrceExtBo = ''
// }
// }
},
created() {
this.formObj = Object.assign({}, this.initData)
this.formObj.isEquipmentCode = 'O'
this.username = this.userInfo['name'];
this.part_add = this.permissions['part_add']
this.part_del = this.permissions['part_del']
@ -423,6 +440,15 @@ export default {
showDevicesDialog(key) {
this.devicesDialogVisible = true
},
showFaultDialog(key) {
if (!this.formObj.zPmsResrceExtBo) {
return this.$message.error('请先选择设备')
}
this.faultDialogObj.queryParam = {
resrce: this.formObj.zPmsResrceExtBo
}
this.faultDialogVisible = true
},
dialogSelected(row) {
if (this.openKey === 'search') {
this.partCategoryIdInput = row.id
@ -431,6 +457,9 @@ export default {
this.$refs['formObj'].clearValidate('partCategoryId')
}
},
faultDialogSelected(row) {
this.formObj.faultDescription = row.faultName
},
devicesDialogSelected(row) {
this.formObj.resrce = row.handle
this.formObj.zPmsResrceExtBo = row.resrce

6
src/views/mes/pms/repair/repair-order-execution/index.vue
View File

@ -277,12 +277,6 @@ export default {
getReportOrder().then(res => {
this.dayData = res.data.data
})
getReportOrderMonth().then(res => {
this.monthData = res.data.data
})
getInspectOrder().then(res => {
this.inspectOrder = res.data.data
})
},
// 列表查询
getList(page, params) {

21
src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue
View File

@ -311,13 +311,15 @@
<el-row>
<el-col v-if="!executeType && !isView" :span="24">
<div style="display: flex; justify-content: center;">
<el-button size="small" style="margin-right: 10px;" type="primary" @click="doUpdate('start')">开始维修
</el-button>
<el-button size="small" style="margin-right: 10px;" type="danger" @click="openInfo('stop')">中止维修
</el-button>
<el-button size="small" style="margin-right: 10px;" type="success" @click="openInfo('shift')">转单
<el-button size="small" style="margin-right: 10px;" type="info" @click="openInfo('shift')">转单
</el-button>
<el-button size="small" style="margin-right: 10px;" type="warning" @click="openInfo('wait')">等待维修
</el-button>
<el-button size="small" style="margin-right: 10px;" type="primary" @click="doUpdate('save')">完成维修
<el-button size="small" style="margin-right: 10px;" type="success" @click="doUpdate('save')">完成维修
</el-button>
<el-button size="small" @click="handleClose">取消</el-button>
</div>
@ -1009,7 +1011,6 @@ export default {
addObj(this.checkObj).then((res) => {
hideLoading();
if (res.data.code === 0) {
this.closeCheck();
if (cut === '1') {
this.doUpdate(shouldUpdateCheckTwo ? 'checkTwo' : 'check');
} else if (cut === '3') {
@ -1018,6 +1019,7 @@ export default {
}
this.doUpdate('checkFail');
}
this.closeCheck();
}
}).catch((e) => {
hideLoading();
@ -1127,6 +1129,9 @@ export default {
me.formObj.pmsReportOrderItems = me.structList
me.formObj.pmsReportOrderConsums = me.consumableRecord
}
if (type === 'start') {
this.formObj.startRepair = 'Y'
}
// 此处是因为在搜索界面检索出来时，会返回一个zPmsResrceExtBo，但不为BO，需要加上前缀，否则会报错
if (me.formObj.zPmsResrceExtBo && me.formObj.zPmsResrceExtBo.indexOf('ResourceBO:') === -1) {
me.formObj.zPmsResrceExtBo = ('ResourceBO:' + getStore({name: 'tenantId'}) + ',' + me.formObj.zPmsResrceExtBo)
@ -1137,12 +1142,16 @@ export default {
if (res.data.code === 1) {
return me.$message.error('操作失败：' + res.data.msg);
}
me.structList = []
me.handleClose()
if (type !== 'start') {
me.structList = []
me.handleClose()
}else {
this.formObj.startRepair = ''
}
me.$message.success('操作成功')
}).catch(e => {
hideLoading()
me.$message.error('操作失败：' + e)
console.log(e)
})
},
getDateTime() {

34
src/views/mes/smd/equipment/index.vue
View File

@ -132,6 +132,32 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="固定资产编号:" prop="ext2">
<div v-if="onlyView">
{{ formObj.ext2 }}
</div>
<el-input v-else v-model="formObj.ext2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备型号:" prop="ext3">
<div v-if="onlyView">
{{ formObj.ext3 }}
</div>
<el-input v-else v-model="formObj.ext3"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备规格：" prop="ext4">
<div v-if="onlyView">
{{ formObj.ext4 }}
</div>
<el-input v-else v-model="formObj.ext4" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="设备厂家:" prop="vendorNo">
@ -142,7 +168,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="重量(KG):" prop="weight">
<el-form-item label="联系方式:" prop="weight">
<div v-if="onlyView">
{{ formObj.weight }}
</div>
@ -510,6 +536,9 @@ export default {
eqpType: "",
eqpTypeDesc: "",
vendorNo: "",
ext2: "",
ext3: "",
ext4: "",
assetNo: "",
procedure: "",
location: "",
@ -1424,6 +1453,9 @@ export default {
eqpType: row.eqpType,
eqpTypeBo: row.eqpTypeBo,
vendorNo: row.vendorNo,
ext2: row.ext2,
ext4: row.ext4,
ext3: row.ext3,
assetNo: row.assetNo,
procedure: row.procedure,
location: row.location,