diff --git a/public/components/common/viewImage/viewImage.html b/public/components/common/viewImage/viewImage.html index a4f8077ce..55019b13e 100644 --- a/public/components/common/viewImage/viewImage.html +++ b/public/components/common/viewImage/viewImage.html @@ -1,3 +1,4 @@
- + +
\ No newline at end of file diff --git a/public/components/frame/validateTel/validateTel.html b/public/components/frame/validateTel/validateTel.html index ee55d8858..b0bc3230a 100644 --- a/public/components/frame/validateTel/validateTel.html +++ b/public/components/frame/validateTel/validateTel.html @@ -1,6 +1,6 @@
- +
diff --git a/public/components/property/addInspectionRoute/addInspectionRoute.html b/public/components/property/addInspectionRoute/addInspectionRoute.html index b5c0f9e0c..ce2ce4c1a 100644 --- a/public/components/property/addInspectionRoute/addInspectionRoute.html +++ b/public/components/property/addInspectionRoute/addInspectionRoute.html @@ -15,13 +15,13 @@ placeholder="必填,请填写路线名称" class="form-control">
-
+
diff --git a/public/components/property/addInspectionRoute/addInspectionRoute.js b/public/components/property/addInspectionRoute/addInspectionRoute.js index 2e190f9a3..a9778af40 100644 --- a/public/components/property/addInspectionRoute/addInspectionRoute.js +++ b/public/components/property/addInspectionRoute/addInspectionRoute.js @@ -9,7 +9,7 @@ data: { addInspectionRouteInfo: { routeName: '', - seq: '', + seq: '1', remark: '', } }, diff --git a/public/components/property/editInspectionRoute/editInspectionRoute.html b/public/components/property/editInspectionRoute/editInspectionRoute.html index 11bfc2be9..58aacce74 100644 --- a/public/components/property/editInspectionRoute/editInspectionRoute.html +++ b/public/components/property/editInspectionRoute/editInspectionRoute.html @@ -14,13 +14,13 @@ placeholder="必填,请填写路线名称" class="form-control">
-
+
diff --git a/public/components/property/editInspectionRoute/editInspectionRoute.js b/public/components/property/editInspectionRoute/editInspectionRoute.js index d68ea6929..80475fd44 100644 --- a/public/components/property/editInspectionRoute/editInspectionRoute.js +++ b/public/components/property/editInspectionRoute/editInspectionRoute.js @@ -5,7 +5,7 @@ editInspectionRouteInfo: { inspectionRouteId: '', routeName: '', - seq: '', + seq: '1', remark: '', } diff --git a/public/pages/property/inspectionPlanManage/inspectionPlanManage.html b/public/pages/property/inspectionPlanManage/inspectionPlanManage.html index 2851b2d88..e69388ee0 100644 --- a/public/pages/property/inspectionPlanManage/inspectionPlanManage.html +++ b/public/pages/property/inspectionPlanManage/inspectionPlanManage.html @@ -1,5 +1,5 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -65,9 +65,9 @@ 计划 路线 周期 - 执行人 + 签到方式 - + 开始时间 结束时间 制定人 制定时间 @@ -80,15 +80,17 @@ {{inspectionPlan.inspectionPlanName}} {{inspectionPlan.inspectionRouteName}} {{inspectionPlan.inspectionPlanPeriodName}} - {{inspectionPlan.staffName}} + {{inspectionPlan.signTypeName}} - + {{inspectionPlan.startTime}} {{inspectionPlan.endTime}} {{inspectionPlan.createUserName}} {{inspectionPlan.createTime}} {{inspectionPlan.stateName}}
+ @@ -131,6 +133,10 @@
+
+ +
+ +
+
+
+
{{inspectionPlanStaffManageInfo.inspectionPlanName}}信息
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
巡检人巡检周期开始时间结束时间操作
{{inspectionPlanStaff.inspectionName}}{{inspectionPlanStaff.inspectionId}}{{inspectionPlanStaff.locationObjName}}{{inspectionPlanStaff.machineCode}}{{inspectionPlanStaff.machineName}} +
+ +
+
+
    +
    + + +
    +
    +
    + + +
    \ No newline at end of file diff --git a/public/pages/property/inspectionPlanStaffManage/inspectionPlanStaffManage.js b/public/pages/property/inspectionPlanStaffManage/inspectionPlanStaffManage.js new file mode 100644 index 000000000..4d0ce8279 --- /dev/null +++ b/public/pages/property/inspectionPlanStaffManage/inspectionPlanStaffManage.js @@ -0,0 +1,77 @@ +/** + 入驻小区 +**/ +(function(vc){ + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data:{ + inspectionPlanStaffManageInfo:{ + inspectionPlanStaffs:[], + inspectionPlanId:'', + inspectionPlanName:'', + total:0, + records:1, + routeName:'' + } + }, + _initMethod:function(){ + //vc.component._listInspectionRoutePoints(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent:function(){ + + vc.on('inspectionPlanStaffManage','listInspectionPoint',function(_param){ + if(!_param.hasOwnProperty('inspectionPlanId')){ + return ; + } + vc.component.inspectionPlanStaffManageInfo.inspectionPlanId = _param.inspectionPlanId; + $that.inspectionPlanStaffManageInfo.inspectionPlanName = _param.inspectionPlanName; + vc.component._listInspectionPlanStaffs(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination','page_event',function(_currentPage){ + vc.component._listInspectionPlanStaffs(_currentPage,DEFAULT_ROWS); + }); + }, + methods:{ + _listInspectionPlanStaffs:function(_page, _rows){ + + var param = { + params:{ + page:_page, + row:_rows, + communityId:vc.getCurrentCommunity().communityId, + inspectionPlanId:vc.component.inspectionPlanStaffManageInfo.inspectionPlanId + } + }; + + //发送get请求 + vc.http.get('inspectionRoutePointManage', + 'list', + param, + function(json,res){ + var _inspectionRouteManageInfo=JSON.parse(json); + vc.component.inspectionPlanStaffManageInfo.total = _inspectionRouteManageInfo.total; + vc.component.inspectionPlanStaffManageInfo.records = _inspectionRouteManageInfo.records; + vc.component.inspectionPlanStaffManageInfo.inspectionPlanStaffs = _inspectionRouteManageInfo.inspectionPlanStaffs; + vc.emit('pagination','init',{ + total:vc.component.inspectionPlanStaffManageInfo.records, + currentPage:_page + }); + },function(errInfo,error){ + console.log('请求失败处理'); + } + ); + }, + _openAddInspectionPlanStaffModal:function(){ + vc.emit('chooseInspectionRoutePoint','openchooseInspectionRoutePointModal',$that.inspectionPlanStaffManageInfo); + }, + _openDeleteInspectionPlanStaffModel:function(_inspectionPoint){ + _inspectionPoint.inspectionPlanId = $that.inspectionPlanStaffManageInfo.inspectionPlanId; + vc.emit('deleteInspectionRoutePoint','openDeleteInspectionRoutePointModal', _inspectionPoint); + }, + _goBack:function(){ + vc.emit('inspectionPlanManage','goBack',{}); + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/inspectionRouteManage/inspectionRouteManage.html b/public/pages/property/inspectionRouteManage/inspectionRouteManage.html index 28b0f4a65..4c0f51c4f 100644 --- a/public/pages/property/inspectionRouteManage/inspectionRouteManage.html +++ b/public/pages/property/inspectionRouteManage/inspectionRouteManage.html @@ -64,7 +64,7 @@ 路线名称 线路ID - 顺序 + 创建时间 操作 @@ -73,7 +73,7 @@ {{inspectionRoute.routeName}} {{inspectionRoute.inspectionRouteId}} - {{inspectionRoute.seq}} + {{inspectionRoute.createTime}}