汇总单

assets/js/config.constant.js

@@ -119,6 +119,8 @@ app.constant('JS_REQUIRES', {
         //*** inspect 
         'integralCtrl': 'assets/js/controllers/inspect/integralCtrl.js',
         'inspectPlanCtrl': 'assets/js/controllers/inspect/inspectPlanCtrl.js',
+        'summaryCtrl': 'assets/js/controllers/inspect/summaryCtrl.js',
+        'summaryDetailCtrl': 'assets/js/controllers/inspect/summaryDetailCtrl.js',
         'inspectReportCtrl': 'assets/js/controllers/inspect/inspectReportCtrl.js',
         'inspectListCtrl': 'assets/js/controllers/inspect/inspectListCtrl.js',
         'inspectForm': 'assets/js/controllers/inspect/inspectForm.js',

assets/js/config.router.js

@@ -1411,6 +1411,30 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                 }
             })
 
+            //管理事件>维修汇总单
+            .state('app.incident.summary', {
+                url: '/summary',
+                templateUrl: "assets/views/inspect/summary.html",
+                resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'summaryCtrl'),
+                title: 'inspection.LIST',
+                icon: 'ti-list',
+                ncyBreadcrumb: {
+                    label: 'inspection list'
+                }
+            })
+
+            //管理事件>维修汇总单
+            .state('app.incident.summaryDetail', {
+                url: '/summaryDetail/{incidentId}',
+                templateUrl: "assets/views/inspect/summaryDetail.html",
+                resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'summaryDetailCtrl'),
+                title: 'inspection.LIST',
+                icon: 'ti-list',
+                ncyBreadcrumb: {
+                    label: 'inspection list'
+                }
+            })
+
             //管理事件>积分管理
             .state('app.incident.integral', {
                 url: '/integral',

assets/js/controllers/inspect/summaryDetailCtrl.js

@@ -0,0 +1,97 @@
+"use strict";
+/**
+ * controller for User Profile Example
+ */
+app.controller("summaryDetailCtrl", [
+  "$rootScope",
+  "$scope",
+  "$state",
+  "$stateParams",
+  "$timeout",
+  "$interval",
+  "$modal",
+  "SweetAlert",
+  "i18nService",
+  "uiGridConstants",
+  "uiGridGroupingConstants",
+  "Restangular",
+  "api_bpm_schedule",
+  "api_bpm_data",
+  "api_wechatfile",
+  "api_configure_data",
+  "moment",
+  function (
+    $rootScope,
+    $scope,
+    $state,
+    $stateParams,
+    $timeout,
+    $interval,
+    $modal,
+    SweetAlert,
+    i18nService,
+    uiGridConstants,
+    uiGridGroupingConstants,
+    Restangular,
+    api_bpm_schedule,
+    api_bpm_data,
+    api_wechatfile,
+    api_configure_data,
+    moment
+  ) {
+    $scope.langs = i18nService.getAllLangs();
+    $scope.lang = "zh-cn";
+
+    i18nService.setCurrentLang($scope.lang);
+
+    // 获取信息
+    $scope.consumableList = [];
+    $scope.incidentDTO = {};
+    $scope.workHourManagementList = [];
+    $scope.totalPriceConsumable = 0;
+    $scope.totalPriceWorkHourManagement = 0;
+    $scope.getInfo = function(){
+      console.log($stateParams.incidentId);
+      $rootScope.isMask = true;
+      api_bpm_data.querySummaryDoc({"incidentId":$stateParams.incidentId}).then(
+        function (data) {
+          $rootScope.isMask = false;
+          $scope.consumableList = data.consumableList || [];
+          $scope.incidentDTO = data.incidentDTO || {};
+          $scope.workHourManagementList = data.workHourManagementList || [];
+          $scope.totalPriceConsumable = $scope.consumableList.reduce((pre,current) => {
+            return pre + current.consumableEndPrice * current.consumablesNum;
+          },0)
+          $scope.totalPriceWorkHourManagement = $scope.workHourManagementList.reduce((pre,current) => {
+            return pre + current.wage;
+          },0)
+        },
+        function () {
+          $rootScope.isMask = false;
+        }
+      );
+    }
+    $scope.getInfo();
+    //返回列表
+    $scope.goToList = function(){
+      $state.go("app.incident.summary");
+    }
+    $scope.transferTime = function (time) {
+      if(time){
+        return moment(time).format('YYYY-MM-DD HH:mm');
+      }else{
+        return '';
+      }
+    }
+    //查看事件
+    $scope.goToIncident = function(){
+      $state.go('app.incident.detail', {
+        formKey: 'incident_back',
+        pdKey: 'incident',
+        dataId: $scope.incidentDTO.id,
+        taskId: $scope.incidentDTO.taskId,
+        processInstanceId: $scope.incidentDTO.processInstanceId
+      });
+    }
+  },
+]);

assets/js/main.js

@@ -1017,6 +1017,14 @@ app.factory('api_bpm_data', ['BpmRestangular', function (BpmRestangular) {
     var inspectionProcessActual = BpmRestangular.all("InspectionProcessActual");
     var solutionService = BpmRestangular.all("solution");
     return {
+        // 汇总单审核通过
+        approved: function (data) {
+            return dataService.customPOST(data, 'approved');
+        },
+        // 获取汇总单信息
+        querySummaryDoc: function (data) {
+            return dataService.customPOST(data, 'querySummaryDoc');
+        },
         // 获取首页今日上班清空
         getManagerIndexInfo: function (data) {
             return dataService.customPOST(data, 'getManagerIndexInfo');

assets/views/inspect/summary.html

@@ -0,0 +1,54 @@
+<style type="text/css">
+    .incidentsearch {
+        width: 30% !important;
+        margin-right: 16px
+    }
+
+    .iptSize {
+        width: 60% !important;
+        height: 28px !important;
+    }
+
+    .tree-control .tree-input {
+        min-height: 28px !important
+    }
+
+    .searchBtnBox>.btn{
+        margin: 0 8px 10px 0;
+    }
+</style>
+<div ng-controller="summaryCtrl">
+    <section id="page-title">
+        <div class="row">
+            <div class="col-sm-8">
+                <h1 class="mainTitle">维修汇总单<i tooltip='维修汇总单列表，可对巡检进行修改，新增，删除' tooltip-placement="right"
+                        class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
+            </div>
+        </div>
+    </section>
+    <div class="schuback" id="searchid">
+        <div class="row " style="padding-right: 0px !important;">
+            <div class="col-xs-12">
+                <div class="col-xs-10" style="padding-right: 0px !important;"></div>
+                <div class="col-xs-2">
+                    <div>
+                        <div class="pull-left margin-top-10 searchBtnBox">
+                            <div class="btn btn_search" ng-click="searchinspe(inspectdata)"><span>搜索</span></div>
+                            <div class="btn btn_remove" ng-click="removeData()"
+                                ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()"
+                                ng-show="shanchu" ng-disabled="selected.items.length==0"><span
+                                    translate="list.button.REMOVE">Remove First Row</span></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tableList" ui-i18n="{{lang}}">
+        <div class=" ">
+            <div id="grid1 " ui-grid="gridOptions " ui-grid-pagination external-scopes="$scope " ui-grid-resize-columns
+                ui-grid-selection ui-grid-auto-resize class="grid ">
+            </div>
+        </div>
+    </div>
+</div>

assets/views/inspect/summaryDetail.html

@@ -0,0 +1,345 @@
+<style type="text/css">
+    .totalPrice{
+        height: 50px;
+        line-height: 50px;
+        border-bottom: 1px solid #eeeeee;
+        text-align: center;
+    }
+    .btnWrap{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .incidentsearch {
+        width: 30% !important;
+        margin-right: 16px
+    }
+
+    .iptSize {
+        width: 60% !important;
+        height: 28px !important;
+    }
+
+    .tree-control .tree-input {
+        min-height: 28px !important
+    }
+
+    .searchBtnBox>.btn{
+        margin: 0 8px 10px 0;
+    }
+    .header_item{
+        font-size: 16px;
+        color: #606367;
+        padding: 8px 15px;
+    }
+    .header_item span{
+        margin-right: 24px;
+    }
+    #importTplIpt {
+        position: absolute;
+        top: 0;
+        right: 0;
+        left: 0;
+        bottom: 0;
+        opacity: 0;
+    }
+
+    .mainDiv {
+        /* background: red; */
+        /* padding: 14px; */
+        /* height: 50px; */
+        overflow: hidden;
+        /* zoom: 1; */
+    }
+
+    .mainDivLeft {
+        /* display: inline-block; */
+        border-radius: 8px;
+        margin-right: 52%;
+        border: 1px solid #eeeeee;
+    }
+
+    .mainDivRight {
+        /* display: inline-block; */
+        width: 48%;
+        border-radius: 8px;
+        float: right;
+        border: 1px solid #eeeeee;
+    }
+
+    .mainDiv-head {
+        height: 47px;
+        line-height: 47px;
+        background: #f5f5f5;
+        font-size: 16px;
+        color: #606367;
+        border-radius: 8px 8px 0 0;
+        padding-left: 10px;
+        padding-right: 4px;
+    }
+
+    .mainDivLeft-span {
+        border: 1px solid;
+        /* padding: 15px 0px 15px 0px; */
+        padding-left: 15px;
+        padding-right: 15px;
+        padding-top: 4px;
+        padding-bottom: 4px;
+        height: 28px;
+        line-height: 28px;
+        border-radius: 4px;
+        margin-right: 10px;
+        font-size: 14px;
+        position: relative;
+    }
+
+    .mainDiv-head-right {
+        float: right;
+    }
+
+    .mainDiv-head-right.hc {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .mainDiv-head-right .hc_left {
+        flex: 1;
+    }
+
+    .mainDiv-head-right .hc_right {
+        text-align: right;
+        flex-shrink: 0;
+        width: 100px;
+    }
+
+    .edit-left {
+        display: inline-block;
+        /* float: left; */
+        margin-left: 10px;
+    }
+
+    .span-1 {
+        border-color: #006bc0;
+        color: #006bc0;
+    }
+
+    .span-2 {
+        border: none;
+        color: white;
+        background-color: #2edbb8;
+    }
+
+    .span-3 {
+        border: none;
+        color: white;
+        background-color: #006bc0;
+    }
+
+    .mainDiv-body {
+        /* height: 500px; */
+        border-radius: 8px;
+        border: 1px solid #eeeeee;
+        margin: 14px;
+        overflow-y: auto;
+    }
+
+    .mainDiv-body-1 {
+        height: 50px;
+        line-height: 50px;
+        font-size: 16px;
+        color: #606367;
+        padding: 0px 14px;
+        border-bottom: 1px solid #eeeeee;
+    }
+
+    .mainDiv-body-2 {
+        /* height: 70px; */
+        line-height: 2;
+        font-size: 14px;
+        color: #606367;
+        padding: 10px 30px;
+        border-bottom: 1px solid #eeeeee;
+    }
+
+    /* .mainDiv-body-2:last-child {
+        border-bottom: none;
+    } */
+
+    .fixHeight {
+        /* height: 500px; */
+        overflow: auto;
+    }
+
+    .mainDiv-body-3 {
+        height: 50px;
+        line-height: 50px;
+        font-size: 14px;
+        color: #606367;
+        padding: 0px 30px;
+        border-bottom: 1px solid #eeeeee;
+    }
+
+    .mainDiv-body-3:last-child {
+        border-bottom: none;
+    }
+
+    .mainDiv-body-img {
+        height: 90px;
+        border-radius: 4px;
+        margin: 14px;
+        margin-bottom: 0px;
+        overflow: hidden;
+    }
+
+    .mainDiv-body-noList {
+        height: 110px;
+        margin: 50px 0;
+        text-align: center;
+    }
+
+    .form-control {
+        display: inline-block;
+    }
+
+    .mainDivLeft-span-1 {
+        border: 1px solid;
+        padding-left: 15px;
+        padding-right: 15px;
+        /* padding-top: 4px; */
+        /* padding-bottom: 4px; */
+        height: 28px;
+        line-height: 28px;
+        border-radius: 4px;
+        margin-right: 10px;
+        font-size: 14px;
+        display: inline-block;
+    }
+
+    .mainDivLeft-span-2 {
+        border: 1px solid;
+        padding-left: 15px;
+        padding-right: 15px;
+        /* padding-top: 4px; */
+        /* padding-bottom: 4px; */
+        height: 28px;
+        line-height: 28px;
+        border-radius: 4px;
+        margin-right: 10px;
+        font-size: 14px;
+        display: inline-block;
+    }
+
+    .mainDivLeft-span-edit-1 {
+        border: 1px solid;
+        padding-left: 8px;
+        padding-right: 8px;
+        /* padding-top: 4px; */
+        /* padding-bottom: 4px; */
+        height: 22px;
+        line-height: 22px;
+        border-radius: 2px;
+        margin-right: 10px;
+        font-size: 12px;
+        display: inline-block;
+    }
+
+    .mainDivLeft-span-edit-2 {
+        border: 1px solid;
+        padding-left: 8px;
+        padding-right: 8px;
+        /* padding-top: 4px; */
+        /* padding-bottom: 4px; */
+        height: 22px;
+        line-height: 22px;
+        border-radius: 2px;
+        margin-right: 10px;
+        font-size: 12px;
+        display: inline-block;
+    }
+</style>
+<div ng-controller="summaryDetailCtrl">
+    <section id="page-title">
+        <div class="row">
+            <div class="col-sm-8">
+                <h1 class="mainTitle">维修汇总单详情<i tooltip='维修汇总单详情' tooltip-placement="right"
+                        class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
+            </div>
+        </div>
+    </section>
+    <div class="schuback" id="searchid">
+        <div class="row " style="padding-right: 0px !important;">
+            <div class="col-xs-12">
+                <div class="header_item">
+                    <span>事件单号：{{ incidentDTO.incidentsign }}</span>
+                    <span>报修科室：{{ incidentDTO.department ? incidentDTO.department.dept : '' }}</span>
+                    <span>登记时间：{{ transferTime(incidentDTO.acceptDate) }}</span>
+                    <span>处理人/组：{{ incidentDTO.groupORHandlerUser }}</span>
+                </div>
+                <div class="header_item">
+                    <span>事件描述：{{ incidentDTO.description }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tableList">
+        <div class="tableList_wrap">
+            <div class="mainDiv">
+                <!-- 谁固定谁在前 -->
+                <div class="mainDivRight">
+                    <div class="mainDiv-head">
+                        <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
+                        <span>工时清单</span>
+                        <div class="mainDiv-head-right"></div>
+                    </div>
+                    <div class="mainDiv-body fixHeight">
+                        <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="workHourManagement in workHourManagementList">
+                            <div>
+                                <span>{{workHourManagement.workName}}</span>
+                                <div class="mainDiv-head-right">
+                                    <span></span>
+                                </div>
+                            </div>
+                            <div>
+                                <span>&emsp;</span>
+                                <div class="mainDiv-head-right hc">
+                                    <strong class="hc_left"></strong><strong class="hc_right">单次：{{workHourManagement.wage}}元</strong>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="totalPrice">总价：{{totalPriceWorkHourManagement}}元</div>
+                    </div>
+                </div>
+                <div class="mainDivLeft">
+                    <div class="mainDiv-head">
+                        <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
+                        <span style="cursor: pointer;" ng-click="clear()">耗材清单</span>
+                        <div class="mainDiv-head-right"></div>
+                    </div>
+                    <div class="mainDiv-body">
+                        <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="consumable in consumableList">
+                            <div>
+                                <span>{{consumable.consumableName}}</span>
+                                <div class="mainDiv-head-right">
+                                    <span>单价：<strong>{{consumable.consumableEndPrice}}元</strong></span>
+                                </div>
+                            </div>
+                            <div>
+                                <span>&emsp;</span>
+                                <div class="mainDiv-head-right hc">
+                                    <strong class="hc_left">x{{consumable.consumablesNum}}</strong><strong class="hc_right">总价：{{consumable.consumableEndPrice * consumable.consumablesNum}}元</strong>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="totalPrice">总价：{{totalPriceConsumable}}元</div>
+                    </div>
+                </div>
+            </div>
+            <div class="totalPrice">汇总单总价：{{ totalPriceWorkHourManagement + totalPriceConsumable }}元</div>
+            <div class="btnWrap">
+                <div class="btn btn_search" ng-click="goToIncident()"><span>查看事件</span></div>
+                <div class="btn btn_search" style="margin-left: 8px;" ng-click="goToList()"><span>返回列表</span></div>
+            </div>
+        </div>
+    </div>
+</div>