解决冲突

2022-02-23 16:20:39 +08:00
parent 8ef9e67941
commit 5832cc4fba
25 changed files with 253 additions and 215 deletions
--- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
+++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-07 13:29:57
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:16:04
+ * @LastEditTime : 2022-02-23 16:04:18
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -36,7 +36,16 @@
        </sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button
+          nz-button
+          nzType="primary"
+          [disabled]="!sf.valid"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['CONTRACT-INDEX-listFrame']"
+          >查询</button
+        >
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -69,10 +78,10 @@
    [scroll]="{ x: '1200px', y: '370px' }"
    (change)="stChange($event)"
  >
-  <ng-template st-row="contractCode" let-item let-index="index">
-    <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
-  </ng-template>
-</st>
+    <ng-template st-row="contractCode" let-item let-index="index">
+      <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
+    </ng-template>
+  </st>
 </nz-card>

 <ng-template #auditModal>
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html
@ -30,7 +30,7 @@
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
+          (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
@ -153,18 +153,6 @@ export class ContractManagementContractListComponent implements OnInit {
              },
            } as SFSelectWidgetSchema,
          },
-          // signTime: {
-          //   title: '签署日期',
-          //   type: 'string',
-          //   ui: {
-          //     widget: 'date',
-          //     mode: 'range',
-          //     format: 'yyyy-MM-dd',
-          //     visibleIf: {
-          //       _$expand: (value: boolean) => value,
-          //     },
-          //   } as SFDateWidgetSchema,
-          // },
          signTime: {
            title: '签署日期',
            type: 'string',
@ -196,11 +184,6 @@ export class ContractManagementContractListComponent implements OnInit {
        break;
    }
  }
-
-  approval(): void {}
-
-  add(): void {}
-
  routeTo(item: any) {
    this.router.navigate(['/ticket/invoice-requested-detail/1']);
  }
@ -246,7 +229,6 @@ export class ContractManagementContractListComponent implements OnInit {
      ]
    });
  }
-
  /**
   * 重置表单
   */
@ -254,7 +236,6 @@ export class ContractManagementContractListComponent implements OnInit {
    this.sf.reset();
    this._$expand = false;
  }
-
  /**
   * 伸缩查询条件
   */
--- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
+++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
@ -140,10 +140,6 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
  }

  save() {
-    console.log(this.sf.value)
-    console.log(this.sf2.value) 
-    console.log(this.detailList.templateName)
-    console.log(this.title)
    if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
      this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
      return;
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.html
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html
@ -10,14 +10,21 @@
 -->

 <!-- 搜索表单 -->
-<page-header-wrapper [title]="'合同模板'">
-</page-header-wrapper>
+<page-header-wrapper [title]="'合同模板'"> </page-header-wrapper>
 <nz-card>
  <div nz-row nzGutter="8">
    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
    </div>

    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -26,10 +33,17 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
-        <button nz-button nzType="primary" 
-         >导出</button>
+        <button
+          nz-button
+          nzType="primary"
+          [disabled]="!sf.valid"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['CONTRACT-TEMPLATE-search']"
+          >查询</button
+        >
+        <button nz-button nzType="primary" acl [acl-ability]="['CONTRACT-TEMPLATE-export']">导出</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -40,26 +54,24 @@
  </div>
 </nz-card>

-<nz-card >
+<nz-card>
  <div class="NewBtn">
-    <button  nz-button nzType="primary"(click)="creatTemplate()">
-    新建
-</button> 
+    <button nz-button nzType="primary" (click)="creatTemplate()" acl [acl-ability]="['CONTRACT-TEMPLATE-new']"> 新建 </button>
  </div>
-  <div style="margin-top: 15px;">
+  <div style="margin-top: 15px">
    <st
-    #st
-    [bordered]="true"
-    [data]="service.$api_get_contractTemplate_page"
-    [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading"
+      #st
+      [bordered]="true"
+      [data]="service.$api_get_contractTemplate_page"
+      [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="service.http.loading"
    >
-    <ng-template st-row="templateName" let-item let-index="index">
-      <a (click)="view(item)">{{item.templateName}}</a>
-    </ng-template>
+      <ng-template st-row="templateName" let-item let-index="index">
+        <a (click)="view(item)">{{ item.templateName }}</a>
+      </ng-template>
    </st>
  </div>
 </nz-card>
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@ -125,10 +125,12 @@ export class ContractManagementTemplateComponent implements OnInit {
          {
            text: '编辑',
            click: (_record) => this.edit(_record),
+            acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
          },
          {
            text: '删除',
            click: (_record) => this.delete(_record),
+            acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
          },
        ],
      },
--- a/src/app/routes/contract-management/components/policy/policy.component.html
+++ b/src/app/routes/contract-management/components/policy/policy.component.html
@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-12 10:52:50
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-23 15:57:26
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\policy\\policy.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header [action]="phActionTpl">
  <ng-template #phActionTpl> </ng-template>
 </page-header>
@ -24,7 +34,7 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-POLICY-search']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/contract-management/components/policy/policy.component.ts
+++ b/src/app/routes/contract-management/components/policy/policy.component.ts
@ -123,7 +123,8 @@ export class ContractManagementPolicyComponent implements OnInit {
            text: '查看传入值',
            click: item => {
              this.openDetail(item)
-            }
+            },
+            acl: { ability: ['CONTRACT-POLICY-view'] },
          }
        ]
      }
