Commit a9b32f1a authored by 王晓倩's avatar 王晓倩

巡检计划问题修改

parent 6a9cef23
...@@ -57,15 +57,6 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService ...@@ -57,15 +57,6 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
TInspectionPlan tInspectionPlan = tInspectionPlanMapper.selectTInspectionPlanById(planId); TInspectionPlan tInspectionPlan = tInspectionPlanMapper.selectTInspectionPlanById(planId);
BeanUtils.copyProperties(tInspectionPlan, inspectionPlanVo); BeanUtils.copyProperties(tInspectionPlan, inspectionPlanVo);
if (StringUtils.isNotEmpty(tInspectionPlan.getPlanStatus())) {
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_plan_status");
for (SysDictData sysDictData : sysDictDataList) {
if (tInspectionPlan.getPlanStatus().equals(sysDictData.getDictValue())) {
inspectionPlanVo.setPlanStatus(sysDictData.getDictLabel());
}
}
}
if(tInspectionPlan.getOrderId() != null && !"".equals(tInspectionPlan.getOrderId())) { if(tInspectionPlan.getOrderId() != null && !"".equals(tInspectionPlan.getOrderId())) {
TWorkOrder tWorkOrder = tWorkOrderMapper.selectTWorkOrderById(tInspectionPlan.getOrderId()); TWorkOrder tWorkOrder = tWorkOrderMapper.selectTWorkOrderById(tInspectionPlan.getOrderId());
inspectionPlanVo.setAllotTime(tWorkOrder.getAllotTime()); inspectionPlanVo.setAllotTime(tWorkOrder.getAllotTime());
......
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
orderId: null, orderId: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
planStatus: "0", planStatus: null,
updateTime: null, updateTime: null,
createTime: null, createTime: null,
remarks: null remarks: null
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
orderName: null, orderName: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
planStatus: "0", planStatus: null,
appointInspector: null, appointInspector: null,
updateTime: null, updateTime: null,
createTime: null, createTime: null,
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
this.open1 = false; this.open1 = false;
this.getList(); this.getList();
}); });
} else if (this.title1 == "添加巡检计划") { } else if (this.title1 == "新增巡检计划") {
addInspectionPlan(this.form1).then(response => { addInspectionPlan(this.form1).then(response => {
this.msgSuccess("添加成功"); this.msgSuccess("添加成功");
this.open1 = false; this.open1 = false;
......
...@@ -43,8 +43,11 @@ ...@@ -43,8 +43,11 @@
<el-form-item label="计划执行时间:" prop="startTime"> <el-form-item label="计划执行时间:" prop="startTime">
<font>{{form.startTime}}{{form.endTime}}</font> <font>{{form.startTime}}{{form.endTime}}</font>
</el-form-item> </el-form-item>
<el-form-item label="计划状态:" prop="startTime"> <el-form-item label="计划状态:" prop="planStatus">
<font>{{form.planStatus}}</font> <font v-if="form.planStatus == 0">未生成工单</font>
<font v-if="form.planStatus == 1">已生成工单</font>
<font v-if="form.planStatus == 2">进行中</font>
<font v-if="form.planStatus == 3">已完成</font>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment