Browse Source

新增修改客户档案bug修改+职务档案中右侧重置错误

liangyan0105 3 years ago
parent
commit
50267dc987

+ 2 - 2
src/app/routes/basedata/customer/edit/edit.component.html

@@ -480,11 +480,11 @@
         </nz-select>
       </nz-form-control>
 
-      <nz-form-label [nzSm]="3" [nzXs]="24">
+      <nz-form-label [nzSm]="3" [nzXs]="24" nzRequired>
         {{ 'sales.staff' | translate }}
       </nz-form-label>
       <!-- 销售人员 树 -->
-      <nz-form-control [nzSm]="4" [nzXs]="24">
+      <nz-form-control [nzSm]="4" [nzXs]="24" >
         <nz-tree-select
           [nzNodes]="salesStaffList"
           nzShowSearch

+ 0 - 2
src/app/routes/basedata/customer/edit/edit.component.ts

@@ -574,8 +574,6 @@ export class BasedataCustomerEditComponent implements OnInit {
         }
       });
     }
-
-    // }
   }
 
   //删除联系人

+ 92 - 85
src/app/routes/basedata/post/post.component.ts

@@ -2,7 +2,14 @@ import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core';
 import { _HttpClient, ModalHelper, SettingsService } from '@delon/theme';
 import { STColumn, STComponent } from '@delon/abc';
 import { SFSchema } from '@delon/form';
-import { NzTreeNode, NzFormatEmitEvent, NzDropdownService, NzDropdownContextComponent, NzModalService, NzNotificationService } from 'ng-zorro-antd';
+import {
+  NzTreeNode,
+  NzFormatEmitEvent,
+  NzDropdownService,
+  NzDropdownContextComponent,
+  NzModalService,
+  NzNotificationService,
+} from 'ng-zorro-antd';
 import { BaseArchivesPost } from 'app/entity/basedata/base-archives-post';
 import { BasedataPostAddComponent } from './add/add.component';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -13,41 +20,38 @@ import { BaseArchivesPostService } from 'app/services/basedata/base-archives-pos
   templateUrl: './post.component.html',
 })
 export class BasedataPostComponent implements OnInit {
-  
-
   constructor(
     private nzDropdownService: NzDropdownService,
-    private modalService:NzModalService,
+    private modalService: NzModalService,
     private fb: FormBuilder,
-    private baseArchivesPostService:BaseArchivesPostService,
+    private baseArchivesPostService: BaseArchivesPostService,
     public settings: SettingsService,
-    private nzNotificationService: NzNotificationService
-  ) { }
+    private nzNotificationService: NzNotificationService,
+  ) {}
 
   ngOnInit() {
     //初始化表单
     this.validateForm = this.fb.group({
       code: [null, [Validators.required]],
       name: [null, [Validators.required]],
-      status:[null]
+      status: [null],
     });
-    this.getListContractTree()
-   }
-   validateForm!: FormGroup;
+    this.getListContractTree();
+  }
+  validateForm!: FormGroup;
   dropdown: NzDropdownContextComponent;
-  searchValue = "";//搜索框的值
-  nodes: any=[];//合同分类tree集合
-  status=true;
+  searchValue = ''; //搜索框的值
+  nodes: any = []; //合同分类tree集合
+  status = true;
 
   //查询tree合同类型
   getListContractTree() {
     //查询条件
-    let baseArchivesPost=new BaseArchivesPost();
-    baseArchivesPost.pkOrg=sessionStorage.getItem("pkOrg");//组织
-    this.baseArchivesPostService.getTreeList(baseArchivesPost).then((response)=>{
-      this.nodes=response.result  ;
-    })
-    
+    let baseArchivesPost = new BaseArchivesPost();
+    baseArchivesPost.pkOrg = sessionStorage.getItem('pkOrg'); //组织
+    this.baseArchivesPostService.getTreeList(baseArchivesPost).then(response => {
+      this.nodes = response.result;
+    });
   }
 
   //双击节点自动打开树分支
@@ -63,141 +67,144 @@ export class BasedataPostComponent implements OnInit {
   }
 
   //右键树节点
-  id="";
+  id = '';
   contextMenu(Fid, $event: MouseEvent, template: TemplateRef<void>): void {
-    this.id = Fid;//获取id
+    this.id = Fid; //获取id
     this.dropdown = this.nzDropdownService.create($event, template);
   }
 
