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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-19 19:33:09 +08:00
parent af14c7ab1a a789b00790
commit 33bffba6b2
8 changed files with 798 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -8,9 +8,9 @@
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['RiskOrder-Search']">查询</button> acl [acl-ability]="['FUND-REPORTING-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()">导出</button> <button nz-button (click)="export()" acl [acl-ability]="['FUND-REPORTING-export']">导出</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -33,7 +33,8 @@
<span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.uploadStatusLabel}}</span> <span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.uploadStatusLabel}}</span>
</ng-template> </ng-template>
<ng-template st-row="verifyStatus" let-item> <ng-template st-row="verifyStatus" let-item>
<a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '2'">{{item?.verifyStatusLabel}}</a> <a (click)="viewResult(item)" acl [acl-ability]="['FUND-REPORTING-view-verify-data']"
*ngIf="item?.verifyStatus === '2'">{{item?.verifyStatusLabel}}</a>
<span *ngIf="item?.verifyStatus !== '2'">{{item?.verifyStatusLabel}}</span> <span *ngIf="item?.verifyStatus !== '2'">{{item?.verifyStatusLabel}}</span>
</ng-template> </ng-template>
<ng-template st-row="orderCode" let-item> <ng-template st-row="orderCode" let-item>
@ -56,8 +57,9 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzType="primary" (click)="upload()">上传</button> <button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['FUND-REPORTING-upload']">上传</button>
<button nz-button nzType="primary" (click)="recall()">撤回</button> <button nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['FUND-REPORTING-recall']">撤回</button>
<button nz-button nzType="primary" (click)="updateData()">更新数据</button> <button nz-button nzType="primary" (click)="updateData()" acl
[acl-ability]="['FUND-REPORTING-upload-data']">更新数据</button>
</div> </div>
</ng-template> </ng-template>

