Merge branch 'lmm' into develop

package-lock.json

@@ -740,18 +740,18 @@
       "integrity": "sha1-NuVJ3T8TInQqOnOOfBE+vkgiGGA="
     },
     "@types/datatables.net": {
-      "version": "1.10.19",
-      "resolved": "https://registry.npm.taobao.org/@types/datatables.net/download/@types/datatables.net-1.10.19.tgz",
-      "integrity": "sha1-F8X5RDP3YQhhMcbI3AVaDhCZ0fk=",
+      "version": "1.10.20",
+      "resolved": "https://registry.nlark.com/@types/datatables.net/download/@types/datatables.net-1.10.20.tgz",
+      "integrity": "sha1-feV7OtTsfi7qXuXIF4MytiLiud4=",
       "dev": true,
       "requires": {
         "@types/jquery": "*"
       }
     },
     "@types/echarts": {
-      "version": "4.9.8",
-      "resolved": "https://registry.nlark.com/@types/echarts/download/@types/echarts-4.9.8.tgz?cache=0&sync_timestamp=1623209570564&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fecharts%2Fdownload%2F%40types%2Fecharts-4.9.8.tgz",
-      "integrity": "sha1-ppd5ykdV6ym2E4evThXsMkYj+GY=",
+      "version": "4.9.9",
+      "resolved": "https://registry.nlark.com/@types/echarts/download/@types/echarts-4.9.9.tgz?cache=0&sync_timestamp=1625599737693&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fecharts%2Fdownload%2F%40types%2Fecharts-4.9.9.tgz",
+      "integrity": "sha1-nCA6zF9wD+Rvz2vB7HSPyxKNjtA=",
       "dev": true,
       "requires": {
         "@types/zrender": "*"
@@ -774,18 +774,18 @@
       "dev": true
     },
     "@types/jasminewd2": {
-      "version": "2.0.9",
-      "resolved": "https://registry.nlark.com/@types/jasminewd2/download/@types/jasminewd2-2.0.9.tgz",
-      "integrity": "sha1-2zlGMUYF3uqdXHrqC2HYBwibp20=",
+      "version": "2.0.10",
+      "resolved": "https://registry.nlark.com/@types/jasminewd2/download/@types/jasminewd2-2.0.10.tgz",
+      "integrity": "sha1-rjHCN6pkIb3jDxBYsdIPRXflREM=",
       "dev": true,
       "requires": {
         "@types/jasmine": "*"
       }
     },
     "@types/jquery": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npm.taobao.org/@types/jquery/download/@types/jquery-3.5.5.tgz?cache=0&sync_timestamp=1613379043957&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjquery%2Fdownload%2F%40types%2Fjquery-3.5.5.tgz",
-      "integrity": "sha1-LGP0fJyNlmk9Jy9UU2Aq/YM4yQM=",
+      "version": "3.5.6",
+      "resolved": "https://registry.nlark.com/@types/jquery/download/@types/jquery-3.5.6.tgz",
+      "integrity": "sha1-l6yONtzNitjtPz87SJM2FNn9jPA=",
       "dev": true,
       "requires": {
         "@types/sizzle": "*"
@@ -804,9 +804,9 @@
       "dev": true
     },
     "@types/overlayscrollbars": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npm.taobao.org/@types/overlayscrollbars/download/@types/overlayscrollbars-1.12.0.tgz",
-      "integrity": "sha1-mEVsrOyorXO9W7VyYypYUHTnB2Q="
+      "version": "1.12.1",
+      "resolved": "https://registry.nlark.com/@types/overlayscrollbars/download/@types/overlayscrollbars-1.12.1.tgz",
+      "integrity": "sha1-+2NwcbVFg0+xKuqU7jCaL/TNwKg="
     },
     "@types/q": {
       "version": "0.0.32",
@@ -822,7 +822,7 @@
     },
     "@types/sizzle": {
       "version": "2.3.3",
-      "resolved": "https://registry.nlark.com/@types/sizzle/download/@types/sizzle-2.3.3.tgz?cache=0&sync_timestamp=1619526734579&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fsizzle%2Fdownload%2F%40types%2Fsizzle-2.3.3.tgz",
+      "resolved": "https://registry.nlark.com/@types/sizzle/download/@types/sizzle-2.3.3.tgz?cache=0&sync_timestamp=1621243834244&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fsizzle%2Fdownload%2F%40types%2Fsizzle-2.3.3.tgz",
       "integrity": "sha1-/14vGQKWnTBSJaBHyKD9XJFc6+8=",
       "dev": true
     },
@@ -853,7 +853,7 @@
     },
     "@types/zrender": {
       "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/@types/zrender/download/@types/zrender-4.0.0.tgz",
+      "resolved": "https://registry.nlark.com/@types/zrender/download/@types/zrender-4.0.0.tgz",
       "integrity": "sha1-poBvEuxOzKrr2bDYFvBJrKYYj70=",
       "dev": true
     },
