diff --git a/angular.json b/angular.json index 0405136b..128a45f7 100644 --- a/angular.json +++ b/angular.json @@ -63,6 +63,22 @@ } ] }, + "dev": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/eascs/environment.dev.ts" + } + ], + "outputHashing": "all", + "budgets": [ + { + "type": "initial", + "maximumWarning": "4mb", + "maximumError": "10mb" + } + ] + }, "development": { "buildOptimizer": false, "optimization": false, @@ -84,6 +100,9 @@ "production": { "browserTarget": "ng-alain:build:production" }, + "dev": { + "browserTarget": "app:build:dev" + }, "development": { "browserTarget": "ng-alain:build:development" } @@ -131,6 +150,9 @@ "configurations": { "production": { "devServerTarget": "ng-alain:serve:production" + }, + "dev": { + "devServerTarget": "app:build:dev" } } } @@ -138,4 +160,4 @@ } }, "defaultProject": "ng-alain" -} +} \ No newline at end of file diff --git a/package.json b/package.json index fae8e91f..c638841e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "ng": "ng", "start": "ng s -o --port 4202", "hmr": "ng s -o --hmr", - "build": "npm run ng-high-memory build", + "build": "ng build", + "build:dev": "npm run build -- -c dev", "analyze": "npm run ng-high-memory build -- --source-map", "analyze:view": "source-map-explorer dist/**/*.js", "lint": "npm run lint:ts && npm run lint:style", @@ -132,4 +133,4 @@ "name": "pro", "version": "12.0.0" } -} +} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 2cdc1e4d..72eda0f1 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -3,7 +3,6 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from 'src/app/routes/ticket-management/services/system.service'; import { FreightAccountService } from '../../../services/freight-account.service'; @Component({ diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index d06337d6..5a068609 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -3,7 +3,6 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from 'src/app/routes/ticket-management/services/system.service'; import { FreightAccountService } from '../../../services/freight-account.service'; @Component({ diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index dbe2dddd..d519bd79 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; -import { TicketService } from 'src/app/routes/ticket-management/services/system.service'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 0cfd1dc9..9e62f8de 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -3,7 +3,6 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from 'src/app/routes/ticket-management/services/system.service'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index d7ce70e9..4743a570 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/system.service'; +import { TicketService } from '../../services/ticket.service'; import { TransactionDetailsComponent } from './transaction-details/transaction-details.component'; @Component({ diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts index c7146f90..1e1c31c3 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../../services/system.service'; +import { TicketService } from '../../../services/ticket.service'; @Component({ selector: 'app-transaction-details', diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index 003971f1..64c52034 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/system.service'; +import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-etc-invoiced-logs', diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 88e0da1d..8b4b0eff 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/system.service'; +import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-etc-invoiced-requested', diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index b146f52e..aa9d45bd 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -6,58 +6,102 @@ - - - - - - - - - - - - - - - - - - - - - + +
+
+ + 天津怡亚通物流科技有限公司 + + + VP2021012010 + + + 50/100 + + + 5000.00/10000.00 + + + 2 + +
+
+ + 茅台股份有限公司 + + + 912301046656930913 + + + 贵州省贵阳市 + + + 075588393198 + + + 中国工商银行股份有限公司哈贵阳支行 + + + 3500044119068126788 + +
+
+ + 运输服务费 + + + 需要 + + + 单位按吨 + + +

起运地:广东省深圳市南山区

+

目的地:湖北省武汉市青山区

+

货物名称:钢材

+

车型车牌:高栏车 粤B36889

