-
-
+
+
{{i?.enterpriseInfoName}}
@@ -23,6 +13,6 @@
diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts
index 275b522b..f1681253 100644
--- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts
+++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-28 20:00:06
+ * @LastEditTime : 2022-03-01 14:19:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -13,6 +13,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { QRComponent } from '@delon/abc/qr';
import { SFSchema, SFUISchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
+import html2canvas from 'html2canvas';
@Component({
selector: 'app-supply-management-qrcode-page',
@@ -50,16 +51,22 @@ export class SupplyManagementQrcodePageComponent implements OnInit {
}
- downLoadQrcode(downloadName: any): void {
+ /**
+ * 下载二维码
+ * @param downloadName 文件名
+ * @param contents 内容
+ */
+ downLoadQrcode(downloadName: any, contents: any): void {
let aLink = document.createElement('a');
- const content = this.qr.dataURL;
+ const content = contents;
let blob = this.base64ToBlob(content); //new Blob([content]);
let evt = document.createEvent("HTMLEvents");
evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为
aLink.download = downloadName;
aLink.href = URL.createObjectURL(blob);
// aLink.dispatchEvent(evt);
- aLink.click()
+ aLink.click();
+
}
@@ -80,4 +87,17 @@ export class SupplyManagementQrcodePageComponent implements OnInit {
this.modal.destroy();
}
+ /**
+ * 把页面装成canvas
+ */
+ toCanvasPhoto() {
+ let aLink = document.createElement('a');
+ html2canvas(document.getElementById('qr_page')!, { height: 340 }).then((canvas:any) => {
+ let url = canvas.toDataURL("image/jpeg");
+ this.downLoadQrcode('二维码', url);
+
+ })
+ }
+
+
}
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
index aa0a881f..7d8445ec 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
@@ -161,11 +161,11 @@
装货时间
+ [nzShowTime]="{ nzFormat: 'HH' }"
+ nzFormat="yyyy-MM-dd HH:00前"
+ formControlName="loadingTime"
+ [nzDisabledDate]="disabledDateStart"
+ >
@@ -174,7 +174,8 @@
卸货时间
-
+
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index cbc6cbf5..2f514508 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -102,15 +102,25 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
@ViewChild('sf7', { static: false }) sf7!: SFComponent;
schema7: SFSchema = {};
ui7!: SFUISchema;
- formatterRmb = (value: number): string =>{
- if(value){
- let value2 = Number(value).toLocaleString(undefined,{'minimumFractionDigits':2,'maximumFractionDigits':2});
- return `￥ ${value2}`;
+ limitValues = {
+ maxWeight: 99999,
+ maxVolume: 99999,
+ maxPiece: 99999,
+ maxDays: 999,
+ intervalDays: 999,
+ maxTimes: 999,
+ }
+
+ formatterRmb = (value: number): string => {
+ if (value === null || value === undefined) {
+ return '';
+ }else{
+ let value2 = Number(value).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+ return `￥${value2}`;
}
- return `￥ 0.00`
-
- } ;
- parserRmb = (value: string): string => value.replace('￥ ', '').replace(',','');
+
+ };
+ parserRmb = (value: string): string => value.replace('￥', '').replace(',', '');
// 页面初始化
ngOnInit(): void {
this.initSF1();
@@ -121,6 +131,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.initSF7();
this.addStartInfo();
this.addEndInfo();
+ this.getLimitvalue();
}
initSF1() {
this.schema1 = {
@@ -658,6 +669,34 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
grid: { span: 24 }
}
};
+ }
+ getLimitvalue() {
+ // 货物核载信息最大值
+ // 货物运输费（小计）最大值
+ const getlimitvaluesParms = [
+ this.service.limitKeys.weight,
+ this.service.limitKeys.volume,
+ this.service.limitKeys.piece,
+ this.service.limitKeys.maxDays,
+ this.service.limitKeys.intervalDays,
+ this.service.limitKeys.maxTimes,
+ ];
+ this.service.request(this.service.$api_findItemValueByItemKeys, getlimitvaluesParms).subscribe((res) => {
+ const maxWeight = res.filter((item: any) => item.itemKey === this.service.limitKeys.weight)[0].itemValue;
+ const maxVolume = res.filter((item: any) => item.itemKey === this.service.limitKeys.volume)[0].itemValue;
+ const maxPiece = res.filter((item: any) => item.itemKey === this.service.limitKeys.piece)[0].itemValue;
+ const maxDays = res.filter((item: any) => item.itemKey === this.service.limitKeys.maxDays)[0].itemValue;
+ const intervalDays = res.filter((item: any) => item.itemKey === this.service.limitKeys.intervalDays)[0].itemValue;
+ const maxTimes = res.filter((item: any) => item.itemKey === this.service.limitKeys.maxTimes)[0].itemValue;
+ this.limitValues = {
+ maxWeight: Number(maxWeight),
+ maxVolume: Number(maxVolume),
+ maxPiece: Number(maxPiece),
+ maxDays: Number(maxDays),
+ intervalDays: Number(intervalDays),
+ maxTimes: Number(maxTimes),
+ }
+ })
}
// 不可选择的时间
disabledDateStart = (current: Date): boolean => {
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index b1238bec..aafd8601 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-28 19:34:22
+ * @LastEditTime : 2022-03-01 14:08:30
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -139,10 +139,14 @@ export class SupplyManagementService extends BaseService {
super(injector);
}
public limitKeys = {
- weight: 'sys.config.goods.approvalCarMaxWeight', //整车-核载重量上限
- volume: 'sys.config.goods.approvalCarMaxVolume', //整车-核载体积上限
- piece: 'sys.config.goods.approvalCarMaxPiece' //整车-核载件数上限
- };
+ weight:'sys.config.goods.approvalCarMaxWeight', //整车-核载重量上限
+ volume:'sys.config.goods.approvalCarMaxVolume', //整车-核载体积上限
+ piece:'sys.config.goods.approvalCarMaxPiece', //整车-核载件数上限
+ maxDays:'sys.config.goods.wholeLoadingMaxDays', //整车-计划装货时间上限
+ intervalDays:'sys.config.goods.wholeUnloadingIntervalDays', //计划装、卸货时间间隔
+ maxTimes:'sys.config.goods.wholeLoadingMaxTimes', //整车-多装多卸地点上限
+ }
+
// 根据ItemKey获取项值
public $api_findItemValueByItemKeys = '/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys';
// 获取保价费信息