Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-24 17:39:37 +08:00
parent 97fde5d6b9 f7efbe28c0
commit 90461ee459
15 changed files with 150 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
View File

@ -60,8 +60,8 @@
</ng-template>
</st>
</nz-tab>
<!-- <nz-tab nzTitle="核销信息">
<div nz-row nzGutter="8">
<nz-tab nzTitle="核销信息">
<!-- <div nz-row nzGutter="8">
<div nz-col [nzXl]="16" [nzLg]="18" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="infoSearchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 12, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
@ -72,13 +72,15 @@
(click)="infoST?.load(1)">查询</button>
<button nz-button (click)="resetInfoSF()">重置</button>
</div>
</div>
<st #infoST [scroll]="{ x: '2000px' }" [data]="[]" [columns]="columns.info" [req]="{ process: beforeReq }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
</div> -->
<st #infoST [scroll]="{ x: '2000px' }" [data]="service.$api_get_advance_collection_hrxiao"
[columns]="columns.info" [page]="{ show: false }" [req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data' } }" [loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{index+1}}
</ng-template>
</st>
</nz-tab> -->
</nz-tab>
</nz-tabset>
</nz-card>

10
src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts
View File

@ -133,17 +133,17 @@ export class AdvanceCollectionDetailComponent implements OnInit {
],
info: [
{ title: '序号', render: 'no', width: 70, className: 'text-left' },
{ title: '核销单号', index: 'cnoName', className: 'text-left', width: 200 },
{ title: '核销日期', index: 'billHId', className: 'text-center', width: 150 },
{ title: '核销单号', index: 'ahxcode', className: 'text-left', width: 200 },
{ title: '核销日期', index: 'ahxdate', className: 'text-center', width: 150 },
{
title: '核销金额',
index: 'yskmoney',
index: 'ahxmoney',
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) },
width: 200
},
{ title: '核销备注', index: 'vatapptype', className: 'text-left', width: 200 }
{ title: '核销备注', index: 'remarks', className: 'text-left', width: 200 }
]
};
}

14
src/app/routes/financial-management/components/refund-record/refund-record.component.ts
View File

