1、修正车辆信息修改报错（未设置报废字段）

2、修正人员信息新建问题（工号出现undefined）

1、修正车辆信息修改报错（未设置报废字段）
2、修正人员信息新建问题（工号出现undefined）
徐烜
1 parent 878448d5
Showing 3 changed files with 17 additions and 32 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
@@ -248,12 +248,7 @@
                     <label class="col-md-2 control-label">报废号：</label>
                     <div class="col-md-4">
                         <input type="text" name="scrapCode" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
-                               required placeholder="请输入报废号"/>
-                    </div>
-
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.scrapCode.$error.required">
-                        报废号必须填写
+                               placeholder="请输入报废号"/>
                     </div>
                 </div>
@@ -361,8 +361,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         'DataStore',
-        '$scope',
-        function(service, $stateParams, $state, DataStore, $scope) {
+        function(service, $stateParams, $state, DataStore) {
             var self = this;
             var Cars = service.getQueryClass();
@@ -388,13 +387,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 获取传过来的id，有的话就是修改，获取一遍数据
             var id = $stateParams.id;
-            var _equipmentCode_temp;
             if (id) {
                 self.busInfoForSave = Cars.get({id: id}, function(obj) {
                     if (!obj.scrapState) { // 防止null值
                         obj.scrapState = false;
                     }
-                    _equipmentCode_temp = obj.equipmentCode;
                 });
             } else {
                 self.busInfoForSave.scrapState = false;
@@ -402,13 +399,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
-                console.log(self.busInfoForSave);
-
-                // 报废的车辆，修改原来的车辆终端号
-                if (self.busInfoForSave.scrapState) {
-                    self.busInfoForSave.equipmentCode = "BF-" + _equipmentCode_temp;
-                }
-
+                // console.log(self.busInfoForSave);
                 // 保存或者更新
                 self.busInfoForSave.$save(function() {
@@ -417,16 +408,6 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
-            $scope.$watch(
-                function() {
-                    return self.busInfoForSave.scrapState;
-                },
-                function(n) {
-                    if (!n) {
-                        self.busInfoForSave.scrapCode = "BF-" + _equipmentCode_temp;
-                    }
-                }
-            );
         }
     ]
 );
@@ -34,7 +34,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "personnelType", desc: "性别"},
                 {name: "company", desc: "所在公司"},
                 {name: "brancheCompany", desc: "分公司"},
-                {name: "posts", desc: "工种"}
+                {name: "posts", desc: "工种"},
+                {name: "updateDate", desc: "更新时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -383,6 +384,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 }
                 delete self.employeeInfoForSave.destroy_temp;
+                // 重新设置一下jobCodeori, $watch有时候会失效
+                self.employeeInfoForSave.jobCode =
+                    self.employeeInfoForSave.companyCode + "-" + self.employeeInfoForSave.jobCodeori;
+
                 console.log(self.employeeInfoForSave);
                 // 保存或更新
@@ -394,11 +399,15 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             $scope.$watch(
                 function() {
-                    return self.employeeInfoForSave.jobCodeori;
+                    return self.employeeInfoForSave;
                 },
-                function(n, o) {
-                    // 员工编号=公司编码_工号
-                    self.employeeInfoForSave.jobCode = self.employeeInfoForSave.companyCode + "-" + n;
+                function(newValue) {
+                    var _companyCode = newValue["companyCode"];
+                    var _jobCodeori = newValue["jobCodeori"];
+                    if (_companyCode && _jobCodeori) {
+                        // 员工编号=公司编码_工号
+                        self.employeeInfoForSave.jobCode = _companyCode + "-" + _jobCodeori;
+                    }
                 },
                 true
             );