装货凭证添加水印

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

@@ -135,7 +135,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -143,7 +143,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -174,7 +181,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -182,7 +189,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -221,7 +235,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -229,7 +243,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -260,7 +281,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -268,7 +289,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             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',
             beforeUpload: (file: any, fileList: any) => {

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

@@ -126,7 +126,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -134,7 +134,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -165,7 +172,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -173,7 +180,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -212,7 +226,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -220,7 +234,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             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',
             beforeUpload: (file: any, fileList: any) => {
@@ -251,7 +272,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           // readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
-            action: apiConf.fileUpload,
+            action: apiConf.waterFileUpload,
             fileType: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
@@ -259,7 +280,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             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',
             beforeUpload: (file: any, fileList: any) => {

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

@@ -20,6 +20,7 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 import { Observable, Observer } from 'rxjs';
 import { EAEnvironmentService } from '@shared';
 import { OrderManagementService } from '../../../services/order-management.service';
+import format from 'date-fns/format';
 
 @Component({
   selector: 'app-order-management-voucher-view',
@@ -61,7 +62,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             title: '装货凭证',
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -70,6 +71,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '提货单',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -99,7 +107,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -108,6 +116,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '人车货照片',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -145,7 +160,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             title: '卸货凭证',
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -154,6 +169,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '提货单',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -183,7 +205,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -192,6 +214,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '人车货照片',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -235,7 +264,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             readOnly: true,
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -244,6 +273,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '提货单',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -274,7 +310,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             readOnly: true,
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -283,6 +319,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '人车货照片',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -329,7 +372,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             readOnly: true,
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -338,6 +381,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '提货单',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {
@@ -368,7 +418,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
             readOnly: true,
             ui: {
               widget: 'upload',
-            action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               fileType: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -377,6 +427,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
               descriptionI18n: '人车货照片',
               data: {
                 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',
               beforeUpload: (file: any, fileList: any) => {

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

@@ -1,24 +1,17 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
 import { DatePipe } from '@angular/common';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
 import {
-  SFComponent,
+  SFComponent, SFSchema, SFUISchema,
-  SFCustomWidgetSchema,
-  SFDateWidgetSchema,
-  SFNumberWidgetSchema,
-  SFRadioWidgetSchema,
-  SFSchema,
-  SFSelectWidgetSchema,
-  SFTextareaWidgetSchema,
-  SFUISchema,
   SFUploadWidgetSchema
 } from '@delon/form';
-import { apiConf } from '@conf/api.conf';
 import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import format from 'date-fns/format';
 import { NzMessageService } from 'ng-zorro-antd/message';
 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 { EAEnvironmentService } from '@shared';
+import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
 
 @Component({
   selector: 'app-order-management-vehicle-sure-arrive',
@@ -67,7 +60,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '装货凭证',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -75,7 +68,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -105,7 +105,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -113,7 +113,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -151,7 +158,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '卸货凭证',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -159,7 +166,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -189,7 +203,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -197,7 +211,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -252,7 +273,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '装货凭证',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -260,7 +281,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -290,7 +318,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -298,7 +326,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -336,7 +371,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '卸货凭证',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -344,7 +379,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -374,7 +416,7 @@ export class VehicleSureArriveComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -382,7 +424,14 @@ export class VehicleSureArriveComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {

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

@@ -1,24 +1,17 @@
+import { DatePipe } from '@angular/common';
 import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
 import {
-  SFComponent,
+  SFComponent, SFSchema, SFUISchema,
-  SFCustomWidgetSchema,
-  SFDateWidgetSchema,
-  SFNumberWidgetSchema,
-  SFRadioWidgetSchema,
-  SFSchema,
-  SFSelectWidgetSchema,
-  SFTextareaWidgetSchema,
-  SFUISchema,
   SFUploadWidgetSchema
 } from '@delon/form';
-import { apiConf } from '@conf/api.conf';
 import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { Observable, Observer } from 'rxjs';
 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({
   selector: 'app-order-management-vehicle-sure-depart',
@@ -82,7 +75,14 @@ export class VehicleSureDepartComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -112,7 +112,7 @@ export class VehicleSureDepartComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -120,7 +120,14 @@ export class VehicleSureDepartComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -183,7 +190,7 @@ export class VehicleSureDepartComponent implements OnInit {
             title: '装货凭证',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -191,7 +198,14 @@ export class VehicleSureDepartComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '提货单',
               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',
               beforeUpload: (file: any, fileList: any) => {
@@ -221,7 +235,7 @@ export class VehicleSureDepartComponent implements OnInit {
             title: '',
             ui: {
               widget: 'upload',
-              action: apiConf.fileUpload,
+              action: apiConf.waterFileUpload,
               accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
@@ -229,7 +243,14 @@ export class VehicleSureDepartComponent implements OnInit {
               urlReName: 'data.fullFileWatermarkPath',
               descriptionI18n: '人车货照片',
               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',
               beforeUpload: (file: any, fileList: any) => {