@ -57,6 +57,10 @@ export class RefundRecordComponent implements OnInit {
label: '拒绝',
type: 'default',
onClick: () => {
if (!this.msg) {
this.service.msgSrv.warning('请填写原因')
return false;
}
this.service
.request(this.service.$api_disagree_refund_record, {
applicationId: item.id,
@ -245,10 +249,10 @@ export class RefundRecordComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '退款单号', render: 'orderRefundCode', width: 180 },
{ title: '退款类型', index: 'refundTypeLabel', width: 120 },
{ title: '退款单号', render: 'orderRefundCode', width: 190 },
{ title: '退款类型', index: 'refundTypeLabel', width: 130 },
{ title: '退款金额', render: 'refundAmount', className: 'text-right', width: 160 },
{ title: '退款时间', index: 'applyTime', width: 160 },
{ title: '退款时间', index: 'applyTime', width: 170 },
{ title: '货主', index: 'shipperId', width: 150 },
{ title: '所属项目', index: 'enterpriseProjectName', width: 140 },
{ title: '支付单', render: 'billRefundPaymentVOS', width: 150 },
@ -258,8 +262,8 @@ export class RefundRecordComponent implements OnInit {
{ title: '收款人', render: 'captain', width: 150 },
{ title: '网络货运人', index: 'ltdName', width: 180 },
{ title: '银行类型', index: 'bankTypeLabel', width: 120 },
{ title: '退款原因', index: 'rejectionCause', width: 150 },
{ title: '失败原因', index: 'failCause', width: 150 },
{ title: '退款原因', index: 'reason', width: 170 },
{ title: '失败原因', index: 'failCause', width: 170 },
{
title: '操作',
fixed: 'right',

8
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
View File

@ -214,11 +214,11 @@ export class TransactionFlowComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'createTime', width: 180 },
{ title: '流水号', index: 'transactionNumber', width: 150 },
{ title: '流水号', index: 'transactionNumber', width: 170 },
{ title: '交易类型', index: 'tradeTypeLabel', width: 120 },
{ title: '关联单号', index: 'businessNumber', width: 150 },
{ title: '账户类型', index: 'accountTypeLabel', width: 130 },
{ title: '账户名称', index: 'roleName', width: 100 },
{ title: '账户名称', index: 'roleName', width: 180 },
{ title: '所属项目', index: 'projectName', width: 140 },
{ title: '收支类型', index: 'incomeTypeLabel', width: 100, className: 'text-center' },
{
@ -236,9 +236,9 @@ export class TransactionFlowComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
},
{ title: '网络货运人', index: 'ltdName', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 180 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '银行流水号', index: 'channelPaySn', width: 120 },
{ title: '银行流水号', index: 'channelPaySn', width: 170 },
{
title: '操作',
fixed: 'right',

2
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -123,6 +123,8 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_advance_collection_header = '/api/fcc/ficoBrmH/getByYskblaId';
// 根据预收款ID获取收款单明细
$api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId';
// 根据预收款ID获取核销信息明细
$api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId';
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -285,7 +285,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{ title: '订单号', render: 'billHCode', width: 170 },
{ title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
{ title: '开票状态', index: 'vatappStsLabel', width: 100 },
{ title: '所属项目', index: 'projectId', width: 140 },
{ title: '所属项目', index: 'projectIdName', width: 140 },
{ title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },
{ title: '装货地', index: 'loadingfrom', width: 220 },
{ title: '卸货地', index: 'loadingto', width: 220 },

25
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../../services/usercenter.service';
import { AuditAdminComponent } from './audit-admin/audit-admin.component';
@ -37,7 +37,11 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf.value,
createTime: {
start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || ''
}
});
}
Object.assign(requestOptions.body, { flag: this.tabType, listSource: 2 });
@ -151,10 +155,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
initEnterST(): STColumn[] {
return [
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 180 },
{ title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 190 },
{ title: '管理员', className: 'text-center', index: 'contacter', width: 150 },
{ title: '手机号', className: 'text-center', index: 'mobile', width: 140 },
{ title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
{ title: '注册时间', className: 'text-center', index: 'createTime', width: 170 },
{
title: '审核状态',
className: 'text-center',
@ -287,6 +291,19 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
expand: (value: boolean) => value
}
}
},
createTime: {
title: '注册时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
nzShowTime: true,
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};

14
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
View File

@ -43,14 +43,8 @@
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<st
#st
[data]="service.$api_freight_config_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px', y: '500px' }"
>
</st>
<!-- 数据列表 -->
<st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{ process: beforeReq }"
[scroll]="{ x: '1200px' }" [loading]="service.http.loading">
</st>
</nz-card>

22
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -161,26 +161,26 @@ export class FreightConfigComponent implements OnInit {
initST(): STColumn[] {
return [
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 250 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 250 },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
{
title: '货源单费率',
className: 'text-right',
index: 'goodsSurchargeRatio',
width: 140,
format: item => `${item.goodsSurchargeRatio}%`
index: 'contractSurchargeRatio',
width: 130,
format: item => `${item.contractSurchargeRatio}%`
},
{
title: '合同单费率',
className: 'text-right',
index: 'contractSurchargeRatio',
width: 140,
format: item => `${item.contractSurchargeRatio}%`
index: 'goodsSurchargeRatio',
width: 130,
format: item => `${item.goodsSurchargeRatio}%`
},
{
title: '合同单业务量（元）',
index: 'contractQuota',
width: 180,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@ -188,7 +188,7 @@ export class FreightConfigComponent implements OnInit {
{
title: '货源单业务量（元）',
index: 'goodsQuota',
width: 180,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
@ -201,7 +201,7 @@ export class FreightConfigComponent implements OnInit {
},
{
title: '操作',
width: '110px',
width: '90px',
fixed: 'right',
className: 'text-center',
buttons: [

5
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -354,6 +354,11 @@
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
</nz-select>
</se>
<se [col]="1" label="企业角色" required>
<nz-select nzPlaceHolder="请选择" [(ngModel)]="roleId">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of roles"></nz-option>
</nz-select>
</se>
</div>
</div>
</ng-template>

16
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -28,9 +28,11 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
disabledUpload = false;
enterpriseAddressCode: any = [];
ltdId: any = [];
roles: any = [];
approvalOpinion = '';
networkTransporter = null;
roleId = null;
esignCheckStatus: any = {
0: '不通过',
@ -55,6 +57,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
ngOnInit() {
this.initData();
this.loadltdId();
this.loadRoles();
this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
this.scrollTop = document.documentElement.scrollTop;
});
@ -66,6 +69,13 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
}
});
}
loadRoles() {
this.service.getRoles({ enterpriseId: 0, projectId: 0 }).subscribe(res => {
if (res) {
this.roles = res;
}
});
}
initData() {
this.service
@ -149,11 +159,12 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
auditPass() {
this.networkTransporter = null;
this.roleId = null;
this.nzModalService.create({
nzTitle: '审核通过',
nzContent: this.approvedModal,
nzOnOk: () => {
if (!this.networkTransporter) {
if (!this.networkTransporter || !this.roleId) {
return false;
}
this.auditEnterprise(20);
@ -163,6 +174,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
}
auditNo() {
this.approvalOpinion = '';
this.roleId = null;
this.nzModalService.create({
nzTitle: '审核驳回',
nzContent: this.redectModal,
@ -183,7 +195,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
id: this.detailData.id,
approvalOpinion: this.approvalOpinion,
networkTransporter: this.networkTransporter,
roleIds: [1]
roleId: this.roleId || null
})
.subscribe(res => {
if (res) {

10
src/app/routes/usercenter/components/freight/list/list.component.html
View File

@ -38,16 +38,8 @@
<st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{ process: beforeReq }"
[res]="{ process: dataProcess }" [scroll]="{ x: '1200px' }" [loading]="loadingList">
<ng-template st-row="enterpriseName" let-item let-index="index">
<div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
<div
style="display: inline-block; max-width: 280px; margin: 0 auto; overflow: hidden; white-space: nowrap; text-overflow: ellipsis">
{{ item.enterpriseName }}
</div>
</div>
</ng-template>
<ng-template st-row="contacter" let-item let-index="index">
{{ item.contacter }}/{{item.mobile}}
{{ item.contacter }}<br>/{{item.mobile}}
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone

39
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -179,15 +179,28 @@ export class FreightComponentsListComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName' , width: 350},
{ title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 180 },
{ title: '管理员', className: 'text-center', render: 'contacter' },
{ title: '审核人', className: 'text-center', index: 'approvalUserName' },
{ title: '网络货运人', className: 'text-center', index: 'netTranName' },
{ title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' } },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
{ title: '管理员', className: 'text-center', render: 'contacter', width: 150 },
{ title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '常用服务',
className: 'text-center',
index: 'oftenUsedServices',
type: 'enum',
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
{
title: '注册渠道',
className: 'text-center',
index: 'source',
type: 'enum',
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
width: 130
},
{
title: '企业状态',
className: 'text-center',
@ -196,15 +209,17 @@ export class FreightComponentsListComponent implements OnInit {
badge: {
0: { text: '正常', color: 'success' },
1: { text: '冻结', color: 'error' }
}
},
width: 130
},
{
title: '操作',
width: '110px',
className: 'text-center',
fixed: 'right',
buttons: [
{ type: 'divider' },
{
text: '查看<br/>',
text: '查看<br>',
acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });

24
src/app/routes/usercenter/components/freight/list/new/new.component.ts
View File

@ -598,18 +598,6 @@ export class FreightComponentsListNewComponent implements OnInit {
},
title99: { title: '', type: 'string', ui: { widget: 'custom' } },
adminMobile: {
title: ' 企业管理员手机号',
type: 'string',
minLength: 1,
format: 'mobile',
maxLength: 11,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入企业管理员手机号',
errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
}
},
tipsA: {
title: '企业管理员证件照',
type: 'string',
@ -663,6 +651,18 @@ export class FreightComponentsListNewComponent implements OnInit {
placeholder: '请输入企业管理员姓名'
}
},
adminMobile: {
title: ' 企业管理员手机号',
type: 'string',
minLength: 1,
format: 'mobile',
maxLength: 11,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入企业管理员手机号',
errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
}
},
certificateNumber: {
title: '企业管理员身份证号',
type: 'string',

26
src/app/shared/services/business/shipper-base.service.ts
View File

@ -15,6 +15,7 @@ export class ShipperBaseService extends BaseService {
$api_get_settlement_customer_list = `/api/mdc/cuc/settlementCustomer/findAll`; // 查找所有结算客户信息(下拉)
$api_get_crm_customer_list = `/api/mdc/cuc/crmCustomer/findAll`; // 查找所有Crm客户信息(下拉)
$api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
$api_get_roles = `/api/mdc/cuc/roleInfo/getRoleList`; // 获取角色列表
// 根据FullKey获取系统子配置(树)
$api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
envCache: any;
@ -183,6 +184,31 @@ export class ShipperBaseService extends BaseService {
);
}
/**
* 获取角色列表
* @returns
*/
getRoles(params = {}, containerAll = false) {
return this.request(this.$api_get_roles, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return {
label: item.roleName,
value: item.id
};
});
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
);
}
/**
* 根据ID获取网络货运人
* @returns