seimin před 3 roky
rodič
revize
c6218ab830

+ 22 - 1
assets/js/controllers/customform/customformCtrl.js

@@ -20618,6 +20618,7 @@ appFormly.controller("CustomformCtrl", [
20618 20618
   "api_configure_form",
20619 20619
   "api_bpm_domain",
20620 20620
   "api_bpm_domain1",
20621
+  "api_bpm",
20621 20622
   "api_bpm_data",
20622 20623
   "api_user_data",
20623 20624
   "api_statistic",
@@ -20645,6 +20646,7 @@ appFormly.controller("CustomformCtrl", [
20645 20646
     api_configure_form,
20646 20647
     api_bpm_domain,
20647 20648
     api_bpm_domain1,
20649
+    api_bpm,
20648 20650
     api_bpm_data,
20649 20651
     api_user_data,
20650 20652
     api_statistic,
@@ -21672,7 +21674,26 @@ appFormly.controller("CustomformCtrl", [
21672 21674
                       baseHandler();
21673 21675
                     })
21674 21676
                   } else {
21675
-                    baseHandler();
21677
+                    if($stateParams.formUiEdit === 'inspection_LinHu_confirm'){
21678
+                      //巡检计划
21679
+                      if(vm.model.inspectionProcessActual.group&&vm.model.inspectionProcessActual.group.id){
21680
+                        api_bpm.assign({ids:$stateParams.dataId.toString(),userId:$rootScope.user.id}).then(function (response) {
21681
+                            if (response.status == 200) {
21682
+                                baseHandler();
21683
+                            } else {
21684
+                                Alert.swal({
21685
+                                    title: "操作失败",
21686
+                                    text: "操作失败, 请稍后再试!",
21687
+                                    type: "error"
21688
+                                });
21689
+                            }
21690
+                        });
21691
+                      }else{
21692
+                        baseHandler();
21693
+                      }
21694
+                    }else{
21695
+                      baseHandler();
21696
+                    }
21676 21697
                   }
21677 21698
                   // return;
21678 21699
                   function baseHandler() {

+ 1 - 1
assets/views/customform/tpl/ui-showimage.html

@@ -3,6 +3,6 @@
3 3
         <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
4 4
     </div>
5 5
     <div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
6
-        <img draggable ng-src="{{imageurl}}" style="width:auto;height:400px" />
6
+        <img draggable ng-src="{{imageurl}}" style="width:100%;max-height:400px" />
7 7
     </div>
8 8
 </div>

+ 1 - 0
assets/views/inspect/inspectReport.html

@@ -186,6 +186,7 @@
186 186
           white-space:normal;
187 187
           flex-wrap: wrap;
188 188
           height: 100%;
189
+          word-break: break-all;
189 190
         }
190 191
         #print .td .inspectPar p{
191 192
           text-align: justify;

+ 1 - 0
index.html

@@ -62,6 +62,7 @@
62 62
         white-space:normal;
63 63
         flex-wrap: wrap;
64 64
         height: 100%;
65
+        word-break: break-all;
65 66
     }
66 67
     .inspectReportCtrl [ui-grid-cell] .ui-grid-cell-contents .inspectPar p{
67 68
         text-align: justify;