Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 19:38:18 +08:00
parent c27874bb3f
commit f40c5a53a4
19 changed files with 520 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/app/routes/contract-management/components/contract-partner/contract-partner.component.html Normal file
View File

@ -0,0 +1,100 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-07 13:29:57
* @LastEditors : Shiming
* @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.
-->
<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>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container>
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
<ng-template sf-template="signTime" let-me let-ui="ui" let-schema="schema">
<!-- <input placeholder="请输入1-30" type="number" [ngModel]="sf.value.description3" style="width: 200px;" nz-input />
<span> 天内支付运费</span> -->
<nz-range-picker [nzShowTime]="true" [(ngModel)]="sf.value.signTime"></nz-range-picker>
</ng-template>
</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)"
acl
[acl-ability]="['CONTRACT-INDEX-listFrame']"
>查询</button
>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<div style="position: relative">
<nz-alert
nzType="info"
[nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
nzShowIcon
[ngStyle]="{ margin: '0 0 1rem 0' }"
>
</nz-alert>
</div>
<st
#st
[data]="service.$api_listFrame_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"
[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>
</nz-card>
<ng-template #auditModal>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea
nz-input
rows="3"
placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
</se>
</div>
</div>
</ng-template>

35
src/app/routes/contract-management/components/contract-partner/contract-partner.component.less Normal file
View File

@ -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;
}
}

200
src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts Normal file
View File

@ -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);
}
}

5
src/app/routes/contract-management/components/index/index.component.html
View File

@ -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 @@
<nz-tab nzTitle="框架合同">
<app-contract-management-contract-frame></app-contract-management-contract-frame>
</nz-tab>
<nz-tab nzTitle="合伙人合同">
<app-contract-management-contract-frame></app-contract-management-contract-frame>
</nz-tab>
</nz-tabset>
</ng-template>

43
src/app/routes/financial-management/components/cost-management/cost-management.component.html
View File

@ -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 @@
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true" [button]="'none'"></sf>
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-COST-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<!-- <button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button> -->
@ -39,22 +44,26 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
</div>
</div>
<st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }"
[loading]="service.http.loading" [scroll]="{ x: '2000px' }">
<st
#st
[data]="service.$api_get_cost_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[loading]="service.http.loading"
[scroll]="{ x: '2000px' }"
>
<ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency}}
{{ item.armoeny | currency }}
</ng-template>
<ng-template st-row="hrmoney" let-item let-index="index">
{{ item.hrmoney | currency}}
</ng-template>
<ng-template st-row="artocode" let-item let-index="index">
{{ item.cnoCode}}/{{ item.cnoName}}
{{ item.hrmoney | currency }}
</ng-template>
<ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template>
<ng-template st-row="hrpaymoney" let-item let-index="index">
{{ item.hrpaymoney | currency}}
{{ item.hrpaymoney | currency }}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
{{ item.hrvatmoney | currency }}
</ng-template>
</st>
</nz-card>
@ -63,8 +72,12 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"></textarea>
<textarea
nz-input
rows="3"
placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
</se>
</div>
</div>

6
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -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: '修改',

2
src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
View File

@ -9,7 +9,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-VOUCHER-list']">查询</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button> -->

3
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -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: '修改'

43
src/app/routes/logs/components/system-logs/system-logs.component.html
View File

