From 43bf5ea968bba9eb7e8cdfa0c5c2941398cfe503 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 17:42:02 +0800 Subject: [PATCH 1/2] fix bug --- .../customer/customer.component.html | 8 ++- .../compliance/customer/customer.component.ts | 68 ++++++++++++------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 91c993cd..71f7089e 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -4,14 +4,15 @@ * @Author : Shiming * @Date : 2022-03-30 13:55:41 * @LastEditors : Shiming - * @LastEditTime : 2022-04-15 17:13:53 + * @LastEditTime : 2022-04-15 17:28:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - +
+
@@ -27,9 +28,10 @@
+
{ + console.log(value); + this.st.reload({ ...this.reqParams }); + } + }, + }, - no2: { + salesmanName: { type: 'string', - title: '业务员' + title: '', + ui: { + placeholder: '请输入业务员', + change: (value: any) => { + this.st.reload({ ...this.reqParams }); + } + } }, - no3: { + partnerName: { type: 'string', - title: '合伙人名称' + title: '', + ui: { + placeholder: '请输入客户名称', + change: (value: any) => { + console.log(value); + this.st.reload({ ...this.reqParams }); + } + } }, } }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = [ - { title: '公司名称', index: 'enterpriseName' ,}, - { title: '注册时间', index: 'registerTime' }, - { title: '客户类型', width: '100px', index: 'customerType' }, - { title: '业务员', index: 'salesmanName' }, - { title: '合伙人', index: 'partnerName' }, - { title: '订单数', index: 'billCounts' }, - { title: '订单不合格数', index: 'billQuaCounts' }, - { title: '订单不合格率', index: 'billQuaCountsPer' }, - { title: '货源单订单数', index: 'gsourceCounts' }, - { title: '合同单数', index: 'billConCounts' }, - { title: '货源单个', index: 'gsourceCounts' }, - { title: '运费直付单数', index: 'freightDirPayCounts' }, - { title: '运费代收单数', index: 'freightRepPayCounts' }, - { title: '手机直付', index: 'updatedAt' }, - { title: '汇款单数', index: 'updatedAt' }, - { title: '及时付款', index: 'timelyPayPer' }, + { title: '公司名称',width: '200px', index: 'enterpriseName' ,}, + { title: '注册时间', width: '200px', index: 'registerTime',}, + { title: '客户类型', width: '200px', index: 'customerType' }, + { title: '业务员',width: '200px', index: 'salesmanName' }, + { title: '合伙人',width: '200px', index: 'partnerName' }, + { title: '订单数',width: '200px', index: 'billCounts' }, + { title: '订单不合格数',width: '200px', index: 'billQuaCounts' }, + { title: '订单不合格率',width: '200px', index: 'billQuaCountsPer' }, + { title: '货源单订单数',width: '200px', index: 'gsourceCounts' }, + { title: '合同单数', width: '200px',index: 'billConCounts' }, + { title: '货源单个',width: '200px', index: 'gsourceCounts' }, + { title: '运费直付单数',width: '200px', index: 'freightDirPayCounts' }, + { title: '运费代收单数',width: '200px', index: 'freightRepPayCounts' }, + { title: '手机直付', width: '200px',index: 'updatedAt' }, + { title: '汇款单数',width: '200px', index: 'updatedAt' }, + { title: '及时付款',width: '200px', index: 'timelyPayPer' }, ]; From 181d85c7ebd5eca34de8b777cb9427bb254c324c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 18 Apr 2022 09:22:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 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 e4944856..6504791e 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -60,7 +60,7 @@ export class OrderManagementBulkComponent implements OnInit { public shipperservice: ShipperBaseService, private router: Router, private ar: ActivatedRoute, - ) {} + ) { } /** * 查询参数 @@ -108,7 +108,7 @@ export class OrderManagementBulkComponent implements OnInit { this.loading = false return data.map(item => ({ ...item, - disabled: item.billStatus !== '4' + disabled: item.billStatus !== '4' })); }; get selectedRows() { @@ -185,14 +185,14 @@ export class OrderManagementBulkComponent implements OnInit { type: 'string', title: '订单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开', } }, wayBillCode: { type: 'string', title: '运单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开', } }, resourceCode: { @@ -212,7 +212,7 @@ export class OrderManagementBulkComponent implements OnInit { _$expand: (value: boolean) => value }, 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 }) @@ -469,7 +469,7 @@ export class OrderManagementBulkComponent implements OnInit { width: '180px', className: 'text-left', format: (item: any) => - `${item?.goodsName}/ + `${item?.goodsName}/ ${item?.weight || '0'}吨/ ${item?.volume || '0'}方/ ${item?.goodsNumber || '0'}件` @@ -559,7 +559,10 @@ export class OrderManagementBulkComponent implements OnInit { { text: '变更运费', click: _record => this.updateFreight(_record), - iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', + iif: _record => { + const flag = _record.mybidDetailInfo.find((item: any) => item?.expenseCode === 'TRA' && item?.paymentStatus === '4'); + return _record.billStatus !== '1' && _record.billStatus !== '6' && !flag; + }, acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] }, }, { @@ -857,6 +860,6 @@ export class OrderManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 },this.service.$api_get_asyncExportBulkList); + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportBulkList); } }