17
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -9,9 +9,9 @@
</div> </div>
<div [class.text-right]="true"> <div [class.text-right]="true">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['RiskOrder-Search']">查询</button> acl [acl-ability]="['ORDER-REPORTING-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()">导出</button> <button nz-button (click)="export()" acl [acl-ability]="['ORDER-REPORTING-export']">导出</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -45,7 +45,8 @@
</ng-template> </ng-template>
<ng-template st-row="checkStatus" let-item let-index="index"> <ng-template st-row="checkStatus" let-item let-index="index">
<a *ngIf="item?.checkStatus === '2'" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a> <a *ngIf="item?.checkStatus === '2'" acl [acl-ability]="['ORDER-REPORTING-view-upload-data']"
(click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<span *ngIf="item?.checkStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span> <span *ngIf="item?.checkStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template> </ng-template>
@ -79,9 +80,11 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzType="primary" (click)="upload()">上传</button> <button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['ORDER-REPORTING-upload']">上传</button>
<button nz-button nzType="primary" (click)="recall()">撤回</button> <button nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['ORDER-REPORTING-recall']">撤回</button>
<button nz-button nzType="primary" (click)="updateData()">更新数据</button> <button nz-button nzType="primary" (click)="updateData()" acl
<button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button> [acl-ability]="['ORDER-REPORTING-update-data']">更新数据</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl
[acl-ability]="['ORDER-REPORTING-search']">上传设置</button>
</div> </div>
</ng-template> </ng-template>

2
src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html
View File

@ -3,6 +3,6 @@
<div class="modal-footer"> <div class="modal-footer">
<button nz-button type="button" (click)="close()">取消</button> <button nz-button type="button" (click)="close()">取消</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid" <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
[nzLoading]="service.http.loading">修改</button> [nzLoading]="service.http.loading" acl [acl-ability]="['ORDER-REPORTING-upload-setting-edit']">修改</button>
</div> </div>
</sf> </sf>

52
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -56,7 +56,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
listImagUrls: any[] = []; // 货源单设置回显 listImagUrls: any[] = []; // 货源单设置回显
dirvingMessage = []; dirvingMessage = [];
modalcontent: any; modalcontent: any;
modalTitle:string = ''; modalTitle: string = '';
imges: any; imges: any;
totalObj: any; totalObj: any;
attObj: any; attObj: any;
@ -135,7 +135,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -143,7 +143,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -174,7 +181,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -182,7 +189,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -221,7 +235,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -229,7 +243,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -260,7 +281,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -268,7 +289,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -589,7 +617,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent, nzContent: AmapPoiPickerComponent,
nzWidth: 900, nzWidth: 900,
nzOnOk: item => { nzOnOk: item => {
if(item?.poi) { if (item?.poi) {
const poi = item.poi; const poi = item.poi;
const locList = poi.pois; const locList = poi.pois;
switch (type) { switch (type) {
@ -916,11 +944,11 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
}); });
}; };
agreement(value: any) { agreement(value: any) {
if(value ==='1'){ if (value === '1') {
this.modalTitle = '附件信息'; this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent; this.modalcontent = this.i?.contractContent?.contractContent;
}else if(value === '2'){ } else if (value === '2') {
this.modalTitle = '补充协议'; this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent; this.modalcontent = this.i?.supplementContent?.contractContent;
} }

52
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -55,7 +55,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
billExpenses: any[] = []; //运费信息表格信息 billExpenses: any[] = []; //运费信息表格信息
dirvingMessage = []; dirvingMessage = [];
modalcontent: any; modalcontent: any;
modalTitle:string = ''; modalTitle: string = '';
attObj: any; attObj: any;
totalObj: any; totalObj: any;
approvalLsit: any; approvalLsit: any;
@ -126,7 +126,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -134,7 +134,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -165,7 +172,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -173,7 +180,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -212,7 +226,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -220,7 +234,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -251,7 +272,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3', // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -259,7 +280,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -560,7 +588,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent, nzContent: AmapPoiPickerComponent,
nzWidth: 900, nzWidth: 900,
nzOnOk: item => { nzOnOk: item => {
if(item?.poi) { if (item?.poi) {
const poi = item.poi; const poi = item.poi;
const locList = poi.pois; const locList = poi.pois;
switch (type) { switch (type) {
@ -855,11 +883,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
}; };
agreement(value: any) { agreement(value: any) {
if(value ==='1'){ if (value === '1') {
this.modalTitle = '附件信息'; this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent; this.modalcontent = this.i?.contractContent?.contractContent;
}else if(value === '2'){ } else if (value === '2') {
this.modalTitle = '补充协议'; this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent; this.modalcontent = this.i?.supplementContent?.contractContent;
} }

105
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -20,6 +20,7 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { EAEnvironmentService } from '@shared'; import { EAEnvironmentService } from '@shared';
import { OrderManagementService } from '../../../services/order-management.service'; import { OrderManagementService } from '../../../services/order-management.service';
import format from 'date-fns/format';
@Component({ @Component({
selector: 'app-order-management-voucher-view', selector: 'app-order-management-voucher-view',
@ -34,14 +35,14 @@ export class orderManagementVoucherViewComponent implements OnInit {
formData: any; formData: any;
datas: any; datas: any;
Status: any; Status: any;
data: any ={ data: any = {
weight: 0, weight: 0,
volume: 0 volume: 0
}; };
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
schema: SFSchema = {}; schema: SFSchema = {};
ui: SFUISchema = {}; ui: SFUISchema = {};
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService,private datePipe: DatePipe,private envSrv: EAEnvironmentService, ) {} constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
ngOnInit(): void { ngOnInit(): void {
// console.log(this.i) // console.log(this.i)
@ -51,7 +52,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} }
initSF() { initSF() {
console.log(this.Status) console.log(this.Status)
if(this.Status == 1) { if (this.Status == 1) {
this.schema = { this.schema = {
@ -61,7 +62,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
title: '装货凭证', title: '装货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -70,6 +71,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -99,7 +107,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -108,6 +116,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -145,7 +160,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
title: '卸货凭证', title: '卸货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -154,6 +169,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -183,7 +205,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -192,6 +214,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -217,9 +246,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema, } as SFUploadWidgetSchema,
} }
}, },
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
}; };
}else { } else {
this.schema = { this.schema = {
properties: { properties: {
no0: { no0: {
@ -235,7 +264,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -244,6 +273,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -274,7 +310,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -283,6 +319,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -329,7 +372,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -338,6 +381,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -368,7 +418,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
readOnly: true, readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif', fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -377,6 +427,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -402,7 +459,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema, } as SFUploadWidgetSchema,
} }
}, },
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
}; };
} }
this.ui = { this.ui = {
@ -410,14 +467,14 @@ export class orderManagementVoucherViewComponent implements OnInit {
spanLabelFixed: 100, spanLabelFixed: 100,
grid: { span: 20 } grid: { span: 20 }
}, },
$unloadingLadingBillFilePath: { grid: { span: 12} }, $unloadingLadingBillFilePath: { grid: { span: 12 } },
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} }, $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
$loadingLadingBillFilePath: { grid: { span: 12} }, $loadingLadingBillFilePath: { grid: { span: 12 } },
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} }, $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
}; };
} }
save(value: any): void { save(value: any): void {
if(!this.sf.valid) { if (!this.sf.valid) {
this.service.msgSrv.warning('必填项为空！') this.service.msgSrv.warning('必填项为空！')
return; return;
} }
@ -431,7 +488,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} }
console.log(params) console.log(params)
this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => { this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
if(res) { if (res) {
this.service.msgSrv.success('修改成功！') this.service.msgSrv.success('修改成功！')
this.modal.destroy(true); this.modal.destroy(true);
} }
@ -439,14 +496,14 @@ export class orderManagementVoucherViewComponent implements OnInit {
} }
sure() { sure() {
const params = [this.i?.id]; const params = [this.i?.id];
this.service.downloadFile(this.service.$api_createBillTakeGoods,params) this.service.downloadFile(this.service.$api_createBillTakeGoods, params)
this.service.downloadFile(this.service.$api_createBillDischargeGoods,params) this.service.downloadFile(this.service.$api_createBillDischargeGoods, params)
this.service.msgSrv.success('生成电子单据成功！') this.service.msgSrv.success('生成电子单据成功！')
this.modal.destroy(true); this.modal.destroy(true);
} }
// 确认到车界面信息(两个只能看的图片) // 确认到车界面信息(两个只能看的图片)
initData() { initData() {
this.service.request(this.service.$api_get_getCredentials, { id : this.i?.id}).subscribe((res) => { this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe((res) => {
console.log(res) console.log(res)
this.datas = res this.datas = res
if (res.unloadingLadingBillFilePath) { if (res.unloadingLadingBillFilePath) {
@ -503,7 +560,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
this.modal.destroy(true); this.modal.destroy(true);
} }
openlaod(value: any) { openlaod(value: any) {
if(value === 1) { if (value === 1) {
const a = document.createElement('a'); const a = document.createElement('a');
a.href = this.datas?.loadingElectronicsLadingBillFilePath; a.href = this.datas?.loadingElectronicsLadingBillFilePath;
document.body.appendChild(a); document.body.appendChild(a);

109
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
View File

@ -1,24 +1,17 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { apiConf } from '@conf/api.conf';
import { import {
SFComponent, SFComponent, SFSchema, SFUISchema,
SFCustomWidgetSchema,
SFDateWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema,
SFUploadWidgetSchema SFUploadWidgetSchema
} from '@delon/form'; } from '@delon/form';
import { apiConf } from '@conf/api.conf';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { EAEnvironmentService } from '@shared';
import format from 'date-fns/format';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { EAEnvironmentService } from '@shared'; import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
@Component({ @Component({
selector: 'app-order-management-vehicle-sure-arrive', selector: 'app-order-management-vehicle-sure-arrive',
@ -45,7 +38,7 @@ export class VehicleSureArriveComponent implements OnInit {
public service: WaybillManagementServe, public service: WaybillManagementServe,
private datePipe: DatePipe, private datePipe: DatePipe,
private envSrv: EAEnvironmentService private envSrv: EAEnvironmentService
) {} ) { }
ngOnInit(): void { ngOnInit(): void {
console.log(this.i); console.log(this.i);
@ -67,7 +60,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '装货凭证', title: '装货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -75,7 +68,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -105,7 +105,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -113,7 +113,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -151,7 +158,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '卸货凭证', title: '卸货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -159,7 +166,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -189,7 +203,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -197,7 +211,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -252,7 +273,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '装货凭证', title: '装货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -260,7 +281,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -290,7 +318,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -298,7 +326,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -336,7 +371,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '卸货凭证', title: '卸货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -344,7 +379,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -374,7 +416,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -382,7 +424,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {

61
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
View File

@ -1,24 +1,17 @@
import { DatePipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { apiConf } from '@conf/api.conf';
import { import {
SFComponent, SFComponent, SFSchema, SFUISchema,
SFCustomWidgetSchema,
SFDateWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema,
SFUploadWidgetSchema SFUploadWidgetSchema
} from '@delon/form'; } from '@delon/form';
import { apiConf } from '@conf/api.conf';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { EAEnvironmentService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service'; import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
import { EAEnvironmentService, EADateUtil } from '@shared'; import format from 'date-fns/format';
import { DatePipe } from '@angular/common';
@Component({ @Component({
selector: 'app-order-management-vehicle-sure-depart', selector: 'app-order-management-vehicle-sure-depart',
@ -44,7 +37,7 @@ export class VehicleSureDepartComponent implements OnInit {
public service: WaybillManagementServe, public service: WaybillManagementServe,
private envSrv: EAEnvironmentService, private envSrv: EAEnvironmentService,
private datePipe: DatePipe private datePipe: DatePipe
) {} ) { }
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -82,7 +75,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -112,7 +112,7 @@ export class VehicleSureDepartComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -120,7 +120,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -183,7 +190,7 @@ export class VehicleSureDepartComponent implements OnInit {
title: '装货凭证', title: '装货凭证',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -191,7 +198,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单', descriptionI18n: '提货单',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {
@ -221,7 +235,7 @@ export class VehicleSureDepartComponent implements OnInit {
title: '', title: '',
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif', accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1, limit: 1,
limitFileCount: 1, limitFileCount: 1,
@ -229,7 +243,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath', urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片', descriptionI18n: '人车货照片',
data: { data: {
appId: this.envSrv.env.appId appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
}, },
name: 'multipartFile', name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => { beforeUpload: (file: any, fileList: any) => {