diff --git a/src/app/routes/supply-goods/components/carload/carload.component.html b/src/app/routes/supply-goods/components/carload/carload.component.html index 7eeedbcc..d232fa10 100644 --- a/src/app/routes/supply-goods/components/carload/carload.component.html +++ b/src/app/routes/supply-goods/components/carload/carload.component.html @@ -1,3 +1,11 @@ + @@ -37,11 +45,10 @@
- - +
- + 共 {{ total }} 条 - 商品 - 订单金额 - 收件人 - 下单商家 - 状态 + 货源编号 + 货源类型 + 货主 + 项目名称 + 装货地 + 卸货地 + 货物名称 + 重量/体积 + 用车需求 + 总费用 + 附加费 + 用车需求 + 货源状态 + 创建时间 + 审核状态 操作 - - -
-
- 订单号：{{ data.orderSn }}        下单时间：{{ - data.createTime - }}         订单类型：{{ - data.supplierType == 1 ? '普通订单' : 'GD订单' - }} -         支付方式：{{ data.payType === 1 ? '一次性付款，先货后款' : '-' - }}{{ data.payType === 2 ? '分批付款，先货后款' : '' }}         配送方式：{{ - data.deliveryTypeDesc - }} -
-
- - + -
-
- -
-
-

- {{ item.goodsName }}
- - ，{{ items.specName }}：{{ items.specValueName }} - - -

数量：{{ item.goodsQuantity }}

-