@ -1,27 +1,30 @@
<page-header-wrapper title="系统操作日志">
</page-header-wrapper>
<page-header-wrapper title="系统操作日志"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 8 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)"acl [acl-ability]="['LOGS-LOGS-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_systemt_logs" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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" [scroll]="{ y: '370px' }"></st>
<st
#st
[data]="service.$api_get_systemt_logs"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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"
[scroll]="{ y: '370px' }"
></st>
</nz-card>

53
src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.html
View File

@ -1,35 +1,42 @@
<!--
* @Author: your name
* @Date: 2022-01-04 14:42:30
* @LastEditTime: 2022-01-04 14:58:19
* @LastEditors: your name
* @LastEditTime : 2022-02-23 17:18:27
* @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\components\system-supply-logs\system-supply-logs.component.html
* @FilePath : \\tms-obc-web\\src\\app\\routes\\logs\\components\\system-supply-logs\\system-supply-logs.component.html
-->
<page-header-wrapper title="货源操作日志">
</page-header-wrapper>
<page-header-wrapper title="货源操作日志"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 8 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['LOGS-SUPPLY-LOGS-list']"
>查询</button
>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_systemt_logs" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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" [scroll]="{ y: '370px' }"></st>
<st
#st
[data]="service.$api_get_systemt_logs"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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"
[scroll]="{ y: '370px' }"
></st>
</nz-card>

39
src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.html
View File

@ -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
-->
<page-header-wrapper title="订单操作日志">
</page-header-wrapper>
<page-header-wrapper title="订单操作日志"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 8 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['LOGS-USER-LOGS-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_systemt_logs" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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" [scroll]="{ y: '370px' }"></st>
<st
#st
[data]="service.$api_get_systemt_logs"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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"
[scroll]="{ y: '370px' }"
></st>
</nz-card>

53
src/app/routes/logs/components/version-logs/version-logs.component.html
View File

@ -1,27 +1,40 @@
<page-header-wrapper title="版本发布记录">
</page-header-wrapper>
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-24 15:59:56
* @LastEditors : Shiming
* @LastEditTime : 2022-02-23 17:22:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\logs\\components\\version-logs\\version-logs.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper title="版本发布记录"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 8 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 8 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="6" [nzOffset]="_$expand ? 18 : 0" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['LOGS-VERSION-LOGS-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<st #st [data]="service.$api_get_version_logs" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },process: beforeReq }"
[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" [scroll]="{ y: '370px' }"></st>
<st
#st
[data]="service.$api_get_version_logs"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[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"
[scroll]="{ y: '370px' }"
></st>
</nz-card>

37
src/app/routes/sys-setting/components/crm-management/crm-management.component.html
View File

@ -1,46 +1,31 @@
<!--
* @Author: your name
* @Date: 2021-12-24 15:38:08
* @LastEditTime: 2021-12-27 10:30:01
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-02-23 17:14:33
* @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\components\crm-management\crm-management.component.html
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\crm-management\\crm-management.component.html
-->
<page-header-wrapper title="CRM客户管理">
</page-header-wrapper>
<nz-card>
<nz-card class="search-box">
<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>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
<div nz-col [nzSpan]="10">
<sf #sf [schema]="schema" [ui]="ui"
[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 (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-CRM-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card class="content-box">
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="roleAction('',1)">新增CRM客户</button>
<button nz-button nzType="primary" (click)="roleAction('',1)" acl [acl-ability]="['SYSTEM-CRM-add']">新增CRM客户</button>
</div>
</div>
<st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns" [req]="{ params: reqParams }"

8
src/app/routes/sys-setting/components/crm-management/crm-management.component.ts
View File

@ -34,11 +34,13 @@ export class CrmManagementComponent implements OnInit {
buttons: [
{
text: '编辑',
click: item => 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 = {

4
src/app/routes/sys-setting/components/role-management/role-management.component.html
View File

@ -8,7 +8,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-ROLE-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
@ -17,7 +17,7 @@
<nz-card>
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="roleAction()">新建角色</button>
<button nz-button nzType="primary" (click)="roleAction()" acl [acl-ability]="['SYSTEM-ROLE-add']">新建角色</button>
</div>
</div>
<st #st [data]="params.listUrl" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading"

6
src/app/routes/sys-setting/components/role-management/role-management.component.ts
View File

@ -45,12 +45,14 @@ export class RoleManagementComponent implements OnInit {
{
text: '编辑',
click: item => 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'] },
}
]
}

6
src/app/routes/sys-setting/components/staff-management/staff-management.component.html
View File

@ -8,7 +8,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-STAFF-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
@ -18,8 +18,8 @@
<div class="d-flex justify-content-between mb-sm">
<label style="font-size: 18px;">员工列表</label>
<div>
<button nz-button nzType="primary" (click)="staffAction()">添加员工</button>
<button nz-button>导出</button>
<button nz-button nzType="primary" (click)="staffAction()" acl [acl-ability]="['SYSTEM-STAFF-add']">添加员工</button>
<button nz-button acl [acl-ability]="['SYSTEM-STAFF-export']">导出</button>
</div>
</div>

15
src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
View File

@ -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'] },
}
]
}

2
src/app/routes/sys-setting/sys-setting-routing.module.ts
View File

@ -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