fix bug
This commit is contained in:
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-01 15:13:03
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-02 10:32:15
|
||||
* @LastEditTime : 2022-03-02 20:57:36
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -18,6 +18,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
|
||||
import { Observable, Observer, of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { SupplyManagementService } from '../../services/supply-management.service';
|
||||
import { apiConf } from '@conf/api.conf';
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-import-supply',
|
||||
@ -30,6 +31,8 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
files2: any;
|
||||
schema: SFSchema = {};
|
||||
ui: SFUISchema = {};
|
||||
fileName: any;
|
||||
uploadUrl = apiConf.file_upload_url;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
constructor(
|
||||
private modal: NzModalRef,
|
||||
@ -70,17 +73,18 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
let str =q.replace(/^\s+|\s+$/g,"");
|
||||
if (str) {
|
||||
this.getRegionCode(str);
|
||||
this.getRegionCode2(str);
|
||||
}
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
resourceCode: {
|
||||
netTranName: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择'
|
||||
} as SFSelectWidgetSchema
|
||||
widget: 'text',
|
||||
},
|
||||
default: '确认货主后带出'
|
||||
},
|
||||
enterpriseProjectId: {
|
||||
type: 'string',
|
||||
@ -90,21 +94,29 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
placeholder: '请选择'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
resourceCode2: {
|
||||
fileName: {
|
||||
type: 'string',
|
||||
title: '导入货源信息',
|
||||
ui: {
|
||||
widget: 'custom'
|
||||
}
|
||||
},
|
||||
file: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'custom'
|
||||
}
|
||||
},
|
||||
},
|
||||
required: ['shipperAppUserId', 'enterpriseProjectId','resourceCode2',],
|
||||
required: ['shipperAppUserId', 'enterpriseProjectId','netTranName','fileName'],
|
||||
};
|
||||
this.ui = {
|
||||
'*': {
|
||||
spanLabelFixed: 130,
|
||||
grid: { span: 20 },
|
||||
},
|
||||
'$resourceCode2': {
|
||||
'$fileName': {
|
||||
spanLabelFixed: 130,
|
||||
grid: { span: 20 },
|
||||
},
|
||||
@ -134,22 +146,15 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
getRegionCode2(regionCode: any) {
|
||||
console.log(regionCode);
|
||||
return this.service
|
||||
.request(this.service.$api_getNetworkTransporter, { id: regionCode })
|
||||
.pipe(
|
||||
map(res =>
|
||||
res.map((item: any) => ({
|
||||
label: item.projectName,
|
||||
value: item.id
|
||||
}))
|
||||
)
|
||||
)
|
||||
.subscribe(res => {
|
||||
// this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
|
||||
// this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
|
||||
.request(this.service.$api_getNetworkTransporter, { id: regionCode }).subscribe((res: any) => {
|
||||
console.log(res?.netTranName)
|
||||
console.log(res?.networkTransporter)
|
||||
this.sf.getProperty('/netTranName')!.widget.reset(res?.netTranName);
|
||||
this.sf.setValue('/netTranName', res?.netTranName)
|
||||
});
|
||||
}
|
||||
save(): void {
|
||||
console.log(this.files)
|
||||
console.log(this.sf.value)
|
||||
// this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => {
|
||||
// if (res) {
|
||||
// this.msgSrv.success('保存成功');
|
||||
@ -162,33 +167,28 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
this.modal.destroy();
|
||||
}
|
||||
handleChange(info: NzUploadChangeParam): void {
|
||||
switch (info.file.status) {
|
||||
switch (info?.file?.status) {
|
||||
case 'uploading':
|
||||
break;
|
||||
case 'done':
|
||||
let fileList = [...info.fileList];
|
||||
// 2. Read from response and show file link
|
||||
fileList = fileList.map((file: any) => {
|
||||
if (file.response) {
|
||||
file.url = file.response.data.fullFilePath;
|
||||
}
|
||||
return file;
|
||||
});
|
||||
this.files2 = fileList[0].name
|
||||
let file = info?.file;
|
||||
let fileName = file?.response.name;
|
||||
this.sf?.setValue('/fileName', fileName);
|
||||
this.sf?.setValue('/file', file?.response?.url);
|
||||
break;
|
||||
case 'error':
|
||||
this.service.msgSrv.error('网络错误');
|
||||
this.service.msgSrv.error('出错误了');
|
||||
break;
|
||||
}
|
||||
}
|
||||
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
|
||||
return new Observable((observer: Observer<boolean>) => {
|
||||
const isJpgOrPng = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
|
||||
if (!isJpgOrPng) {
|
||||
this.service.msgSrv.error('仅支持XLX / XLSX文件格式');
|
||||
observer.complete();
|
||||
return;
|
||||
}
|
||||
// const isJpgOrPng = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
|
||||
// if (!isJpgOrPng) {
|
||||
// this.service.msgSrv.error('仅支持XLX / XLSX文件格式');
|
||||
// observer.complete();
|
||||
// return;
|
||||
// }
|
||||
// tslint:disable-next-line: no-non-null-assertion
|
||||
const isLt2M = file.size! / 1024 / 1024 < 3;
|
||||
if (!isLt2M) {
|
||||
@ -196,10 +196,15 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
|
||||
observer.complete();
|
||||
return;
|
||||
}
|
||||
observer.next(isJpgOrPng && isLt2M);
|
||||
observer.next(isLt2M);
|
||||
observer.complete();
|
||||
});
|
||||
};
|
||||
clearFile() {
|
||||
this.fileName = null;
|
||||
this.sf?.setValue('/fileName', null);
|
||||
this.sf?.setValue('/file', null);
|
||||
}
|
||||
downFile() {
|
||||
this.service.downloadFile(this.service.$api_exportGoodsResourceOperateTemplate);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user