@@ -5589,9 +5589,9 @@
       }
     },
     "karma-jasmine-html-reporter": {
-      "version": "1.6.0",
-      "resolved": "https://registry.nlark.com/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-1.6.0.tgz",
-      "integrity": "sha1-WG4XAlobQSjp+6VdXx6JIb/DvB4=",
+      "version": "1.7.0",
+      "resolved": "https://registry.nlark.com/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-1.7.0.tgz",
+      "integrity": "sha1-UsSJp012CTShCJv6XqSo/LhMwos=",
       "dev": true
     },
     "karma-source-map-support": {

package.json

@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "~8.1.1",
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
-    "@types/overlayscrollbars": "^1.9.0",
+    "@types/overlayscrollbars": "^1.12.1",
     "core-js": "^3.15.2",
     "crypto-js": "^4.0.0",
     "datatables.net": "^1.10.25",
@@ -45,10 +45,10 @@
     "@angular/cli": "~8.1.1",
     "@angular/compiler-cli": "~8.1.1",
     "@angular/language-service": "~8.1.1",
-    "@types/datatables.net": "^1.10.18",
-    "@types/echarts": "^4.9.8",
+    "@types/datatables.net": "^1.10.20",
+    "@types/echarts": "^4.9.9",
     "@types/jasmine": "~3.3.8",
-    "@types/jasminewd2": "~2.0.3",
+    "@types/jasminewd2": "^2.0.10",
     "@types/node": "~8.9.4",
     "babel-polyfill": "^6.26.0",
     "codelyzer": "^5.0.0",
@@ -58,7 +58,7 @@
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
+    "karma-jasmine-html-reporter": "^1.7.0",
     "protractor": "~5.4.0",
     "shelljs": "^0.8.4",
     "ssh2-sftp-client": "^6.0.1",

src/app/services/main.service.ts

@@ -502,4 +502,14 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //删除用户（包含企业微信用户）
+  rmvDataAndWeChatNum(data, flag) {
+    return this.http.post(
+      host.host + "/user/data/rmvDataAndWeChatNum/" + flag,
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
 }

src/app/share/dialog-delete/dialog-delete.component.html

@@ -9,7 +9,7 @@
     </div>
     <div class="operate">
       <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>
-      <button class="btn cancel ml8" nz-button nzType="default" (click)="hideDelModal('cancel')" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
+      <button class="btn cancel ml8" nz-button nzType="default" (click)="cancel(cancelTxt=='否'?'no':'cancel')" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
     </div>
   </div>
 </div>

src/app/share/dialog-delete/dialog-delete.component.ts

@@ -1,31 +1,39 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
 @Component({
-  selector: 'app-dialog-delete',
-  templateUrl: './dialog-delete.component.html',
-  styleUrls: ['./dialog-delete.component.less']
+  selector: "app-dialog-delete",
+  templateUrl: "./dialog-delete.component.html",
+  styleUrls: ["./dialog-delete.component.less"],
 })
 export class DialogDeleteComponent implements OnInit {
   @Output() hideDelModalEvent = new EventEmitter<any>();
   @Output() confirmDelEvent = new EventEmitter<any>();
+  @Output() cancelDelEvent = new EventEmitter<any>();
   @Input() btnLoading: boolean = false;
   @Input() cancenlLoading: boolean = false;
   @Input() delModal: boolean = false;
-  @Input() content: string = '您确定要删除吗？';
-  @Input() tips: string = '';
-  @Input() confirmTxt: string = '确定';
-  @Input() cancelTxt: string = '取消';
-  constructor() { }
+  @Input() content: string = "您确定要删除吗？";
+  @Input() tips: string = "";
+  @Input() confirmTxt: string = "确定";
+  @Input() cancelTxt: string = "取消";
+  constructor() {}
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
   // 隐藏
-  hideDelModal(e:string) {
+  hideDelModal(e: string) {
     this.hideDelModalEvent.emit(e);
   }
   // 确认删除
   confirmDel() {
     this.confirmDelEvent.emit();
   }
-
+  cancel(type: string) {
+    if (type == "cancel") {
+      //取消
+      this.hideDelModal("cancel");
+    } else if (type == "no") {
+      //否
+      this.cancelDelEvent.emit();
+    }
+  }
 }

src/app/views/users-management/users-management.component.html

@@ -202,8 +202,9 @@
   </div>
 </div>
 <!-- 删除模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-  (confirmDelEvent)="confirmDel()" content="您确认要删除此用户吗？"></app-dialog-delete>
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="是否删除企业微信同用户？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>

src/app/views/users-management/users-management.component.ts

@@ -413,16 +413,40 @@ export class UsersManagementComponent implements OnInit {
     that.coopId = data.id;
     that.delModal = true;
   }
-  // 确认删除
+  // 确认删除(删除企业微信用户)
   confirmDel() {
     let that = this;
     that.btnLoading = true;
     that.mainService
-      .coopData("rmvData", "user", [that.coopId])
+      .rmvDataAndWeChatNum([that.coopId], true)
       .subscribe((data) => {
         that.btnLoading = false;
         that.hideDelModal();
-        if (data.status == 200) {
+        if (data["status"] == 200) {
+          if (
+            that.listOfData.length == 1 &&
+            that.pageIndex == Math.ceil(that.listLength / that.pageSize)
+          ) {
+            that.listLength--;
+            that.pageIndex = Math.ceil(that.listLength / that.pageSize);
+          }
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data["msg"]);
+        }
+      });
+  }
+  // 确认删除(不删除企业用户)
+  cancenlLoading = false;
+  cancelDel() {
+    let that = this;
+    that.cancenlLoading = true;
+    that.mainService
+      .rmvDataAndWeChatNum([that.coopId], false)
+      .subscribe((data) => {
+        that.cancenlLoading = false;
+        that.hideDelModal();
+        if (data["status"] == 200) {
           if (
             that.listOfData.length == 1 &&
             that.pageIndex == Math.ceil(that.listLength / that.pageSize)
@@ -432,7 +456,7 @@ export class UsersManagementComponent implements OnInit {
           }
           that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, data.msg);
+          that.showPromptModal("删除", false, data["msg"]);
         }
       });
   }