+ +
+
-
- +
-
+
+
- - + + +
已选择 - {{ selectedRows.length }} 条数据   开票金额总计 {{ + {{ selectedRows.length }} 条数据   开票金额总计 {{ totalCallNo }} 清空
- + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.less b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.less index a3fa49cc..0b8dcbda 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.less +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.less @@ -10,4 +10,30 @@ padding-top: 16px; } } + + .statistics-box { + .ant-form-item { + margin-bottom: 0; + + .ant-form-item-control-input-content { + color: #f5222d; + } + } + } + +} + +.expend-options { + margin-top: 0px; +} + + +@media (min-width: 1200px) { + .expend-options { + max-width: 400px; + position : absolute; + right : 0; + bottom : 25px; + } + } \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 103f5015..8b5f2b1b 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -1,9 +1,10 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SFComponent, SFSchema, SFDateWidgetSchema, SFTextWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../../services/system.service'; +import { TicketService } from '../../../services/ticket.service'; +import { RequestedInvoiceModalComponent } from '../requested-invoice-modal/requested-invoice-modal.component'; @Component({ selector: 'app-invoice-requested-detail', @@ -11,68 +12,19 @@ import { TicketService } from '../../../services/system.service'; styleUrls: ['./invoice-requested-detail.component.less'] }) export class InvoiceRequestedDetailComponent implements OnInit { - url = `/rule?_allow_anonymous=true`; @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '运单号', index: 'no' }, - { title: '开票状态', index: 'callNo' }, - { title: '开票金额', index: 'callNo' }, - { title: '总费用', index: 'callNo' }, - { title: '基础运费', index: 'callNo' }, - { title: '附加费', index: 'callNo' }, - { title: '发票号码', index: 'callNo' }, - { title: '开票日期', index: 'updatedAt', type: 'date' } - ]; - searchSchema: SFSchema = { - properties: { - orderSn: { - type: 'string', - title: '运单号', - ui: { - autocomplete: 'off' - } - }, - receiveName: { - type: 'string', - title: '开票状态', - enum: [ - { label: '全部', value: '' }, - { label: '待受理', value: '待受理' }, - { label: '待开票', value: '待开票' }, - { label: '开票中', value: '开票中' }, - { label: '已开票', value: '已开票' }, - { label: '已撤销', value: '已撤销' }, - { label: '已拒绝', value: '已拒绝' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - } - }, - default: '' - }, - orderSn2: { - type: 'string', - title: '发票号码', - ui: { - placeholder: '请输入', - autocomplete: 'off' - } - } - } - }; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); reqParams = {}; + detail: any = {}; selectedRows: any[] = []; totalCallNo = 0; + _$expand = false; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} ngOnInit(): void {} @@ -89,6 +41,43 @@ export class InvoiceRequestedDetailComponent implements OnInit { } } + openRequestedModal() { + const modal = this.nzModalService.create({ + nzTitle: '开票', + nzContent: RequestedInvoiceModalComponent, + nzWidth: 800, + nzFooter: [ + { + type: 'default', + label: '手工处理', + onClick: () => { + modal.destroy(); + } + }, + { + type: 'primary', + label: '自动开票', + onClick: () => { + modal.destroy(); + } + } + ] + }); + } + + removeOrder() { + if (this.selectedRows?.length <= 0) { + return; + } + this.nzModalService.warning({ + nzTitle: '确定从当前批次中移除所选订单？', + nzContent: '移除后相关订单可以重新提交开票申请', + nzOnOk: () => { + console.log(this.selectedRows); + } + }); + } + goBack() { history.go(-1); } @@ -99,4 +88,125 @@ export class InvoiceRequestedDetailComponent implements OnInit { resetSF() { this.sf.reset(); } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderSn: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + receiveName: { + type: 'string', + title: '开票状态', + enum: [ + { label: '全部', value: '' }, + { label: '待受理', value: '待受理' }, + { label: '待开票', value: '待开票' }, + { label: '开票中', value: '开票中' }, + { label: '已开票', value: '已开票' }, + { label: '已撤销', value: '已撤销' }, + { label: '已拒绝', value: '已拒绝' } + ], + ui: { + widget: 'select', + placeholder: '请选择' + }, + default: '' + }, + orderSn2: { + type: 'string', + title: '发票号码', + ui: { + placeholder: '请输入' + } + }, + receiveName2: { + type: 'string', + title: '订单类型', + enum: [{ label: '全部', value: '' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, + orderS2n2: { + type: 'string', + title: '运司机', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderS22n2: { + type: 'string', + title: '车牌号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + receiveN2ame2: { + type: 'string', + title: '所属项目', + enum: [{ label: '全部', value: '' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '订单号', index: 'no', width: 150 }, + { title: '订单完成日期', index: 'updatedAt', type: 'date', width: 150 }, + { title: '开票状态', index: 'callNo', width: 100 }, + { title: '所属项目', index: 'callNo', width: 100 }, + { title: '订单类型', index: 'callNo', width: 100 }, + { title: '装货地', index: 'callNo', width: 90 }, + { title: '卸货地', index: 'callNo', width: 90 }, + { title: '货物信息', index: 'callNo', width: 100 }, + { title: '承运司机', index: 'callNo', width: 100 }, + { title: '申请金额', index: 'callNo', width: 100 }, + { title: '运输费', index: 'callNo', width: 90 }, + { title: '附加费', index: 'callNo', width: 90 }, + { title: '开票金额', index: 'callNo', width: 100 }, + { title: '税率', index: 'callNo', width: 90 }, + { title: '发票号码', index: 'callNo', width: 100 }, + { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 } + ]; + } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 249c1c37..e6e883a1 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -1,14 +1,15 @@ - +
-
-
+
@@ -21,25 +22,29 @@ - - + + + - -
- -
- 已选择 - {{ selectedRows.length }} 条数据   开票金额总计 {{ - totalCallNo }} - 清空 + +
+
+ 已选择 + {{ selectedRows.length }} 条数据   开票金额总计 + {{totalCallNo }} + 清空 +
+ +
-
+ - diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less index 9b585022..50ac4f7a 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less @@ -19,20 +19,4 @@ padding-left : 16px; padding-right: 16px; } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - margin-top: -40px; - max-width : 400px; - position : absolute; - right : 0; - bottom : 30px; - } - } \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 10d36072..51df1225 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/system.service'; +import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-invoice-requested', @@ -19,125 +19,8 @@ export class InvoiceRequestedComponent implements OnInit { sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; - columns: STColumn[] = [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '申请编号', index: 'no' }, - { title: '申请时间', index: 'updatedAt', type: 'date' }, - { title: '处理进度', index: 'callNo' }, - { title: '托运人', index: 'callNo' }, - { title: '开票方', index: 'callNo' }, - { title: '运单数', index: 'callNo' }, - { title: '开票金额', index: 'callNo' }, - { title: '发票张数', index: 'callNo' }, - { title: '收件人', index: 'callNo' }, - { title: '联系电话', index: 'callNo' }, - { title: '收件地址', index: 'callNo' }, - { title: '备注', index: 'callNo' }, - { - title: '操作', - buttons: [ - { - text: '审核', - click: item => this.auditAction(item) - }, - { - text: '去开票', - click: item => this.routeTo(item) - }, - { - text: '查看原因', - click: item => this.showReason(item) - }, - { - text: '订单明细', - click: item => this.routeTo(item) - } - ] - } - ]; - searchSchema: SFSchema = { - properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, - orderSn: { - type: 'string', - title: '申请编号', - ui: { - autocomplete: 'off' - } - }, - createTime: { - title: '申请时间', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd' - } as SFDateWidgetSchema - }, - receiveName: { - type: 'string', - title: '处理进度', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName = i; - this.sf?.setValue('/receiveName', i); - } - } - }, - receiveName2: { - type: 'string', - title: '托运人', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName2 = i; - this.sf?.setValue('/receiveName2', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - receiveName3: { - type: 'string', - title: '开票方', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], - ui: { - widget: 'select', - placeholder: '请选择', - change: (i: any) => { - this.sf.value.receiveName3 = i; - this.sf?.setValue('/receiveName3', i); - }, - visibleIf: { - expand: (value: boolean) => value - } - } - } - } - }; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); reqParams = {}; @@ -149,15 +32,19 @@ export class InvoiceRequestedComponent implements OnInit { ngOnInit(): void {} + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + this.reqParams = { ...this.sf.value }; + } + return requestOptions; + }; + stChange(e: STChange): void { switch (e.type) { case 'checkbox': this.selectedRows = e.checkbox!; this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0); break; - case 'filter': - this.st.load(); - break; } } @@ -166,7 +53,7 @@ export class InvoiceRequestedComponent implements OnInit { add(): void {} routeTo(item: any) { - this.router.navigate(['/ticket/invoice-requested-detail/1']); + this.router.navigate(['/ticket/invoice-requested/detail/1']); } auditAction(item: any) { @@ -226,4 +113,177 @@ export class InvoiceRequestedComponent implements OnInit { this._$expand = !this._$expand; this.sf?.setValue('/expand', this._$expand); } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderSn: { + type: 'string', + title: '申请编号', + ui: { + placeholder: '请输入' + } + }, + orderSn2: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + orderSn3: { + type: 'string', + title: '费用号', + ui: { + placeholder: '请输入' + } + }, + receiveName2: { + type: 'string', + title: '购买方', + enum: [ + { label: '全部', value: '全部' }, + { label: '企业认证审核', value: '企业认证审核' }, + { label: '企业管理员审核', value: '企业管理员审核' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + receiveName3: { + type: 'string', + title: '网络货运人', + enum: [{ label: '全部', value: '全部' }], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + receiveName23: { + type: 'string', + title: '其他需求', + enum: [ + { label: '全部', value: '全部' }, + { label: '有', value: '有' }, + { label: '无', value: '无' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + receiveName: { + type: 'string', + title: '处理进度', + enum: [ + { label: '全部', value: '全部' }, + { label: '待审核', value: '待审核' }, + { label: '处理中', value: '处理中' }, + { label: '已完成', value: '已完成' }, + { label: '已拒绝', value: '已拒绝' }, + { label: '已撤销', value: '已撤销' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + createTime: { + title: '申请时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + re2ceiveName: { + type: 'string', + title: '销货清单', + enum: [ + { label: '全部', value: '全部' }, + { label: '需要', value: '需要' }, + { label: '不需要', value: '不需要' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '申请编号', index: 'no' }, + { title: '网络货运人', index: 'callNo' }, + { title: '购买方', index: 'callNo' }, + { title: '订单数', index: 'callNo' }, + { title: '申请金额', index: 'callNo' }, + { title: '运输费', index: 'callNo' }, + { title: '附加费', index: 'callNo' }, + { title: '已开票金额', index: 'callNo' }, + { title: '开户行', index: 'callNo' }, + { title: '银行账户', index: 'callNo' }, + { title: '注册地址', index: 'callNo' }, + { title: '注册电话', index: 'callNo' }, + { title: '服务名称', index: 'callNo' }, + { title: '销货清单', index: 'callNo' }, + { title: '其他要求', index: 'callNo' }, + { title: '申请人', index: 'callNo' }, + { title: '申请时间', index: 'updatedAt', type: 'date' }, + { + title: '操作', + buttons: [ + { + text: '开票', + click: item => this.routeTo(item) + }, + { + text: '驳回', + click: item => this.routeTo(item) + }, + { + text: '查看原因', + click: item => this.showReason(item) + }, + { + text: '订单明细', + click: item => this.routeTo(item) + }, + { + text: '下载对账单', + click: item => this.auditAction(item) + } + ] + } + ]; + } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html new file mode 100644 index 00000000..f4b9c301 --- /dev/null +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -0,0 +1,49 @@ +
+
+ + 茅台股份有限公司 + + + 912301046656930913 + + + 贵州省贵阳市 + + + 075588393198 + + + 中国工商银行股份有限公司哈贵阳支行 + + + 3500044119068126788 + + +

起运地:广东省深圳市南山区

+

目的地:湖北省武汉市青山区

+

货物名称:钢材

+

车型车牌:高栏车 粤B36889

+ +
+
+ + 天津怡亚通物流科技有限公司 + + + 100笔 + + + 300,000.00元 + + + 运输服务费 + + + 需要 + + + 单位按吨 + + +
+
\ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.less b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.less new file mode 100644 index 00000000..aebf12ee --- /dev/null +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.less @@ -0,0 +1,13 @@ +:host::ng-deep { + + .statistics-box { + .ant-form-item { + margin-bottom: 0; + + .ant-form-item-control-input-content { + color: #f5222d; + } + } + } + +} \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts new file mode 100644 index 00000000..00494154 --- /dev/null +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-requested-invoice-modal', + templateUrl: './requested-invoice-modal.component.html', + styleUrls: ['./requested-invoice-modal.component.less'] +}) +export class RequestedInvoiceModalComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts index 26596abd..dc4f0bb7 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../../services/system.service'; +import { TicketService } from '../../../services/ticket.service'; @Component({ selector: 'app-invoiced-list-detail', diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index cf16b366..e8c4ab66 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TicketService } from '../../services/system.service'; +import { TicketService } from '../../services/ticket.service'; @Component({ selector: 'app-invoiced-list', diff --git a/src/app/routes/ticket-management/services/system.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts similarity index 85% rename from src/app/routes/ticket-management/services/system.service.ts rename to src/app/routes/ticket-management/services/ticket.service.ts index 59cef689..17bb2cfe 100644 --- a/src/app/routes/ticket-management/services/system.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -5,6 +5,9 @@ import { BaseService } from 'src/app/shared/services'; providedIn: 'root' }) export class TicketService extends BaseService { + + $mock_url = '/rule?_allow_anonymous=true'; + constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/ticket-management/ticket-management-routing.module.ts b/src/app/routes/ticket-management/ticket-management-routing.module.ts index 470d70af..597257fc 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -11,9 +11,9 @@ import { InvoicedListComponent } from './components/invoiced-list/invoiced-list. const routes: Routes = [ { path: 'invoice-requested', component: InvoiceRequestedComponent }, - { path: 'invoice-requested-detail/:id', component: InvoiceRequestedDetailComponent }, + { path: 'invoice-requested/detail/:id', component: InvoiceRequestedDetailComponent }, { path: 'invoice-list', component: InvoicedListComponent }, - { path: 'invoice-list-detail/:id', component: InvoicedListDetailComponent }, + { path: 'invoice-list/detail/:id', component: InvoicedListDetailComponent }, { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent }, { path: 'etc-invoice-list', component: ETCInvoicedListComponent }, { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent }, diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts index fb64abba..221da7c1 100644 --- a/src/app/routes/ticket-management/ticket-management.module.ts +++ b/src/app/routes/ticket-management/ticket-management.module.ts @@ -11,6 +11,7 @@ import { InvoiceRequestedComponent } from './components/invoice-requested/invoic import { InvoiceRequestedDetailComponent } from './components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component'; import { InvoicedListDetailComponent } from './components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component'; import { TransactionDetailsComponent } from './components/etc-invoiced-list/transaction-details/transaction-details.component'; +import { RequestedInvoiceModalComponent } from './components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component'; const COMPONENTS: any = [ ETCInvoicedListComponent, @@ -22,7 +23,7 @@ const COMPONENTS: any = [ InvoiceRequestedDetailComponent, InvoicedListDetailComponent ]; -const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent]; +const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent, RequestedInvoiceModalComponent]; @NgModule({ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS], imports: [CommonModule, TicketManagementRoutingModule, SharedModule] diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 2eeccc71..4a33d723 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -290,12 +290,27 @@ "group": true, "children": [ { - "text": "开票申请", - "link": "/ticket/invoice-requested" - }, - { - "text": "已开发票", - "link": "/ticket/invoice-list" + "text": "销项发票", + "children": [ + { + "text": "开票申请", + "link": "/ticket/invoice-requested" + }, + { + "text": "开票订单明细", + "link": "/ticket/invoice-requested/detail/:id", + "hide": true + }, + { + "text": "已开发票", + "link": "/ticket/invoice-list" + }, + { + "text": "已开发票明细", + "link": "/ticket/invoice-list/detail/:id", + "hide": true + } + ] }, { "text": "ETC发票", diff --git a/src/environments/eascs/environment.dev.ts b/src/environments/eascs/environment.dev.ts index f6d00fed..3bcdc166 100644 --- a/src/environments/eascs/environment.dev.ts +++ b/src/environments/eascs/environment.dev.ts @@ -12,7 +12,7 @@ export const environment = { production: true, useHash: true, api: { - baseUrl: 'https://tms-api-test.eascs.com', + baseUrl: 'https://tms-api-dev.eascs.com', refreshTokenEnabled: false, refreshTokenType: 'auth-refresh', },