From dc64c78694d021538a41ff557c22aa3e0862be4a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:36:26 +0800 Subject: [PATCH 01/29] 8033 --- proxy.conf.js | 2 +- .../components/api-auth/api-auth.component.html | 8 ++++---- .../components/api-auth/api-auth.component.ts | 17 +++++++++++++++-- .../menu-manager/menu-manager-routing.module.ts | 6 +++--- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 4690cd30..d18ecb48 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html index f1d7c7f0..86ffe160 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html @@ -23,8 +23,8 @@ - - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -65,7 +65,7 @@ {{ item.sorted }} - 权限配置 + 权限配置 diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts index c61cab04..f6004b13 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { EAEnvironmentService } from '@shared'; import { NzDrawerService } from 'ng-zorro-antd/drawer'; @@ -34,14 +35,26 @@ export class ApiAuthComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private drawer: NzDrawerService) { + + isShowBackEND = false; + isShowFre = false; + + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private drawer: NzDrawerService, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } diff --git a/src/app/routes/menu-manager/menu-manager-routing.module.ts b/src/app/routes/menu-manager/menu-manager-routing.module.ts index d46c398f..30dde843 100644 --- a/src/app/routes/menu-manager/menu-manager-routing.module.ts +++ b/src/app/routes/menu-manager/menu-manager-routing.module.ts @@ -5,12 +5,12 @@ import { MenuManagerComponentsIndexComponent } from './components/index/index.co const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, - { path: 'index', component: MenuManagerComponentsIndexComponent }, - { path: 'auth', component: ApiAuthComponent }, + { path: 'index', component: MenuManagerComponentsIndexComponent, data: { guard: { ability: ['MENU-INDEX-obclist'] } } }, + { path: 'auth', component: ApiAuthComponent, data: { guard: { ability: ['MENU-AUTH-obclist', 'MENU-AUTH-smclist'] } } } ]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule], + exports: [RouterModule] }) export class MenuManagerRoutingModule {} From 1fab74e445262c04f2b8e86cb425a0436beea04d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:04:37 +0800 Subject: [PATCH 02/29] edit --- .../dynamic-setting-h5.component.html | 16 ++++++++++------ .../dynamic-setting-h5.component.ts | 11 +++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 3d52444d..5df97748 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -112,19 +112,23 @@
- - + [nzShowUploadList]="{showPreviewIcon:true,showRemoveIcon:true}" + [nzFileList]="item.itemValue?[{uid:item.id,name:'',url:item.itemValue}]:[]" + (nzChange)="uploadChange($event,item)" [nzLimit]="1" + [nzShowButton]="filst?.nzFileList?.length===0 " [nzPreview]="nzPreview" + [nzRemove]="nzRemove"> +
上传
- -
+

支持 diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 5c3b0261..a3013280 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -98,6 +98,17 @@ export class DynamicSettingH5Component implements OnInit { } } + nzPreview = (file: NzUploadFile) => { + this.showImg(file.url); + }; + nzRemove = (file: NzUploadFile) => { + const config = this.configList.find((c: any) => c.id === file.uid); + if (config) { + config.itemValue = ''; + } + return true; + }; + showImg(url: any) { this.nzImageService.preview([{ src: url }]); } From 384a55a1e24be145a7fa469d26ce38cb111edf0d Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 16:09:28 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.html | 7 ++-- .../invoice-reporting.component.ts | 37 +------------------ 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 010dee32..6784c8fd 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -9,7 +9,7 @@

- +
- +
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 9ec54f1a..4bf92d71 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -281,26 +281,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }); } - /** - *撤销 - * @param record 记录实例 - */ - resetData() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); - return; - } - let params: any[] = []; - this.selectedRows.forEach(item => { - params.push(item.billId); - }); - this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('更新成功'); - this.st.load(1); - } - }) - } + /** *撤销 * @param record 记录实例 @@ -333,28 +314,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } selectChange(item: any) { - console.log(item); - this.selectedIndex = item?.value || ''; - console.log(this.selectedIndex); setTimeout(() => { this.st.load(); }) } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id, - }, - relativeTo: this.ar - }); - } /** * 上传 @@ -368,6 +334,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.selectedRows.forEach(item => { params.push(item.id); }); + return; //TODO 接口未提供 this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('上传成功'); From 258e930fed94eb72474f448261e998c4a119d722 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:21:57 +0800 Subject: [PATCH 04/29] edit --- .../components/index/index.component.html | 17 +++++++------ .../components/index/index.component.ts | 25 ++++++++++++++----- .../menu-manager-routing.module.ts | 6 ++++- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/app/routes/menu-manager/components/index/index.component.html b/src/app/routes/menu-manager/components/index/index.component.html index 8b1acd73..3577b04b 100644 --- a/src/app/routes/menu-manager/components/index/index.component.html +++ b/src/app/routes/menu-manager/components/index/index.component.html @@ -23,14 +23,15 @@ - - + +
- - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -85,12 +86,12 @@ 查看 - 编辑 + 编辑 - 删除 + 删除 - 新增子项 + 新增子项 diff --git a/src/app/routes/menu-manager/components/index/index.component.ts b/src/app/routes/menu-manager/components/index/index.component.ts index 2f9b1306..3cd5cf8c 100644 --- a/src/app/routes/menu-manager/components/index/index.component.ts +++ b/src/app/routes/menu-manager/components/index/index.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { Menu, ModalHelper } from '@delon/theme'; import { EAEnvironmentService } from '@shared'; @@ -37,14 +38,26 @@ export class MenuManagerComponentsIndexComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private modal: NzModalService, private modalHelper: ModalHelper,) { + + isShowBackEND = false; + isShowFre = false; + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private modal: NzModalService, + private modalHelper: ModalHelper, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } @@ -126,13 +139,13 @@ export class MenuManagerComponentsIndexComponent implements OnInit { } }); } - menuSort(){ + menuSort() { const dialogData = { appId: this.selectedPlatform.appId }; - this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res:any) => { - if(res) { - console.log('a') + this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res: any) => { + if (res) { + console.log('a'); this.loadMemu(this.selectedPlatform.appId); } }); diff --git a/src/app/routes/menu-manager/menu-manager-routing.module.ts b/src/app/routes/menu-manager/menu-manager-routing.module.ts index 30dde843..4879b5aa 100644 --- a/src/app/routes/menu-manager/menu-manager-routing.module.ts +++ b/src/app/routes/menu-manager/menu-manager-routing.module.ts @@ -5,7 +5,11 @@ import { MenuManagerComponentsIndexComponent } from './components/index/index.co const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, - { path: 'index', component: MenuManagerComponentsIndexComponent, data: { guard: { ability: ['MENU-INDEX-obclist'] } } }, + { + path: 'index', + component: MenuManagerComponentsIndexComponent, + data: { guard: { ability: ['MENU-INDEX-obclist', 'MENU-INDEX-smclist'] } } + }, { path: 'auth', component: ApiAuthComponent, data: { guard: { ability: ['MENU-AUTH-obclist', 'MENU-AUTH-smclist'] } } } ]; From 772b5206b75029d18b786f8ec42e8363970bd8d3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:31:47 +0800 Subject: [PATCH 05/29] edit --- .../cart-config/cart-config.component.html | 12 ++++-- .../cart-config/cart-config.component.ts | 42 +++++++++++++++++-- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html index c5cfa144..00d6b58b 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html @@ -1,7 +1,11 @@ - + + + + + @@ -22,10 +26,10 @@
- +
+ [req]="{process: beforeReq }" [res]="{ process: afterRes }" [loading]="loading" [scroll]="{ y: '370px' }"> \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts index b7039fb0..0682a22e 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; @@ -20,17 +21,20 @@ export class CartConfigComponent implements OnInit { { name: '车型配置', type: 1, - isActived: false + isActived: false, + isShow: true }, { name: '车长配置', type: 2, - isActived: false + isActived: false, + isShow: true }, { name: '禁限物品名单', type: 3, - isActived: false + isActived: false, + isShow: true } ]; tabType = 1; @@ -102,10 +106,12 @@ export class CartConfigComponent implements OnInit { buttons: [ { text: '编辑', + acl: { ability: ['SYSTEM-CART-CONFIG-edit'] }, click: item => this.configAction(item) }, { text: '删除', + acl: { ability: ['SYSTEM-CART-CONFIG-delete'] }, click: item => this.deleteAction(item) } ] @@ -113,7 +119,35 @@ export class CartConfigComponent implements OnInit { ]; loading = true; - constructor(public service: SystemService, private nzModalService: NzModalService, private cdr: ChangeDetectorRef) {} + constructor( + public service: SystemService, + private nzModalService: NzModalService, + private cdr: ChangeDetectorRef, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.tabs = [ + { + name: '车型配置', + type: 1, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-modeList') + }, + { + name: '车长配置', + type: 2, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-cartLength') + }, + { + name: '禁限物品名单', + type: 3, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-goodsList') + } + ]; + this.tabType = this.tabs.find(tab => tab.isShow)?.type || 1; + } ngOnInit(): void {} From a95adb929974c34feccfbce3a24cee7fea451289 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 16:31:58 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/billing-order/billing-order.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index 047cdf2a..e6588a35 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -11,9 +11,9 @@
- + - + +
- 编辑 + 编辑 - 删除 + 删除 - 新增子组织 + 新增子组织
- 配置接口权限 + 配置接口权限 - 配置数据权限 + 配置数据权限 - + From b0be5df59e1b8c5e05afc40e431a71e1e94eceb9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:48:42 +0800 Subject: [PATCH 11/29] edit --- .../components/invoice-detail/invoice-detail.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index b56088d4..b100b5f9 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -290,11 +290,11 @@ export class InvoiceDetailComponent implements OnInit { { title: '数量', render: 'vatqty', width: 140, className: 'text-right' }, { title: '金额', - index: 'vattax', + index: 'vatmoney', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } }, { title: '税率', From f25fdea3dbdc721175cdf7befd35c6b8ff74c566 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:54:08 +0800 Subject: [PATCH 12/29] edit --- .../components/invoice-detail/invoice-detail.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index b100b5f9..4bc5640d 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -305,11 +305,11 @@ export class InvoiceDetailComponent implements OnInit { }, { title: '税额', - index: 'vatnotax', + index: 'vattax', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } } ]; } From 4a054905855fc38a31aa7de242c5f198e70f02d4 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 16:58:58 +0800 Subject: [PATCH 13/29] edit --- .../sms-template/sms-template.component.html | 9 +++--- .../sms-template/sms-template.component.ts | 30 +++++++++---------- .../sys-setting/sys-setting-routing.module.ts | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html index 2b413ab5..41716b59 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html @@ -2,7 +2,7 @@
- +
- + - + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 43d1df9c..7adb409a 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,4 +1,3 @@ - import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; @@ -23,7 +22,7 @@ export class SmsTemplateComponent implements OnInit { isVisible = false; tempData = {}; isEdit = false; - + searchSchema: SFSchema = { properties: { templateName: { @@ -50,27 +49,27 @@ export class SmsTemplateComponent implements OnInit { templateName: { type: 'string', title: '模板名称', - ui: { placeholder: '请输入模板名称', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板名称', errors: { require: '必填项' } } }, templateCode: { type: 'string', title: '模板编码', readOnly: this.isEdit, - ui: { placeholder: '请输入模板编码', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板编码', errors: { require: '必填项' } } }, templateContent: { type: 'string', title: '模板内容', - ui: { placeholder: '请输入模板内容', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板内容', errors: { require: '必填项' } } } }, - required: ['templateName','templateCode','templateContent'] - } + required: ['templateName', 'templateCode', 'templateContent'] + }; } columns: STColumn[] = [ - { title: '模板名称', className: 'text-center', index: 'templateName' }, - { title: '模板编码', className: 'text-center', index: 'templateCode' }, + { title: '模板名称', className: 'text-center', width: '200px', index: 'templateName' }, + { title: '模板编码', className: 'text-center', width: '140px', index: 'templateCode' }, { title: '模板内容', className: 'text-center', index: 'templateContent' }, // { // title: '创建人', className: 'text-center', index: 'content', @@ -79,21 +78,23 @@ export class SmsTemplateComponent implements OnInit { title: '更新时间', index: 'modifyTime', type: 'date', + width: '160px', className: 'text-center' }, { title: '操作', + width: '90px', buttons: [ { text: '编辑', - click: i => this.edit(i), + acl: { ability: ['SMS_TEMPLATE-save'] }, + click: i => this.edit(i) } ] } ]; - constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { - } + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {} ngOnInit(): void { this.initSF(); @@ -144,7 +145,7 @@ export class SmsTemplateComponent implements OnInit { templateCode, templateName, templateContent - } + }; this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => { // console.log(res); @@ -152,8 +153,7 @@ export class SmsTemplateComponent implements OnInit { this.isVisible = false; this.st.reload(); } - }) - + }); } handleCancel(): void { 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 3eb42854..17f14f29 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -56,7 +56,7 @@ const routes: Routes = [ // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, { path: 'insurance-set', component: InsuranceSetComponent }, - { path: 'sms-template', component: SmsTemplateComponent } + { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } } ]; @NgModule({ From 8fb7be6a4a6d222861a7018001af645fffc25cec Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:05:10 +0800 Subject: [PATCH 14/29] 1.2.0 --- package.json | 2 +- .../components/payment-order/payment-order.component.html | 2 +- .../components/receipt-order/receipt-order.component.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2b60058a..1439c62d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tms-obc-web", - "version": "1.0.1", + "version": "1.2.0", "description": "运营后台-WEB", "author": "cipchk ", "repository": { diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 2dad7899..f9ee3d69 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -33,7 +33,7 @@
+ [acl-ability]="['FINANCIAL-PAYMENT-ORDER-list']">筛选
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 63a2ec0b..151c7e56 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -251,6 +251,7 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-RECEIPT-view'] }, click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id]) } // { From 507d8660d65be1bc16500aaa451d6addd140e405 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:22:25 +0800 Subject: [PATCH 15/29] 1.2.0 --- .../components/list/list.component.html | 54 ++++++++----------- .../routes/vehicle/vehicle-routing.module.ts | 12 +++-- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index e2e98417..7c2dbd77 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -16,17 +16,10 @@
- - + + - + + +
this.roleAction(item, 2) }, { text: '删除', + acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] }, click: item => this.deleteAction(item) }, ] 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 17f14f29..fb77019d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, - { path: 'announcement-message', component: AnnouncementMessageComponent }, + { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } } ]; From 6047fde637812989225f34c124b157dca47c918e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:30:08 +0800 Subject: [PATCH 17/29] 8026 --- .../recharge-record/recharge-record.component.html | 3 ++- .../recharge-record/recharge-record.component.ts | 8 +++++--- .../financial-managemen-routing.module.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html index d0ed4c80..8f33ae3e 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html @@ -40,7 +40,8 @@
- +
', + acl: { ability: ['FINANCIAL-RECHARGE-receiptApply'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, @@ -207,6 +208,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn }, { text: '添加备注', + acl: { ability: ['FINANCIAL-RECHARGE-addRemark'] }, click: item => this.addRemark(item) } ] diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index aa5ba856..f82dc133 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -50,7 +50,7 @@ const routes: Routes = [ component: PlatformAccountDetailComponent, data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, - { path: 'recharge-record', component: RechargeRecordComponent }, + { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, From 7355907be3d24d57074d4e3f25ffa58e0fdece6c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:31:39 +0800 Subject: [PATCH 18/29] 8021 --- .../components/payable-order/payable-order.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index f5fac6ee..860a4753 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -273,6 +273,7 @@ export class PayableOrderComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-PAYABLE-view'] }, click: item => this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } }) } From d83eabaf09e5df3a9f432bb09ce23aedcb0c5a98 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 17:41:17 +0800 Subject: [PATCH 19/29] fix bug --- .../assigned-car/assigned-car.component.html | 26 +++++++++++++++---- .../choose-famifiar.component.html | 8 ++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html index 22030b03..8888f432 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html @@ -1,4 +1,17 @@ + + +
+
-
- - -
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html index 0f517765..2f8b7ad1 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html @@ -4,12 +4,13 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 14:27:20 + * @LastEditTime : 2022-04-28 17:36:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> +
@@ -19,6 +20,7 @@
+
@@ -55,7 +57,9 @@
+ +
-
+
\ No newline at end of file From a65aa4e50ad7abbeeec7151aa731e8e3ac6c603b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:45:04 +0800 Subject: [PATCH 20/29] 8023 7983 --- .../financial-management/financial-managemen-routing.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index f82dc133..00db0eb7 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, - { path: 'voucher-management', component: VoucherManagementComponent }, + { path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } }, { path: 'voucher-management/detail/:id', component: VoucherDetailComponent }, { path: 'voucher-summary', component: VoucherSummaryComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-SUMMARY-list'] } } }, { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, From 60c5d155648b19ca535c7e9745b6d37975126eba Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 18:57:49 +0800 Subject: [PATCH 21/29] edit --- .../tax-management-routing.module.ts | 20 ++++++++++--------- .../usercenter/usercenter-routing.module.ts | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/routes/tax-management/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts index ce7b3f5f..01f84120 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-30 13:58:28 @@ -16,18 +16,20 @@ import { TaxManagementIndividualIncomeComponent } from './components/individual- import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; - const routes: Routes = [ - { path: 'orderReport', component: TaxManagementOrderReportingComponent }, - { path: 'income', component: TaxManagementIndividualIncomeComponent }, - { path: 'collect', component: TaxManagementIndividualCollectComponent }, - { path: 'declare', component: TaxManagementIndividualDeclareComponent }, - { path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent }, + { path: 'orderReport', component: TaxManagementOrderReportingComponent, data: { guard: { ability: ['TAX-ORDERREPORT-search'] } } }, + { path: 'income', component: TaxManagementIndividualIncomeComponent, data: { guard: { ability: ['TAX-INCOME-search'] } } }, + { path: 'collect', component: TaxManagementIndividualCollectComponent, data: { guard: { ability: ['TAX-COLLECT-search'] } } }, + { path: 'declare', component: TaxManagementIndividualDeclareComponent, data: { guard: { ability: ['TAX-DECLARE-search'] } } }, + { + path: 'invoiceReport', + component: TaxManagementInvoiceReportingComponent, + data: { guard: { ability: ['TAX_INVOICE_REPORT-list'] } } + } ]; - @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class TaxManagementModuleRoutingModule { } +export class TaxManagementModuleRoutingModule {} diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts index 3034830b..5cbf597a 100644 --- a/src/app/routes/usercenter/usercenter-routing.module.ts +++ b/src/app/routes/usercenter/usercenter-routing.module.ts @@ -71,7 +71,7 @@ const routes: Routes = [ { path: 'driver/config', component: UserCenterComponentsDriverConfigComponent, - data: { guard: { ability: ['USERCENTER-DRIVER-CAPTAIN-list'] } } + data: { guard: { ability: ['USERCENTER-DRIVER-CONFIG-search'] } } } ]; From ab6957990d4dce82b72cbb89cb90236642f24707 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 19:00:20 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E5=B7=B2=E5=BC=80=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sms-template/sms-template.component.ts | 2 +- .../components/invoiced-list/invoiced-list.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 43d1df9c..26a9049f 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,5 +1,5 @@ -import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index f45918ab..14c6bf69 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -39,6 +39,7 @@ export class InvoicedListComponent implements OnInit { ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body,{sts: '3'}) if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value, @@ -48,7 +49,7 @@ export class InvoicedListComponent implements OnInit { } }); } - return requestOptions; + return requestOptions ; }; stChange(e: STChange): void { From 674dba6cf8b68a2a65eb5a07c5f6bed70cb4f916 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:27:46 +0800 Subject: [PATCH 23/29] fix bug --- .../modify-captain.component.html | 4 ++-- .../modify-captain/modify-captain.component.ts | 18 +++++++++++++++++- .../services/order-management.service.ts | 5 ++++- .../close-account/close-account.component.html | 7 +++---- .../close-account/close-account.component.ts | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index dee32307..88299e93 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 17:27:37 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:22:55 + * @LastEditTime : 2022-04-28 19:27:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -29,7 +29,7 @@ - + diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 7e3ab9d6..68d4bdc0 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 14:45:39 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 16:31:57 + * @LastEditTime : 2022-04-28 19:27:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -38,6 +38,21 @@ export class VehicleModifyCaptainComponent implements OnInit { this.initSF(); this.initST(); } + initData(id: string) { + // this.service.request(this.service.$api_getDriverBankInfoList, {roleId: id}).subscribe((res:any) => { + // console.log(res); + // if(res) { + // let List :any= [] + // res.forEach((element: any) => { + // List.push({ + // bankCardNumber: element.bankBranchName + '/'+element.bankCardNumber, + // value: element.id + // }) + // }); + // this.bankData = List + // } + // }) + } initSF() { this.schema = { properties: { @@ -120,6 +135,7 @@ export class VehicleModifyCaptainComponent implements OnInit { this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => { if (res) { this.dataList = [res]; + this.initData(res.appUserId); } }); } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index f68ed55c..a684e125 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 17:14:39 + * @LastEditTime : 2022-04-28 19:19:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -222,6 +222,9 @@ export class OrderManagementService extends ShipperBaseService { // 订单上报推送 $api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission'; + // 获取司机所有银行卡信息 + $api_getDriverBankInfoList= '/api/fcc/bankInfoDMC/getDriverBankInfoList'; + // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; // // 生成提货单 diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index 0dae990d..b29143f4 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -1,10 +1,10 @@ @@ -16,7 +16,6 @@ - edit
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 1472bf4e..c63b5418 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -188,7 +188,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; if(res) { this.formData = res; const List: any = []; - List.push({ label: res.enterpriseName, value: res.id }); + List.push({ label: res.enterpriseName, value: res.enterpriseId }); this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); } From 4b69dc96fc136057956301fb9a5c420ecc9daea5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:28:37 +0800 Subject: [PATCH 24/29] fix bug --- .../vehicle/modify-captain/modify-captain.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index 88299e93..5604bdbf 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 17:27:37 * @LastEditors : Shiming - * @LastEditTime : 2022-04-28 19:27:13 + * @LastEditTime : 2022-04-28 19:28:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -28,7 +28,7 @@ - + From 88af60bde31a7f2015ff321db4c9ea05a96a08bc Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 19:43:04 +0800 Subject: [PATCH 25/29] edit --- .../components/account-detail/account-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/components/account-detail/account-detail.component.html b/src/app/shared/components/account-detail/account-detail.component.html index a9bc8438..86ce37aa 100644 --- a/src/app/shared/components/account-detail/account-detail.component.html +++ b/src/app/shared/components/account-detail/account-detail.component.html @@ -14,9 +14,9 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" [scroll]="{ y: '370px' }"> - {{ item.paAccount || '添加' }} + {{ item.paAccount || '添加' }} - {{ item.pfAccount || '添加' }} + {{ item.pfAccount || '添加' }} \ No newline at end of file From c3bb84e9275ad82f4424001550ba164335672e65 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:44:12 +0800 Subject: [PATCH 26/29] fix bug --- .../close-account/close-account.component.ts | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index c63b5418..1d880abd 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -156,22 +156,23 @@ export class CloseAccountComponent implements OnInit { maxLength: 30, ui: { widget: 'select', - serverSearch: true, + // serverSearch: true, + allowClear: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q?.replace(/^\s+|\s+$/g, ''); if (str) { return this.service - .request(this.service.$api_enterpriceList, { enterpriseName: str}) - .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .request(this.service.$api_enterpriceList, { enterpriseName: str }) + .pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, - } as SFSelectWidgetSchema, - }, + } as SFSelectWidgetSchema + }, }, required: ['customerName', 'customerCode', 'networkTransporterId', 'enterpriseId'] }; @@ -186,11 +187,26 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; this.service.request(this.service.$api_settlementCustomer_get, {id: value.id}).subscribe((res: any) => { console.log(res) if(res) { - this.formData = res; const List: any = []; - List.push({ label: res.enterpriseName, value: res.enterpriseId }); - this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; - this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); + List.push({ label: value.enterpriseName, value: res.enterpriseId }); + // this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; + // console.log(List); + + // this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); + // if(res.enterpriseId) { + // this.sfFre.setValue('/enterpriseId', res.enterpriseId); + // } + console.log(this.sfFre.getProperty('/enterpriseId')); + this.formData = res; + setTimeout(() => { + this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; + this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); + if (res?.enterpriseId) { + console.log(res?.enterpriseId); + console.log(res?.enterpriseId); + this.sfFre.setValue('/enterpriseId', res.enterpriseId); + } + }) } }) this.edit = true; From 7d25e6c9a1383ce7972ad2698f5995cab2ff2dd0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 19:55:12 +0800 Subject: [PATCH 27/29] edit --- .../menu-tree/menu-tree.component.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts index 1db86b54..b71b2f52 100644 --- a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts +++ b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts @@ -122,8 +122,17 @@ export class MenuTreeComponent implements OnInit, OnChanges { }); } } else { + console.log(event); + if (event.node?.isChecked) { this.recursionSetNodeAuth(event.node.origin); + if (event.node.parentNode) { + this._NodeAuthMap.set(event.node.parentNode.origin.id, { + authorityId: event.node.parentNode.origin.id, + buttonAuthorityIds: [], + isUpdateAuthority: 1 + }); + } if (this.origin.checked) { this.origin.buttonInfoList.forEach((auth: any) => this._apiAuthSet.add(auth.functionButtonId)); } From 17da1ee45d3d205a28b82c5812d752b2bad3266d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 19:58:12 +0800 Subject: [PATCH 28/29] edit --- .../individual-income/individual-income.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 3087e371..bf8b851d 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -45,10 +45,10 @@ 已选择 {{ selectedRows.length }} 条数据
- - - - + + + + From 3053d1120f0117b3c388b918f76dd141f4ecb906 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:58:12 +0800 Subject: [PATCH 29/29] fix bug --- .../vehicle-detail/vehicle-detail.component.ts | 9 +-------- .../close-account/close-account.component.ts | 10 ---------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index bf23f79e..c0f99450 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:52:15 + * @LastEditTime : 2022-04-28 19:49:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -112,8 +112,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit { .request(this.service.$api_get_log_list, { operateObject: this.i?.billCode, operateTypeList: ['3', '8'] }) .subscribe(res => { if (res) { - console.log('操作日志'); - console.log(res); let a: any = []; res.records.forEach((item: any) => { a.push({ @@ -122,7 +120,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit { color: 'green' }); }); - console.log(a); this.operationList = a; } }); @@ -133,15 +130,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('风险详情'); - console.log(res); this.abnormalList = res; } }); this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('异常预警'); - console.log(res); this.warringList = res; } }); diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 1d880abd..3506236f 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -189,21 +189,11 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; if(res) { const List: any = []; List.push({ label: value.enterpriseName, value: res.enterpriseId }); - // this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; - // console.log(List); - - // this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); - // if(res.enterpriseId) { - // this.sfFre.setValue('/enterpriseId', res.enterpriseId); - // } - console.log(this.sfFre.getProperty('/enterpriseId')); this.formData = res; setTimeout(() => { this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); if (res?.enterpriseId) { - console.log(res?.enterpriseId); - console.log(res?.enterpriseId); this.sfFre.setValue('/enterpriseId', res.enterpriseId); } })