审核优化

assets/js/controllers/customform/customformCtrl.js

@@ -22328,6 +22328,7 @@ appFormly.controller("CustomformCtrl", [
                             $scope.onChangeComplexity = function(item){
                               if($scope.complexityConfirm.complexity.value == $scope.complexity){
                                 $scope.complexityConfirm.updateReason = '';
+                                $scope.complexityConfirm.auditor = null;
                               }
                             }
                             $scope.ok = function () {
@@ -22339,7 +22340,7 @@ appFormly.controller("CustomformCtrl", [
                                     });
                                     return;
                                 }
-                                if (!$scope.complexityConfirm.auditor){
+                                if ($scope.complexityConfirm.complexity.value != $scope.complexity && !$scope.complexityConfirm.auditor){
                                     Alert.swal({
                                         title: "操作失败",
                                         text: "请选择审核人!",
@@ -22347,7 +22348,7 @@ appFormly.controller("CustomformCtrl", [
                                     });
                                     return;
                                 }
-                                if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
+                                if ($scope.complexityConfirm.complexity.value != $scope.complexity && !$scope.complexityConfirm.updateReason.trim()){
                                     Alert.swal({
                                         title: "操作失败",
                                         text: "请填写升级原因!",
@@ -22357,7 +22358,7 @@ appFormly.controller("CustomformCtrl", [
                                 }
                                 api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                                   // var auditState = $scope.complexityConfirm.complexity.value == $scope.complexity?res.find(v=>v.value == 1):res.find(v=>v.value == 0);
-                                  var auditState = res.find(v=>v.value == 0);
+                                  var auditState = $scope.complexityConfirm.complexity.value != $scope.complexity ? res.find(v=>v.value == 0) : res.find(v=>v.value == 1);
                                   var postData = { 
                                     incidentIntegral: {
                                       incidentId:incidentData.id,
@@ -22367,7 +22368,7 @@ appFormly.controller("CustomformCtrl", [
                                       sourceScore:$scope.complexity,
                                       currentScore:$scope.complexityConfirm.complexity.value,
                                       updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
-                                      auditUser: $scope.complexityConfirm.auditor.id
+                                      auditUser: $scope.complexityConfirm.auditor ? $scope.complexityConfirm.auditor.id : undefined
                                     }
                                   }
                                   console.log(postData)

assets/views/incident/tpl/toIntegralMechanism.tpl.html

@@ -22,7 +22,7 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="!flag || (flag && complexityConfirm.complexity.value != complexity)">
         <div class="input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">审核人<span class="red">*</span></label>:</div>