-
-
- {{ item.sendType === 1 ? '已发货' : item.sendType === 2 ? '部分发货' : '' }}
- {{ item.returnStatusName }} -
+ {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + +
●已接单
+
●已取消
+
●待接单
+ + + {{data.id3}} + + +
+
●审核通过
+
●不通过
+
●待审核
+
- - - - ¥{{ data.payAmount.toFixed(2) }} - - {{ data.receiveName }}
- {{ data.receiveMobile }} - - - {{ data.tenantName }} - - - {{ data.orderStatusStr }}{{ - data.orderStatusDesc - }}
{{ - data.payStatusDesc - }} - - -
- - - - 付款审核 - - - 审核
- - - 修改价格 - - - 立即发货 -
- - 立即发货 -
- 查看详情 -
- - - - - + + + + - - - - - - - {{ item }} - - - - diff --git a/src/app/routes/supply-goods/components/carload/carload.component.less b/src/app/routes/supply-goods/components/carload/carload.component.less index c98cff00..36f9126d 100644 --- a/src/app/routes/supply-goods/components/carload/carload.component.less +++ b/src/app/routes/supply-goods/components/carload/carload.component.less @@ -1,128 +1,7 @@ -.order-goods { - display: flex; - text-align: left; - .order-goods-img { - width: 80px; - height: 80px; - margin-right: 10px; - overflow: hidden; - img { - width: 100%; - } - } - .order-goods-info { - flex: 1; - } - .order-goods-state { - width: 70px; - margin-left: 10px; - line-height: 28px; - text-align: right; - } -} -h2 { - font-size: 16px; -} -p { - font-size: 14px; -} -.form, -.table { - background-color: #fff; -} -.form { - padding: 20px; -} -.select-item { - width: 180px; -} -.ant-form-item { - margin-bottom: 16px; -} -.order-line { - display: flex; - justify-content: space-between; -} -.order-receiving { - .order-receiving-remark { - line-height: 26px; - span { - color: #1890ff; - } - input { - width: 130px; - margin-right: 6px; - padding: 0; - overflow: hidden; - color: #1890ff; - white-space: nowrap; - text-overflow: ellipsis; - background: none; - border: none; - &.have-edit { - color: #000000a6; - border: 1px solid #d9d9d9; - } - } - } -} -.order-operation { - div { - color: #1890ff; - cursor: pointer; - } - p { - margin-bottom: 10px; - } -} -.timeline { - span { - display: inline-block; - margin: 0 4px; - padding: 5px 6px; - color: #999; - background-color: #f2f2f2; - border-radius: 2px; - cursor: pointer; - } -} -.ant-table-tbody > tr.ant-table-row:hover > td { - background: #fff; -} - -.btnBox { - margin: 0 0 10px 0; -} -.searchAreaWrap { - display: flex; -} -.sfExpand { - display: block; -} -.actionBox { - margin: 0 0 0 10px; -} -.sfBox { - width: 60%; -} -.expandsfBox { - width: 100%; -} -.expandAcitonBox { - margin: 10px 0 20px 0; - text-align: right; -} -.actionAreaWrap { - margin: 0 0 20px 0; -} -.overflowText { - display: -webkit-box; - overflow: hidden; - text-align: left; - text-overflow: -o-ellipsis-lastline; - text-overflow: ellipsis; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; +.status-point { + display: inline-block; + width: 6px; + height: 6px; + border-radius: 50%; } diff --git a/src/app/routes/supply-goods/components/carload/carload.component.ts b/src/app/routes/supply-goods/components/carload/carload.component.ts index 1145ae70..61d06539 100644 --- a/src/app/routes/supply-goods/components/carload/carload.component.ts +++ b/src/app/routes/supply-goods/components/carload/carload.component.ts @@ -2,7 +2,7 @@ * @Description: * @Author: wsm * @Date: 2021-07-15 09:42:57 - * @LastEditTime: 2021-12-01 10:36:54 + * @LastEditTime: 2021-12-01 14:45:06 * @LastEditors: Please set LastEditors * @Reference: */ @@ -29,21 +29,15 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi exportTemplate!: TemplateRef; ui: SFUISchema = {}; mode: any = 'search'; - tabs = ['全部', '待审核', '待支付', '待发货', '待收货', '已完成']; - exportFieldList = [ - '订单号', - '下单时间', - '支付方式', - '订单金额', - '订单状态', - '下单商家', - 'SKU信息（SKUID,商品名称+规格名称,数量）', - '配送方式', - '收件人', - '收件人电话', - '收件人地址', - ]; - listData: any; + tabs = ['全部', '待接单', '已接单', '已取消']; + listData: any =[ + { + id: 1, + id2: 2, + id3:3, + id4: 4, + } + ] orderStatus: any = '0'; // 订单状态, 10为已提交待付款, 20为已付款待发,30为已发货待收货,50取消订单,40 已完成 nzSelectedIndex = 0; total = 1; @@ -87,33 +81,36 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi hidden: true, }, }, - storeName: { title: '企业名称', type: 'string', ui: { showRequired: false } }, + storeName: { title: '货源编号', type: 'string', ui: { showRequired: false } }, contactsName: { - title: '联系人', + title: '货物名称', type: 'string', ui: { showRequired: false, }, }, unifiedSocialCreditCode: { - title: '税源地', + title: '装货地', type: 'string', ui: { showRequired: false, }, }, - enStatus: { + unifiedSocialCreditCode2: { + title: '卸货地', type: 'string', - title: '货主状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 }, - { label: '废弃', value: 2 }, - ], - default: '', ui: { - widget: 'select', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + unifiedSocialCreditCode3: { + title: '货主', + type: 'string', + ui: { + showRequired: false, visibleIf: { expand: (value: boolean) => value, }, @@ -121,7 +118,7 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi }, enStatus2: { type: 'string', - title: 'CRM审核状态', + title: '审核状态', enum: [ { label: '全部', value: '' }, { label: '正常', value: 0 }, @@ -149,6 +146,7 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi }; } tabChange(i: number) { + console.log(i) this.changeIndex(i); this.getList(); } @@ -165,12 +163,6 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi } else if (i === 3) { this.orderStatus = '20'; this.payStatus = null; - } else if (i === 4) { - this.orderStatus = '30'; - this.payStatus = null; - } else if (i === 5) { - this.orderStatus = '40'; - this.payStatus = null; } this.pageIndex = 1; } @@ -232,10 +224,7 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi this.router.navigate(['../order-detail', data.orderSn], { relativeTo: this.ar }); } - // 批量发货 - deliverBelivery() { - this.router.navigate(['../order-batch-delivery'], { relativeTo: this.ar }); - } + changePageIndex(pageIndex: number) { this.pageIndex = pageIndex; this.getList(); @@ -249,79 +238,10 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi this.sf?.setValue('/expand', this.sfExpand); } - // 修改运单 - updateLogistics(data: any) { - // 如果是多个运单 - if (data.deliveryList.length > 1) { - this.updateLogisticsList(data); - } else { - data.deliveryAddrId = data.deliveryList[0].deliveryAddrId; - data.deliveryCorpSn = data.deliveryList[0].deliveryCorpSn; - data.deliverySn = data.deliveryList[0].deliverySn; // 原物流单号 - data.expressName = data.deliveryList[0].expressName; // 原物流公司 - data.sendName = data.deliveryList[0].sendName; - data.sendMobile = data.deliveryList[0].sendMobile; - data.sendAddr = data.deliveryList[0].sendAddr; - data.orderExpressItemVOList = data.deliveryList[0].orderExpressItemVOList; // 运单对应的发货商品信息 - this.updateLogisticsPop(data); - } - } + showApply() { - // 修改运单中间页List - updateLogisticsList(data: any) { - const modalRef = this.modal.create({ - nzTitle: '运单信息', - nzWidth: 1200, - // nzContent: OrderComponentsOrderLogisticsmessageComponent, - nzComponentParams: { - listData: data, - }, - nzFooter: null, - }); - modalRef.afterClose.subscribe((result) => { - if (result === true) { - this.getList(); - } - }); - } - - // 修改运单弹窗 - updateLogisticsPop(data: any) { - const modalRef = this.modal.create({ - nzTitle: '已发货商品', - nzWidth: 1200, - // nzContent: OrderComponentsOrderDeliverGoodsUpdateComponent, - nzComponentParams: { - listData: data, - }, - nzFooter: null, - }); - modalRef.afterClose.subscribe((result) => { - if (result === true) { - this.getList(); - } - }); - } - - // 立即发货 - deliverGoods(data: any) { - // const modalRef = this.modal.create({ - // nzTitle: '订单发货', - // nzWidth: 1200, - // nzContent: OrderComponentsOrderDelivergoodsComponent, - // nzComponentParams: { - // listData: data, - // }, - // nzFooter: null, - // }); - // modalRef.afterOpen.subscribe(() => {}); - // modalRef.afterClose.subscribe((result) => { - // if (result === true) { - // this.getList(); - // } - // }); - this.router.navigate(['../order-deliver-goods'], { relativeTo: this.ar }); } + /** * 重置表单 @@ -330,65 +250,9 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi this.sf.reset(); this.sfExpand = false; } - /** - * 立即确认 - */ - deliversure(val: any) { - const modalRef = this.modal.create({ - nzTitle: '订单确认', - nzWidth: 700, - // nzContent: OrderComponentsOrderOrderlistOrderSureComponent, - nzComponentParams: { - record: val, - }, - nzFooter: null, - }); - modalRef.afterOpen.subscribe(() => {}); - modalRef.afterClose.subscribe((result) => { - if (result === true) { - this.getList(); - } - }); - } - /** - * 付款审核 - */ - paymentReview(data: any) { - const dialogData = { - ...data, - }; - // this.modalHelper.create(OrderComponentsOrderOrderlistPaymentReviewComponent, { dialogData }, { size: 900 }).subscribe((res) => { - // if (res === '2') { - // this.getList(); - // } - // }); - } - /** - * 修改价格 - */ - modifyPrice(data: any) { - const dialogData = { - ...data, - }; - // this.modalHelper.create(OrderComponentsOrderOrderlistModifyPriceComponent, { dialogData }, { size: 900 }).subscribe((res) => { - // if (res === '2') { - // this.getList(); - // } - // }); - } - /** - * 审核 - */ - orderReview(data: any) { - const dialogData = { - ...data, - }; - // this.modalHelper.create(OrderReviewComponent, { dialogData }, { size: 900 }).subscribe((res) => { - // if (res === '2') { - // this.getList(); - // } - // }); - } + + + /** * 查询字段个数navigate */ diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.html b/src/app/routes/supply-goods/components/large-amount/large-amount.component.html new file mode 100644 index 00000000..d232fa10 --- /dev/null +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.html @@ -0,0 +1,157 @@ + + + + + +
+ +
+ + +
+ + + + +
+ +
+
+ + + + +
+ +
+ + +
+ +
+ + + + 共 {{ total }} 条 + + + 货源编号 + 货源类型 + 货主 + 项目名称 + 装货地 + 卸货地 + 货物名称 + 重量/体积 + 用车需求 + 总费用 + 附加费 + 用车需求 + 货源状态 + 创建时间 + 审核状态 + 操作 + + + + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + + {{data.id3}} + + +
●已接单
+
●已取消
+
●待接单
+ + + {{data.id3}} + + +
+
●审核通过
+
●不通过
+
●待审核
+ +
+ + + + + + + + + + diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.less b/src/app/routes/supply-goods/components/large-amount/large-amount.component.less new file mode 100644 index 00000000..36f9126d --- /dev/null +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.less @@ -0,0 +1,7 @@ + +.status-point { + display: inline-block; + width: 6px; + height: 6px; + border-radius: 50%; +} diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.spec.ts b/src/app/routes/supply-goods/components/large-amount/large-amount.component.spec.ts new file mode 100644 index 00000000..4511b1f3 --- /dev/null +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.spec.ts @@ -0,0 +1,31 @@ +/* + * @Description: + * @Author: wsm + * @Date: 2021-07-08 15:46:29 + * @LastEditTime: 2021-12-01 10:02:07 + * @LastEditors: Please set LastEditors + * @Reference: + */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { SupplyGoodsComponentListLargeAmountComponent } from './large-amount.component'; + +describe('SupplyGoodsComponentListLargeAmountComponent', () => { + let component: SupplyGoodsComponentListLargeAmountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [SupplyGoodsComponentListLargeAmountComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SupplyGoodsComponentListLargeAmountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts b/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts new file mode 100644 index 00000000..4ff565d1 --- /dev/null +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts @@ -0,0 +1,252 @@ +/* + * @Description: + * @Author: wsm + * @Date: 2021-07-15 09:42:57 + * @LastEditTime: 2021-12-01 15:06:11 + * @LastEditors: Please set LastEditors + * @Reference: + */ +import { AfterViewInit, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { STComponent } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ModalHelper } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { filter } from 'rxjs/operators'; + + +@Component({ + selector: 'app-supply-goods-components-list-large-amount', + templateUrl: './large-amount.component.html', + styleUrls: ['./large-amount.component.less'], +}) +export class SupplyGoodsComponentListLargeAmountComponent implements OnInit, AfterViewInit { + @ViewChild('st', { static: true }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + validateForm!: FormGroup; + @ViewChild('exportTemplate') + exportTemplate!: TemplateRef; + ui: SFUISchema = {}; + mode: any = 'search'; + tabs = ['全部', '进行中', '已完结', '已取消']; + listData: any =[ + { + id: 1, + id2: 2, + id3:3, + id4: 4, + } + ] + orderStatus: any = '0'; // 订单状态, 10为已提交待付款, 20为已付款待发,30为已发货待收货,50取消订单,40 已完成 + nzSelectedIndex = 0; + total = 1; + loading = false; + pageSize = 20; + pageIndex = 1; + toSendCount = 0; + addTimeStart = ''; + addTimeEnd = ''; + sfExpand = false; + _$expand = false; + + schema!: SFSchema; + payStatus: any; + constructor( + private fb: FormBuilder, + private modal: NzModalService, + private router: Router, + private ar: ActivatedRoute, + private modalHelper: ModalHelper, + ) {} + + ngOnInit(): void { + this.getList(); + this.initSF(); + this.initUI(); + } + + ngAfterViewInit() { + // this.router.events.pipe(filter((evt) => evt instanceof NavigationEnd)).subscribe(() => { + // + // }); + } + + initSF() { + this.schema = { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true, + }, + }, + storeName: { title: '货源编号', type: 'string', ui: { showRequired: false } }, + contactsName: { + title: '货物名称', + type: 'string', + ui: { + showRequired: false, + }, + }, + unifiedSocialCreditCode: { + title: '装货地', + type: 'string', + ui: { + showRequired: false, + }, + }, + unifiedSocialCreditCode2: { + title: '卸货地', + type: 'string', + ui: { + showRequired: false, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + enStatus2: { + type: 'string', + title: '录单员', + enum: [ + { label: '全部', value: '' }, + { label: '正常', value: 0 }, + { label: '冻结', value: 1 }, + { label: '废弃', value: 2 }, + ], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + }, + }; + this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; + } + initUI() { + this.ui = { + '*': { + spanLabelFixed: 90, + grid: { span: 8 }, + }, + }; + } + tabChange(i: number) { + console.log(i) + this.changeIndex(i); + this.getList(); + } + changeIndex(i: number) { + if (i === 0) { + this.orderStatus = '0'; + this.payStatus = null; + } else if (i === 1) { + this.orderStatus = '5'; + this.payStatus = null; + } else if (i === 2) { + this.orderStatus = null; + this.payStatus = '10'; + } else if (i === 3) { + this.orderStatus = '20'; + this.payStatus = null; + } + this.pageIndex = 1; + } + getList(type?: string) { + // this.loading = true; + const params: any = { + pageSize: this.pageSize, + pageIndex: this.pageIndex, + ...this.sf?.value, + orderStatus: this.orderStatus, + payStatus: this.payStatus, + createTime: this.sf?.value.createTime || [], + time: {}, + }; + if (this.sf?.value?.createTime) { + delete params.createTime; + params.time.start = this.sf?.value?.createTime[0]; + params.time.end = this.sf?.value?.createTime[1]; + } + delete params.expand; + if (type === 'search') { + params.pageIndex = 1; + } + // this.service.request(this.service.$api_get_page, params).subscribe((res) => { + // this.loading = false; + // this.listData = res.orderPage.records; + // this.toSendCount = res.toSendCount; + // this.listData.forEach((element: { goodsList: { goodsSpecJson: string }[] }) => { + // element.goodsList.forEach((item: { goodsSpecJson: string }) => { + // if (item.goodsSpecJson) { + // item.goodsSpecJson = JSON.parse(item.goodsSpecJson); + // } + // }); + // }); + // this.total = res.orderPage.total; + // }); + } + + orderExport() { + // this.service.exportStart(params, this.service.$api_export); + this.modal.create({ + nzTitle: '订单导出', + nzContent: this.exportTemplate, + // nzContent: `待导出订单总数：${this.pageInfo.total}条，确定要导出吗？`, + nzOnOk: () => { + const params: any = { + pageSize: this.pageSize, + pageIndex: this.pageIndex, + ...this.sf?.value, + orderStatus: this.orderStatus, + // createTime: this.sf?.value.createTime || [], + }; + delete params.expand; + }, + }); + } + + goDetail(data: any) { + this.router.navigate(['../order-detail', data.orderSn], { relativeTo: this.ar }); + } + + + changePageIndex(pageIndex: number) { + this.pageIndex = pageIndex; + this.getList(); + } + changePageSize(value: number) { + this.pageSize = value; + this.getList(); + } + expandToggle() { + this.sfExpand = !this.sfExpand; + this.sf?.setValue('/expand', this.sfExpand); + } + + showApply() { + + } + + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this.sfExpand = false; + } + + + + /** + * 查询字段个数navigate + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } +} diff --git a/src/app/routes/supply-goods/components/list/list.component.html b/src/app/routes/supply-goods/components/list/list.component.html index 97942916..a4d06ef5 100644 --- a/src/app/routes/supply-goods/components/list/list.component.html +++ b/src/app/routes/supply-goods/components/list/list.component.html @@ -1,19 +1,17 @@ - - + - + - diff --git a/src/app/routes/supply-goods/supply-goods.module.ts b/src/app/routes/supply-goods/supply-goods.module.ts index 399a3c44..64b64a4b 100644 --- a/src/app/routes/supply-goods/supply-goods.module.ts +++ b/src/app/routes/supply-goods/supply-goods.module.ts @@ -1,20 +1,22 @@ /* * @Author: your name * @Date: 2021-11-29 15:22:34 - * @LastEditTime: 2021-12-01 10:03:01 + * @LastEditTime: 2021-12-01 15:03:22 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ import { NgModule } from '@angular/core'; import { SharedModule } from '@shared'; import { SupplyGoodsComponentListCarloadComponent } from './components/carload/carload.component'; +import { SupplyGoodsComponentListLargeAmountComponent } from './components/large-amount/large-amount.component'; import { SupplyGoodsComponentListComponent } from './components/list/list.component'; import { SupplyGoodsRoutingModule } from './supply-goods-routing.module'; const COMPONENTS = [ SupplyGoodsComponentListComponent, - SupplyGoodsComponentListCarloadComponent + SupplyGoodsComponentListCarloadComponent, + SupplyGoodsComponentListLargeAmountComponent ]; @NgModule({ diff --git a/src/assets/images/user/yuandian.svg b/src/assets/images/user/yuandian.svg new file mode 100644 index 00000000..69353e5e --- /dev/null +++ b/src/assets/images/user/yuandian.svg @@ -0,0 +1 @@ + \ No newline at end of file