优化

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -551,15 +551,18 @@ app.controller("inspectionScope", [
       $scope.stateModel.modelName = $scope.modelName;
       $scope.stateModel.typeIds = arr.map((v) => v.id).toString();
       arr = arr.map((v) => ({
-        inspection: $scope.stateModel,
+        inspection: $scope.stateModel.id,
         inspectionType: v.id,
+        inspectionTypeName: v.name,
         parent: v.parent,
-        user: v.user,
-        group: v.group,
+        user: v.user?v.user.id:undefined,
+        userName: v.user?v.user.name:undefined,
+        group: v.group?v.group.id:undefined,
+        groupName: v.group?v.group.groupName:undefined,
       }));
       // 一条都没选择
       if (arr.length === 0) {
-        arr.push({ inspection: $scope.stateModel });
+        arr.push({ inspection: $scope.stateModel.id });
       }
       console.log(arr);
       // return;
@@ -720,7 +723,7 @@ app.directive("zTree", function () {
               .fetchDataList("inspectionBind", {
                 idx: 0,
                 sum: 1000,
-                inspectionBind: { inspection: { id: $scope.stateModel.id } },
+                inspectionBind: { inspection: $scope.stateModel.id },
               })
               .then(function (response) {
                 $.fn.zTree.destroy("z-tree");
@@ -856,7 +859,7 @@ app.directive("zTree", function () {
             .fetchDataList("inspectionBind", {
               idx: 0,
               sum: 1000,
-              inspectionBind: { inspection: { id: $scope.stateModel.id } },
+              inspectionBind: { inspection: $scope.stateModel.id },
             })
             .then(function (response) {
               var result = response.list || [];
@@ -881,8 +884,8 @@ app.directive("zTree", function () {
           result = result.map((v) => ({
             id: v.inspectionType,
             name: v.inspectionTypeName,
-            group: v.group,
-            user: v.user,
+            group: {id:v.group,groupName:v.groupName},
+            user: {id:v.user,name:v.userName},
             parent: v.parent ? { id: v.parent.inspectionType } : undefined,
             pId: v.parent ? v.parent.inspectionType : 0,
           }));