From 1d76809e3a034eaa540e7a69c0c6efe0792d338b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 13:29:42 +0800 Subject: [PATCH 01/12] UI --- proxy.conf.js | 2 +- src/app/global-config.module.ts | 1 + src/app/routes/commom/less/commom-table.less | 8 +-- .../fund-reporting.component.less | 5 -- .../fund-reporting.component.spec.ts | 24 -------- .../freight/list/list.component.html | 42 ++++++++++--- .../components/freight/list/list.component.ts | 60 ++++++++++--------- 7 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts diff --git a/proxy.conf.js b/proxy.conf.js index d58ece8c..21093efc 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/global-config.module.ts b/src/app/global-config.module.ts index faeed3b0..8ffa9a12 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -12,6 +12,7 @@ import { environment } from '@env/environment'; const alainConfig: AlainConfig = { st: { + bordered: true, req: { method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }, res: { reName: { list: 'data.records', total: 'data.total' } }, page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000], toTop: false }, diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 152d7534..ff5ea6f4 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -113,9 +113,9 @@ line-height: 21px; } - .text-truncate { - white-space: normal; - } + // .text-truncate { + // white-space: normal; + // } } } @@ -138,4 +138,4 @@ } } -.height_box{} \ No newline at end of file +.height_box {} \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less deleted file mode 100644 index 6009fbbf..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts deleted file mode 100644 index fb500388..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableFundReportingComponent } from './fund-reporting.component'; - -describe('DatatableFundReportingComponent', () => { - let component: DatatableFundReportingComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [DatatableFundReportingComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableFundReportingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 018efd10..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -26,15 +26,23 @@
-
- +
+
+ + +
+
    +
  • + 高级筛选 +
  • 新增企业
    • @@ -52,8 +60,7 @@ - -
    + @@ -68,16 +75,35 @@ - {{ item.contacter }}
    /{{item.mobile}} +

    + {{ item.contacter }} +

    +     + +

    + {{ item.customerServiceIdLabel }} +

    - {{ item.partnerName }}
    /{{item.partnerMobile}} +

    + {{ item.partnerName }} +

    - {{ item.channelName }}
    {{ item.channelMobile }} +

    + {{ item.channelName }} +

    diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 2d8995c3..70185274 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { SFDateWidgetSchema } from '@delon/form'; import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { BasicTableComponent } from 'src/app/routes/commom'; @@ -24,6 +24,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen promotersTelephone = ''; loadingList = true; + + sfValue = { enterpriseName: '', contactName: '' }; + constructor( public service: UsermanageService, private modal: NzModalService, @@ -195,12 +198,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initSF() { this.schema = { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, enterpriseName: { title: '企业名称', type: 'string', @@ -340,7 +337,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen { label: '全部', value: '' }, { label: '货主注册', value: 1 }, { label: '平台添加', value: 2 }, - { label: '数据迁移', value: 4 }, + { label: '数据迁移', value: 4 } ], default: '', ui: { @@ -377,24 +374,31 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center' }, - { title: '企业名称', render: 'enterpriseName', width: 350 }, - { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, + { + title: '企业名称', + index: 'enterpriseName', + width: 250, + type: 'link', + click: item => this.router.navigate(['./detail', item.id], { relativeTo: this.ar }) + }, + { title: '企业评分', className: 'text-center', render: 'score', width: 160 }, { title: '公司所在地', - className: 'text-center', index: 'province', width: 200, format: item => `${item.provinceName}${item.cityName}${item.areaName}` }, + { title: '管理员', render: 'contacter', width: 150 }, + { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, { title: '企业类型', className: 'text-center', index: 'enterpriseType', - width: 200, + width: 160, type: 'enum', enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' } }, - { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, + { title: '常用服务', className: 'text-center', @@ -405,14 +409,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, - { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', - enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, width: 130 }, { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, @@ -442,18 +446,18 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '操作', - width: '200px', - className: 'text-center block-td', + width: '180px', + className: 'text-center ', fixed: 'right', buttons: [ - { - text: '查看', - acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, - click: item => { - this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); - // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); - } - }, + // { + // text: '查看', + // acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, + // click: item => { + // this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); + // // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); + // } + // }, // { // acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] }, // text: '基础设置', @@ -465,9 +469,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen click: item => this.showAccountDetail(item) }, { - text: '分配客服人员', + text: '分配客服', click: item => this.showService(item) - }, + } // { // text: '修改合伙人', // click: item => this.editPartner(item) From 2e3f5d65a5703046ec19c6a18b9322ab02a0c21e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 13:49:47 +0800 Subject: [PATCH 02/12] fix bug --- proxy.conf.js | 4 +-- .../operationtable.component.ts | 25 +++++++++++++------ .../routes/datatable/services/data.service.ts | 2 ++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 28ccca86..958626b6 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 10:35:23 + * @LastEditTime : 2022-05-07 11:27:16 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -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/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index 15a0571c..aa8b8e33 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -73,9 +73,9 @@ export class DatatableOperationtableComponent implements OnInit { } initPillarData(flag?: boolean){ let type = 1 - if(this.mode === 'year') { + if(this.modeNext === 'year') { type = 1 - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { type = 2 } const params: any = { @@ -126,7 +126,18 @@ export class DatatableOperationtableComponent implements OnInit { // Can not select days before today and today differenceInCalendarDays(current, this.today) > 0; exportFun() { - + let type = 1 + if(this.mode === 'year') { + type = 1 + } else if(this.mode === 'month') { + type = 2 + } + const params: any = { + time: this.time, + type, + enterpriseInfoId: this.enterpriseInfoId + }; + this.service.exportStart({ ...params, pageSize: -1 }, this.service.$api_asyncExportOperationalReport); } changeCurve(){ @@ -135,9 +146,9 @@ export class DatatableOperationtableComponent implements OnInit { } changeDataNext() { - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.dateFormat = 'yyyy-MM' } } @@ -145,9 +156,9 @@ export class DatatableOperationtableComponent implements OnInit { if(result === null) { return } - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } this.initPillarData(true) diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index adea49fc..ca0bac57 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -107,6 +107,8 @@ export class DataService extends ShipperBaseService { $api_total_freight = `/api/sdc/reportData/getTotalFreight`; // 附加费总额 $api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`; + // 运营导出 + $api_asyncExportOperationalReport = `/api/sdc/report/asyncExportOperationalReport`; From 1ef81780c224990ab891bb2cd58ae5dce0724bbe Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 13:53:05 +0800 Subject: [PATCH 03/12] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 0dd9918b..1bcfb1c8 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -290,7 +290,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements placeholder: '请选择', } }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 7bec1594..72ca5609 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -297,7 +297,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme placeholder: '请选择' } }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { From 72dc31a6260d6200533f55deeccb4fe6dfd6add0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:02:10 +0800 Subject: [PATCH 04/12] fix bug --- proxy.conf.js | 4 ++-- .../components/operationtable/operationtable.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 958626b6..abb6987d 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 11:27:16 + * @LastEditTime : 2022-05-07 14:00:05 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.html b/src/app/routes/datatable/components/operationtable/operationtable.component.html index b3587bb0..5d8f4db9 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.html +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html @@ -45,14 +45,14 @@
- +
\ No newline at end of file From 18259ad5194e5329b2edffd088de8ff7fd142818 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 14:44:38 +0800 Subject: [PATCH 05/12] edit --- .../index/menu-modal/menu-modal.component.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts index 2dc63603..d7d39505 100644 --- a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts +++ b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts @@ -72,6 +72,16 @@ export class MenuModalComponent implements OnInit { widget: 'radio' } }, + reuse: { + title: '是否缓存页面', + type: 'boolean', + default: this.formData.reuse || false, + enum: [true, false], + readOnly: this.isDisabled, + ui: { + widget: 'radio' + } + }, link: { title: '菜单路由', type: 'string', From 16babe9622a158892bf3b0e3f4212afa2ffa6479 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:48:26 +0800 Subject: [PATCH 06/12] fix bug --- proxy.conf.js | 4 ++-- .../contract-template-detail.component.ts | 8 +++++--- .../contract-template/contract-template.component.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index abb6987d..25a048b9 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 14:00:05 + * @LastEditTime : 2022-05-07 14:30:27 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -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/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index f355dec3..2ee737cc 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 20:19:39 + * @LastEditTime : 2022-05-07 14:28:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -94,7 +94,8 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '权力义务转让协议', value: '10' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); @@ -217,7 +218,8 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '权力义务转让协议', value: '10' }, ]; setTimeout(() => { if (this.sf) { diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index 71f198d2..4b424a00 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -245,7 +245,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit { this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => { if (res) { this.service.msgSrv.success('删除成功！'); - this.st.reload(1) + this.st.reload() } }) }); From 93b7985330457ce3b14bfe9bca9843d7c0df84a2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:57:17 +0800 Subject: [PATCH 07/12] fix bug --- proxy.conf.js | 4 ++-- .../partner/level-config/components/list/list.component.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 25a048b9..6ca24ab5 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 14:30:27 + * @LastEditTime : 2022-05-07 14:49:15 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts index 637a23ee..12b39be1 100644 --- a/src/app/routes/partner/level-config/components/list/list.component.ts +++ b/src/app/routes/partner/level-config/components/list/list.component.ts @@ -195,6 +195,5 @@ export class ParterLevelConfigListComponent implements OnInit { */ resetSF() { this.sf.reset(); - this.st.load(1); } } From 513821eeeec9385092cb4150d92faf23b14ed777 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 15:02:38 +0800 Subject: [PATCH 08/12] fix bug --- .../components/bulk-publish/bulk-publish.component.ts | 8 ++++---- .../onecar-publish/onecar-publish.component.ts | 8 ++++---- .../release-publish/release-publish.component.ts | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 2a4d764b..1229c193 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -223,7 +223,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', @@ -255,7 +255,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -279,7 +279,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1162,7 +1162,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null); diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 4d823afa..9efffd38 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -269,7 +269,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', @@ -301,7 +301,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (_value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -325,7 +325,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1510,7 +1510,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null); diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 9bd0c8c3..a457bfcd 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -259,11 +259,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }, goodsTypeId: { type: 'string', - title: '货物名称', + title: '货物类型', ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请选择货物名称' }, + errors: { required: '请选择货物类型' }, asyncData: () => this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( map((data: any) => { @@ -291,7 +291,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, change: (value: any, data: any) => { this.sf3.setValue('/goodsName', data.label); }, @@ -315,7 +315,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { title: '', maxLength: 20, ui: { - errors: { required: '请填写货物名称' }, + errors: { required: '请填写货物类型' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' }, @@ -1294,7 +1294,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { if (res === false) { const modalRef = this.modalService.error({ - nzTitle: '货物名称含有违禁词，请重新输入！', + nzTitle: '货物类型含有违禁词，请重新输入！', }); modalRef.afterClose.subscribe(result => { // this.sf3.setValue('/goodsName1', null); From 94ec729fd6eeac232ad1312ce93584f54a042d16 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 15:04:03 +0800 Subject: [PATCH 09/12] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index afdba959..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • -
  • + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index bbea8955..ff67d4cb 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -473,14 +473,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 77d5992ef53c22118628668511b0dbad8ae87274 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 15:05:04 +0800 Subject: [PATCH 10/12] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index d8652768..afdba959 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index ff67d4cb..bbea8955 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -473,14 +473,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From ccf64a754aa57893fc00c9daf2a65757835266de Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 15:12:46 +0800 Subject: [PATCH 11/12] edit --- proxy.conf.js | 2 +- src/app/app.module.ts | 3 +++ .../pro/components/menu/menu.component.html | 4 ++-- .../layout/pro/components/menu/menu.component.ts | 16 +++++++++++++++- .../index/menu-modal/menu-modal.component.ts | 1 - .../components/freight/list/list.component.ts | 3 --- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index abb6987d..50566fcb 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/app.module.ts b/src/app/app.module.ts index 32f1b6a4..d6f7b0c7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -42,6 +42,7 @@ const APPINIT_PROVIDES = [ multi: true }, { provide: DEFAULT_CURRENCY_CODE, useValue: '￥' }, + { provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] }, AuthGuard ]; // #endregion @@ -55,6 +56,8 @@ import { SharedModule } from './shared/shared.module'; import { STWidgetModule } from './shared/widget/st-widget.module'; import { registerLocaleData } from '@angular/common'; import { AuthGuard } from './core/guards/auth.guard'; +import { RouteReuseStrategy } from '@angular/router'; +import { ReuseTabService, ReuseTabStrategy } from '@delon/abc/reuse-tab'; @NgModule({ declarations: [AppComponent], diff --git a/src/app/layout/pro/components/menu/menu.component.html b/src/app/layout/pro/components/menu/menu.component.html index 272c43b3..400db4c5 100644 --- a/src/app/layout/pro/components/menu/menu.component.html +++ b/src/app/layout/pro/components/menu/menu.component.html @@ -14,7 +14,7 @@ - {{ i.text }} + {{ i.text }} {{ i.text }}