Merge branch 'lmm' into develop

package-lock.json

@@ -2608,9 +2608,9 @@
       }
     },
     "core-js": {
-      "version": "3.15.1",
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.15.1.tgz?cache=0&sync_timestamp=1624386897006&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.1.tgz",
-      "integrity": "sha1-bAiriKvfVlRQRcz1/YH0f0B+fxo="
+      "version": "3.15.2",
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.15.2.tgz?cache=0&sync_timestamp=1624966056491&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.2.tgz",
+      "integrity": "sha1-dAZg0v9V7zTOZk1+JFURnFvdPWE="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -11696,9 +11696,9 @@
       }
     },
     "sortablejs": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npm.taobao.org/sortablejs/download/sortablejs-1.13.0.tgz",
-      "integrity": "sha1-OrJHP4xpymNWnoCxzRtWabUSaek="
+      "version": "1.14.0",
+      "resolved": "https://registry.nlark.com/sortablejs/download/sortablejs-1.14.0.tgz",
+      "integrity": "sha1-bS4XzL2yX0ZHNN9iHU811Ks1s9g="
     },
     "source-list-map": {
       "version": "2.0.1",

package.json

@@ -24,7 +24,7 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.9.0",
-    "core-js": "^3.15.1",
+    "core-js": "^3.15.2",
     "crypto-js": "^4.0.0",
     "datatables.net": "^1.10.25",
     "date-fns": "^2.22.1",
@@ -36,7 +36,7 @@
     "overlayscrollbars": "^1.11.0",
     "overlayscrollbars-ngx": "^0.1.1",
     "rxjs": "~6.4.0",
-    "sortablejs": "^1.12.0",
+    "sortablejs": "^1.14.0",
     "tslib": "^1.9.0",
     "zone.js": "^0.9.1"
   },

src/app/views/task-type-management/task-type-management.component.ts

@@ -930,6 +930,10 @@ export class TaskTypeManagementComponent implements OnInit {
         }
       }
     }
+    if (!this.taskData.taskType.classesIds) {
+      that.showPromptModal(that.add ? "新增" : "编辑", false, "请选择关联班次");
+      return;
+    }
     if (this.taskData.taskType.classesIds.length == 0) {
       that.showPromptModal(that.add ? "新增" : "编辑", false, "请选择关联班次");
       return;
@@ -1629,7 +1633,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.yLoading = true;
     that.mainService.getDictionary("list", this.jyfsType).subscribe((data) => {
       this.yNum--;
-      if(this.yNum === 0){
+      if (this.yNum === 0) {
         this.yLoading = false;
       }
       this.checkoutData = data;