From f40c5a53a4160d662ba0e24a2a8d027ab91f4a84 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Feb 2022 19:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-partner.component.html | 100 +++++++++ .../contract-partner.component.less | 35 +++ .../contract-partner.component.ts | 200 ++++++++++++++++++ .../components/index/index.component.html | 5 +- .../cost-management.component.html | 45 ++-- .../cost-management.component.ts | 6 +- .../voucher-management.component.html | 2 +- .../voucher-management.component.ts | 3 +- .../system-logs/system-logs.component.html | 45 ++-- .../system-supply-logs.component.html | 55 ++--- .../system-waybill-logs.component.html | 41 ++-- .../version-logs/version-logs.component.html | 55 +++-- .../crm-management.component.html | 37 +--- .../crm-management.component.ts | 8 +- .../role-management.component.html | 4 +- .../role-management.component.ts | 6 +- .../staff-management.component.html | 6 +- .../staff-management.component.ts | 15 +- .../sys-setting/sys-setting-routing.module.ts | 2 +- 19 files changed, 520 insertions(+), 150 deletions(-) create mode 100644 src/app/routes/contract-management/components/contract-partner/contract-partner.component.html create mode 100644 src/app/routes/contract-management/components/contract-partner/contract-partner.component.less create mode 100644 src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html new file mode 100644 index 00000000..14be2c5c --- /dev/null +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.html @@ -0,0 +1,100 @@ + + +
+ +
+ +
+ + + +
+ + + + + + +
+
+ + + +
+ +
+ + + +
+ + +
+ + + + {{ item?.contractCode }} + + + + + +
+
+ + + +
+
+ diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.less b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.less new file mode 100644 index 00000000..7151df68 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.less @@ -0,0 +1,35 @@ +:host::ng-deep { + .search-box { + .ant-card-body { + padding-bottom: 18px; + } + } + + .content-box { + .ant-card-body { + padding-top: 0; + } + } + + nz-range-picker { + width: 100%; + } + + .ant-tabs-tab-btn { + padding-right: 16px; + padding-left : 16px; + } +} + +.expend-options { + margin-top: 0; +} + + +@media (min-width: 1200px) { + .expend-options { + z-index : -99; + margin-top: -40px; + } + +} \ No newline at end of file diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts new file mode 100644 index 00000000..3aea4685 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts @@ -0,0 +1,200 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { ContractManagementService } from '../../services/contract-management.service'; + +@Component({ + selector: 'app-contract-management-contract-frame', + templateUrl: './contract-frame.component.html', + styleUrls: ['./contract-frame.component.less'] +}) +export class ContractManagementFrameComponent implements OnInit { + url = `/rule?_allow_anonymous=true`; + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('auditModal', { static: false }) + auditModal!: any; + schema: SFSchema = {}; + columns: STColumn[] = []; + ui: SFUISchema = {}; + _$expand = false; + + reqParams = {}; + selectedRows: any[] = []; + constructor(public service: ContractManagementService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void { + this.initST() + this.initSF() + } + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { + title: '合同编号', + width: '100px', + className: 'text-center', + render: 'contractCode' + }, + { + title: '合同名称', + width: '100px', + className: 'text-center', + index:'contractName' + }, + { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' }, + { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' }, + { + title: '有效期至', + className: 'text-center', + width: '120px', + index: 'effectiveEndTime' + }, + { + title: '签署日期', + className: 'text-center', + width: '120px', + index: 'signTime' + }, + { + title: '状态', + className: 'text-center', + width: '120px', + type: 'badge', + index: 'esignFlowStatus', + badge: { + '0': { text: '未发起', color: 'default' }, + '1': { text: '待签章', color: 'default' }, + '2': { text: '已生效', color: 'success' }, + '3': { text: '已撤销', color: 'warning' }, + '4': { text: '已作废', color: 'warning' }, + '5': { text: '已过期', color: 'warning' }, + '7': { text: '已拒签', color: 'warning' }, + }, + }, + + ]; + } + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + contractCode: { + type: 'string', + title: '合同编号', + }, + shipperName: { + type: 'string', + title: '托运人' + }, + carrierName: { + type: 'string', + title: '承运人', + }, + signTime: { + title: '签署日期', + type: 'string', + ui: { + widget: 'custom', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + }, + type: 'object', + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + case 'filter': + this.st.load(); + break; + } + } + + approval(): void {} + + add(): void {} + + routeTo(item: any) { + this.router.navigate(['/ticket/invoice-requested-detail/1']); + } + + auditAction(item: any) { + const modal = this.nzModalService.create({ + nzTitle: '审核', + nzContent: this.auditModal, + nzFooter: [ + { + label: '拒绝', + type: 'default', + onClick: () => { + modal.destroy(); + } + }, + { + label: '通过', + type: 'primary', + onClick: () => { + modal.destroy(); + } + } + ] + }); + modal.afterClose.subscribe(res => { + this.st.load(); + }); + } + + showReason(item: any) { + const modal = this.nzModalService.create({ + nzTitle: '查看原因', + nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx', + nzFooter: [ + { + label: '关闭', + type: 'primary', + onClick: () => { + modal.destroy(); + } + } + ] + }); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } +} diff --git a/src/app/routes/contract-management/components/index/index.component.html b/src/app/routes/contract-management/components/index/index.component.html index 4f696b97..f44482f3 100644 --- a/src/app/routes/contract-management/components/index/index.component.html +++ b/src/app/routes/contract-management/components/index/index.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-07 13:27:10 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:16:56 + * @LastEditTime : 2022-02-23 19:30:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -19,5 +19,8 @@ + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index 9d429044..850e3de1 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 17:14:57 + * @LastEditTime : 2022-02-23 16:35:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -13,11 +13,16 @@
- +
- + @@ -39,22 +44,26 @@ -->
- + - {{ item.armoeny | currency}} + {{ item.armoeny | currency }} - {{ item.hrmoney | currency}} - - - {{ item.cnoCode}}/{{ item.cnoName}} + {{ item.hrmoney | currency }} + {{ item.cnoCode }}/{{ item.cnoName }} - {{ item.hrpaymoney | currency}} + {{ item.hrpaymoney | currency }} - {{ item.hrvatmoney | currency}} + {{ item.hrvatmoney | currency }} @@ -63,9 +72,13 @@
- +
- \ No newline at end of file + diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 782f926a..07d0c744 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -299,12 +299,14 @@ export class CostManagementComponent implements OnInit { buttons: [ { text: '浏览', - click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel }) + click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel }), + acl: { ability: ['FINANCIAL-COST-view'] }, }, { text: '审核', click: item => this.auditAction(item), - iif: item => item.sts === 2 + iif: item => item.sts === 2, + acl: { ability: ['FINANCIAL-COST-audit'] }, } // { // text: '修改', diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html index 10813518..6ff72e0a 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html @@ -9,7 +9,7 @@ [button]="'none'">
- + diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index ab91724f..9923c87f 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -328,7 +328,8 @@ export class VoucherManagementComponent implements OnInit { buttons: [ { text: '浏览', - click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]) + click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]), + acl: { ability: ['FINANCIAL-VOUCHER-view'] }, }, // { // text: '修改' diff --git a/src/app/routes/logs/components/system-logs/system-logs.component.html b/src/app/routes/logs/components/system-logs/system-logs.component.html index 9d2b0a3a..baf8f620 100644 --- a/src/app/routes/logs/components/system-logs/system-logs.component.html +++ b/src/app/routes/logs/components/system-logs/system-logs.component.html @@ -1,27 +1,30 @@ - - + -
-
- -
-
- - - -
+
+
+
+
+ + + +
+
- - \ No newline at end of file + + diff --git a/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html index 3470fe56..58fe9ebf 100644 --- a/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html +++ b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html @@ -1,35 +1,42 @@ - - + -
-
- -
-
- - - -
+
+
+
+
+ + +
+
- - \ No newline at end of file + + diff --git a/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html index 74de77e0..b32f532a 100644 --- a/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html +++ b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html @@ -6,30 +6,29 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\system-waybill-logs\system-waybill-logs.component.html --> - - + -
-
- -
-
- - - -
+
+
+
+
+ + +
+
- - \ No newline at end of file + + diff --git a/src/app/routes/logs/components/version-logs/version-logs.component.html b/src/app/routes/logs/components/version-logs/version-logs.component.html index fec8020f..43f942b1 100644 --- a/src/app/routes/logs/components/version-logs/version-logs.component.html +++ b/src/app/routes/logs/components/version-logs/version-logs.component.html @@ -1,27 +1,40 @@ - - + + -
-
- -
-
- - - -
+
+
+
+
+ + + +
+
- - \ No newline at end of file + + diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html index 5f27be10..cf0ab56a 100644 --- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html +++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html @@ -1,46 +1,31 @@ - +
- -
- -
- - - -
- +
+
-
- - - - +
+ +
-
-
- +
this.roleAction(item, 2) + click: item => this.roleAction(item, 2), + acl: { ability: ['SYSTEM-CRM-edit'] }, }, { text: '删除', - click: item => this.deleteAction(item) + click: item => this.deleteAction(item), + acl: { ability: ['SYSTEM-CRM-delete'] }, }, ] } @@ -106,7 +108,7 @@ export class CrmManagementComponent implements OnInit { } }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 12, gutter: 4 } } }; } initSFFre() { this.addSchema = { diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.html b/src/app/routes/sys-setting/components/role-management/role-management.component.html index c50a2e16..4835d533 100644 --- a/src/app/routes/sys-setting/components/role-management/role-management.component.html +++ b/src/app/routes/sys-setting/components/role-management/role-management.component.html @@ -8,7 +8,7 @@ [button]="'none'">
- +
@@ -17,7 +17,7 @@
- +
this.roleAction(item), - iif: item => item.roleName !== '超级管理员' + iif: item => item.roleName !== '超级管理员', + acl: { ability: ['SYSTEM-ROLE-edit'] }, }, { text: '删除', click: item => this.deleteAction(item), - iif: item => item.roleName !== '超级管理员' + iif: item => item.roleName !== '超级管理员', + acl: { ability: ['SYSTEM-ROLE-delete'] }, } ] } diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html index eba6c101..5dbf2377 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html @@ -8,7 +8,7 @@ [button]="'none'">
- +
@@ -18,8 +18,8 @@
- - + +
diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts index 51270126..b1c6f48e 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts @@ -52,27 +52,32 @@ export class StaffManagementComponent implements OnInit { buttons: [ { text: '编辑', - click: item => this.staffAction(item) + click: item => this.staffAction(item), + acl: { ability: ['SYSTEM-STAFF-edit'] }, }, { text: '恢复', iif: item => item.stateLocked === 1, - click: item => this.action(item, 2) + click: item => this.action(item, 2), + acl: { ability: ['SYSTEM-STAFF-lock'] }, }, { text: '冻结', iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, - click: item => this.action(item, 1) + click: item => this.action(item, 1), + acl: { ability: ['SYSTEM-STAFF-lock'] }, }, { text: '超管转授', iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, - click: item => this.transpowerAction(item) + click: item => this.transpowerAction(item), + acl: { ability: ['SYSTEM-STAFF-shiftAdmin'] }, }, { text: '删除', iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, - click: item => this.action(item, 3) + click: item => this.action(item, 3), + acl: { ability: ['SYSTEM-STAFF-delete'] }, } ] } diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 2155d0cc..6bf5a8b5 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-02-17 15:03:00 + * @LastEditTime : 2022-02-23 17:17:53 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts