From 73a834b91b25a96eb567bb57a99f0ae13b2a9ab1 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 16:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms-template/sms-template.component.html | 31 ++++ .../sms-template/sms-template.component.less | 6 + .../sms-template/sms-template.component.ts | 144 ++++++++++++++++++ .../sys-setting/services/system.service.ts | 70 +++++---- .../sys-setting/sys-setting-routing.module.ts | 4 +- .../routes/sys-setting/sys-setting.module.ts | 4 +- .../invoice-reporting.component.html | 4 +- .../invoice-reporting.component.ts | 1 + 8 files changed, 229 insertions(+), 35 deletions(-) create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.html create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.less create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.ts diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html new file mode 100644 index 00000000..06e3616b --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html @@ -0,0 +1,31 @@ + + + +
+ +
+ + + + +
+ +
+ + +
+ + +
+ + + + + + + + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.less b/src/app/routes/sys-setting/components/sms-template/sms-template.component.less new file mode 100644 index 00000000..12fe08a6 --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.less @@ -0,0 +1,6 @@ +:host::ng-deep { + .filter-wrap { + margin-bottom: 20px; + text-align: right; + } +} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts new file mode 100644 index 00000000..2cf92a0e --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -0,0 +1,144 @@ + +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { SystemService } from '../../services/system.service'; + +@Component({ + selector: 'app-sms-template', + templateUrl: './sms-template.component.html', + styleUrls: ['./sms-template.component.less'] +}) +export class SmsTemplateComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('sfEdit', { static: false }) + sfEdit!: SFComponent; + visible = false; + isVisible = false; + tempData = {}; + + searchSchema: SFSchema = { + properties: { + templateCode: { + type: 'string', + title: '模板编码', + ui: { placeholder: '请输入模板编码' } + }, + templateContent: { + type: 'string', + title: '模板内容', + ui: { placeholder: '请输入模板内容' } + } + } + }; + + editSchema: SFSchema = { + properties: { + templateCode: { + type: 'string', + title: '模板编码', + ui: { placeholder: '请输入模板编码' } + }, + templateContent: { + type: 'string', + title: '模板内容', + ui: { placeholder: '请输入模板内容' } + }, + templateName: { + type: 'string', + title: '模板名称', + ui: { placeholder: '请输入模板名称' } + } + } + } + + columns: STColumn[] = [ + { title: '模板编码', className: 'text-center', index: 'templateCode' }, + { title: '模板内容', className: 'text-center', index: 'templateContent' }, + // { + // title: '创建人', className: 'text-center', index: 'content', + // }, + { + title: '更新时间', + index: 'modifyTime', + type: 'date', + className: 'text-center' + }, + { + title: '操作', + buttons: [ + { + text: '编辑', + click: i => this.edit(i), + } + ] + } + ]; + + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { + } + + ngOnInit(): void { } + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + } + return requestOptions; + }; + + edit(item: any) { + // console.log(item); + this.tempData = item; + this.isVisible = true; + } + + search() { + this.st.reload(1); + this.visible = false; + } + + open(): void { + this.visible = true; + } + + close(): void { + this.visible = false; + } + + handleOk(): void { + const value = this.sfEdit.value; + const { id, templateCode, templateName, templateContent } = value + const params = { + id, + templateCode, + templateName, + templateContent + } + + this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => { + // console.log(res); + if (res) { + this.isVisible = false; + this.st.reload(); + } + }) + + } + + handleCancel(): void { + this.isVisible = false; + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 208ea905..1277fe8b 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -112,12 +112,12 @@ export class SystemService extends BaseService { public $api_remove_config = '/api/mdc/pbc/sysConfig/deletebatch'; // 查询系统配置项 public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; - // 新增系统配置项 - public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; - // 更新系统配置项 - public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; - // 批量更新系统配置项 - public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; + // 新增系统配置项 + public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; + // 更新系统配置项 + public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; + // 批量更新系统配置项 + public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; // 更新系统配置项排序 public $api_update_config_item_sort = '/api/mdc/pbc/sysConfigItem/updateSort'; // 删除系统配置项 @@ -128,12 +128,12 @@ export class SystemService extends BaseService { public $api_getTicketByNetworkTransporterId = '/api/mdc/cuc/networkTransporterTicket/getTicketByNetworkTransporterId'; // 保存票务信息 public $api_networkTransporterTicket_save = '/api/mdc/cuc/networkTransporterTicket/save'; - // 根据地区code查询列表 - $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; + // 根据地区code查询列表 + $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; // 根据地区code查询地区详情 $api_getRegionDetailByCode = '/api/mdc/pbc/region/getRegionDetailByCode'; - + // 分页查询按钮列表 $api_getButtonInfoPage = '/api/mdc/cuc/buttonInfo/getButtonInfoPage'; // 新增编辑按钮信息 @@ -154,29 +154,29 @@ export class SystemService extends BaseService { $api_modifyAnnouncementInfo = '/api/mdc/pbc/announcementInfo/modifyAnnouncementInfo'; // 新增公告信息 $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo'; - - - // 查询保险配置 - $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; - // 获取保险配置费率 - $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; - // 获取保险配置(id) - $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; - // 删除保险配置(id) - $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; - // 批量保存保险配置 - $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; - - // 营业执照识别 - $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; - // 短信发送列表 - $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; - // 身份证识别 - $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; - // 获取字典 - $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; - // 设置crm客户 - $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; + + + // 查询保险配置 + $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; + // 获取保险配置费率 + $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; + // 获取保险配置(id) + $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; + // 删除保险配置(id) + $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; + // 批量保存保险配置 + $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; + + // 营业执照识别 + $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; + // 短信发送列表 + $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; + // 身份证识别 + $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; + // 获取字典 + $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; + // 设置crm客户 + $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; // 获取一、二、三级地区详情 $api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree'; $api_getRoleTemplateInfo: string = ''; @@ -185,6 +185,12 @@ export class SystemService extends BaseService { $api_getAppList: string = ''; $api_getRoleTemplateListByAppId: string = ''; $api_updateRoleInfo: string = ''; + + // 短信模板list + $api_smsTemplate_page = '/api/mdc/pbc/smsTemplate/list/page'; + // 短信模板编辑 + $api_smsTemplate_edit = '/api/mdc/pbc/smsTemplate/save'; + constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 7be49b35..f0670f64 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -25,6 +25,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/ import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; import { NoTeManagementComponent } from './components/note-management/note-management.component'; +import { SmsTemplateComponent } from './components/sms-template/sms-template.component'; const routes: Routes = [ { path: 'staff-management', component: StaffManagementComponent }, @@ -44,7 +45,8 @@ const routes: Routes = [ { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, - { path: 'insurance-set', component: InsuranceSetComponent } + { path: 'insurance-set', component: InsuranceSetComponent }, + { path: 'sms-template', component: SmsTemplateComponent} ]; @NgModule({ diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index ecb6d87a..2e1275c1 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -33,6 +33,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/ import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; import { NoTeManagementComponent } from './components/note-management/note-management.component'; +import { SmsTemplateComponent } from './components/sms-template/sms-template.component'; const COMPONENTS = [ StaffManagementComponent, @@ -50,7 +51,8 @@ const COMPONENTS = [ NetworkFreightNewComponent, AnnouncementMessageComponent, InsuranceSetComponent, - NoTeManagementComponent + NoTeManagementComponent, + SmsTemplateComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index e1635dc7..7bd651ef 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -34,7 +34,9 @@ 已上传 上传中 上传异常 - + + + {{item.billCode}} 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 4eb8aaaf..26de04d6 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 @@ -222,6 +222,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { { title: '发票号码', index: 'billCode', + render: 'invoiceNO', className: 'text-center', width: '150px', },