巡检计划查看

assets/js/controllers/customform/customformCtrl.js

@@ -11282,22 +11282,26 @@ appFormly.config(function config(formlyConfigProvider) {
           function ($scope, $rootScope, api_bpm_domain, $stateParams) {
             $scope.model[$scope.options.key] = '0';//默认全部
             var arr = [];
-            if($scope.model.inspection.batchNos){
-              arr = $scope.model.inspection.batchNos.map(v=>({value:v,name:v}));
+            if(scope.options.key === 'searchParams_batchNos'){
+              // 批次号
+              if($scope.model.batchNos){
+                arr = $scope.model.batchNos.map(v=>({value:v,name:v}));
+              }
+              arr.unshift({value:'0',name:'全部'});
+              $scope.options.templateOptions.options = arr;
+            }else if(scope.options.key === 'searchParams_online'){
+              // 线上OR线下 liaomingming
+              arr.push({value:'0',name:'全部'});
+              arr.push({value:'1',name:'线上'});
+              arr.push({value:'2',name:'线下'});
+              $scope.options.templateOptions.options = arr;
+            }else if(scope.options.key === 'searchParams_state'){
+              // 状态
+              arr.push({value:'0',name:'全部'});
+              arr.push({value:'1',name:'执行中'});
+              arr.push({value:'2',name:'已完成'});
+              $scope.options.templateOptions.options = arr;
             }
-            arr.unshift({value:'0',name:'全部'});
-            $scope.options.templateOptions.options = arr;
-            console.log($scope)
-            // ts.$parent.fields.forEach(v=>{
-            //   if(v.templateOptions.onlyKey === "batchNos"){
-            //     //巡检计划-批次号
-            //     var batchNos = $scope.model.batchNos === "0"?"":$scope.model.batchNos;
-            //     v.templateOptions.getScope().refreshData(batchNos)
-            //   }
-            // })
-            // ts.$parent.fields.forEach(v=>{if(v.templateOptions.onlyKey === "batchNos"){var batchNos = item == "0"?"":item;v.templateOptions.getScope().refreshData(batchNos);}})
-            // console.log($scope.options)
-            // console.log($scope.model)
           },
         ],
       };
@@ -13117,7 +13121,12 @@ appFormly.config(function config(formlyConfigProvider) {
         });
       };
 
-      //页面获取数据
+      $scope.s_totalNum = 0;//总数
+      $scope.s_completeNum = 0;//已完成数
+      $scope.s_completeNum_online = 0;//线上已完成数
+      $scope.s_completeNum_offline = 0;//线下已完成数
+
+      //页面获取数据 liaomingming
       $scope.refreshData = function (style, filterData) {
         // $scope.ldloading[style.replace('-', '_')] = true;
         console.log(angular.isUndefined(filterData))
@@ -13126,27 +13135,32 @@ appFormly.config(function config(formlyConfigProvider) {
         }
         $scope.myData = [];
         console.log(filterData)
-        if(filterData.inspectionProcessActual && filterData.inspectionProcessActual.batchNo){
-          filterData.inspectionProcessActual = {
-            inspectionid: $scope.model.id,
-            batchNo:filterData.inspectionProcessActual.batchNo
-          }
-        }else{
-          filterData.inspectionProcessActual = {
-            inspectionid: $scope.model.id
-          }
+        // var params = angular.copy(filterData.inspectionProcessActual);
+        filterData.inspectionProcessActual = {
+          inspectionid: $scope.model.id
+        }
+        if($scope.model && $scope.model.searchParams_batchNos !== '0'){
+          filterData.inspectionProcessActual.batchNo = $scope.model.searchParams_batchNos;
+        }
+        if($scope.model && $scope.model.searchParams_online !== '0'){
+          filterData.inspectionProcessActual.online = $scope.model.searchParams_online == 1;
+        }
+        if($scope.model && $scope.model.searchParams_state !== '0'){
+          filterData.inspectionProcessActual.state = $scope.model.searchParams_state == 1 ? 0 : 1;
         }
-        // angular.extend(filterData, {
-        //   inspectionProcessActual: {
-        //     inspectionid: $scope.model.id,
-        //   },
-        // });
         console.log(filterData)
         api_bpm_data.fetchDataList("inspectionProcessActual", filterData).then(
           function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             $scope.myData = myData.list;
+            if(filterData.sum == 9999){
+              var completeArr = $scope.myData.filter(v=>v.state === 1);
+              $scope.s_totalNum = $scope.myData.length;//总数
+              $scope.s_completeNum = completeArr.length;//已完成数
+              $scope.s_completeNum_online = completeArr.filter(v=>v.online).length;//线上已完成数
+              $scope.s_completeNum_offline = completeArr.filter(v=>!v.online).length;//线下已完成数
+            }
             for (var i = 0; i < $scope.myData.length; i++) {
               //添加序号
               $scope.myData[i]["item"] =
@@ -13159,7 +13173,10 @@ appFormly.config(function config(formlyConfigProvider) {
           }
         );
       };
-      $scope.refreshData("expand-right", defaultFilterData);
+      $scope.refreshData("expand-right", {
+        idx: 0,
+        sum: 9999,
+      });
     },
   });
 

assets/views/customform/tpl/ui-grid-show.html

@@ -1 +1,2 @@
+<div>总：{{s_completeNum}}/{{s_totalNum}}&nbsp;&nbsp;&nbsp;&nbsp;线下： {{s_completeNum_offline}}/{{s_completeNum}}&nbsp;&nbsp;&nbsp;&nbsp;线上：{{s_completeNum_online}}/{{s_completeNum}}</div>
 <div id="grid1" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-cellNav ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid" ></div>