-
已选择{{
- selectedRows?.length || 0 }}条订单，确认批量签收吗？
+
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
-
+
-
-
\ No newline at end of file
+
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 1bcfb1c8..5720c774 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -824,4 +824,5 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportBulkList);
}
+
}
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
index fd1002df..1e9e4a90 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-29 17:28:23
* @LastEditors : Shiming
- * @LastEditTime : 2022-05-09 14:40:09
+ * @LastEditTime : 2022-05-10 10:29:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -91,10 +91,27 @@
{{ selectItem?.enterpriseName || selectItem?.contactName }}
{{ selectItem?.channelIdLabel }}
-
-
+
+
+
+
+
+
+
+
+ Loading Data...
+
+
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
index 65d2cac3..3bbf706d 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@@ -24,7 +24,7 @@ export class PartnerListComponent {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
-
+ isLoading: boolean = false
@ViewChild('editTemplate', { static: true })
editTemplate: any;
templateId: any;
@@ -509,4 +509,10 @@ export class PartnerListComponent {
}
];
}
+ onSearch(value: string): void {
+ this.isLoading = true;
+ console.log(value);
+
+ // this.searchChange$.next(value);
+ }
}
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
index d9b46fc3..5e6d311f 100644
--- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
@@ -1,7 +1,8 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { SFComponent, SFSchema, SFValue } from '@delon/form';
+import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFValue } from '@delon/form';
import { ModalHelper } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { PartnerListService } from '../../services/partner-list.service';
@@ -24,7 +25,6 @@ export class PartnerAuditModalComponent implements OnInit {
console.log(this.info);
this.initSF(this.info);
// asyncData: () => this.service.getChannel(),
-
if(this.info.channelId) {
const value = [{
label: this.info.channelIdLabel,
@@ -38,25 +38,26 @@ export class PartnerAuditModalComponent implements OnInit {
}
})
- } else {
- console.log()
- this.service.getChannel().pipe(map(data => {
- console.log(data);
+ }
+ // else {
+ // console.log()
+ // this.service.getChannel().pipe(map(data => {
+ // console.log(data);
- }))
- this.service.getChannel().subscribe((res) => {
- console.log(res);
- const value :any= res;
- setTimeout(() => {
- if(this.sf) {
- this.sf.getProperty('/channelId')!.schema.enum = value;
- this.sf.getProperty('/channelId')!.widget.reset(value);
- this.sf.setValue('/channelId', value);
- }
- })
- })
+ // }))
+ // this.service.getChannel().subscribe((res) => {
+ // console.log(res);
+ // const value :any= res;
+ // setTimeout(() => {
+ // if(this.sf) {
+ // this.sf.getProperty('/channelId2')!.schema.enum = value;
+ // this.sf.getProperty('/channelId2')!.widget.reset(value);
+ // this.sf.setValue('/channelId2', value);
+ // }
+ // })
+ // })
- }
+ // }
}
initSF(user: any) {
@@ -90,21 +91,37 @@ export class PartnerAuditModalComponent implements OnInit {
default: this.info.isPass !== undefined ? this.info.isPass : true
},
channelId: {
- title: '渠道销售',
type: 'string',
+ title: '渠道销售',
ui: {
widget: 'select',
- placeholder: '请选择',
- allowClear: true,
hidden: this.info.isPass === false,
- visibleIf: {
- status: value => value
+ serverSearch: true,
+ searchDebounceTime: 300,
+ searchLoadingText: '搜索中...',
+ allowClear: true,
+ onSearch: (q: any) => {
+ let str = q.replace(/^\s+|\s+$/g, '');
+ let params :any= {}
+ if (str) {
+ console.log(+str);
+ if(+str) {
+ console.log('数字');
+ params.phoneNumber = str
+ } else {
+ console.log('中文');
+ params.name = str
+ }
+ return this.service
+ .request(this.service.$api_get_channel, params)
+ .pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.channelId } as SFSchemaEnum))))
+ .toPromise();
+ } else {
+ return of([]);
+ }
},
- errors: {
- required: ' '
- }
- },
- default: user.channelId
+ default: user.channelId
+ } as SFSelectWidgetSchema
},
approvalOpinion: {
title: '备注',
@@ -124,10 +141,8 @@ export class PartnerAuditModalComponent implements OnInit {
}
}
},
- required: ['channelId', 'approvalOpinion']
+ required: [ 'approvalOpinion','channelId']
};
- console.log('666');
-
}
sure() {
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
index 75be4b4c..7cc254f2 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@@ -202,7 +202,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
{ title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '200px' },
{ title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' },
{ title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' },
- { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' },
+ { title: '国家（地区）', index: 'gjdq', className: 'text-center', width: '200px' },
{ title: '所属行业', index: 'hy', className: 'text-center', width: '200px' },
{ title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' },
{ title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' },
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
index 693100db..82898869 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
+++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
@@ -1,3 +1,13 @@
+
-