diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html deleted file mode 100644 index 8d241242..00000000 --- a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - -
-
- - {{ i?.no }} - 待接单555 - - - - -
-
- - - - -
-
- -
- {{ i?.owner }} - 32943898021309809423 - 3321944288191034921 - 18112345678 -
- -
-
-
-

装卸货信息

-

装货地：广东省深圳市龙岗区怡亚通大厦

-

联系人：奥利给/13680058545

-

卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）

-

联系人：花花世界/13680058545

-

发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）

-

卸货日期：花花世界/13680058545

-
-
-
-
-

货物信息

-

货物名称：广东省深圳市龙岗区怡亚通大厦

-

重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）

-

车型/车长：花花世界/13680058545

-
-
-
-
-

托运信息

-

公司名称：广东省深圳市龙岗区怡亚通大厦

-

联系人：广东省深圳市福田区岗厦村9巷8号405（新村）

-
-
-
-
-

承运信息

-

司机：广东省深圳市龙岗区怡亚通大厦

-

车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）

-

车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency}}

-

{{400 | currency }}

-
-
- -
-
-

{{400 | currency }}

-

未支付

-
- -
-
- -
-
-
-
平台支付
- 司机运输费666 - 1000.00 - 未支付 -
-
-
-
-
货主支付
- 司机运输费22 - 1000.00 - 未支付 -
-
- 附加费 - 1000.00 - 未支付 -
-
-
- - -
- -
-
- - -
-
- -
-
- -
- - - diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less deleted file mode 100644 index 3cd8c1be..00000000 --- a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less +++ /dev/null @@ -1,36 +0,0 @@ -:host{ - .btn-size{ - font-size: 14px; - } - .bdr{ - border-right: 1px solid #ccc; - } - .bdl{ - border-left: 1px solid #ccc; - } - .source-info{ - p{ - margin-bottom: .5em; - } - } - .freight-info-box{ - width: 95%; - } - .freigth-label{ - display: inline-block; - width: 50px; - text-align: right; - } - - ::ng-deep{ - .approval-status{ - .ant-steps{ - width: 70%; - margin: 0 auto; - } - } - } - .leftPadding { - padding-right: 100px; - } -} \ No newline at end of file diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts deleted file mode 100644 index 4ecfc74a..00000000 --- a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-07 14:04:46 - * @LastEditTime: 2021-12-07 14:06:17 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\additionalc-detail\additionalc-detail.component.spec.ts - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderManagementAdditionalcDetailComponent } from './additionalc-detail.component'; - -describe('OrderManagementAdditionalcDetailComponent', () => { - let component: OrderManagementAdditionalcDetailComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OrderManagementAdditionalcDetailComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderManagementAdditionalcDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts deleted file mode 100644 index 148fc09a..00000000 --- a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-06 20:34:08 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts - */ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; -import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { OrderManagementService } from '../../services/order-management.service'; -@Component({ - selector: 'app-supply-management-additionalc-detail', - templateUrl: './additionalc-detail.component.html', - styleUrls: ['./additionalc-detail.component.less'] -}) -export class OrderManagementAdditionalcDetailComponent implements OnInit { - - id = this.route.snapshot.params.id; - i: any; - logColumns: STColumn[] = [ - { title: '时间', index: 'operationUserPhone' }, - { title: '地点', index: ' createTime' }, - ]; - - constructor( - private route: ActivatedRoute, - private msgSrv: NzMessageService, - private service: OrderManagementService, - private modalService: NzModalService - ) { - - } - - ngOnInit(): void { - this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => { - console.log(res); - this.i = res - }); - } - - - - hand() { - this.modalService.create({ - nzTitle: '', - // nzContent: OrderManagementGaodeMapComponent, - nzWidth: 1200 - }); - } - - goBack() { - window.history.go(-1); - } - -} diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.html b/src/app/routes/order-management/components/additionalc/additionalc.component.html deleted file mode 100644 index 4fda9bc3..00000000 --- a/src/app/routes/order-management/components/additionalc/additionalc.component.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - -
- -
- -
- - - -
- -
-
- - - - -
- -
- - - - - - - -
- - - - {{item.no}} - - -
- - - - - - - - - - - - - - diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.less b/src/app/routes/order-management/components/additionalc/additionalc.component.less deleted file mode 100644 index 30444d6b..00000000 --- a/src/app/routes/order-management/components/additionalc/additionalc.component.less +++ /dev/null @@ -1,7 +0,0 @@ - .left_btn { - width: 50px; - height: 32px; - padding-left: 8px; - line-height:32px; - background-color: #d7d7d7; - } \ No newline at end of file diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts b/src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts deleted file mode 100644 index 09643337..00000000 --- a/src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-06 20:03:28 - * @LastEditTime: 2021-12-07 11:21:42 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -/* - * @Author: your name - * @Date: 2021-12-06 19:39:49 - * @LastEditTime: 2021-12-06 19:41:08 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderManagementAdditionalcComponent } from './additionalc.component'; - -describe('OrderManagementAdditionalcComponent', () => { - let component: OrderManagementAdditionalcComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OrderManagementAdditionalcComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderManagementAdditionalcComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.ts b/src/app/routes/order-management/components/additionalc/additionalc.component.ts deleted file mode 100644 index 270da4ca..00000000 --- a/src/app/routes/order-management/components/additionalc/additionalc.component.ts +++ /dev/null @@ -1,280 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; -import { OrderManagementService } from '../../services/order-management.service'; - - -@Component({ - selector: 'app-supply-management-additionalc', - templateUrl: './additionalc.component.html', - styleUrls: ['./additionalc.component.less'] -}) -export class OrderManagementAdditionalcComponent implements OnInit { - url = `/user?_allow_anonymous=true`; - ui: SFUISchema = {}; - uiView: SFUISchema = {}; - schema: SFSchema = {}; - schemaView: SFSchema = {}; - auditMany = false; - auditstatus = false; - isVisibleView = false; - isVisibleRE = false; - _$expand = false; - infoData1: any; - @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; - @ViewChild('sfView', { static: false }) sfView!: SFComponent; - columns: STColumn[] = []; - demoValue: any; - datass: any = [ - { - one: '1', - two: '1', - three: '1', - id: 1 - }, - { - one: '2', - two: '2', - three: '2', - id: 2 - }, -]; - tabs = [ { - name: '全部', - type: 5, - count: 0, - }, - { - name: '检测中', - type: 5, - count: 0, - }, - { - name: '不合格', - type: 5, - count: 0, - }, - { - name: '合格', - type: 5, - count: 0, - }, - { - name: '申诉中', - type: 5, - count: 0, - }, - { - name: '已取消', - type: 5, - count: 0, - } - ]; - constructor(public service: OrderManagementService, private modal: NzModalService) { } - - /** - * 查询参数 - */ - get reqParams() { - return { - ...this.sf?.value, - }; - } - get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; - } - ngOnInit(): void { - this.initSF(); - this.initST(); - this.initSFReject(); - } - - - - /** - * 初始化查询表单 - */ - initSF() { - this.schema = { - properties: { - no: { - type: 'string', - title: '公司名称', - }, - no2: { - type: 'string', - title: '车牌号' - }, - }, - }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; - } - initSFReject() { - this.schemaView = { - properties: { - roleDescription: { - title: '备注', - type: 'string', - maxLength: 50, - ui: { - placeholder: '请输入备注，最多不超过50字', - widget: 'textarea', - autosize: { minRows: 2, maxRows: 6 } - }, - }, - }, - }; - this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } }; - } - - /** - * 初始化数据列表 - */ - initST() { - this.columns = [ - { - title: '运单号', - width: '100px', - className: 'text-center', - render: 'goodsId' - }, - { - title: '检测状态', - width: '100px', - className: 'text-center', - }, - { title: '异常原因', index: 'externalSn', width: '120px', className: 'text-center' }, - { title: '驳回原因', index: 'linkUrl', width: '120px', className: 'text-center' }, - { - title: '托运公司', - className: 'text-center', - width: '120px', - }, - { - title: '发货省/市/区', - className: 'text-center', - width: '120px', - }, - { - title: '收货省/市/区', - className: 'text-center', - width: '120px', - }, - { - title: '运单费用', - className: 'text-center', - width: '120px', - }, - { - title: '司机手机号', - className: 'text-center', - width: '120px', - }, - { - title: '车牌号', - className: 'text-center', - width: '120px', - }, - { - title: '交易时间', - className: 'text-center', - width: '120px', - render: 'feiong' - }, - { - title: '创建时间', - className: 'text-center', - width: '120px', - }, - { - title: '创建人', - className: 'text-center', - width: '120px', - }, - { - title: '操作', - fixed: 'right', - width: '200px', - className: 'text-left', - buttons: [ - { - text: '审核', - click: (_record) => this.viewAudit(_record), - }, - ], - }, - ]; - } - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - tabChange(item: any) { - console.log(item) - } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - - - - // 获取录单员 - getCatalogueMember() { - const params = { - }; - return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe( - map((res) => { - if (res) { - console.log(res) - } - }), - ); - } - - selectChange(e: number) { - console.log(e); - } - /** - * 导入货源 - */ - importGoodsSource() { - - } - audit(item: any) { - console.log(item) - } - - /* - * 审核关闭弹窗 - */ - handleCancel(item: string) { - this.isVisibleRE = false - } - /** - * 审核通过按钮 - */ - handleOK() { - - } - - viewAudit(item: any) { - this.isVisibleRE = true; - } -} diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.html b/src/app/routes/order-management/components/car-manage/car-manage.component.html deleted file mode 100644 index b2cc709a..00000000 --- a/src/app/routes/order-management/components/car-manage/car-manage.component.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - -
- -
- -
- - - -
- -
-
- - - - -
- -
- - - - - - - -
- - - - {{item.no}} - - -
- - - - - - - {{ infoData1?.enterpriseName }} - {{ infoData1?.unifiedSocialCreditCode }} - {{ infoData1?.enterpriseType }} - {{ infoData1?.registrationCapital }} 万元 - {{ infoData1?.enterpriseRegistrationTime }} - - - - {{ infoData1?.enterpriseAddress }} - - - - {{ infoData1?.businessScope }} - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.less b/src/app/routes/order-management/components/car-manage/car-manage.component.less deleted file mode 100644 index 30444d6b..00000000 --- a/src/app/routes/order-management/components/car-manage/car-manage.component.less +++ /dev/null @@ -1,7 +0,0 @@ - .left_btn { - width: 50px; - height: 32px; - padding-left: 8px; - line-height:32px; - background-color: #d7d7d7; - } \ No newline at end of file diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts b/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts deleted file mode 100644 index 2d81888c..00000000 --- a/src/app/routes/order-management/components/car-manage/car-manage.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-06 20:03:28 - * @LastEditTime: 2021-12-07 11:08:28 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -/* - * @Author: your name - * @Date: 2021-12-06 19:39:49 - * @LastEditTime: 2021-12-06 19:41:08 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderManagementCarManageComponent } from './car-manage.component'; - -describe('OrderManagementCarManageComponent', () => { - let component: OrderManagementCarManageComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OrderManagementCarManageComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderManagementCarManageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/order-management/components/car-manage/car-manage.component.ts b/src/app/routes/order-management/components/car-manage/car-manage.component.ts deleted file mode 100644 index 05412b1f..00000000 --- a/src/app/routes/order-management/components/car-manage/car-manage.component.ts +++ /dev/null @@ -1,297 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; -import { OrderManagementService } from '../../services/order-management.service'; - - -@Component({ - selector: 'app-supply-management-car-manage', - templateUrl: './car-manage.component.html', - styleUrls: ['./car-manage.component.less'] -}) -export class OrderManagementCarManageComponent implements OnInit { - url = `/user?_allow_anonymous=true`; - ui: SFUISchema = {}; - uiView: SFUISchema = {}; - schema: SFSchema = {}; - schemaView: SFSchema = {}; - auditMany = false; - auditstatus = false; - isVisibleView = false; - isVisibleRE = false; - _$expand = false; - infoData1: any; - @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; - @ViewChild('sfView', { static: false }) sfView!: SFComponent; - columns: STColumn[] = []; - demoValue: any; - datass: any = [ - { - one: '1', - two: '1', - three: '1', - id: 1 - }, - { - one: '2', - two: '2', - three: '2', - id: 2 - }, -]; - tabs = [ { - name: '全部', - type: 5, - count: 0, - }, - { - name: '待审核', - type: 5, - count: 0, - }, - { - name: '已审核', - type: 5, - count: 0, - }, - { - name: '驳回', - type: 5, - count: 0, - } - ]; - constructor(public service: OrderManagementService, private modal: NzModalService) { } - - /** - * 查询参数 - */ - get reqParams() { - return { - ...this.sf?.value, - }; - } - get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; - } - ngOnInit(): void { - this.initSF(); - this.initST(); - this.initSFReject(); - } - - - - /** - * 初始化查询表单 - */ - initSF() { - this.schema = { - properties: { - no: { - type: 'string', - title: '公司名称', - }, - no2: { - type: 'string', - title: '姓名' - }, - no3: { - type: 'string', - title: '手机号' - }, - }, - }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; - } - initSFReject() { - this.schemaView = { - properties: { - roleDescription: { - title: '驳回原因', - type: 'string', - maxLength: 50, - ui: { - placeholder: '请输入驳回原因，最多不超过50字', - widget: 'textarea', - autosize: { minRows: 2, maxRows: 6 } - }, - }, - }, - }; - this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } }; - } - - /** - * 初始化数据列表 - */ - initST() { - this.columns = [ - { - title: '公司名称', - width: '100px', - className: 'text-center', - render: 'goodsId' - }, - { - title: '姓名', - width: '100px', - className: 'text-center', - }, - { title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' }, - { title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' }, - { - title: '身份证', - className: 'text-center', - width: '120px', - }, - { - title: '驾驶证', - className: 'text-center', - width: '120px', - }, - { - title: '从业资格证', - className: 'text-center', - width: '120px', - }, - { - title: '平台认证状态', - className: 'text-center', - width: '120px', - }, - { - title: '银行卡', - className: 'text-center', - width: '120px', - }, - { - title: '审核状态', - className: 'text-center', - width: '120px', - }, - { - title: '驳回原因', - className: 'text-center', - width: '120px', - render: 'feiong' - }, - { - title: '添加时间', - className: 'text-center', - width: '120px', - }, - { - title: '添加人', - className: 'text-center', - width: '120px', - }, - { - title: '操作', - fixed: 'right', - width: '200px', - className: 'text-left', - buttons: [ - { - text: '审核', - click: (_record) => this.viewAudit(_record), - }, - { - text: '查看详情', - click: (_record) => this.viewDetail(_record), - }, - ], - }, - ]; - } - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - tabChange(item: any) { - console.log(item) - } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - - - - // 获取录单员 - getCatalogueMember() { - const params = { - }; - return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe( - map((res) => { - if (res) { - console.log(res) - } - }), - ); - } - - selectChange(e: number) { - console.log(e); - } - /** - * 导入货源 - */ - importGoodsSource() { - - } - audit(item: any) { - console.log(item) - } - - /* - * 审核关闭弹窗 - */ - handleCancel(item: string) { - if(item === '0') { - this.isVisibleView = false - } else{ - this.isVisibleRE = false - } - } - /** - * 审核通过按钮 - */ - handleOK() { - - } - /** - *查看评价 - */ - viewDetail(item: any) { - console.log(item) - this.auditstatus = true; - this.isVisibleView = true - } - viewAudit(item: any) { - console.log(item) - this.auditstatus = false; - this.isVisibleView = true - } - /** - *驳回 - */ - Reject() { - this.isVisibleRE = true; - } -} diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.html b/src/app/routes/order-management/components/driver-manage/driver-manage.component.html deleted file mode 100644 index d7abb76d..00000000 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - -
- -
- -
- - - -
- -
-
- - - - -
- -
- - - - - - - -
- - - - {{item.no}} - - -
- - - - - - - {{ infoData1?.enterpriseName }} - {{ infoData1?.unifiedSocialCreditCode }} - {{ infoData1?.enterpriseType }} - {{ infoData1?.registrationCapital }} 万元 - {{ infoData1?.enterpriseRegistrationTime }} - - {{ infoData1?.enterpriseRegistrationTime }} - - - - - {{ infoData1?.enterpriseAddress }} - - - - {{ infoData1?.businessScope }} - - - - {{ infoData1?.businessScope }} - 已临期 - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.less b/src/app/routes/order-management/components/driver-manage/driver-manage.component.less deleted file mode 100644 index 30444d6b..00000000 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.less +++ /dev/null @@ -1,7 +0,0 @@ - .left_btn { - width: 50px; - height: 32px; - padding-left: 8px; - line-height:32px; - background-color: #d7d7d7; - } \ No newline at end of file diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.spec.ts b/src/app/routes/order-management/components/driver-manage/driver-manage.component.spec.ts deleted file mode 100644 index bd6e2009..00000000 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-06 20:03:28 - * @LastEditTime: 2021-12-06 20:03:29 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -/* - * @Author: your name - * @Date: 2021-12-06 19:39:49 - * @LastEditTime: 2021-12-06 19:41:08 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderManagementDriverManageComponent } from './driver-manage.component'; - -describe('OrderManagementDriverManageComponent', () => { - let component: OrderManagementDriverManageComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OrderManagementDriverManageComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderManagementDriverManageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts b/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts deleted file mode 100644 index a6cd12b3..00000000 --- a/src/app/routes/order-management/components/driver-manage/driver-manage.component.ts +++ /dev/null @@ -1,299 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; -import { NzModalService } from 'ng-zorro-antd/modal'; -import { map } from 'rxjs/operators'; -import { OrderManagementService } from '../../services/order-management.service'; - - -@Component({ - selector: 'app-supply-management-driver-manage', - templateUrl: './driver-manage.component.html', - styleUrls: ['./driver-manage.component.less'] -}) -export class OrderManagementDriverManageComponent implements OnInit { - url = `/user?_allow_anonymous=true`; - ui: SFUISchema = {}; - uiView: SFUISchema = {}; - schema: SFSchema = {}; - schemaView: SFSchema = {}; - auditMany = false; - auditstatus = false; - isVisibleView = false; - isVisibleRE = false; - _$expand = false; - infoData1: any; - @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; - @ViewChild('sfView', { static: false }) sfView!: SFComponent; - columns: STColumn[] = []; - demoValue: any; - datass: any = [ - { - one: '1', - two: '1', - three: '1', - id: 1 - }, - { - one: '2', - two: '2', - three: '2', - id: 2 - }, -]; - tabs = [ { - name: '全部', - type: 5, - count: 0, - }, - { - name: '待审核', - type: 5, - count: 0, - }, - { - name: '已审核', - type: 5, - count: 0, - }, - { - name: '驳回', - type: 5, - count: 0, - } - ]; - constructor(public service: OrderManagementService, private modal: NzModalService) { } - - /** - * 查询参数 - */ - get reqParams() { - return { - ...this.sf?.value, - }; - } - get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; - } - ngOnInit(): void { - this.initSF(); - this.initST(); - this.initSFReject(); - } - - - - /** - * 初始化查询表单 - */ - initSF() { - this.schema = { - properties: { - no: { - type: 'string', - title: '公司名称', - }, - no2: { - type: 'string', - title: '姓名' - }, - no1: { - type: 'string', - title: '手机号' - }, - }, - }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; - } - initSFReject() { - this.schemaView = { - properties: { - roleDescription: { - title: '驳回原因', - type: 'string', - maxLength: 50, - ui: { - placeholder: '请输入驳回原因，最多不超过50字', - widget: 'textarea', - autosize: { minRows: 2, maxRows: 6 } - }, - }, - }, - }; - this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } }; - } - - /** - * 初始化数据列表 - */ - initST() { - this.columns = [ - { - title: '公司名称', - width: '100px', - className: 'text-center', - render: 'goodsId' - }, - { - title: '姓名', - width: '100px', - className: 'text-center', - }, - { title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' }, - { title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' }, - { - title: '身份证', - className: 'text-center', - width: '120px', - }, - { - title: '驾驶证', - className: 'text-center', - width: '120px', - }, - { - title: '从业资格证', - className: 'text-center', - width: '120px', - }, - { - title: '平台认证状态', - className: 'text-center', - width: '120px', - }, - { - title: '银行卡', - className: 'text-center', - width: '120px', - }, - { - title: '审核状态', - className: 'text-center', - width: '120px', - }, - { - title: '驳回原因', - className: 'text-center', - width: '120px', - render: 'feiong' - }, - { - title: '添加时间', - className: 'text-center', - width: '120px', - }, - { - title: '添加人', - className: 'text-center', - width: '120px', - render: 'enStatusStr27878' - }, - { - title: '操作', - fixed: 'right', - width: '200px', - className: 'text-left', - buttons: [ - { - text: '审核', - click: (_record) => this.viewAudit(_record), - }, - { - text: '查看详情', - click: (_record) => this.viewDetail(_record), - }, - ], - }, - ]; - } - - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - tabChange(item: any) { - console.log(item) - } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - - - - // 获取录单员 - getCatalogueMember() { - const params = { - }; - return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe( - map((res) => { - if (res) { - console.log(res) - } - }), - ); - } - - selectChange(e: number) { - console.log(e); - } - /** - * 导入货源 - */ - importGoodsSource() { - - } - audit(item: any) { - console.log(item) - } - - /* - * 审核关闭弹窗 - */ - handleCancel(item: string) { - if(item === '0') { - this.isVisibleView = false - } else{ - this.isVisibleRE = false - } - } - /** - * 审核通过按钮 - */ - handleOK() { - - } - /** - *查看评价 - */ - viewDetail(item: any) { - console.log(item) - this.auditstatus = true; - this.isVisibleView = true - } - viewAudit(item: any) { - console.log(item) - this.auditstatus = false; - this.isVisibleView = true - } - /** - *驳回 - */ - Reject() { - this.isVisibleRE = true; - } -} diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index d315c5e7..a97719e5 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -8,15 +8,11 @@ */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { OrderManagementAdditionalcDetailComponent } from './components/additionalc-detail/additionalc-detail.component'; -import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; -import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component'; import { OrderManagementComplaintDetailComponent } from './components/complaint-detail/complaint-detail.component'; import { OrderManagementComplaintComponent } from './components/complaint/complaint.component'; -import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component'; import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component'; import { OrderManagementRiskComponent } from './components/risk/risk.component'; import { OrderManagementVehicleDetailChangeComponent } from './components/vehicle-detail-change/vehicle-detail-change.component'; @@ -30,10 +26,6 @@ const routes: Routes = [ { path: 'bulk', component: OrderManagementBulkComponent }, { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent }, - { path: 'driver-manage', component: OrderManagementDriverManageComponent }, - { path: 'car-manage', component: OrderManagementCarManageComponent }, - { path: 'additionalc', component: OrderManagementAdditionalcComponent }, - { path: 'additionalc-detail/:id', component: OrderManagementAdditionalcDetailComponent }, { path: 'risk', component: OrderManagementRiskComponent }, { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent }, { path: 'complaint', component: OrderManagementComplaintComponent }, diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index c9e0c338..4cdb23c6 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -8,15 +8,11 @@ */ import { NgModule, Type } from '@angular/core'; import { SharedModule } from '@shared'; -import { OrderManagementAdditionalcDetailComponent } from './components/additionalc-detail/additionalc-detail.component'; -import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; -import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component'; import { OrderManagementComplaintDetailComponent } from './components/complaint-detail/complaint-detail.component'; import { OrderManagementComplaintComponent } from './components/complaint/complaint.component'; -import { OrderManagementDriverManageComponent } from './components/driver-manage/driver-manage.component'; import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component'; import { OrderManagementRiskComponent } from './components/risk/risk.component'; import { OrderManagementVehicleDetailChangeComponent } from './components/vehicle-detail-change/vehicle-detail-change.component'; @@ -41,10 +37,6 @@ const COMPONENTS: Type[] = [ OrderManagementVehicleDetailComponent, OrderManagementBulkComponent, OrderManagementBulkeDetailComponent, - OrderManagementDriverManageComponent, - OrderManagementCarManageComponent, - OrderManagementAdditionalcComponent, - OrderManagementAdditionalcDetailComponent, OrderManagementRiskComponent, OrderManagementComplaintComponent, UpdateFreightComponent, diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html new file mode 100644 index 00000000..3c201861 --- /dev/null +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html @@ -0,0 +1,67 @@ + + + + + + + +
+
+ + {{headerInfo?.ltdidName}} + + + 2021-12-11 + +
+
+ + {{headerInfo?.projectName}} + + + {{headerInfo?.taxNumber}} + +
+
+ + {{headerInfo?.vatname}} + + + {{headerInfo?.isdetail}} + +
+
+ + + +
+
+ +
+
+ + + +
+
+ + + + + + {{index+1}} + + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.less b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.less new file mode 100644 index 00000000..aebf12ee --- /dev/null +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.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/input-invoice/input-invoice-detail/input-invoice-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts new file mode 100644 index 00000000..0a7627b6 --- /dev/null +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts @@ -0,0 +1,140 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../../services/ticket.service'; +import { RequestedDetailComponent } from '../../invoice-requested/requested-detail/requested-detail.component'; + +@Component({ + selector: 'app-input-invoice-detail', + templateUrl: './input-invoice-detail.component.html', + styleUrls: ['./input-invoice-detail.component.less', '../../../../commom/less/expend-but.less', '../../../../commom/less/box.less'] +}) +export class InputInvoiceDetailComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + + _$expand = false; + + id = null; + headerInfo: any = {}; + constructor(public service: TicketService, private route: ActivatedRoute) { + this.id = route.snapshot.params.id; + this.loadHeadInfo(); + } + + ngOnInit(): void {} + + loadHeadInfo() { + this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => { + console.log(res); + if (res) { + this.headerInfo = res; + } + }); + } + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + } + return requestOptions; + }; + + goBack() { + history.go(-1); + } + + /** + * 重置表单 + */ + 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 + } + }, + billHCode: { + type: 'string', + title: '费用单', + ui: { + placeholder: '请输入' + } + }, + billHC2ode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + vatappSts: { + type: 'string', + title: '结算客户', + enum: [{ label: '全部', value: '' }], + ui: { + widget: 'select', + placeholder: '请选择' + }, + default: '' + }, + createTime: { + title: '费用日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + create2Time: { + title: '订单日期', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '序号', render: 'billHCode', width: 80 }, + { title: '费用号', index: 'vatappSts', width: 100 }, + { title: '费用日期', index: 'billTime', type: 'date', width: 150 }, + { title: '订单号', index: 'projectId', width: 100 }, + { title: '订单日期', index: 'loadingfrom', width: 150 }, + { title: '结算客户', index: 'loadingto', width: 90 }, + { title: '费用科目', index: 'goodsinfo', width: 100 }, + { title: '收票金额', index: 'driverinfo', width: 140 }, + { title: '收票税额', index: 'billkpmoney', width: 100 } + ]; + } +} diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html new file mode 100644 index 00000000..733a8a63 --- /dev/null +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -0,0 +1,40 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + +
+ +
+ 已选择 + {{ selectedRows.length }} 张发票 + 清空 +
+
+ + + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts new file mode 100644 index 00000000..f7c34009 --- /dev/null +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -0,0 +1,231 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { TicketService } from '../../services/ticket.service'; + +@Component({ + selector: 'app-input-invoice', + templateUrl: './input-invoice.component.html', + styleUrls: ['../../../commom/less/box.less'] +}) +export class InputInvoiceComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('auditModal', { static: false }) + auditModal!: any; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + + _$expand = false; + + selectedRows: any[] = []; + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + } + return requestOptions; + }; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + } + } + + auditAction() { + if (this.selectedRows?.length <= 0) { + this.service.msgSrv.warning('请选择申请记录'); + return; + } + const modal = this.nzModalService.warning({ + nzTitle: '确定对已选运单批量申请开票？', + nzOnOk: () => {} + }); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + 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: { + autocomplete: 'off', + placeholder: '请输入' + } + }, + ltdId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' + }, + orderS2n: { + type: 'string', + title: '发票号码', + ui: { + autocomplete: 'off', + placeholder: '请输入' + } + }, + order2S2n: { + type: 'string', + title: '发票类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn1: { + type: 'string', + title: '销售方', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + ord0erSn1: { + type: 'string', + title: '收票状态', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn2: { + type: 'string', + title: '发票日期', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderS1n2: { + type: 'string', + title: '收票备注', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderS3: { + type: 'string', + title: '订单号', + ui: { + autocomplete: 'off', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + orderSn4: { + type: 'string', + title: '费用号', + ui: { + autocomplete: 'off', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '', index: 'key', type: 'checkbox' }, + { title: '收票单号', index: 'no', type: 'link' }, + { title: '网络货运人', index: 'no' }, + { title: '发票日期', index: 'no', type: 'date' }, + { title: '发票号', index: 'callNo' }, + { title: '发票金额', index: 'callNo' }, + { title: '税额', render: 'call1No' }, + { title: '发票类型', render: 'call1N2o' }, + { title: '销售方', index: 'callNo' }, + { title: '创建时间', index: 'updatedAt', type: 'date' }, + { title: '创建人', index: 'updatedAt' }, + { title: '收票状态', index: 'updatedAt' }, + { + title: '操作', + buttons: [ + { + text: '浏览', + click: item => this.router.navigate(['/ticket/input-invoice/detail/1']) + }, + { + text: '修改', + // click: item => this.router.navigate(['']) + } + ] + } + ]; + } +} 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 3f050e34..139838df 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 @@ -29,7 +29,7 @@ - + @@ -50,20 +50,11 @@ - - + {{ item.vatappcode }}
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 6dee6695..fe20cc39 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 @@ -27,45 +27,35 @@ export class InvoiceRequestedComponent implements OnInit { _$expand = false; totalCallNo = 0; + selectedRows: any[] = []; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} ngOnInit(): void {} - get reqParams() { - // if (this.sf) { - // Object.assign(requestOptions.body, { - // ...this.sf.value, - // sts: this?.resourceStatus, - // createTime: { - // start: this.sf.value.createTime?.[0] || null, - // end: this.sf.value.createTime?.[1] || null - // } - // }); - // } - const a:any = {}; - if(this.resourceStatus) { - a.sts = this.resourceStatus + beforeReq = (requestOptions: STRequestOptions) => { + if (this.resourceStatus) { + Object.assign(requestOptions.body, { sts: this.resourceStatus }); } - return { - ...a, - ...this.sf?.value, - createTime: { - start: this.sf?.value?.createTime?.[0] || null, - end: this.sf?.value?.createTime?.[1] || null - } - }; + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value, + createTime: { + start: this.sf?.value?.createTime?.[0] || null, + end: this.sf?.value?.createTime?.[1] || null + } + }); + } + return requestOptions; }; - get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.applyAmount, 0); + break; + } } - // 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; - // } - // } rejectAction(item: any[]) { const modal = this.nzModalService.create({ @@ -122,21 +112,19 @@ export class InvoiceRequestedComponent implements OnInit { type: 'default', label: '手工处理', onClick: () => { - console.log('11111') const params = { - ficoVatappBillVOList: this.selectedRows, + ficoVatappBillVOList: this.selectedRows // id: this.id - } + }; this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => { - console.log(res) - if(res) { - this.service.msgSrv.success('开票成功！') + console.log(res); + if (res) { + this.service.msgSrv.success('开票成功！'); + modal.destroy(); } else { - this.service.msgSrv.error(res?.msg) + this.service.msgSrv.error(res?.msg); } - }) - modal.destroy(); - + }); } }, { @@ -144,13 +132,15 @@ export class InvoiceRequestedComponent implements OnInit { label: '自动开票', onClick: () => { const params = { - ficoVatappBillVOList: this.selectedRows, + ficoVatappBillVOList: this.selectedRows // id: this.id - } + }; this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => { - console.log(res) - }) - modal.destroy(); + if (res) { + this.service.msgSrv.success('开票成功！'); + modal.destroy(); + } + }); } } ] @@ -164,7 +154,7 @@ export class InvoiceRequestedComponent implements OnInit { nzWidth: 1200, nzComponentParams: { id: item.id - }, + }, nzFooter: null }); } @@ -357,16 +347,17 @@ export class InvoiceRequestedComponent implements OnInit { } ]; } - orderDetail(item: any){ - console.log(item) - this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id, - { - queryParams: { id : item?.id } - } - ]) + orderDetail(item: any) { + console.log(item); + this.router.navigate([ + '/ticket/invoice-requested/detail/' + item?.id, + { + queryParams: { id: item?.id } + } + ]); } selectChange(e: any) { - console.log(e) + console.log(e); this.resourceStatus = e; this.initST(); setTimeout(() => { 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 index 32bb832f..b7da1ae6 100644 --- 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 @@ -9,19 +9,18 @@ - - {{ item.billHCode }} - + [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }}" + [res]="{ reName: { list: 'data.records', total: 'data.total' } }" + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }" (change)="stChange($event)"> + + {{ item.billHCode }} +
- + - -
- + + \ No newline at end of file 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 1872c98a..40a64978 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -5,6 +5,8 @@ import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist. import { ETCInvoicedListComponent } from './components/etc-invoiced-list/etc-invoiced-list.component'; import { ETCInvoicedLogsComponent } from './components/etc-invoiced-logs/etc-invoiced-logs.component'; import { ETCInvoicedRequestedComponent } from './components/etc-invoiced-requested/etc-invoiced-requested.component'; +import { InputInvoiceDetailComponent } from './components/input-invoice/input-invoice-detail/input-invoice-detail.component'; +import { InputInvoiceComponent } from './components/input-invoice/input-invoice.component'; import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component'; import { InvoiceRequestedDetailComponent } from './components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component'; import { InvoiceRequestedComponent } from './components/invoice-requested/invoice-requested.component'; @@ -20,7 +22,9 @@ const routes: Routes = [ { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent }, { path: 'etc-invoice-list', component: ETCInvoicedListComponent }, { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent }, - { path: 'etc-blacklist', component: ETCBlacklistComponent } + { path: 'etc-blacklist', component: ETCBlacklistComponent }, + { path: 'input-invoice', component: InputInvoiceComponent }, + { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent } ]; @NgModule({ diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts index a5ad88b3..5e9e446c 100644 --- a/src/app/routes/ticket-management/ticket-management.module.ts +++ b/src/app/routes/ticket-management/ticket-management.module.ts @@ -17,6 +17,8 @@ import { CancellationInvoiceComponent } from './components/cancellation-invoice/ import { PushInvoiceComponent } from './components/cancellation-invoice/push-invoice/push-invoice.component'; import { AddOwnerComponent } from './components/etc-blacklist/add-owner/add-owner.component'; import { AddCartComponent } from './components/etc-blacklist/add-cart/add-cart.component'; +import { InputInvoiceComponent } from './components/input-invoice/input-invoice.component'; +import { InputInvoiceDetailComponent } from './components/input-invoice/input-invoice-detail/input-invoice-detail.component'; const COMPONENTS: any = [ ETCInvoicedListComponent, @@ -28,7 +30,9 @@ const COMPONENTS: any = [ InvoiceRequestedDetailComponent, InvoiceDetailComponent, CancellationInvoiceComponent, - PushInvoiceComponent + PushInvoiceComponent, + InputInvoiceComponent, + InputInvoiceDetailComponent ]; const NOTROUTECOMPONENTS: any = [ TransactionDetailsComponent, diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index c14fe9ef..23bfec69 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -160,37 +160,6 @@ "icon": "anticon anticon-dashboard", "link": "/order-management/bulk" }, - { - "text": "结算单", - "children": [ - { - "text": "司机管理", - "icon": "anticon anticon-dashboard", - "link": "/order-management/driver-manage" - }, - { - "text": "车辆管理", - "icon": "anticon anticon-dashboard", - "link": "/order-management/car-manage" - } - ] - }, - { - "text": "补录单", - "children": [ - { - "text": "补录运单", - "icon": "anticon anticon-dashboard", - "link": "/order-management/additionalc" - }, - { - "text": "补录运单详情", - "icon": "anticon anticon-dashboard", - "link": "/order-management/additionalc-detail/:id", - "hide": true - } - ] - }, { "text": "风险单管理", "icon": "anticon anticon-dashboard", @@ -372,6 +341,15 @@ "link": "/ticket/etc-blacklist" } ] + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice" + }, + { + "text": "进项发票", + "link": "/ticket/input-invoice/detail/:id", + "hide": true } ] },