From 16babe9622a158892bf3b0e3f4212afa2ffa6479 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 14:48:26 +0800 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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) + } ] } ];