diff --git a/src/api/mes/pms/repair-failure-reporting.js b/src/api/mes/pms/repair-failure-reporting.js index eb50c5b..8b61eb9 100644 --- a/src/api/mes/pms/repair-failure-reporting.js +++ b/src/api/mes/pms/repair-failure-reporting.js @@ -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'), diff --git a/src/const/crud/mes/pms/repair/repair-order-execution.js b/src/const/crud/mes/pms/repair/repair-order-execution.js index 66fb127..b1e245d 100644 --- a/src/const/crud/mes/pms/repair/repair-order-execution.js +++ b/src/const/crud/mes/pms/repair/repair-order-execution.js @@ -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", diff --git a/src/views/mes/pms/maintenance/execute/order-implement/index.vue b/src/views/mes/pms/maintenance/execute/order-implement/index.vue index 28b2771..cde0492 100644 --- a/src/views/mes/pms/maintenance/execute/order-implement/index.vue +++ b/src/views/mes/pms/maintenance/execute/order-implement/index.vue @@ -158,52 +158,52 @@ - - - - - 点击上传 - - - - - - - - 点击上传 - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/pms/maintenance/plan/index.vue b/src/views/mes/pms/maintenance/plan/index.vue index 1b461f5..8f20c7d 100644 --- a/src/views/mes/pms/maintenance/plan/index.vue +++ b/src/views/mes/pms/maintenance/plan/index.vue @@ -399,9 +399,6 @@ - @@ -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') { diff --git a/src/views/mes/pms/repair/repair-failure-reporting/index.vue b/src/views/mes/pms/repair/repair-failure-reporting/index.vue index aeb812a..56b72ac 100644 --- a/src/views/mes/pms/repair/repair-failure-reporting/index.vue +++ b/src/views/mes/pms/repair/repair-failure-reporting/index.vue @@ -4,6 +4,10 @@ + + @@ -17,22 +21,22 @@ label-width="150px"> - - - - - - {{ item.label }} - - - - - + + + + + + + + + + + + + + + + @@ -86,14 +90,15 @@ :disabled="true"> - - - +
{{ formObj.faultDescription }}
- + + +
@@ -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 diff --git a/src/views/mes/pms/repair/repair-order-execution/index.vue b/src/views/mes/pms/repair/repair-order-execution/index.vue index 5a16ad0..bb549fe 100644 --- a/src/views/mes/pms/repair/repair-order-execution/index.vue +++ b/src/views/mes/pms/repair/repair-order-execution/index.vue @@ -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) { diff --git a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue index e9e5536..2845834 100644 --- a/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue +++ b/src/views/mes/pms/repair/repair-order-execution/order-info/execute.vue @@ -311,13 +311,15 @@
+ 开始维修 + 中止维修 - 转单 + 转单 等待维修 - 完成维修 + 完成维修 取消
@@ -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() { diff --git a/src/views/mes/smd/equipment/index.vue b/src/views/mes/smd/equipment/index.vue index ac43b56..c9955ed 100644 --- a/src/views/mes/smd/equipment/index.vue +++ b/src/views/mes/smd/equipment/index.vue @@ -132,6 +132,32 @@
+ + + +
+ {{ formObj.ext2 }} +
+ +
+
+ + +
+ {{ formObj.ext3 }} +
+ +
+
+ + +
+ {{ formObj.ext4 }} +
+ +
+
+
@@ -142,7 +168,7 @@ - +
{{ formObj.weight }}
@@ -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,