bugfix

assets/js/controllers/consumables/consumablesCtrl.js

@@ -352,7 +352,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         companyIds = companyIds || [];
         var dat = {
             "company": {
-                serviceTypeIds:"1708",
+                serviceTypeIds:"1709",
                 name:name
             },
             "idx": 0,
@@ -369,7 +369,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
                         })
                     })
                 }
-                $scope.updata_company = data.list;  
+                $scope.updata_company = data.list;
             }
         });
     }
@@ -388,7 +388,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             $scope.hc_eject_specification = val.name;
         }
     })
-    
+
     // 品牌
     $scope.$watch('hc_eject_brandModel_caozuo', function (val) {
         // $scope.hc_eject_brandModel = val;
@@ -408,7 +408,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         ids = ids || [];
         var dat = {
             "company": {
-                serviceTypeIds:"1708",
+                serviceTypeIds:"1709",
             },
             "idx": 0,
             "sum": 999
@@ -457,7 +457,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     $scope.changeWarehousing = function(type){
         $scope.isWarehousing = type;
     }
-    
+
     // 编辑保存按钮
     $scope.companyIds = null;
     $scope.startPrice = '';
@@ -539,7 +539,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
                     $rootScope.hc_eject_big = false; //编辑弹出框
                     $rootScope.hc_eject_sma = false; //编辑弹出框
                     // $rootScope.hc_toedit = "new_top";
-                    
+
                 }
             })
         }
@@ -977,7 +977,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
                 // ------------------
                 var dat = {
                     "company": {
-                        serviceTypeIds:"1708",
+                        serviceTypeIds:"1709",
                     },
                     "idx": 0,
                     "sum": 999
@@ -1084,7 +1084,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
 app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$state', function ($rootScope, $http, $scope, $modal, $state) {
     // 编辑按钮
     $scope.edit = function () {
-        
+
         // --------------------------------
         console.log($scope.item)
         $rootScope.isAdds = false;
@@ -1101,7 +1101,7 @@ app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$st
         $rootScope.hc_eject_inventoryNum_caozuo = $scope.item.inventoryNum; //耗材在库数量
         $rootScope.hc_eject_inventorySum_caozuo = $scope.item.inventorySum; //耗材入库数量
         $rootScope.hc_eject_id_caozuo = $scope.item.id; //耗材id
-        
+
     };
     //查看按钮
     $scope.see = function () {

assets/js/controllers/customform/customformCtrl.js

@@ -10664,7 +10664,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   },
                 };
                 $scope.addData.taskSub["state"] = {
-                  id: $scope.stateListData[1],
+                  id: $scope.stateListData[2],
                 };
                 api_user_data
                   .addData("taskSub", $scope.addData)

assets/js/controllers/task/taskFormCtr.js

@@ -671,7 +671,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
             })
         }
         $scope.getStateData();