@ -148,7 +149,12 @@ export class ContractManagementPolicyComponent implements OnInit {
        },
        policyNo: {
          type: 'string',
-          title: '保单号'
+          title: '保单号',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          }
        },
        processResult: {
          type: 'string',
--- a/src/app/routes/contract-management/services/contract-management.service.ts
+++ b/src/app/routes/contract-management/services/contract-management.service.ts
@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2022-01-04 21:05:49
@ -15,25 +15,24 @@ import { BaseService } from 'src/app/shared/services';
  providedIn: 'root'
 })
 export class ContractManagementService extends BaseService {
-
  $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`;
-     // 查询投诉列表
-     $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
-     // 新增/更新信息
-     $api_save_contractTemplate = `/api/sdc/contractTemplate/save`;
-     // 查询合同模板表
-     $api_get_contractTemplate_page = `/api/sdc/contractTemplate/list/page`;
-     // 查询合同模板表详情
-     $api_get_contractTemplate = `/api/sdc/contractTemplate/get`;
-     // 删除合同模板
-     $api_deletebatch_contractTemplate = `/api/sdc/contractTemplate/deletebatch`;
+  // 查询投诉列表
+  $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
+  // 新增/更新信息
+  $api_save_contractTemplate = `/api/sdc/contractTemplate/save`;
+  // 查询合同模板表
+  $api_get_contractTemplate_page = `/api/sdc/contractTemplate/list/page`;
+  // 查询合同模板表详情
+  $api_get_contractTemplate = `/api/sdc/contractTemplate/get`;
+  // 删除合同模板
+  $api_deletebatch_contractTemplate = `/api/sdc/contractTemplate/deletebatch`;

-     // 查询明细合同
-     $api_listDetailed_page = `/api/sdc/contract/listDetailed/page`;
-     // 查询框架合同
-     $api_listFrame_page = `/api/sdc/contract/listFrame/page`;
-     // 获取订单合同表
-     $api_contract_get = `/api/sdc/contract/get`;
+  // 查询明细合同
+  $api_listDetailed_page = `/api/sdc/contract/listDetailed/page`;
+  // 查询框架合同
+  $api_listFrame_page = `/api/sdc/contract/listFrame/page`;
+  // 获取订单合同表
+  $api_contract_get = `/api/sdc/contract/get`;
  constructor(public injector: Injector) {
    super(injector);
  }