Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionPlanServiceImpl.java

@@ -57,15 +57,6 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
         TInspectionPlan tInspectionPlan = tInspectionPlanMapper.selectTInspectionPlanById(planId);
         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())) {
             TWorkOrder tWorkOrder = tWorkOrderMapper.selectTWorkOrderById(tInspectionPlan.getOrderId());
             inspectionPlanVo.setAllotTime(tWorkOrder.getAllotTime());

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -337,7 +337,7 @@
           orderId: null,
           startTime: null,
           endTime: null,
-          planStatus: "0",
+          planStatus: null,
           updateTime: null,
           createTime: null,
           remarks: null
@@ -350,7 +350,7 @@
           orderName: null,
           startTime: null,
           endTime: null,
-          planStatus: "0",
+          planStatus: null,
           appointInspector: null,
           updateTime: null,
           createTime: null,
@@ -440,7 +440,7 @@
                 this.open1 = false;
                 this.getList();
               });
-            } else if (this.title1 == "添加巡检计划") {
+            } else if (this.title1 == "新增巡检计划") {
               addInspectionPlan(this.form1).then(response => {
                 this.msgSuccess("添加成功");
                 this.open1 = false;

gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

@@ -43,8 +43,11 @@
                 <el-form-item label="计划执行时间:" prop="startTime">
                   <font>{{form.startTime}}至{{form.endTime}}</font>
                 </el-form-item>
-                <el-form-item label="计划状态:" prop="startTime">
-                  <font>{{form.planStatus}}</font>
+                <el-form-item label="计划状态:" prop="planStatus">
+                  <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>
             </el-col>