From e6a8558eb1af5b0788977fd4fd51f709e5aa7257 Mon Sep 17 00:00:00 2001 From: weiyu Date: Sun, 24 Apr 2022 17:21:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-management/components/vehicle/vehicle.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 535d606a..00f391e2 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -441,7 +441,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme { text: '变更运费', click: _record => this.updateFreight(_record), - iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', + iif: item => item.billType !== '3' && item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] } }, { From d8137c9a7b32fefa6220ef46a40e69b52ca9263e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 25 Apr 2022 10:31:16 +0800 Subject: [PATCH 2/5] fix bug --- .../components/complaint/complaint.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index a0e077a1..ad471efe 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -104,7 +104,7 @@ export class OrderManagementComplaintComponent implements OnInit { ui: { } }, - complaintCause: { + drvComplaintCause: { title: '投诉原因', type: 'string', ui: { From 8bd52b73cb09d9102a1abe7bdec03a5f45e80a5a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 25 Apr 2022 11:01:10 +0800 Subject: [PATCH 3/5] fix bug --- proxy.conf.js | 4 +-- .../list/editPartner/editPartner.component.ts | 32 +++++++++++++------ .../components/freight/list/list.component.ts | 2 ++ .../services/business/shipper-base.service.ts | 17 ++++++---- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index a3308533..ff162fda 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-04-24 17:51:09 + * @LastEditTime : 2022-04-25 10:32:29 * @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/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index 1f55f50c..308214d5 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -72,8 +72,8 @@ export class EditPartnerComponentsAddComponent implements OnInit { // { label: '合伙人可见', value: 2 }, // { label: '销售渠道可见', value: 3 }, // ], - // }, - enterpriceIds: { + // },channelId + channelId: { type: 'string', title: '合伙人修改为', ui: { @@ -86,14 +86,19 @@ export class EditPartnerComponentsAddComponent implements OnInit { asyncData: () => this.shipperservice.getNetworkenterpriceIds() } }, + // settStartTime: { + // title: '结算起算日期', + // type: 'string', + // ui: { + // widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // } as SFDateWidgetSchema, + // }, settStartTime: { title: '结算起算日期', type: 'string', - ui: { - widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'date', }, remark: { type: 'string', @@ -136,9 +141,18 @@ export class EditPartnerComponentsAddComponent implements OnInit { this.modal.close(true) } save() { - const params = { - ...this.sf.value + console.log(this?.rows); + let enterId : any; + if(this.sts == '1') { + enterId = this.rows + } else { + enterId = [this.i.id] } + const params = { + ...this.sf.value, + enterpriceIds: enterId, + } + this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => { if(res) { this.service.msgSrv.success('修改成功') 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 162ddc2b..e31caa23 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -141,6 +141,8 @@ export class FreightComponentsListComponent implements OnInit { this.selectedRows.forEach(item => { params.push(item.id); }); + console.log(params); + const modalRef = this.modal.create({ nzTitle: '修改合伙人', nzContent: EditPartnerComponentsAddComponent, diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 56d9efaa..306f8614 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -26,6 +26,9 @@ export class ShipperBaseService extends BaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + + // 合伙人下拉列表 + public $api_partner_lists = '/api/mdc/partner/list'; // 批量获取项目信息 public $api_get_project_list = '/api/mdc/cuc/enterpriseProject/getProjectList'; constructor(public injector: Injector) { @@ -146,19 +149,19 @@ export class ShipperBaseService extends BaseService { ); } /** - * 获取网络货运人 + * 合伙人下拉列表 * @returns */ getNetworkEnterpriseName(params = {}, containerAll = false) { - return this.request(this.$api_get_network_freight_forwarder_list, params).pipe( + return this.request(this.$api_partner_lists, params).pipe( map((res: any) => { if (!res) { return []; } const list = res.map((item: any) => { return { - label: item.enterpriseName, - value: item.enterpriseName + label: item.keyword, + value: item.id }; }); const obj = []; @@ -174,15 +177,15 @@ export class ShipperBaseService extends BaseService { * @returns */ getNetworkenterpriceIds(params = {}, containerAll = false) { - return this.request(this.$api_get_network_freight_forwarder_list, params).pipe( + return this.request(this.$api_partner_lists, params).pipe( map((res: any) => { if (!res) { return []; } const list = res.map((item: any) => { return { - label: item.enterpriseName, - value: item.enterpriseName + label: item.contactName + '/' + item.contactMobile, + value: item.id }; }); const obj = []; From 9d1c8d78c16c39b3d0ab44c4c6ccd9cd555e5fea Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 25 Apr 2022 11:01:34 +0800 Subject: [PATCH 4/5] fix bug --- .../level-config/components/list/list.component.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 3d4501b2..fa27d518 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 @@ -83,14 +83,15 @@ export class ParterLevelConfigListComponent implements OnInit { title: '创建时间', index: 'createTime' }, - { - title: '排序', - index: 'sortId' - }, + { title: '启用时间', index: 'enableTime' }, + { + title: '排序', + index: 'sortId' + }, { title: '状态', index: 'stateLocked', From bf06b0a6b2793174403b6f32e6c9e332ab771e08 Mon Sep 17 00:00:00 2001 From: weiyu Date: Mon, 25 Apr 2022 11:28:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/invoice-reporting/invoice-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49955f8a..cb2c9e06 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 @@ -230,7 +230,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { { title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link', click: item => { - window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener') + window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener') } }, { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },