优化巡检计划前端代码

WebService/src/main/resources/components/inspectionPlanPackage/add-inspectionPlan/addInspectionPlan.html

@@ -17,8 +17,14 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">巡检路线</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addInspectionPlanInfo.inspectionRouteId" type="text"
-                                           placeholder="必填，请填写巡检路线" class="form-control">
+<!--                                    <input v-model="addInspectionPlanInfo.inspectionRouteId" type="text"-->
+<!--                                           placeholder="必填，请填写巡检路线" class="form-control">-->
+                                    <vc:create name="inspectionRouteSelect2"
+                                               parentModal="addInspectionPlanModel"
+                                               callBackListener="addInspectionPlanInfo"
+                                               callBackFunction="notify"
+                                               namespace="addInspectionPlan"
+                                    ></vc:create>
                                 </div>
                             </div>
                             <div class="form-group row">

WebService/src/main/resources/components/inspectionPlanPackage/add-inspectionPlan/addInspectionPlan.js

@@ -42,12 +42,17 @@
             vc.on('addInspectionPlan', 'openAddInspectionPlanModal', function () {
                 $('#addInspectionPlanModel').modal('show');
             });
+
             vc.on("addInspectionPlanInfo", "notify", function (_param) {
                 if (_param.hasOwnProperty("staffId")) {
                     vc.component.addInspectionPlanInfo.staffId = _param.staffId;
                     vc.component.addInspectionPlanInfo.staffName = _param.staffName;
                 }
+                if (_param.hasOwnProperty("inspectionRouteId")) {
+                    vc.component.addInspectionPlanInfo.inspectionRouteId = _param.inspectionRouteId;
+                }
             });
+
         },
         methods: {
             addInspectionPlanValidate() {

WebService/src/main/resources/components/inspectionPlanPackage/inspectionPlan-manage/inspectionPlanManage.html

@@ -65,6 +65,7 @@
                             <th class="text-center">路线</th>
                             <th class="text-center">周期</th>
                             <th class="text-center">执行人</th>
+                            <th class="text-center">签到方式</th>
                             <th class="text-center">开始时间</th>
                             <th class="text-center">结束时间</th>
                             <th class="text-center">制定人</th>
@@ -80,13 +81,14 @@
                         <tr v-for="inspectionPlan in inspectionPlanManageInfo.inspectionPlans">
                             <td class="text-center">{{inspectionPlan.inspectionPlanName}}</td>
                             <td class="text-center">{{inspectionPlan.inspectionRouteName}}</td>
-                            <td class="text-center">{{inspectionPlan.inspectionPlanPeriod}}</td>
+                            <td class="text-center">{{inspectionPlan.inspectionPlanPeriodName}}</td>
                             <td class="text-center">{{inspectionPlan.staffName}}</td>
+                            <td class="text-center">{{inspectionPlan.signTypeName}}</td>
                             <td class="text-center">{{inspectionPlan.startTime}}</td>
                             <td class="text-center">{{inspectionPlan.endTime}}</td>
                             <td class="text-center">{{inspectionPlan.createUserName}}</td>
                             <td class="text-center">{{inspectionPlan.createTime}}</td>
-                            <td class="text-center">{{inspectionPlan.state}}</td>
+                            <td class="text-center">{{inspectionPlan.stateName}}</td>
                             <td class="text-center">{{inspectionPlan.remark}}</td>
                             <td class="text-center">
                                 <div class="btn-group">