Browse Source

feat(eamReport): 添加报修方式和故障时间筛选功能

- 在缺陷记录页面添加报修方式下拉选择框,支持设备故障和TPM红牌选项
- 添加故障时间范围筛选功能,包括开始时间和结束时间选择器
- 调整日期选择器样式,统一宽度为100px,箭头大小为16px
- 修复groupID转大写时的空值错误,添加非空判断条件
- 在工作订单详情中添加故障时间筛选功能
- 扩展搜索数据结构,添加repairReportingType、createdStartDate和createdEndDate字段
- 配置表格列显示报修方式字段信息
master
qiankanghui 3 days ago
parent
commit
c69576f6ee
  1. 27
      src/views/modules/eam/eamWorkOrderForDefect2.vue
  2. 68
      src/views/modules/eamReport/eamDefectRecord.vue

27
src/views/modules/eam/eamWorkOrderForDefect2.vue

@ -63,6 +63,31 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'故障时间'">
<el-date-picker
style="width: 170px"
v-model="searchData.createdStartDate"
:picker-options="pickerOptions"
type="datetime"
value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss'
placeholder="故障开始时间">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 23px;">
<laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
style="width: 170px"
v-model="searchData.createdEndDate"
:picker-options="pickerOptions"
type="datetime"
value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss'
placeholder="故障结束时间">
</el-date-picker>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.status" clearable style="width: 100px">
<el-option label="未开工" value="未开工"></el-option>
@ -825,8 +850,10 @@ export default {
searchData: {
deep: true,
handler: function (newV, oldV) {
if (this.searchData.groupID) {
this.searchData.groupID = this.searchData.groupID.toUpperCase()
}
}
},
"detailData.actualDate"(newV, oldV) {
this.detailData.workTime = Math.ceil(Math.floor(this.dayjs(this.detailData.actualDate).diff(this.detailData.reachDate, 'seconds') / 30) / 2)

68
src/views/modules/eamReport/eamDefectRecord.vue

@ -11,6 +11,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'报修方式'">
<el-select v-model="searchData.repairReportingType" placeholder="请选择" clearable style="width: 100px">
<el-option label="设备故障" value="设备故障"></el-option>
<el-option label="TPM红牌" value="TPM红牌"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'计划编码'">
<el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
</el-form-item>
@ -40,9 +46,34 @@
<el-option label="已取消" value="已取消"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'故障时间'">
<el-date-picker
style="width: 170px"
v-model="searchData.createdStartDate"
:picker-options="pickerOptions"
type="datetime"
value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss'
placeholder="故障开始时间">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 20px;">
<laber style="margin-left: -9px;font-size: 16px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
style="width: 170px"
v-model="searchData.createdEndDate"
:picker-options="pickerOptions"
type="datetime"
value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss'
placeholder="故障结束时间">
</el-date-picker>
</el-form-item>
<el-form-item :label="'计划执行日期'">
<el-date-picker
style="width: 120px"
style="width: 100px"
v-model="searchData.startDate"
:picker-options="pickerOptions"
type="date"
@ -50,12 +81,12 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 23px;">
<laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
<el-form-item style="margin-top: 20px;">
<laber style="margin-left: -9px;font-size: 16px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
style="width: 120px"
style="width: 100px"
v-model="searchData.endDate"
:picker-options="pickerOptions"
type="date"
@ -74,8 +105,8 @@
placeholder="到达时间">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 23px;">
<laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
<el-form-item style="margin-top: 20px;">
<laber style="margin-left: -9px;font-size: 16px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
@ -192,9 +223,11 @@ export default {
searchData: {
deep: true,
handler: function (newV, oldV) {
if (this.searchData.groupID) {
this.searchData.groupID = this.searchData.groupID.toUpperCase()
}
}
}
},
data () {
return {
@ -216,6 +249,7 @@ export default {
objectID: '',
planOperator: '',
buDesc: '',
repairReportingType: '',
functionType: 'C',
status: '',
startDate: new Date(),
@ -226,7 +260,9 @@ export default {
reachDate: '',
actualDate: '',
itemNo: '',
itemDesc: ''
itemDesc: '',
createdStartDate: '',
createdEndDate: ''
},
height: 200,
pageIndex: 1,
@ -451,6 +487,24 @@ export default {
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 101005009,
serialNumber: '101005009Table1RepairReportingType',
tableId: "101005009Table1",
tableName: "维修工单表",
columnProp: 'repairReportingType',
headerAlign: "center",
align: "center",
columnLabel: '报修方式',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 101005009,

Loading…
Cancel
Save