修改事件不改变单号

assets/js/controllers/mainCtrl.js

@@ -4010,7 +4010,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             });
           }
           // 建单并派单
-          $scope.buildAndAssign = function(){
+          $scope.buildAndAssign = async function(){
             if(!$scope.categorySelectId){
               SweetAlert.swal({
                   title: "提示",
@@ -4156,8 +4156,12 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             }else if($scope.incidentModel.assign == 2){
               postData.incident.candidateGroups = $scope.incidentModel.group.id;
             }
-            api_bpm_domain.workernumber('sj').then(res1=>{
+            if(!postData.incident.incidentsign){
+              let res1 = await api_bpm_domain.workernumber('sj');
               postData.incident.incidentsign = res1.data;
+            }
+            // api_bpm_domain.workernumber('sj').then(res1=>{
+              // postData.incident.incidentsign = res1.data;
               api_flow.accept("accept", postData).then(function (response) {
                 if ($scope.uploader != null) {
                   // 有图片
@@ -4200,10 +4204,10 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   }
                 );
               });
-            })
+            // })
           }
           // 暂存
-          $scope.temporaryStorage = function(){
+          $scope.temporaryStorage = async function(){
             $rootScope.isMask = true;
             var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
             var postData = {
@@ -4241,8 +4245,12 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             }else if($scope.incidentModel.assign == 2){
               postData.incident.candidateGroups = $scope.incidentModel ? $scope.incidentModel.group.id : undefined;
             }
-            api_bpm_domain.workernumber('sj').then(res1=>{
+            if(!postData.incident.incidentsign){
+              let res1 = await api_bpm_domain.workernumber('sj');
               postData.incident.incidentsign = res1.data;
+            }
+            // api_bpm_domain.workernumber('sj').then(res1=>{
+              // postData.incident.incidentsign = res1.data;
               api_flow.accept("storage", postData).then(function (response) {
                 if ($scope.uploader != null) {
                   // 有图片
@@ -4285,7 +4293,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   }
                 );
               });
-            })
+            // })
           }
           // 展开/收起
           $scope.showId = "";
@@ -4637,7 +4645,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   // -------新建事件，积分机制，直接处理--------
                 };
                 // 直接处理，新建事件
-                function handlerStart(){
+                async function handlerStart(){
                   $rootScope.isMask = true;
                   console.log(scope.incidentModel,$scope.incidentModel);
                   var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
@@ -4710,8 +4718,13 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   //   // 微信报修转事件
                   //   postData.flow = scope.modelData.flow;
                   // }
-                  api_bpm_domain.workernumber('sj').then(res1=>{
+                  if(!postData.incident.incidentsign){
+                    let res1 = await api_bpm_domain.workernumber('sj');
                     postData.incident.incidentsign = res1.data;
+                  }
+
+                  // api_bpm_domain.workernumber('sj').then(res1=>{
+                  //   postData.incident.incidentsign = res1.data;
                     api_flow.accept("accept", postData).then(function (resData) {
                       if (scope.uploader != null) {
                         // 有图片
@@ -4840,7 +4853,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         }
                       );
                     });
-                  })
+                  // })
                 }
                 // 取消
                 $scope.cancel = function () {