wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-02-13 

维修超时发邮件
java8
fengyuan_yang 11 months ago
parent
a9c1ccb9b7
commit
9068e883b4
4 changed files with 161 additions and 38 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. 40
      src/views/modules/eam/com_eam_object_add_update.vue
  2. 12
      src/views/modules/eam/eam_device_list.vue
  3. 137
      src/views/modules/part/bomManagement.vue
  4. 10
      src/views/modules/reportWorkOrder/reportDefectOrder.vue

40
src/views/modules/eam/com_eam_object_add_update.vue
View File

@ -23,7 +23,7 @@
<el-input v-model="pageData.objectDesc" style="width: 330px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px">
<el-form-item prop="locationID" :rules="rules.locationType">
<span slot="label" @click="getBaseList(26)"><a herf="#">区域</a></span>
<el-input v-model="pageData.locationID" style="width: 120px;"></el-input>
@ -35,7 +35,7 @@
<el-input v-model="pageData.familyDesc" disabled style="width: 330px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px">
<el-form-item prop="groupID" :rules="rules.groupType">
<span slot="label" @click="getBaseList(28)"><a herf="#">分组</a></span>
<el-input v-model="pageData.groupID" style="width: 120px;"></el-input>
@ -47,7 +47,7 @@
<el-input v-model="pageData.supplierName" disabled style="width: 330px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
<el-form-item>
<span slot="label" @click="getBaseList(30)"><a herf="#">制造商编码</a></span>
<el-input v-model="pageData.manufacturerID" style="width: 120px;"></el-input>
@ -59,34 +59,43 @@
<el-input v-model="pageData.resourceDesc" disabled style="width: 330px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px">
<el-form-item prop="deptID" :rules="rules.deptType">
<span slot="label" @click="getBaseList(204)"><a herf="#">所属部门编码</a></span>
<el-input v-model="pageData.deptID" style="width: 120px"></el-input>
<el-input v-model="pageData.deptName" disabled style="width: 330px"></el-input>
</el-form-item>
<el-form-item label="在用" prop="active" :rules="rules.activeType">
<el-select v-model="pageData.active" style="width: 120px;">
<el-select v-model="pageData.active" style="width: 141px;">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select >
</el-form-item>
<el-form-item label="购入日期:" style="margin-left: -10px">
<el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss" style="width: 330px;"></el-date-picker>
<el-form-item label="标准响应时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardResponseDuration" style="width: 142px;"></el-input-number>
</el-form-item>
<el-form-item label="超时响应推送时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutResponseDuration" style="width: 142px;"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
<el-form-item label="序列号:">
<el-input v-model="pageData.seqNo" style="width: 455px;"></el-input>
<el-input v-model="pageData.seqNo" style="width: 220px;"></el-input>
</el-form-item>
<el-form-item label="资产编号">
<el-input v-model="pageData.assetNo" style="width: 220px;"></el-input>
</el-form-item>
<el-form-item label="购入日期">
<el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss" style="width: 141px;"></el-date-picker>
</el-form-item>
<el-form-item label="标准维修时长(m)">
<el-input-number :controls="false" :step="0" v-model="pageData.standardMaintenanceDuration" style="width: 120px;" ></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardMaintenanceDuration" style="width: 142px;"></el-input-number>
</el-form-item>
<el-form-item label="资产编号" style="margin-left: -10px">
<el-input v-model="pageData.assetNo" style="width: 330px;" ></el-input>
<el-form-item label="超时维修推送时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutMaintenanceDuration" style="width: 142px;"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
<el-form-item label="备注" >
<el-input
type="textarea"
@ -153,7 +162,10 @@ export default {
deptName: '',
assetNo: '',
assetRemark: '',
standardMaintenanceDuration: ''
standardMaintenanceDuration: '',
timeOutMaintenanceDuration: '',
standardResponseDuration: '',
timeOutResponseDuration: ''
},
dataListLoading: false,
rules:{

12
src/views/modules/eam/eam_device_list.vue
View File

@ -1,12 +1,5 @@
<template>
<div class="mod-config">
<!-- <div>-->
<!-- <span @click="favoriteFunction()">-->
<!-- <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
<!-- </span>-->
<!-- </div>-->
<el-row :gutter="15">
<el-col :span="5" :style="{height: this.height + 45 + 'px'}" style="display: block;overflow-y: scroll">
<el-tree
@ -3695,7 +3688,10 @@
assetNo: '',
assetRemark: '',
deptName: '',
standardMaintenanceDuration: ''
standardMaintenanceDuration: '',
timeOutMaintenanceDuration: '',
standardResponseDuration: '',
timeOutResponseDuration: ''
}
//打开组件 去做新增业务
this.$nextTick(() => {

137
src/views/modules/part/bomManagement.vue
View File

@ -482,7 +482,7 @@
<el-input v-model="componentData.printUnitName" disabled style="width: 110px"></el-input>
</el-form-item>
<el-form-item :label="'消耗项目'" prop="consumptionItem">
<el-select v-model="componentData.consumptionItem" style="width: 165px">
<el-select v-model="componentData.consumptionItem" style="width: 167px">
<el-option label="Consumed" value="Consumed"></el-option>
<el-option label="Not Consumed" value="Not Consumed"></el-option>
</el-select>
@ -507,7 +507,7 @@
<el-input v-model="componentData.issueToLocName" readonly style="width: 110px"></el-input>
</el-form-item>
<el-form-item :label="'生产属性'" prop="issueType">
<el-select v-model="componentData.issueType" style="width: 165px">
<el-select v-model="componentData.issueType" style="width: 167px">
<el-option label="Reserve And Backflush" value="Reserve And Backflush"></el-option>
<el-option label="Reserve" value="Reserve"></el-option>
<el-option label="Backflush" value="Backflush"></el-option>
@ -515,6 +515,58 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
<el-form-item :label="'实际生产数量'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.productionData" :disabled="!productionDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'材料数量'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialData" :disabled="!materialDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'成品数量'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.finishedProductData" :disabled="!finishedProductDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'用量损耗'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.consumptionLoss" :disabled="!consumptionLossFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'涂胶长度'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.coatingLength" :disabled="!coatingLengthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'胶水克重'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.glueWeight" :disabled="!glueWeightFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
<el-form-item :label="'材料宽度'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialWidth" :disabled="!materialWidthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'宽度换算单位'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.widthConversion" :disabled="!widthConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'材料长度1'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialLength" :disabled="!materialLengthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'材料厚度'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialThickness" :disabled="!materialThicknessFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'面积单位换算'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.areaConversion" :disabled="!areaConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'密度单位换算'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.densityConversion" :disabled="!densityConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
<el-form-item :label="'材料克重'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialWeight" :disabled="!materialWeightFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'材料长度2'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialLength2" :disabled="!materialLength2Family.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
<el-form-item :label="'单位换算'">
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.unitConversion" :disabled="!unitConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px">
<el-form-item label="备注">
<el-input type="textarea" v-model="componentData.noteText" :rows="3" resize='none' show-word-limit style="width: 759px;height: 20px"></el-input>
@ -1188,7 +1240,23 @@ export default {
updateBy: '',
lineSequence: '',
consumptionItem: '',
productFlag: ''
productFlag: '',
familyID: '',
productionData: undefined,
materialData: undefined,
finishedProductData: undefined,
consumptionLoss: undefined,
coatingLength: undefined,
glueWeight: undefined,
materialWidth: undefined,
widthConversion: undefined,
materialLength: undefined,
materialThickness: undefined,
areaConversion: undefined,
densityConversion: undefined,
materialWeight: undefined,
materialLength2: undefined,
unitConversion: undefined
},
partData: {
site: '',
@ -2077,7 +2145,23 @@ export default {
copyAlternativeModelFlag: false,
headerSaveFlag: false,
menuId: this.$route.meta.menuId,
batchComponentPartModelFlag: false
batchComponentPartModelFlag: false,
// ======== 子物料字段分类集合 ========
productionDataFamily: ['RFID003', 'RFID004', 'RFID005', 'RFID006', 'RFID007', 'RFID008', 'RFID009', 'RFID012', 'RFID023', 'RFID024', 'RFID025', 'RFID027'],
materialDataFamily: ['RFID011', 'RFID020', 'RFID021', 'RFID022'],
finishedProductDataFamily: ['RFID020', 'RFID021', 'RFID022'],
consumptionLossFamily: ['RFID001', 'RFID002', 'RFID014', 'RFID015', 'RFID016', 'RFID017', 'RFID018', 'RFID019'],
coatingLengthFamily: ['RFID013'],
glueWeightFamily: ['RFID013'],
materialWidthFamily: ['RFID014', 'RFID015'],
widthConversionFamily: ['RFID014', 'RFID015'],
materialLengthFamily: ['RFID016', 'RFID017'],
materialThicknessFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
areaConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
densityConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
materialWeightFamily: ['RFID018', 'RFID019'],
materialLength2Family: ['RFID018', 'RFID019'],
unitConversionFamily: ['RFID018', 'RFID019'],
}
},
@ -2554,10 +2638,6 @@ export default {
this.$message.warning('请先选择替代！')
return
}
// if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
// this.$message.warning('不可编辑的替代状态!')
// return
// }
this.componentData = {
flag: '1',
site: this.modalData.site,
@ -2583,7 +2663,23 @@ export default {
createBy: this.$store.state.user.name,
lineSequence: '',
consumptionItem: 'Consumed',
productFlag: 'component'
productFlag: 'component',
familyID: '',
productionData: undefined,
materialData: undefined,
finishedProductData: undefined,
consumptionLoss: undefined,
coatingLength: undefined,
glueWeight: undefined,
materialWidth: undefined,
widthConversion: undefined,
materialLength: undefined,
materialThickness: undefined,
areaConversion: undefined,
densityConversion: undefined,
materialWeight: undefined,
materialLength2: undefined,
unitConversion: undefined
}
// 获取子料的序号
getComponentLineSequence(this.componentData).then(({data}) => {
@ -2699,10 +2795,6 @@ export default {
* 子明细编辑模态框
*/
updateComponentModal (row) {
// if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
// this.$message.warning('不可编辑的替代状态!')
// return
// }
this.componentData = {
flag: '2',
site: row.site,
@ -2728,7 +2820,23 @@ export default {
updateBy: this.$store.state.user.name,
lineSequence: row.lineSequence,
consumptionItem: row.consumptionItem,
productFlag: 'component'
productFlag: 'component',
familyID: row.familyID,
productionData: row.productionData == null ? undefined : row.productionData,
materialData: row.materialData == null ? undefined : row.materialData,
finishedProductData: row.finishedProductData == null ? undefined : row.finishedProductData,
consumptionLoss: row.consumptionLoss == null ? undefined : row.consumptionLoss,
coatingLength: row.coatingLength == null ? undefined : row.coatingLength,
glueWeight: row.glueWeight == null ? undefined : row.glueWeight,
materialWidth: row.materialWidth == null ? undefined : row.materialWidth,
widthConversion: row.widthConversion == null ? undefined : row.widthConversion,
materialLength: row.materialLength == null ? undefined : row.materialLength,
materialThickness: row.materialThickness == null ? undefined : row.materialThickness,
areaConversion: row.areaConversion == null ? undefined : row.areaConversion,
densityConversion: row.densityConversion == null ? undefined : row.densityConversion,
materialWeight: row.materialWeight == null ? undefined : row.materialWeight,
materialLength2: row.materialLength2 == null ? undefined : row.materialLength2,
unitConversion: row.unitConversion == null ? undefined : row.unitConversion,
}
this.componentDisableFlag = true
this.componentSaveModal = true
@ -3002,6 +3110,7 @@ export default {
this.componentData.componentPartDesc = row.partDesc
this.componentData.printUnit = row.printUnit
this.componentData.printUnitName = row.printUnitName
this.componentData.familyID = row.familyID
this.componentPartModelFlag = false
},

10
src/views/modules/reportWorkOrder/reportDefectOrder.vue
View File

@ -1913,11 +1913,17 @@
// 到达
reach () {
if (this.saveData.operator === '' || this.saveData.operator == null) { // 2025-02-13 海波要求
this.$message.warning('请选择到达人员！')
return
}
let tempData = {
site: this.saveData.site,
buNo: this.saveData.buNo,
functionType: 'C',
orderNo: this.reachData.orderNo,
feedBackId: this.reachData.feedBackId,
objectID: this.reachData.objectID,
status: '已到达',
reachOperator: this.saveData.operator,
reachOperatorName: this.saveData.operatorName
@ -1961,8 +1967,8 @@
checkWorkPlanId: row.checkWorkPlanId,
checkItemNo: row.checkItemNo,
reachDate: row.reachDate,
operator: row.reachOperator,
operatorName: row.reachOperatorName,
operator: row.result == null ? row.reachOperator : row.adminID,
operatorName: row.result == null ? row.reachOperatorName : row.operator,
handlingMethod: row.handlingMethod,
feedBackDesc: row.feedBackDesc,
faultReason: row.faultReason,

Write Preview
Loading…
Cancel
Save