-
   //树节点点击事件
   treeClick(event) {
-    var getdDepart = event.node.origin;//当前点击的对象
-    if(getdDepart.status=="0"){//是否启用
-      this.status=false;
-    }else{
-      this.status=true;
+    var getdDepart = event.node.origin; //当前点击的对象
+    if (getdDepart.status == '0') {
+      //是否启用
+      this.status = false;
+    } else {
+      this.status = true;
     }
     this.baseArchivesPost = {
       name: getdDepart.title,
       code: getdDepart.code,
-      id: getdDepart.key
-    }
+      id: getdDepart.key,
+    };
   }
 
   //右键取消
   cancel() {
-    this.dropdown.close()
+    this.dropdown.close();
   }
 
   /**
    * 新增一级按钮
    */
-  baseArchivesPost:BaseArchivesPost={}
+  baseArchivesPost: BaseArchivesPost = {};
   add() {
     const modalRef = this.modalService.create({
-      nzTitle: "新增",
+      nzTitle: '新增',
       nzContent: BasedataPostAddComponent,
       nzWidth: 600,
       nzFooter: [
         {
-          label: "关闭",
-          type: "default",
+          label: '关闭',
+          type: 'default',
           onClick: addModel => {
-            addModel.close()
-          }
+            addModel.close();
+          },
         },
         {
-          label: "确定",
-          type: "primary",
+          label: '确定',
+          type: 'primary',
           // loading:this.modelSaveLoading,
           onClick: addModel => {
-            addModel.submitForm().then(()=>{
+            addModel.submitForm().then(() => {
               this.getListContractTree();
-            })
-          }
-        }
-      ]
-    })
+            });
+          },
+        },
+      ],
+    });
   }
 
   /**
    * 右键新增子集按钮
    */
-  addChild(){
+  addChild() {
     const modalRef = this.modalService.create({
-      nzTitle: "新增",
+      nzTitle: '新增',
       nzContent: BasedataPostAddComponent,
       nzWidth: 600,
-      nzComponentParams:{
-        parentId:this.id
+      nzComponentParams: {
+        parentId: this.id,
       },
       nzFooter: [
         {
-          label: "关闭",
-          type: "default",
+          label: '关闭',
+          type: 'default',
           onClick: addModel => {
-            addModel.close()
-          }
+            addModel.close();
+          },
         },
         {
-          label: "确定",
-          type: "primary",
+          label: '确定',
+          type: 'primary',
           // loading:this.modelSaveLoading,
           onClick: addModel => {
-            addModel.submitForm().then(()=>{
+            addModel.submitForm().then(() => {
               this.getListContractTree();
-            })
-          }
-        }
-      ]
-    })
+            });
+          },
+        },
+      ],
+    });
   }
 
-  reset(){
-    this.baseArchivesPost={}
+  // 右侧 重置
+  reset() {
+    // this.baseArchivesPost = {}; 这样会情况掉 id 不可取
+    this.baseArchivesPost.code = '';
+    this.baseArchivesPost.name = '';
   }
 
   /**
    * 删除
    */
-  delete(){
-    let baseArchivesPost=new BaseArchivesPost();
-    baseArchivesPost.id=this.id;
-    this.baseArchivesPostService.delete(baseArchivesPost).then((response)=>{
-      if(response.success){
-        this.dropdown.close()
-        this.nzNotificationService.success("删除成功","");
+  delete() {
+    let baseArchivesPost = new BaseArchivesPost();
+    baseArchivesPost.id = this.id;
+    this.baseArchivesPostService.delete(baseArchivesPost).then(response => {
+      if (response.success) {
+        this.dropdown.close();
+        this.nzNotificationService.success('删除成功', '');
         this.getListContractTree();
-      }else{
-        this.nzNotificationService.error("删除失败",response.message);
+      } else {
+        this.nzNotificationService.error('删除失败', response.message);
       }
-    })
+    });
   }
   /**
    * 修改保存
    */
-  submitForm(){
+  submitForm() {
     for (const i in this.validateForm.controls) {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
     }
     let valid = this.validateForm.valid;
-    if(valid){
+    if (valid) {
       //格式化是否期用
-      if(this.status){
-        this.baseArchivesPost.status="1"
-      }else{
-        this.baseArchivesPost.status="0"
+      if (this.status) {
+        this.baseArchivesPost.status = '1';
+      } else {
+        this.baseArchivesPost.status = '0';
       }
-      this.baseArchivesPostService.update(this.baseArchivesPost).then((response)=>{
-        if(response.success){
-          this.nzNotificationService.success("修改成功","");
+      this.baseArchivesPostService.update(this.baseArchivesPost).then(response => {
+        if (response.success) {
+          this.nzNotificationService.success('修改成功', '');
           this.getListContractTree();
-        }else{
-          this.nzNotificationService.error("修改失败",response.message);
+        } else {
+          this.nzNotificationService.error('修改失败', response.message);
         }
-      })
+      });
     }
   }
 }