-        // 获取状态-lmm
+        // 获取状态
         $scope.stateListData1 = {};
         $scope.getStateData1=function(){//lyl
             var data={
@@ -763,7 +763,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                                     liableArr.push({id:vm.model.taskMonth.liable[i]})
                                 }
                                 vm.model.taskMonth.liable=liableArr;
-                            }                                                     
+                            }
                             api_user_data.updData("taskMonth",vm.model).then(function(res){
                                 if(res.status==200){
                                     SweetAlert.swal({
@@ -793,11 +793,11 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                             }, function() {
                                 $state.go($scope.formData.cancelUrl);
                           });
-                        }                  
+                        }
                         break;
                         // 反馈
                     case "feedback":
-                        // 反馈时间赋予    
+                        // 反馈时间赋予
                         if(vm.model.taskMonth.feedback!=jry_modelWatch.model.taskMonth.feedback){
                             vm.model.taskMonth.backTime=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
                         }
@@ -809,8 +809,8 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         }
                         if(vm.model.taskMonth.feedback4!=jry_modelWatch.model.taskMonth.feedback4){
                             vm.model.taskMonth.backTime4=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
-                        }       
-                        vm.model.taskMonth.state.id=$scope.stateListData[1];
+                        }
+                        vm.model.taskMonth.state.id=$scope.stateListData[2];
                         api_user_data.updData("taskMonth",vm.model).then(function(res){
                             if(res.status==200){
                                 SweetAlert.swal({
@@ -869,9 +869,9 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         }
                         if(vm.model.taskSub.feedback4!=jry_modelWatch.model.taskSub.feedback4){
                             vm.model.taskSub.backTime4=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
-                        } 
-                        vm.model.taskSub.state.id=$scope.stateListData1[2];
-                        console.log($scope.stateListData1[2])
+                        }
+                        vm.model.taskSub.state.id=$scope.stateListData1[3];
+                        console.log($scope.stateListData1[3])
                         api_user_data.updData("taskSub",vm.model).then(function(res){
                             if(res.status==200){
                                 SweetAlert.swal({
@@ -1003,7 +1003,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                 }
             });
         } else {
-            // 
+            //
             if (angular.isDefined(fieldsWatch) && fieldsWatch.length > 0) {
                 var vmForm = {
                     fields: fieldsWatch,
@@ -1052,7 +1052,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                                 //options:[{"id":"false","name":"不取消"},{"id":"true","name":"取消"}],
                                 // refresh:function(){
                                 //     return [{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}];
-                                // },  
+                                // },
                                 //options:[{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}],
                                 valueProp: "id",
                                 labelProp: "name",
@@ -1220,9 +1220,9 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         //                     { name:'influence.name', displayName:'影响度', width:80},
                         //                     { name:'priority.name', displayName:'优先级', width:80},
                         //                     { name:'handlerUser.name', displayName:'当前处理人', width:100},
-                        //                     { name:'acceptDate', displayName:'创建时间', width:100}                                        
+                        //                     { name:'acceptDate', displayName:'创建时间', width:100}
                         //         ],
-                        //         displayName:'title', 
+                        //         displayName:'title',
                         //         onClick:function(val, options, field, event , model){
                         //             //model.start_code++;
                         //             console.log(options);
@@ -1260,7 +1260,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         //             if(angular.isUndefined(field.form.dropState)){
                         //                 field.form.dropState=false;
                         //             }
-                        //             field.form.dropState=!field.form.dropState;  
+                        //             field.form.dropState=!field.form.dropState;
                         //             console.log(field);
                         //         }
                         //     }
@@ -1283,7 +1283,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         //         pkey:'change'
                         //     }
                         // },
-                        // {   
+                        // {
                         //     type: 'ui-label',
                         //     key: 'title',
                         //     className: 'col-xs-4',
@@ -1293,7 +1293,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         //     }
                         // },
                         // //关联发布单号
-                        // //新建发布                    
+                        // //新建发布
                         // {
                         //     key: 'droplist',
                         //     type: 'ui-dropfiletable',
@@ -1329,7 +1329,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                         //                     label: '计划开始时间',
                         //                     required: true
                         //                 }
-                        //             },   
+                        //             },
                         //             {
                         //                 className: 'col-xs-3',
                         //                 type: 'ui-datepicker',

assets/views/login_login.html

@@ -120,8 +120,8 @@
                 </p> -->
                 <!-- wt -->
                 <p style="overflow:hidden">
-                    <button ng-style="{width:isZncd?'48%':'100%'}" ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl" style="width: 48%!important;"> 登录 </button>
-                    <a ng-if="isZncd" href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a>
+                    <button ng-style="{width: '100%'}" ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl"> 登录 </button>
+                    <!-- <a ng-if="isZncd" href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a> -->
                 </p>
                 <!-- 激活码:<input type="text" ng-model="ceshilicense">   -->
                 <!-- <div class="col-xs-12">