diff --git a/.gitignore b/.gitignore index 7b70918a..b5af4d96 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ scripts/var.less # IDE - VSCode .vscode/* +.vscode !.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 28a51d58..a1c49108 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "compile-hero.disable-compile-files-on-did-save-code": false + "compile-hero.disable-compile-files-on-did-save-code": true } \ No newline at end of file diff --git a/proxy.conf.js b/proxy.conf.js index a4074f73..c4946471 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-03-31 14:02:38 + * @LastEditTime : 2022-04-01 14:41:31 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,17 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', + protocol: 'https:', + port: 443 + }, + secure: false, + changeOrigin: true, + logLevel: 'debug' + }, + '//sascs': { + target: { + host: 'sascs-tj-tms-test.obs.cn-south-1.myhuaweicloud.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html index b0b593d1..8e7f9b89 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html @@ -9,7 +9,7 @@ - diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 679bd575..7b27f0bc 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -35,7 +35,8 @@ export class DriverAccountDetailComponent implements OnInit { ltdId: this.params.ltdId, projectId: this.params.projectId, enterpriseId: this.params.enterpriseId, - roleId: this.params.roleId + roleId: this.params.roleId, + bankType: this.params.bankType, }); if (this.sf) { Object.assign(requestOptions.body, { @@ -59,6 +60,7 @@ export class DriverAccountDetailComponent implements OnInit { roleId: this.params.roleId, pageIndex: this.st.pi, pageSize: this.st.ps, + bankType: this.params.bankType, createTime: { start: this.sf?.value?.createTime?.[0] || '', end: this.sf?.value?.createTime?.[1] || '' @@ -162,13 +164,13 @@ export class DriverAccountDetailComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '交易时间', index: 'createTime', type: 'date' }, - { title: '流水号', index: 'channelPaySn' }, - { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, - { title: '交易单号', index: 'businessNumber' }, - { title: '订单号', index: 'orderSn' }, - { title: '运单号', index: 'transportSn' }, - { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, + { title: '交易时间', index: 'createTime', type: 'date', width: 150 }, + { title: '流水号', index: 'channelPaySn', width: 170 }, + { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 }, + { title: '交易单号', index: 'businessNumber' , width: 190}, + { title: '订单号', index: 'orderSn' , width: 190}, + { title: '运单号', index: 'transportSn', width: 190 }, + { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 }, { title: '交易金额', index: 'amount', @@ -185,9 +187,9 @@ export class DriverAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'payName'}, - { title: '收款方', index: 'payeeName' }, - { title: '备注', index: 'tradeContent' }, + { title: '付款方', index: 'payName', width: 150}, + { title: '收款方', index: 'incomeName', width: 150 }, + { title: '备注', index: 'tradeContent' , width: 150}, ]; } } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html index 5eec5af3..b5de0f0c 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html @@ -9,7 +9,7 @@ - diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 499dee65..410c7fac 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -221,7 +221,7 @@ export class FreightAccountDetailComponent implements OnInit { widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, { title: '付款方', index: 'payName' , width: 170}, - { title: '收款方', index: 'payeeName', width: 170 }, + { title: '收款方', index: 'incomeName', width: 170 }, { title: '备注', index: 'tradeContent', width: 170 } ]; } diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html index 429e0d92..41222f22 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html @@ -1,4 +1,4 @@ - + -
+

订单号: {{ i?.billCode }}

-
+
@@ -43,8 +45,10 @@ {{ i?.goodsResource?.shipperAppUserName }} {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} - {{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} - {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} + {{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }} + {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} {{ i?.wayBill?.wayBillCode }} @@ -66,9 +70,13 @@
  - + [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'" + >
@@ -86,8 +94,8 @@ {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - {{ i?.carModel }}/{{ i?.carLength }} - {{ i?.driverName }}/{{ i?.driverPhone }}/{{ i?.carNo }} + {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }} + {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : '' }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨
@@ -108,7 +116,7 @@
装

装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

-

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? '/' + item.contractTelephone : '' }}

@@ -122,7 +130,7 @@
卸

卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

-

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? '/' + item.contractTelephone : '' }}

