Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段显示、保养用时

Browse Source
master
wws 12 months ago
parent a8822645ee
commit d7980c0a75
7 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File

8
src/views/device/deviceOrder/index.vue
Unescape Escape View File

@ -538,10 +538,10 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="巡检执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="巡检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>

8
src/views/device/inspectionWork/index.vue
Unescape Escape View File

@ -428,10 +428,10 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="巡检执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="巡检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>

31
src/views/device/maintenanceWork/index.vue
Unescape Escape View File

@ -342,7 +342,7 @@
<el-table-column v-if="false" label="计划id" align="center" prop="planId" /> <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
<el-table-column width="150" label="计划编码" align="center" prop="planCode" /> <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
<el-table-column v-if="false" label="计划类型" align="center" prop="planType" /> <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
<el-table-column width="150" label="巡检单号" align="center" prop="orderCode" fixed> <el-table-column width="150" label="保养单号" align="center" prop="orderCode" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -397,9 +397,9 @@
<dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/> <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工单费用" align="center" prop="orderCost"/> <el-table-column width="120" label="工单费用(元)" align="center" prop="orderCost"/>
<el-table-column label="保养人" align="center" prop="planPerson"/> <el-table-column label="保养人" align="center" prop="planPerson"/>
<el-table-column label="工单用时" align="center" prop="orderCostTime"/> <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
<el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/> <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/>
<el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/> <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
<el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/> <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>
@ -446,6 +446,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 保养详情 -->
<el-dialog <el-dialog
title="保养详情" title="保养详情"
:visible.sync="workDetail" :visible.sync="workDetail"
@ -460,10 +461,12 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="保养执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="保养执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
<el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
<el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -565,7 +568,7 @@ import {getWorkCenter} from "@/api/device/plan";
export default { export default {
name: "InspectionWork", name: "InspectionWork",
dicts: ['device_order_status', 'device_loop_type'], dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'],
data() { data() {
return { return {
// 日期范围选择快捷 // 日期范围选择快捷
@ -696,12 +699,22 @@ export default {
this.workCenterList = response.data; this.workCenterList = response.data;
}) })
}, },
// 测试 // 展示
showWork(row) { showWork(row) {
this.reset(); this.reset();
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
if (this.workVO.order.upkeep == 0) {
this.workVO.order.upkeep = '内部';
}else {
this.workVO.order.upkeep = '委外';
}
if (this.workVO.order.shutDown == 0) {
this.workVO.order.shutDown = '开机保养';
}else {
this.workVO.order.shutDown = '停机保养';
}
this.workDetail = true; this.workDetail = true;
}); });

9
src/views/device/spotInspectionOrder/index.vue
Unescape Escape View File

@ -529,10 +529,10 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="点检执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item v-if="false" label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -846,6 +846,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.recordList = [];
const orderCode = row.orderCode || this.ids const orderCode = row.orderCode || this.ids
getDeviceOrder(orderCode).then(response => { getDeviceOrder(orderCode).then(response => {
this.form = response.data; this.form = response.data;

8
src/views/device/spotInspectionWork/index.vue
Unescape Escape View File

@ -417,10 +417,10 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="点检执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item v-if="false" label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>

23
src/views/device/upkeepOrder/index.vue
Unescape Escape View File

@ -413,7 +413,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工单费用" align="center" prop="orderCost"/> <el-table-column label="工单费用" align="center" prop="orderCost"/>
<el-table-column label="保养人" align="center" prop="planPerson"/> <el-table-column label="保养人" align="center" prop="planPerson"/>
<el-table-column label="工单用时" align="center" prop="orderCostTime"/> <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
<el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/> <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/>
<el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/> <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
<el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/> <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>
@ -1006,10 +1006,12 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="保养执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item> <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="保养执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item> <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item> <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item> <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
<el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
<el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item> <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item> <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -1314,6 +1316,16 @@ export default {
const orderId = row.orderId || this.ids const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => { getInspectionWork(orderId).then(response => {
this.workVO = response.data; this.workVO = response.data;
if (this.workVO.order.upkeep == 0) {
this.workVO.order.upkeep = '内部';
}else {
this.workVO.order.upkeep = '委外';
}
if (this.workVO.order.shutDown == 0) {
this.workVO.order.shutDown = '开机保养';
}else {
this.workVO.order.shutDown = '停机保养';
}
this.workDetail = true; this.workDetail = true;
}); });
@ -1634,6 +1646,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.recordList = [];
const orderCode = row.orderCode || this.ids const orderCode = row.orderCode || this.ids
getDeviceOrder(orderCode).then(response => { getDeviceOrder(orderCode).then(response => {
this.form = response.data; this.form = response.data;

4
src/views/device/upkeepPlan/index.vue
Unescape Escape View File

@ -477,8 +477,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="110px" label="是否停机保养:"> <el-form-item label-width="110px" label="是否停机保养:">
<el-radio v-model="form.shutDown" label="0">停机保养</el-radio> <el-radio v-model="form.shutDown" label="1">停机保养</el-radio>
<el-radio v-model="form.shutDown" label="1">开机保养</el-radio> <el-radio v-model="form.shutDown" label="0">开机保养</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

Write Preview
Loading…
Cancel
Save