liangyan0105 3 роки тому
батько
коміт
9e75eecd82

+ 20 - 19
src/app/routes/basedata/sales-status/sales-status.component.html

@@ -1,5 +1,6 @@
+<!-- 头部面包屑导航 -->
 <page-header [action]="phActionTpl">
-  <ng-template #phActionTpl> </ng-template>
+  <ng-template #phActionTpl></ng-template>
 </page-header>
 <nz-card>
   <div nz-row [nzGutter]="24">
@@ -9,6 +10,7 @@
         <!-- 添加一级 -->
         <div nz-row [nzGutter]="24" style="margin-bottom: 10px;">
           <div nz-col nzMd="24" nzLg="24">
+            <!-- acl [acl-ability]="'base-archives-project-approval:add'" 需添加响应 限才 能看到按钮 -->
             <button (click)="add()" nz-button acl [acl-ability]="'base-archives-project-approval:add'" nzType="primary">
               {{ 'button.leve.one' | translate }}
             </button>
@@ -34,6 +36,18 @@
               (nzClick)="treeClick($event)"
               (nzDblClick)="openFolder($event)"
             >
+              <!-- 数据渲染树 -->
+              <ng-template #nzTreeTemplate let-node>
+                <span class="custom-node">
+                  <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
+                    <span class="folder-name">{{ node.title }}</span>
+                  </span>
+                  <span *ngIf="node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
+                    <span class="file-name">{{ node.title }}</span>
+                  </span>
+                </span>
+              </ng-template>
+              <!-- 树 右击下拉框 -->
               <ng-template #contextTemplate>
                 <ul nz-menu nzInDropDown>
                   <li nz-menu-item (click)="addChild()" acl [acl-ability]="'sales-status:add'">
@@ -45,16 +59,6 @@
                   <li nz-menu-item (click)="cancel()">{{ 'button.cancel' | translate }}</li>
                 </ul>
               </ng-template>
-              <ng-template #nzTreeTemplate let-node>
-                <span class="custom-node">
-                  <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
-                    <span class="folder-name">{{ node.title }}</span>
-                  </span>
-                  <span *ngIf="node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
-                    <span class="file-name">{{ node.title }}</span>
-                  </span>
-                </span>
-              </ng-template>
             </nz-tree>
           </div>
         </div>
@@ -76,8 +80,7 @@
                 [(ngModel)]="baseSalesStatus.code"
                 name="code"
                 nz-input
-                placeholder="{{ 'aoto.create' | translate }}"
-              />
+                placeholder="{{ 'aoto.create' | translate }}"/>
             </nz-form-control>
           </nz-form-item>
 
@@ -92,8 +95,7 @@
                 name="name"
                 nz-input
                 placeholder="{{ 'placeholder' | translate }}{{ 'sales.name' | translate }}"
-                maxlength="20"
-              />
+                maxlength="20"/>
               <nz-form-explain *ngIf="validateForm.get('name')?.dirty && validateForm.get('name')?.errors">
                 {{ 'placeholder' | translate }}{{ 'sales.name' | translate }}
               </nz-form-explain>
@@ -109,8 +111,8 @@
                 [(ngModel)]="status"
                 name="status"
                 nzCheckedChildren="{{ 'yes' | translate }}"
-                nzUnCheckedChildren="{{ 'no' | translate }}"
-              ></nz-switch>
+                nzUnCheckedChildren="{{ 'no' | translate }}">
+              </nz-switch>
             </nz-form-control>
           </nz-form-item>
 
@@ -124,8 +126,7 @@
                 [(ngModel)]="baseSalesStatus.sort"
                 name="sort"
                 nz-input
-                placeholder="{{ 'placeholder' | translate }}{{ 'milestone.serial.number' | translate }}"
-              />
+                placeholder="{{ 'placeholder' | translate }}{{ 'milestone.serial.number' | translate }}"/>
               <nz-form-explain *ngIf="validateForm.get('sort')?.dirty && validateForm.get('sort')?.errors">
                 {{ 'placeholder' | translate }}{{ 'quotation.merchants' | translate
                 }}{{ 'milestone.serial.number' | translate }}

+ 4 - 5
src/app/routes/basedata/sales-status/sales-status.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { _HttpClient, ModalHelper } from '@delon/theme';
-import { STColumn, STComponent } from '@delon/abc';
-import { SFSchema } from '@delon/form';
+// import { STColumn, STComponent } from '@delon/abc';
+// import { SFSchema } from '@delon/form';
 
 import { BasedataSalesStatusAddComponent } from './add/add.component';
 import {
@@ -17,7 +17,6 @@ import { BaseSalesStatus } from 'app/entity/basedata/base-sales-status';
 import { BaseSalesStatusService } from 'app/services/basedata/base-sales-status.service';
 import { I18NService } from '@core';
 
-
 @Component({
   selector: 'app-basedata-sales-status',
   templateUrl: './sales-status.component.html',
@@ -44,7 +43,7 @@ export class BasedataSalesStatusComponent implements OnInit {
   }
 
   validateForm!: FormGroup;
-  dropdown: NzDropdownContextComponent;
+  dropdown: NzDropdownContextComponent; //下拉框文字组件
   searchValue = ''; //搜索框的值
   nodes: any = []; //tree集合
   status = true;
@@ -60,7 +59,7 @@ export class BasedataSalesStatusComponent implements OnInit {
     // 带参 查询 请求
     this.baseSalesStatusService.getTreeList(baseSalesStatus).then(res => {
       console.log(res);
-      
+
       this.nodes = res.result;
       console.log('销售状态 数据', this.nodes);
     });