@@ -135,25 +143,24 @@ - {{i?.goodsResource?.insuranceTypeLabel}} + {{ i?.goodsResource?.insuranceTypeLabel }} - {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}} + {{ i?.goodsResource?.goodsValue !== null ? (i?.goodsResource?.goodsValue | currency) + '元' : '-' }} - {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}} + {{ i?.goodsResource?.insurancePremium !== null ? (i?.goodsResource?.insurancePremium | currency) + '元' : '-' }} - {{ item.price | currency }} - {{ item.price + item.surcharge | currency }} + {{ item.price + item.surcharge | currency }} {{ item.surcharge | currency }} @@ -161,16 +168,16 @@
总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ） + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}
 - 查看附件      - 补充协议 + 查看附件      + 补充协议 @@ -190,7 +197,9 @@ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + + {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + {{ i?.supplementaryInformationVO?.area }} @@ -213,12 +222,20 @@
- +
-
+
@@ -230,36 +247,39 @@ - + - -
- 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! -
+ +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    -
  • 系统识别:{{item?.complianceTypeName}}
    • -
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • +
  • 系统识别:{{ item?.complianceTypeName }}
    • +
  • {{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。
  • 2021-11-07 03:20:15
 - - + - - + - +
暂无附件信息
 - + diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 835a7e4c..560ff7c0 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-31 16:05:06 + * @LastEditTime : 2022-04-01 11:03:39 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -69,7 +69,7 @@ -
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+
{{ item?.createUserName }}{{ item?.createUserPhone ? "/" + item?.createUserPhone : '' }}
- -
- -
吨
+ +
+
电子装货单
 - -
- -
方
-
+ +
电子卸货单
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 54b91f69..7cf3957c 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -30,7 +30,9 @@ import { OrderManagementService } from '../../../services/order-management.servi export class orderManagementVoucherViewComponent implements OnInit { record: any = {}; i: any; + loadPDF: string = ''; formData: any; + datas: any; Status: any; data: any ={ weight: 0, @@ -52,6 +54,7 @@ export class orderManagementVoucherViewComponent implements OnInit { if(this.Status == 1) { this.schema = { + properties: { loadingLadingBillFilePath: { type: 'string', @@ -217,9 +220,15 @@ export class orderManagementVoucherViewComponent implements OnInit { required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] }; }else { - console.log('只读') this.schema = { properties: { + no0: { + type: 'string', + title: '', + ui: { + widget: 'custom', + }, + }, loadingLadingBillFilePath: { type: 'string', title: '装货凭证', @@ -298,6 +307,7 @@ export class orderManagementVoucherViewComponent implements OnInit { listType: 'picture-card', } as SFUploadWidgetSchema, }, + no4: { type: 'string', title: '', @@ -306,6 +316,13 @@ export class orderManagementVoucherViewComponent implements OnInit { }, default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', }, + no6: { + type: 'string', + title: '', + ui: { + widget: 'custom', + }, + }, unloadingLadingBillFilePath: { type: 'string', title: '卸货凭证', @@ -421,18 +438,17 @@ export class orderManagementVoucherViewComponent implements OnInit { }) } sure() { - const params = [this.i.id]; - this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('生成电子单据成功！') - this.modal.destroy(true); - } - }) + const params = [this.i?.id]; + this.service.downloadFile(this.service.$api_createBillTakeGoods,params) + this.service.downloadFile(this.service.$api_createBillDischargeGoods,params) + this.service.msgSrv.success('生成电子单据成功！') + this.modal.destroy(true); } // 确认到车界面信息(两个只能看的图片) initData() { this.service.request(this.service.$api_get_getCredentials, { id : this.i?.id}).subscribe((res) => { console.log(res) + this.datas = res if (res.unloadingLadingBillFilePath) { this.formData = { loadingLadingBillFilePath: [ @@ -486,5 +502,22 @@ export class orderManagementVoucherViewComponent implements OnInit { close(): void { this.modal.destroy(true); } - + openlaod(value: any) { + if(value === 1) { + const a = document.createElement('a'); + a.href = this.datas?.loadingElectronicsLadingBillFilePath; + document.body.appendChild(a); + console.log(document.body.contains(a)) + a.click(); //点击下载 + document.body.removeChild(a); //下载完成移除元素 + } else { + const a = document.createElement('a'); + a.href = this.datas?.unloadingElectronicsLadingBillFilePath; + document.body.appendChild(a); + console.log(document.body.contains(a)) + a.click(); //点击下载 + document.body.removeChild(a); //下载完成移除元素 + } + + } } diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 6ee6806b..ae12b403 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -25,7 +25,7 @@ export class PartnerListComponent { @ViewChild('editTemplate', { static: true }) editTemplate: any; - templateId: any; + templateId: any; templates: any[] = []; @ViewChild('editCannel', { static: true }) diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index 570e07f3..483a6ed1 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 16:51:13 + * @LastEditTime : 2022-04-01 11:09:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -76,7 +76,7 @@ [loading]="false" > -
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+
{{ item?.createUserName }}{{ item?.createUserPhone ? '/' + item?.createUserPhone : ''}}
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 5d3eedb2..c4befd05 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@