Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-30 16:51:04 +08:00
parent e8bf51ffc3
commit c0a087584f
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -544,16 +544,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`, nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`, nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => { // this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => {
if (res === true) { // if (res === true) {
this.service.msgSrv.success('操作成功！'); // this.service.msgSrv.success('操作成功！');
this.st?.reload(1); // this.st?.reload(1);
this.getGoodsSourceStatistical(); // this.getGoodsSourceStatistical();
this.initST(); // this.initST();
} // }
this.st?.reload(1); // this.st?.reload(1);
this.getGoodsSourceStatistical(); // this.getGoodsSourceStatistical();
}) // })
{
this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params})
this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})}
}); });
} }
// 获取所属项目 // 获取所属项目

11
src/app/routes/order-management/services/order-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-03 15:31:52 * @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-28 11:07:48 * @LastEditTime : 2022-03-30 16:08:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -163,6 +163,15 @@ export class OrderManagementService extends ShipperBaseService {
// 异常预警 // 异常预警
public $api_getAbnormalWarningByBillId = '/api/sdc/abnormalWarning/getAbnormalWarningByBillId'; public $api_getAbnormalWarningByBillId = '/api/sdc/abnormalWarning/getAbnormalWarningByBillId';
// 生成卸货单
public $api_createBillDischargeGoods = '/api/sdc/billOperate/createBillDischargeGoods';
// 生成提货单
public $api_createBillTakeGoods = '/api/sdc/billOperate/createBillTakeGoods';
// 生成卸货单-页面展示
public $api_getBillDischargeGoodsVO = '/api/sdc/billOperate/getBillDischargeGoodsVO';
// 生成提货单-页面展示
public $api_getBillTakeGoodsVO = '/api/sdc/billOperate/getBillTakeGoodsVO';
getDictByKey(dictKey: string) { getDictByKey(dictKey: string) {
const params = { dictKey: dictKey }; const params = { dictKey: dictKey };
return this.request(this.$api_getDictValue, params); return this.request(this.$api_getDictValue, params);

4
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-25 16:03:45 * @Date : 2022-01-25 16:03:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-09 16:17:28 * @LastEditTime : 2022-03-30 16:50:35
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -100,7 +100,7 @@
</ng-container> </ng-container>
<!-- 开关选项 --> <!-- 开关选项 -->
<ng-container *ngSwitchCase="10"> <ng-container *ngSwitchCase="10">
<nz-switch [ngModel]="item.itemValue" style="margin-left: 26px;"></nz-switch> <nz-switch [(ngModel)]="item.itemValue" style="margin-left: 26px;"></nz-switch>
</ng-container> </ng-container>
<!-- 下拉单选 --> <!-- 下拉单选 -->
<ng-container *ngSwitchCase="11"> <ng-container *ngSwitchCase="11">

2
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-25 16:03:45 * @Date : 2022-01-25 16:03:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-22 19:59:59 * @LastEditTime : 2022-03-30 16:50:00
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */