This commit is contained in:
wangshiming
2022-02-17 15:30:59 +08:00
parent b67e17f1d8
commit b9495a8753
12 changed files with 981 additions and 12 deletions

View File

@ -220,7 +220,7 @@
</nz-card>
<nz-card>
<div class="align-center">
<!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button> -->
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')">生成二维码</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')">指派熟车</button>
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>

View File

@ -21,6 +21,7 @@ import { PublishSuccessComponent } from '../onecar-publish/publish-success/publi
import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
@Component({
selector: 'app-publish-goods-bulk-publish',
templateUrl: './bulk-publish.component.html',
@ -692,6 +693,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
if (submitType == 'assign') {
this.chooseFamifiar(params);
return;
}else if(submitType === 'qrcode'){
this.service.request(this.service.$api_saveAnotherBulkOrderQRCode, params).subscribe(res => {
if (res) {
this.assignedQrcode( res, params )
}
});
return;
}
}
if (this.PageStatus === '大宗修改') {
@ -700,6 +708,28 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.requests(this.service.$api_set_saveAnotherBulkOrder, params, 2);
}
}
// 生成二维码
assignedQrcode(id:string,parms:any ) {
const item = {
id,
enterpriseInfoName: parms.enterpriseInfoName,
loadingAddressArr: this.startInfo.map((ele: any)=>ele.detailedAddress),
unloadingAddressArr: this.endInfo.map((ele: any)=>ele.detailedAddress),
deadlineTime: parms.deadlineTime,
}
const modalRef = this.modalService.create({
nzTitle: '二维码',
nzWidth: '468px',
nzContent: SupplyManagementQrcodePageComponent,
nzComponentParams: {
i: item,
},
nzFooter: null,
});
modalRef.afterClose.subscribe(() => {
this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } });
});
}
requests(url: any, params: any, change?: any) {
this.service.request(url, params).subscribe((res: any) => {
if (res) {

View File

@ -241,7 +241,7 @@
<nz-card>
<div class="align-center">
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<!-- <button nz-button nzType="primary" (click)="submit('assign')">生成二维码</button> -->
<button nz-button nzType="primary" (click)="submitConfirm('qrcode')">生成二维码</button>
<button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
</div>

View File

@ -21,6 +21,7 @@ import { PublishAddressListComponent } from '../onecar-publish/address-list/addr
import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
@Component({
selector: 'app-publish-goods-bulk-publish',
templateUrl: './bulk-release-publish.component.html',
@ -615,6 +616,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
let reqUrl = this.service.$api_consignBulk;
if (submitType === 'assign') {
this.chooseFamifiar(params);
}else if(submitType === 'qrcode'){
this.service.request(this.service.$api_consignBulkQRCode, params).subscribe(res => {
if (res) {
this.assignedQrcode( res, params )
}
});
return;
} else {
this.service.request(reqUrl, params).subscribe(res => {
if (res) {
@ -629,6 +637,28 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
});
}
}
// 生成二维码
assignedQrcode(id:string,parms:any ) {
const item = {
id,
enterpriseInfoName: parms.enterpriseInfoName,
loadingAddressArr: this.startInfo.map((ele: any)=>ele.detailedAddress),
unloadingAddressArr: this.endInfo.map((ele: any)=>ele.detailedAddress),
deadlineTime: parms.deadlineTime,
}
const modalRef = this.modalService.create({
nzTitle: '二维码',
nzWidth: '468px',
nzContent: SupplyManagementQrcodePageComponent,
nzComponentParams: {
i: item,
},
nzFooter: null,
});
modalRef.afterClose.subscribe(() => {
this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } });
});
}
// 获取城市列表
getRegionCode(regionCode: any) {
return this.service

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-24 16:36:35
* @LastEditTime : 2022-02-17 15:25:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -102,7 +102,10 @@ export class SupplyManagementService extends BaseService {
// 货源审核【批量】
public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
// 大宗再下一单二维码
$api_saveAnotherBulkOrderQRCode = '/api/sdc/goodsResourceOperate/saveAnotherBulkOrderQRCode';
// 代发大宗货源二维码
$api_consignBulkQRCode = '/api/sdc/goodsResourceOperate/consignBulkQRCode';
// 获取操作日志列表
public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';