diff --git a/src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts b/src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts index 8a9865ba..7a06dda1 100644 --- a/src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts +++ b/src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { EAEnterpriseService } from '@shared'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { SystemService } from 'src/app/routes/sys-setting/services/system.service'; @@ -17,12 +16,7 @@ export class SettingFinancialComponent implements OnInit { schema!: SFSchema; roleList = []; roleNames: any = []; - constructor( - private modal: NzModalRef, - public msgSrv: NzMessageService, - public service: SystemService, - private enterpriseSrv: EAEnterpriseService - ) {} + constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public service: SystemService) {} ngOnInit(): void { if (this.i?.id !== 0) { @@ -113,16 +107,10 @@ export class SettingFinancialComponent implements OnInit { }; // this.service.request(this.service.$api_editorStaff, params).subscribe((res) => { // this.service.msgSrv.success('编辑成功！'); - // // this.loadMyIdentity(); // this.modal.close(true); // }); } } - loadMyIdentity() { - this.enterpriseSrv.loadEnterpises().subscribe((data: any[]) => { - this.enterpriseSrv.setCache(data); - }); - } close() { this.modal.destroy(); diff --git a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts index b579a5bc..3c0b4749 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts @@ -1,11 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; -import { copy } from '@delon/util'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; -import { EAEnterpriseService } from 'src/app/shared/services/business/enterprise.service'; import { SystemService } from '../../../services/system.service'; @Component({ @@ -21,12 +18,7 @@ export class SystemStaffStaffModalComponent implements OnInit { ui!: SFUISchema; roleList = []; roleNames: any = []; - constructor( - private modal: NzModalRef, - public msgSrv: NzMessageService, - public service: SystemService, - private enterpriseSrv: EAEnterpriseService - ) {} + constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public service: SystemService) {} ngOnInit(): void { if (this.i?.userId !== 0) { diff --git a/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts b/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts index de514d33..577167b0 100644 --- a/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts +++ b/src/app/routes/sys-setting/components/user-logs/user-logs.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; -import { dateTimePickerUtil } from '@delon/util'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { SFItemDateWidget } from 'src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget'; import { SystemService } from '../../services/system.service'; @Component({ diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts index 7cbb5cc7..7ce10374 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { EAEnterpriseService } from '@shared'; import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalRef } from 'ng-zorro-antd/modal'; -import { SystemService } from 'src/app/routes/sys-setting/services/system.service'; import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service'; @Component({ diff --git a/src/app/shared/services/business/account.service.ts b/src/app/shared/services/business/account.service.ts index fc461324..4075476e 100644 --- a/src/app/shared/services/business/account.service.ts +++ b/src/app/shared/services/business/account.service.ts @@ -56,7 +56,6 @@ export class EAAccountService extends BaseService { */ loginByAccount(username: string, password: string): void { this.asyncRequest(this.$api_login_by_account, { username, password, type: 0 }, 'POST', true, 'FORM').then((res) => { - console.log(res); this.doAfterLogin(res); }); } diff --git a/src/app/shared/services/business/enterprise.service.ts b/src/app/shared/services/business/enterprise.service.ts index 43774b06..d2404d18 100644 --- a/src/app/shared/services/business/enterprise.service.ts +++ b/src/app/shared/services/business/enterprise.service.ts @@ -5,9 +5,7 @@ import { tap } from 'rxjs/operators'; import { BaseService } from '../core/base.service'; import { EACacheService } from '../core/cache.service'; -@Injectable({ - providedIn: 'root', -}) +@Injectable() export class EAEnterpriseService extends BaseService { // 获取当前用户绑定的分销商/代理商/供应商 public $api_get_my_enterprises = `/chia/enterpriseInfo/list/queryMyAppInfo`; diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 1084f725..6ec37b96 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -11,7 +11,6 @@ export class ShipperBaseService extends BaseService { $api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员) $api_get_network_freight_forwarder = `/api/mdc/networkTransporter/findAll`; // 获取网络货运人 - constructor(public injector: Injector) { super(injector); } @@ -21,21 +20,19 @@ export class ShipperBaseService extends BaseService { * @returns */ getCarlessCarrier() { - return - const params = { - }; + return; + const params = {}; return this.request(this.$api_get_carless_carrier, params, 'POST').pipe( - map((res) => { + map(res => { if (res) { res.map((m: any) => { return { label: m.platformName, value: m.operationId }; }); } - }), + }) ); } - /** * 获取所属项目 * @returns @@ -46,16 +43,13 @@ export class ShipperBaseService extends BaseService { if (!res) { return []; } - const list = res.map(((item: any) => { - return { - label: item.projectName, - value: item.enterpriseId - } - })) - const obj = [{ value: '', label: '全部' }]; - return [...obj, ...list]; + const list = res.map((item: any) => ({ + label: item.projectName, + value: item.enterpriseId + })); + return [{ value: '', label: '全部' }, ...list]; }) - ) + ); } /** @@ -68,38 +62,31 @@ export class ShipperBaseService extends BaseService { if (!res) { return []; } - const list = res.map(((item: any) => { - return { - label: item.name, - value: item.userId - } - })) - const obj = [{ value: '', label: '全部' }]; - return [...obj, ...list]; + const list = res.map((item: any) => ({ + label: item.name, + value: item.userId + })); + return [{ value: '', label: '全部' }, ...list]; }) - ) + ); } /** - * 获取网络货运人 - * @returns - */ + * 获取网络货运人 + * @returns + */ getNetworkFreightForwarder(params = {}) { return this.request(this.$api_get_network_freight_forwarder, params).pipe( map((res: any) => { if (!res) { return []; } - const list = res.map(((item: any) => { - return { - label: item.enterpriseName, - value: item.id - } - })) - const obj = [{ value: '', label: '全部' }]; - return [...obj, ...list]; + const list = res.map((item: any) => ({ + label: item.enterpriseName, + value: item.id + })); + return [{ value: '', label: '全部' }, ...list]; }) - ) + ); } - } diff --git a/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.html b/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.html deleted file mode 100644 index 12b29e22..00000000 --- a/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.html +++ /dev/null @@ -1,11 +0,0 @@ - -
- - - - - - -
- \ No newline at end of file diff --git a/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.less b/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.ts b/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.ts deleted file mode 100644 index d98058d5..00000000 --- a/src/app/shared/widget/sl-form-item-date/sl-form-item-date.widget.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { FormGroup, Validators } from '@angular/forms'; -import { ControlWidget } from '@delon/form'; -import { _HttpClient } from '@delon/theme'; -import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; -import setHours from 'date-fns/setHours'; -import { DisabledTimeFn, DisabledTimePartial } from 'ng-zorro-antd/date-picker'; -@Component({ - selector: 'sf-item-date', - templateUrl: './sl-form-item-date.widget.html', - styleUrls: ['./sl-form-item-date.widget.less'] -}) -export class SFItemDateWidget extends ControlWidget implements OnInit { - /* 用于注册小部件 KEY 值 */ - static readonly KEY = 'item-date'; - - // 组件所需要的参数，建议使用 `ngOnInit` 获取 - format: any; - placeholder: string = ''; - nzShowTime = false; - - data: any = { - start: null, - end: null - }; - - ngOnInit(): void { - this.format = this.ui.format || 'yyyy-mm-dd'; - this.placeholder = this.ui.placeholder || ''; - this.nzShowTime = this.ui.nzShowTime || false; - this.data = this.value; - } - - // reset 可以更好的解决表单重置过程中所需要的新数据问题 - reset(value: string) {} - - change(value: Date, key: string) { - if (this.data) { - this.data[key] = value; - } else { - this.data = { [key]: value }; - } - if (this.ui.change) this.ui.change(this.data); - this.setValue(this.data); - } -} diff --git a/src/app/shared/widget/st-widget.module.ts b/src/app/shared/widget/st-widget.module.ts index e619ab77..1b8f7fa9 100644 --- a/src/app/shared/widget/st-widget.module.ts +++ b/src/app/shared/widget/st-widget.module.ts @@ -30,7 +30,6 @@ import { EAFromToWidget } from './from-to/from-to.widget'; import { ImgWidget } from './img/img.widget'; import { NounWidget } from './noun/noun.widget'; import { PropertyValuesWidget } from './property-values/property-values.widget'; -import { SFItemDateWidget } from './sl-form-item-date/sl-form-item-date.widget'; import { SpecValuesWidget } from './spec-values/spec-values.widget'; import { TinymceWidget } from './tinymce/tinymce.widget'; @@ -45,7 +44,6 @@ export const STWIDGET_COMPONENTS = [ PropertyValuesWidget, SLFromToSearchWidget, DictSelectWidget, - SFItemDateWidget ]; @NgModule({ @@ -81,6 +79,5 @@ export class STWidgetModule { widgetRegistry.register(PropertyValuesWidget.KEY, PropertyValuesWidget); widgetRegistry.register(SLFromToSearchWidget.KEY, SLFromToSearchWidget); widgetRegistry.register(DictSelectWidget.KEY, DictSelectWidget); - widgetRegistry.register(SFItemDateWidget.KEY, SFItemDateWidget); } }