diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index 1fbf408f..9cbb9666 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -22,7 +22,7 @@
- 总费用:{{i?.freightPrice | currency}}
+ 总费用:{{i?.freightPrice | currency: '¥'}}
@@ -79,8 +79,8 @@
装货卸货信息
(
-
-
+
+
)
@@ -129,7 +129,7 @@
- {{item?.freightPrice | currency}}
+ {{item?.freightPrice | currency: '¥'}}
{{freightType[item?.freightType]}}
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 7b733e2d..e78b0689 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -259,22 +259,22 @@ export class SupplyManagementBulkComponent implements OnInit {
{
text: '货源审核',
click: (_record) => this.audit(_record, 1),
- // iif: item => item.auditStatus === 1,
+ iif: item => item.auditStatus == 1,
},
{
text: '二维码',
click: (_record) => this.assignedQrcode(_record),
- // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
+ iif: item => item.auditStatus == 1 || item.auditStatus == 2,
},
{
text: '修改单价',
click: (_record) => this.modification(_record),
- // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
+ iif: item => item.auditStatus == 1 || item.auditStatus == 2,
},
{
text: '取消货源',
click: (_record) => this.delOne(_record),
- // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
+ iif: item => item.auditStatus == 1 || item.auditStatus == 2,
},
{
text: '再下一单',
@@ -282,8 +282,8 @@ export class SupplyManagementBulkComponent implements OnInit {
},
{
text: '重新指派',
- // click: (_record) => this.delOne(_record),
- // iif: item => item.auditStatus === 2,
+ click: (_record) => this.delOne(_record),
+ iif: item => item.auditStatus == 2,
},
],
},
@@ -402,14 +402,31 @@ export class SupplyManagementBulkComponent implements OnInit {
handleOK() {
}
- // 修改货源
+ // 修改单价
modification(item: any) {
- this.router.navigate(['/supply-management/bulk-amend', item.id], {
- queryParams: {
- sta: 3
+ const modalRef = this.modal.create({
+ nzTitle: '修改单价',
+ nzWidth: '600px',
+ nzContent: SupplyManagementUpdatePriceComponent,
+ nzComponentParams: {
+ record: item,
},
+ nzFooter: null,
+ });
+ modalRef.afterClose.subscribe(res => {
+ if (res) {
+ console.log(res)
+ // this.getGoodsSourceDetail();
+ }
})
}
+ // getGoodsSourceDetail() {
+ // this.service.request(this.service.$api_get_bulk_detail, { id: this.id }).subscribe(res => {
+ // this.i = res;
+ // this.currentStatus = +this.i?.resourceStatus - 1;
+ // })
+ // }
+
// 再下一单
nextOrder(item: any) {
this.router.navigate(['/supply-management/bulk-amend', item.id], {
diff --git a/src/app/routes/supply-management/components/update-price/update-price.component.html b/src/app/routes/supply-management/components/update-price/update-price.component.html
index 0323f3a5..dd078c9e 100644
--- a/src/app/routes/supply-management/components/update-price/update-price.component.html
+++ b/src/app/routes/supply-management/components/update-price/update-price.component.html
@@ -1,14 +1,6 @@
-
-
+
{
- console.log(res)
- this.ii = res[0];
- })
+ if (this.record?.id) this.getGoodsResourceShipperDeatail(this.record?.id);
}
initSF() {
@@ -64,13 +55,10 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
rule: {
type: 'string',
title: '取整规则',
- enum: [
- { label: '保留小数', value: '1' },
- { label: '抹除小数', value: '2' },
- { label: '抹除个位', value: '3' },
- ],
+ default: '0',
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'goodresource:rounding:rules' },
optionalHelp: {
text: '例如:付司机运费= 重量*单价 = 999.99;\n 保留小数:即 999.99; \n 抹除小数:即 999.00;\n 抹除个位,即 990.00',
}
@@ -88,6 +76,13 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
};
}
+ getGoodsResourceShipperDeatail(id: any) {
+ this.service.request(this.service.$api_get_goods_resource_shipper, { id }).subscribe(res => {
+ if (res) {
+ this.i = res;
+ }
+ })
+ }
/**
* 初始化数据列表
*/
@@ -99,8 +94,9 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
];
}
save(value: any): void {
- console.log(value)
- const { id, freightType, freightPrice, resourceCode, rule, resourceId } = value;
+ console.log(value);
+ // const { id: resourceId, freightType, freightPrice, resourceCode, rule, goodsID: id } = value;
+ const { resourceId, freightType, freightPrice, resourceCode, rule, id } = value;
this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => {
if (res) {
this.msgSrv.success('保存成功');