- {{detailRecord?.ltdName}}
- {{detailRecord?.totalRebate |currency: ' '}}
+ {{detailRecord?.ltdName}}
+ {{detailRecord?.totalRebate |currency: ' '}}
添加司机
- 
-
- -
-
- 正面照 -
- 示例 -
- 
-
- -
-
- 背面照 -
- 示例 -
+
+
+ -
+
- 正面照 +
- 示例 +
+
+
+ -
+
- 背面照 +
- 示例 +
+ 
+
-
+ 查看示例
+
+ 
+
+
+
+ 查看示例
+
-->
+
+
+
+ 文件上传完成！成功${result?.successNumber}条，失败${result?.failNumber}条！
`,
+ nzFooter: [
+ {
+ label: '取 消',
+ type: 'default',
+ onClick: () => {
+ tipsModal.destroy();
+ }
+ },
+ {
+ label: '下载失败数据',
+ type: 'primary',
+ onClick: () => {
+ if(!result?.failNumber) {
+ this.service.msgSrv.error('没有失败数据！');
+ return;
+ }
+ this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => {
+ if(res) {
+ console.log(res);
+ }
+ })
+ console.log(111);
+ }
+ },
+ ]
+ })
+ }
+ });
+ }
/**
* 修改运费
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 1a69f9cd..1d30559b 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-03-07 13:54:46
+ * @LastEditTime : 2022-03-24 19:35:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -119,6 +119,8 @@ export class SupplyManagementService extends BaseService {
public $api_getContractContent = '/api/sdc/contractTemplate/getContractContent';
// 获取运价
public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight';
+ // 从业资格证
+ $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate';
/**
* 获取车型、车长字典数据
* @returns
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
index 278aea3f..dc1c1f86 100644
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 15:54:08
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-17 19:58:06
+ * @LastEditTime : 2022-03-24 11:10:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -96,7 +96,7 @@
-
-
+
+
+
- +
+
+
+
+ {{openInfo?.vatname}}
+
+
+ {{openInfo?.vatremarks}}
+
+
+ {{openInfo?.otherremarks}}
+
+
+ {{openInfo?.isdetail?'需要':'不需要'}}
+
+
+ {{openInfo?.vatnotax | currency}}
+
@@ -65,6 +86,9 @@
+
+
+
公司名： {{openInfo?.artoname}}
+税号： {{openInfo?.artotaxno}}
+注册地址： {{openInfo?.artoadd}}
+注册电话： {{openInfo?.artotel}}
+开户行： {{openInfo?.artobank}}
+', click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } }) }, { - text: '手工开票', + text: '手工开票
', iif: item => item.sts != '3', click: item => this.requestedAction(item) }, { - text: '推送开票', + text: '推送开票
', iif: item => item.sts === '1', click: item => this.pushInvoiceAction(item) - }, + } // { // text: '作废发票', // iif: item => item.sts === '3', diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 091af5f8..3790504f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -45,7 +45,7 @@ {{ totalCallNo }} 清空 - + diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index acde105a..9fa49838 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -32,5 +32,5 @@ diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 802103d3..ed1d8ae9 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -7,6 +7,7 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ import { Component, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -23,7 +24,7 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef) {} + constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); @@ -127,8 +128,17 @@ export class RequestedInvoiceModalComponent { }; this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('开票成功'); - this.modal.destroy(true); + this.nzModalService.confirm({ + nzTitle: '是否进入销票处理页面完成开票', + nzOnOk: () => { + this.service.msgSrv.success('开票成功'); + this.modal.destroy(true); + this.router.navigate(['/ticket/cancellation-invoice']); + }, + nzOnCancel: () => { + this.modal.destroy(true); + } + }); } }); } diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 48255eee..5da0014c 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -59,4 +59,17 @@
+
+
+
+
+
+
+
+
+ ', click: item => @@ -272,6 +323,16 @@ export class InvoicedListComponent implements OnInit { text: '查看物流
', click: item => this.showlogosticsLogs(item), iif: item => item.expresscompany + }, + { + text: '填写物流
', + click: item => this.requestedAction(item), + iif: item => !item.expresscompany + }, + { + text: '修改物流
', + click: item => this.requestedAction(item), + iif: item => item.expresscompany } ] } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index d2d66aa4..a235412f 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -32,6 +32,8 @@ export class TicketService extends ShipperBaseService { $api_ficoVatinv_Detail = '/api/fcc/ficoVatinvL/getDetailByVatinvHId'; // 运营端订单明细开票处理 $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo'; + // 手工开票获取开票申请信息展示 + $api_get_apply_fico_info = '/api/fcc/ficoVatappH/get'; // 运营端手工开票/确认/E税云开票成功后的回调 $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv'; // 运营端推送开票-E税云开票 @@ -53,6 +55,9 @@ export class TicketService extends ShipperBaseService { // 已开发票查询 $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page'; + // 更新快递信息 + $api_update_Express= '/api/fcc/ficoVatinvH/updateExpress'; + // 发票作废 $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel'; // 获取销项发票抬头 diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.html b/src/app/routes/usercenter/components/driver/captain/add/add.component.html index 1e60ca0b..fdc58217 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.html +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.html @@ -1,7 +1,17 @@ +
添加车队长
+
@@ -24,7 +34,6 @@
diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.less b/src/app/routes/usercenter/components/driver/captain/add/add.component.less
index bfa10586..fd19d3c9 100644
--- a/src/app/routes/usercenter/components/driver/captain/add/add.component.less
+++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.less
@@ -1,36 +1,41 @@
.pr {
- position: relative;
+ position: relative;
+}
+
+.pa {
+ position: absolute;
+ top: 35px;
+ left: 150px;
+ img{border: solid 1px #ebf0fb;}
+}
+
+.tips {
+ display: flex;
+ margin-bottom: 0;
+ color: #333;
+
+ dt {
+ width: 150px;
}
-
- .pa {
- position: absolute;
- top: 35px;
- left: 150px;
- img{border: solid 1px #ebf0fb;}
- }
-
- .tips {
- display: flex;
+
+ dd {
+ width: 190px;
margin-bottom: 0;
- color: #333;
-
- dt {
- width: 150px;
- }
-
- dd {
- width: 190px;
- margin-bottom: 0;
- text-align: center;
- }
+ text-align: center;
}
- :host{
- ::ng-deep {
- .ant-input-borderless{
- padding: 0;
- padding-top: 4px;
- color: black;
- resize:none;
+}
+:host{
+ ::ng-deep {
+ .ant-input-borderless{
+ padding: 0;
+ padding-top: 4px;
+ color: black;
+ resize:none;
+ }
+ .hideBtn .ant-upload-list-item-actions button{
+ &:last-child{
+ display: none;
}
}
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts
index 45f387a7..8a477dc9 100644
--- a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts
@@ -90,12 +90,13 @@ export class CtcCaptatinAddComponent implements OnInit {
widget: this.i.id ? 'text' : '',
placeholder: '请输入手机号',
blur: () => {
- if(this.sf?.value?.mobile) {
+ if(!this.sf.value.mobile) {
+ return
+ }
this.service.request(this.service.$api_getByMobile, { mobile: this.sf.value.mobile }).subscribe(res => {
if (res.certificateNumber) {
this.readFlag = true
this.detailData = {
- ...res,
mobile: this.sf.value.mobile,
bankName: this.sf.value.bankName,
bankCardNo: this.sf.value.bankCardNo,
@@ -109,28 +110,41 @@ export class CtcCaptatinAddComponent implements OnInit {
url: res.certificatePhotoFrontWatermark,
response: res.certificatePhotoFrontWatermark,
}],
- certificatePhotoBackWatermark: [
- {
- uid: -1,
- name: 'LOGO',
- status: 'done',
- url: res.certificatePhotoBackWatermark,
- response: res.certificatePhotoBackWatermark,
- }],
- name: res.name,
- certificateNumber: res.certificateNumber,
- certificatePhotoFront: res.certificatePhotoFront,
- certificatePhotoBack: res.certificatePhotoBack,
+ certificatePhotoBackWatermark: [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: res.certificatePhotoBackWatermark,
+ response: res.certificatePhotoBackWatermark,
+ }],
+ name: res.name,
+ certificateNumber: res.certificateNumber,
+ certificatePhotoFront: res.certificatePhotoFront,
+ certificatePhotoBack: res.certificatePhotoBack,
}
}
this.initSF()
} else {
this.readFlag = false
- this.detailData = {}
+ this.detailData = {
+ mobile: this.sf.value.mobile,
+ bankName: this.sf.value.bankName,
+ bankCardNo: this.sf.value.bankCardNo,
+ remark: this.sf.value.remark,
+ identityInfoDTO: {
+ certificatePhotoFrontWatermark: '',
+ certificatePhotoBackWatermark: '',
+ name: '',
+ certificateNumber: '',
+ certificatePhotoFront: '',
+ certificatePhotoBack: '',
+ }
+ }
+ this.initSF()
}
})
- }
- }
+ }
},
default: this.detailData.mobile
},
@@ -138,7 +152,7 @@ export class CtcCaptatinAddComponent implements OnInit {
title: '姓名',
type: 'string',
ui: {
- widget: this.i.id ? 'text' : '',
+ widget: this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20) ? 'text' : '',
placeholder: '请输入姓名',
},
readOnly: this.readFlag,
@@ -147,12 +161,11 @@ export class CtcCaptatinAddComponent implements OnInit {
bankCardNo: {
title: '银行卡号',
type: 'string',
- maxLength: 20,
ui: {
- widget: this.i.id ? 'text' : '',
+ widget: '',
placeholder: '请输入银行卡号',
- change: (val: any) =>{
- const value = val.replace(/\D/g,'')
+ change: (val: any) => {
+ const value = val.replace(/\D/g, '')
this.sf.setValue('/bankCardNo', value)
},
errors: {
@@ -164,9 +177,8 @@ export class CtcCaptatinAddComponent implements OnInit {
bankName: {
title: '开户行',
type: 'string',
- maxLength: 35,
ui: {
- widget: this.i.id ? 'text' : '',
+ widget: '',
placeholder: '请输入开户行',
},
default: this.detailData.bankName
@@ -178,7 +190,7 @@ export class CtcCaptatinAddComponent implements OnInit {
ui: {
widget: 'textarea',
showRequired: true,
- borderless:true,
+ borderless: true,
},
default: '请上传身份证原件的高清照片，若上传复印件，则需加盖公司印章及法人签字；上传后系统会自动识别并填写',
},
@@ -193,11 +205,11 @@ export class CtcCaptatinAddComponent implements OnInit {
certificatePhotoFrontWatermark: {
type: 'string',
title: '',
- readOnly: this.i.id || this.readFlag,
+ readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag,
ui: {
offsetControl: 6,
action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -212,10 +224,10 @@ export class CtcCaptatinAddComponent implements OnInit {
listType: 'picture-card',
change: (args: any) => {
if (args.type === 'success') {
- this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
+ this.detailData.identityInfoDTO.certificatePhotoFront = args.file.response.data.fullFilePath
this.checkIdCard(args.file.response.data.fullFilePath, 'front');
} else {
- this.detailData.certificatePhotoFront = ''
+ this.detailData.identityInfoDTO.certificatePhotoFront = ''
}
},
beforeUpload: (file: any, _fileList: any) => {
@@ -230,6 +242,7 @@ export class CtcCaptatinAddComponent implements OnInit {
observer.complete();
});
},
+ previewFile: (file: any) => { }
},
default: this.detailData.identityInfoDTO.certificatePhotoFrontWatermark
},
@@ -244,11 +257,11 @@ export class CtcCaptatinAddComponent implements OnInit {
certificatePhotoBackWatermark: {
type: 'string',
title: '',
- readOnly: this.i.id || this.readFlag,
+ readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag,
ui: {
offsetControl: 6,
action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -263,9 +276,9 @@ export class CtcCaptatinAddComponent implements OnInit {
listType: 'picture-card',
change: (args: any) => {
if (args.type === 'success') {
- this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath
+ this.detailData.identityInfoDTO.certificatePhotoBack = args.file.response.data.fullFilePath
} else {
- this.detailData.certificatePhotoBack = ''
+ this.detailData.identityInfoDTO.certificatePhotoBack = ''
}
},
beforeUpload: (file: any, _fileList: any) => {
@@ -280,15 +293,16 @@ export class CtcCaptatinAddComponent implements OnInit {
observer.complete();
});
},
+ previewFile: (file: any) => { }
},
default: this.detailData.identityInfoDTO.certificatePhotoBackWatermark
},
certificateNumber: {
title: '身份证号',
type: 'string',
- readOnly: this.readFlag,
+ readOnly: (this.i.id && (this.i.driverLicenseStatus === 10 || this.i.driverLicenseStatus === 20)) || this.readFlag,
ui: {
- widget: this.i.id ? 'text' : '',
+ widget: this.i.id && (this.i.driverLicenseStatus !== 10 && this.i.driverLicenseStatus !== 20) ? 'text' : '',
placeholder: '请输入身份证号',
},
default: this.detailData.identityInfoDTO.certificateNumber
@@ -298,7 +312,7 @@ export class CtcCaptatinAddComponent implements OnInit {
type: 'string',
maxLength: 100,
ui: {
- widget: this.i.id ? 'text' : 'textarea',
+ widget: 'textarea',
placeholder: '请输入备注',
autosize: { minRows: 2, maxRows: 6 },
},
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
index 13df6295..0b6288ab 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@@ -1,7 +1,7 @@