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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
潘晓云
2022-05-11 11:09:11 +08:00
parent 0f8d3c8116 e6e784d129
commit abc5eb852d
20 changed files with 398 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-05-10 13:41:21
* @LastEditTime : 2022-05-11 10:12:55
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

19
src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
View File

@ -46,27 +46,27 @@ export class PayableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf?.value,
billTime: {
start: this.sf?.value.billTime?.[0] || null,
end: this.sf?.value.billTime?.[1] || null
start: this.sf?.value.billTime?.[0] || '',
end: this.sf?.value.billTime?.[1] || ''
},
feedate: {
start: this.sf?.value.feedate?.[0] || null,
end: this.sf?.value.feedate?.[1] || null
start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || ''
}
});
if (this.sf?.value.billTime) {
Object.assign(requestOptions.body, {
billTime: {
start: this.sf?.value.billTime?.[0] || null,
end: this.sf?.value.billTime?.[1] || null
start: this.sf?.value.billTime?.[0] || '',
end: this.sf?.value.billTime?.[1] || ''
}
});
}
if (this.sf?.value.feedate) {
Object.assign(requestOptions.body, {
feedate: {
start: this.sf?.value.feedate?.[0] || null,
end: this.sf?.value.feedate?.[1] || null
start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || ''
}
});
}
@ -134,9 +134,6 @@ export class PayableOrderDetailComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
billTime: {

38
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -93,6 +93,20 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
placeholder: '请输入'
}
},
billHCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
waybillHCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入'
}
},
ltdId: {
type: 'string',
title: '网络货运人',
@ -141,13 +155,12 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
sts: {
type: 'string',
title: '核销状态',
enum: [
{ value: 1, label: '已核销' },
{ value: 0, label: '待核销' }
],
default: '',
ui: {
widget: 'select',
placeholder: '请选择'
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'write:off:status' },
containAllLable: true
}
},
phxdate: {
@ -166,13 +179,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
billHCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
feeHCode: {
type: 'string',
title: '费用号',
@ -195,7 +201,9 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
{ title: '核销单号', index: 'phxcode', type: 'link', width: 160 },
{ title: '订单号', index: 'billHCode', width: 160 },
{ title: '运单号', index: 'waybillHCode', width: 160 },
{ title: '网络货运人', index: 'ltdName', width: 220 },
{ title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
{ title: '付款账户', index: 'shipperaccount', width: 170 },
@ -223,7 +231,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
{ title: '银行水单', index: 'bankreceipt', width: 190 },
{ title: '创建时间', index: 'createTime', width: 180 },
// { title: '创建人', index: 'createUserIdLabel', width: 120 },
{ title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
{ title: '核销状态', index: 'stsLabel', width: 120 },
{ title: '核销备注', index: 'remarks', width: 120 },
{
title: '操作',

8
src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
View File

@ -207,6 +207,13 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
placeholder: '请输入'
}
},
waybillHCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入'
}
},
// orderS3: {
// type: 'string',
// title: '费用号',
@ -234,6 +241,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
{ title: '', index: 'key', type: 'checkbox' },
{ title: '核销单号', index: 'ahxcode', type: 'link', width: 210 },
{ title: '订单号', index: 'billHCode', type: 'link', width: 180 },
{ title: '运单号', index: 'waybillHCode', width: 180 },
{ title: '网络货运人', index: 'ltdName', width: 220 },
{ title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
{ title: '收款账户', index: 'ltdaccountId', width: 200 },

10
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -152,9 +152,15 @@ export class VoucherManagementComponent extends BasicTableComponent {
vctype: {
type: 'string',
title: '凭证类型',
enum: [
{label: '全部', value:''},
{label: 'WLW', value:'WLW'},
{label: 'YH', value:'YH'},
{label: 'KP', value:'KP'},
{label: 'ZZ', value:'ZZ'},
],
ui: {
widget: 'dict-select',
params: { dictKey: 'credential:type' },
widget: 'select',
placeholder: '请选择'
},
default: ''

8
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -78,10 +78,10 @@
<div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' +
item?.carNo : '' }} </div><br />
<div *ngIf="item.payeeName !== item.driverName">车队长： {{ item?.payeeName ? item?.payeeName + '/' : ''}}{{
item?.payeePhone }} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }} </div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div *ngIf="item.payeeName !== item.driverName"> {{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }} </div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<!-- <div>{{ item.billCode }}</div> -->

6
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -336,6 +336,12 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
index: 'driverName',
render: 'driverName'
},
{
title: '车队长',
className: 'text-left',
width: '180px',
render: 'payeeName'
},
{
title: '装卸货时间',
width: '200px',

10
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 16:53:07
* @LastEditTime : 2022-05-11 09:49:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -95,10 +95,10 @@
</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' +
item?.carNo : '' }} </div><br />
<div *ngIf="item.payeeName !== item.driverName">车队长： {{ item?.payeeName ? item?.payeeName + '/' : ''}}{{
item?.payeePhone }} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }} </div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div *ngIf="item.payeeName !== item.driverName"> {{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }} </div>
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">

7
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -379,8 +379,15 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
title: '承运司机',
className: 'text-left',
width: '250px',
index: 'driverName',
render: 'driverName'
},
{
title: '车队长',
className: 'text-left',
width: '180px',
render: 'payeeName'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
{ title: '关联货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },

5
src/app/routes/partner/partner-list/components/index/partner-list.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-29 17:28:23
* @LastEditors : Shiming
* @LastEditTime : 2022-05-10 11:39:19
* @LastEditTime : 2022-05-10 15:33:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -93,12 +93,11 @@
<se label="当前渠道销售"> {{ selectItem?.channelIdLabel }} </se>
<se label="渠道销售修改为" required>
<nz-select
nzMode="multiple"
nzPlaceHolder="请搜索"
nzAllowClear
nzShowSearch
nzServerSearch
[(ngModel)]="cannelItem.channelId"
[nzShowArrow]="false"
(nzOnSearch)="onSearch($event)"
>
<ng-container *ngFor="let item of cannels">

222
src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
View File

@ -9,7 +9,7 @@
<nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info" nz-row>
<div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
<img [src]="detailData?.enterpriseLogo" />
<img [src]="detailData?.avatar" />
<div style="flex: 1">
<div nz-row>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
@ -28,9 +28,7 @@
</div>
<div nz-row>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 注册时间：{{ detailData?.createTime }} </div>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
所属城市：{{enterpriseDefaultCityName}}
</div>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 所属城市：{{ enterpriseDefaultCityName }} </div>
</div>
</div>
</div>
@ -40,19 +38,33 @@
<button [disabled]="service.http.loading" nz-button nzDanger (click)="save()"> 保存 </button>
</ng-container>
<ng-template #editButton>
<ng-container *ngIf="detailData?.approvalStatus === 10">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(true)"> 通过 </button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus != 10">
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
<button
[disabled]="service.http.loading"
nz-button
nzDanger
nz-popconfirm
[nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)"
nzPopconfirmPlacement="bottomRight"
*ngIf="detailData?.lockedStatus"
acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
>
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
<button
[disabled]="service.http.loading"
nz-button
nzDanger
nz-popconfirm
[nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)"
nzPopconfirmPlacement="bottomRight"
*ngIf="!detailData?.lockedStatus"
acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
>
冻结
</button>
</ng-container>
@ -64,57 +76,116 @@
</ng-template>
<ng-template #frozen>
<ng-container *ngTemplateOutlet="
PopconfirmTempalte;
context: { title: '确定冻结该合伙人吗？', content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' }
">
<ng-container
*ngTemplateOutlet="
PopconfirmTempalte;
context: {
title: '确定冻结该合伙人吗？',
content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作'
}
"
>
</ng-container>
</ng-template>
<ng-template #enable>
<ng-container *ngTemplateOutlet="
PopconfirmTempalte;
context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
">
<ng-container
*ngTemplateOutlet="
PopconfirmTempalte;
context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
"
>
</ng-container>
</ng-template>
</page-header-wrapper>
<nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'">
<div class="font-weight-blod text-md detail-title" style="justify-content: space-between;">
<div style="display: flex; justify-content: center;align-items: center;">
<a class="sign"></a>
<p style="margin-bottom: 0">
合伙人信息
<label *ngIf="!detailData?.adminUserInfo?.isExpired" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>{{detailData?.adminUserInfo?.esignCheckMsg}}
</label>
<label *ngIf="detailData?.adminUserInfo?.isExpired" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</div>
<div>
<ng-container *ngIf="detailData?.approvalStatus === 10">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(true)"> 通过 </button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
</ng-container>
</div>
</div>
<sv-container col="3" class="mt16">
<sv-title>合伙人信息</sv-title>
<!-- <sv-title>合伙人信息</sv-title> -->
<sv label="姓名">
<input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
<input
nz-input
type="text"
[(ngModel)]="detailData.adminUserInfo.name"
[readonly]="!isEdit"
[nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'"
/>
</sv>
<sv label="手机号">
<!-- <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> -->
{{detailData.adminUserInfo.mobile}}
{{ detailData.adminUserInfo.mobile }}
</sv>
<sv label="身份证号">
<input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
<input
nz-input
type="text"
[(ngModel)]="detailData.adminUserInfo.certificateNumber"
[readonly]="!isEdit"
[nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'"
/>
</sv>
<sv label="身份证有效期" col="1">
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
<nz-date-picker
[(ngModel)]="detailData.adminUserInfo.validStartTime"
[nzDisabled]="!isEdit"
nzPlaceHolder=" "
[nzBorderless]="!isEdit"
[nzSuffixIcon]="isEdit ? 'calendar' : ''"
style="width: 140px"
class="calendar"
>
</nz-date-picker>
-
<ng-container
*ngIf="!isEdit && !detailData?.adminUserInfo?.validEndTime && detailData.adminUserInfo.validStartTime">
<ng-container *ngIf="!isEdit && !detailData?.adminUserInfo?.validEndTime && detailData.adminUserInfo.validStartTime">
<label style="padding-left: 11px">长期</label>
</ng-container>
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
<nz-date-picker
[(ngModel)]="detailData.adminUserInfo.validEndTime"
[nzDisabled]="!isEdit"
nzPlaceHolder=" "
[nzBorderless]="!isEdit"
[nzSuffixIcon]="isEdit ? 'calendar' : ''"
style="width: 140px"
class="calendar"
>
</nz-date-picker>
<ng-container *ngIf="isEdit">
<label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
(ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''" class="ml-sm">长期</label>
<label
nz-checkbox
[ngModel]="!!!detailData.adminUserInfo.validEndTime"
(ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''"
class="ml-sm"
>长期</label
>
</ng-container>
</sv>
<sv label="身份证照" col="1">
<div class="d-flex">
<ng-container *ngTemplateOutlet="
<ng-container
*ngTemplateOutlet="
uploadTemplate;
context: {
data: detailData?.adminUserInfo,
@ -123,9 +194,11 @@
key2: 'certificatePhotoFront',
hover: 'legalFront'
}
">
"
>
</ng-container>
<ng-container *ngTemplateOutlet="
<ng-container
*ngTemplateOutlet="
uploadTemplate;
context: {
data: detailData?.adminUserInfo,
@ -134,16 +207,26 @@
key2: 'certificatePhotoBack',
hover: 'legalBack'
}
">
"
>
</ng-container>
</div>
</sv>
<sv label="所属城市">
<ng-container *ngIf="isEdit; else cascaderelseTemplate">
<nz-tree-select #areaTreeSelect style="width: 350px" [(ngModel)]="enterpriseAddressCode"
[nzDropdownStyle]="{ 'max-height': '300px' }" [nzExpandedKeys]="enterpriseDefaultAddressCode"
[nzNodes]="areaList" [nzAsyncData]="true" [nzCheckStrictly]="true" nzCheckable
(nzExpandChange)="onExpandChange($event.node)" nzDropdownClassName="area-tree-select">
<nz-tree-select
#areaTreeSelect
style="width: 350px"
[(ngModel)]="enterpriseAddressCode"
[nzDropdownStyle]="{ 'max-height': '300px' }"
[nzExpandedKeys]="enterpriseDefaultAddressCode"
[nzNodes]="areaList"
[nzAsyncData]="true"
[nzCheckStrictly]="true"
nzCheckable
(nzExpandChange)="onExpandChange($event.node)"
nzDropdownClassName="area-tree-select"
>
</nz-tree-select>
</ng-container>
<ng-template #cascaderelseTemplate>
@ -164,9 +247,17 @@
<sv-container col="3" class="mt16">
<sv-title>修改渠道销售记录</sv-title>
<sv label="">
<st #st [data]="service.$api_get_personal_channel_list" [columns]="columns"
[req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small"
[page]="{ show: false }" [scroll]="{ x: '1200px' }">
<st
#st
[data]="service.$api_get_personal_channel_list"
[columns]="columns"
[req]="{ params: { partnerId: route.snapshot.params.id } }"
[loading]="service.http.loading"
bordered
size="small"
[page]="{ show: false }"
[scroll]="{ x: '1200px' }"
>
</st>
</sv>
</sv-container>
@ -175,8 +266,7 @@
<ng-template #PopconfirmTempalte let-title="title" let-content="content">
<div class="ant-popover-message">
<i nz-icon nzType="info-circle" nzTheme="fill"></i>
<div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">{{ title }}
</div>
<div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">{{ title }} </div>
<div class="ant-popover-message-title ng-star-inserted">
{{ content }}
</div>
@ -184,18 +274,36 @@
</ng-template>
<ng-template #uploadTemplate let-data="data" let-status="status" let-key="key" let-key2="key2" let-hover="hover">
<nz-upload class="avatar-uploader" [nzAction]="uploadURl" nzName="multipartFile" nzListType="picture-card"
[nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
[nzDisabled]="!isEdit || disabledUpload" (nzChange)="changeUpload($event, data, key, key2, hover)">
<nz-upload
class="avatar-uploader"
[nzAction]="uploadURl"
nzName="multipartFile"
nzListType="picture-card"
[nzShowUploadList]="false"
nzFileType="image/png,image/jpeg,image/jpg,image/gif"
[nzDisabled]="!isEdit || disabledUpload"
(nzChange)="changeUpload($event, data, key, key2, hover)"
>
<ng-container *ngIf="!data[key] && isEdit">
<i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
<div class="ant-upload-text">上传</div>
</ng-container>
<div *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
(click)="$event.cancelBubble = true" class="image-hover">
<div
*ngIf="data[key]"
(mouseover)="detailData[hover] = true"
(mouseleave)="detailData[hover] = false"
(click)="$event.cancelBubble = true"
class="image-hover"
>
<img nz-image [nzSrc]="data[key]" style="width: 200px; height: 160px" />
<i nz-icon *ngIf="detailData[hover] && isEdit" nzType="close-circle" nzTheme="fill" class="delete-icon"
(click)="deleteImg(data, key, key2)"></i>
<i
nz-icon
*ngIf="detailData[hover] && isEdit"
nzType="close-circle"
nzTheme="fill"
class="delete-icon"
(click)="deleteImg(data, key, key2)"
></i>
</div>
</nz-upload>
</ng-template>
</ng-template>

84
src/app/routes/partner/recorded/components/record/record.component.html
View File

@ -1,16 +1,29 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-29 17:28:23
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 10:11:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\record\\record.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
[button]="'none'"></sf>
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 15 } } }"
[compact]="true"
[button]="'none'"
></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" (click)="search()">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button acl [acl-ability]="['RECORDED-LIST-export']"> 导出</button>
<button nz-button acl [acl-ability]="['RECORDED-LIST-export']"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -29,37 +42,49 @@
</nz-tabset>
<ng-template #extraTemplate>
<div class="d-flex align-items-center ">
<div class="d-flex align-items-center">
<div class="mr-md">
已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据，累计入账 <strong class="text-red">{{
totalCallNo }}</strong>
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据，累计入账 <strong class="text-red">{{ totalCallNo }}</strong>
<!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
</div>
<button nz-button (click)="this.auditAction(null)" acl [acl-ability]="['RECORDED-LIST-audit']">审核</button>
<button nz-button (click)="this.auditAction(null)" acl [acl-ability]="['RECORDED-LIST-audit']">审核</button>
</div>
</ng-template>
<div class="table-content">
<st #st [data]="service.$api_get_recorded_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true,process: beforeReq}" [loading]="service.http.loading"
[scroll]="{ x:'1200px' }" (change)="stChange($event)"
<st
#st
[data]="service.$api_get_recorded_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, process: beforeReq }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px' }"
(change)="stChange($event)"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
[page]="{ show: true, pageSizes: [10, 20, 50, 100, 200, 500] }">
[page]="{ show: true, pageSizes: [10, 20, 50, 100, 200, 500] }"
>
<ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
{{ item.bankName }} <br> {{ item.bankCardNumber }}
{{ item.bankName }} <br />
{{ item.bankCardNumber }}
</ng-template>
</st>
<div class=" text-md" *ngIf="st?.list?.length !== 0 ">
<span class="mr-md">合伙人数：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmountSum}}</label></span>
<span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
<span class="mr-md">开票金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceEntryNum}}</label></span>
<span class="mr-md">代缴个税：<label
class="text-red-dark font-weight-bold">{{totalInfo?.taxPersonalSum}}</label></span>
<span class="mr-md">入账金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.recordedAmountSum}}</label></span>
<div class="text-md" *ngIf="st?.list?.length !== 0">
<span class="mr-md"
>合伙人数：<label class="text-red-dark font-weight-bold">{{ totalInfo?.invoiceAmountSum }}</label></span
>
<span class="mr-md"
>入账笔数：<label class="text-red-dark font-weight-bold">{{ totalInfo?.count }}</label></span
>
<span class="mr-md"
>开票金额：<label class="text-red-dark font-weight-bold">{{ totalInfo?.invoiceEntryNum }}</label></span
>
<span class="mr-md"
>代缴个税：<label class="text-red-dark font-weight-bold">{{ totalInfo?.taxPersonalSum }}</label></span
>
<span class="mr-md"
>入账金额：<label class="text-red-dark font-weight-bold">{{ totalInfo?.recordedAmountSum }}</label></span
>
</div>
</div>
</nz-card>
@ -68,8 +93,13 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px;margin-left: 14px;"></textarea>
<textarea
nz-input
rows="3"
[(ngModel)]="msg"
placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
</se>
</div>
</div>

10
src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
View File

@ -110,13 +110,13 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
}
},
isOvertime: {
overtime: {
title: '是否逾期',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: false, label: '否' },
{ value: true, label: '是' }
{ value: '0', label: '否' },
{ value: '1', label: '是' }
],
ui: {
placeholder: '请选择',
@ -178,11 +178,11 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
},
{
title: '是否逾期',
index: 'overdueStatus',
index: 'overtime',
className: 'text-center',
width: '120px',
type: 'enum',
enum: { false: '否', true: '是' }
enum: { '0': '否', '1': '是' }
},
{
title: '税款所属期起',

135
src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html
View File

@ -1,67 +1,92 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:08
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 10:41:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\input-invoice\\input-invoice-detail\\input-invoice-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'收票信息'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
</page-header-wrapper>
<nz-card class="statistics-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="网络货运人" required>
{{headerInfo?.ltdid}}
</se>
<se label="发票日期" required>
{{headerInfo?.invdate}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="销售方" required>
{{headerInfo?.hrtoName}}
</se>
<se label="发票号" required>
{{headerInfo?.invoiceno}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="收票类型" required>
{{headerInfo?.invtype}}
</se>
<se label="收票备注">
{{headerInfo?.remarks}}
</se>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="网络货运人" required>
{{ headerInfo?.ltdName }}
</se>
<se label="发票日期" required>
{{ headerInfo?.invdate }}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="销售方" required>
{{ headerInfo?.hrtoName }}
</se>
<se label="发票号" required>
{{ headerInfo?.invoiceno }}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="收票类型" required>
{{ headerInfo?.invtype }}
</se>
<se label="收票备注">
{{ headerInfo?.remarks }}
</se>
</div>
</div>
</nz-card>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_input_invoice_detail_page" [columns]="columns" size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false" [scroll]="{ x:'1200px',y: '200px' }">
<ng-template st-row="billHCode" let-item let-index="index" let-column="column">
{{index+1}}
</ng-template>
</st>
</nz-card>
<st
#st
[data]="service.$api_get_input_invoice_detail_page"
[columns]="columns"
size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
[scroll]="{ x: '1200px', y: '200px' }"
>
<ng-template st-row="billHCode" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>
<ng-template st-row="invmoney" let-item let-index="index" let-column="column">
{{ item.invmoney | currency }}
</ng-template>
<ng-template st-row="invtax" let-item let-index="index" let-column="column">
{{ item.invtax | currency }}
</ng-template>
</st>
</nz-card>

4
src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
View File

@ -144,8 +144,8 @@ export class InputInvoiceDetailComponent implements OnInit {
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '结算客户', index: 'cnoName', width: 90 },
{ title: '费用科目', index: 'feesubname', width: 100 },
{ title: '收票金额', index: 'invmoney', width: 140 },
{ title: '收票税额', index: 'invtax', width: 100 }
{ title: '收票金额', render: 'invmoney', width: 140 },
{ title: '收票税额', render: 'invtax', width: 100 }
];
}
}

4
src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
View File

@ -114,7 +114,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
title: '发票类型',
enum: [
{ value: '', label: '全部' },
{ value: '1', label: '运输专票' }
{ value: '运输专票', label: '运输专票' }
],
ui: {
widget: 'select',
@ -212,7 +212,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
},
{ title: '发票类型', index: 'invtype', width: 150, className: 'text-center' },
{ title: '销售方', index: 'hrtoName', width: 200 },
{ title: '创建时间', index: 'createtime', type: 'date', width: 150, className: 'text-center' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 150, className: 'text-center' },
{ title: '创建人', index: 'createbyname', width: 120 },
{ title: '收票状态', index: 'stsLabel', width: 120, className: 'text-center' },
{

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

@ -422,8 +422,8 @@
</sv>
</sv-container>
</div>
<!-- <nz-divider></nz-divider> -->
<!-- <sv-container col="3" class="mt16">
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title>合伙人信息</sv-title>
<sv label="合伙人名称">
{{partnerInfo.partnerContactName}}
@ -443,9 +443,9 @@
<input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
</sv-container> -->
<!-- <nz-divider></nz-divider> -->
<!-- <sv-container col="3" class="mt16">
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title>渠道销售信息</sv-title>
<sv label="姓名">
<input nz-input type="text" [(ngModel)]="partnerInfo.channelName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -459,9 +459,9 @@
<input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv>
</sv-container> -->
</sv-container>
</nz-card>
<!-- <nz-card>
<nz-card>
<nz-tabset>
<nz-tab nzTitle="修改合伙人记录">
<st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
@ -488,7 +488,7 @@
</st>
</nz-tab>
</nz-tabset>
</nz-card> -->
</nz-card>
<ng-template #PopconfirmTempalte let-title="title" let-content="content">
<div class="ant-popover-message">
<i nz-icon nzType="info-circle" nzTheme="fill"></i>

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

@ -78,15 +78,13 @@ export class EditSaleComponentsAddComponent implements OnInit {
if (str) {
console.log(+str);
if(+str) {
console.log('数字');
params.phoneNumber = str
} else {
console.log('中文');
params.name = str
}
return this.service
.request(this.service.$api_get_channel, params)
.pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.channelId } as SFSchemaEnum))))
.pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);

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

@ -92,7 +92,7 @@
<p nz-tooltip [nzTooltipTitle]="item.partnerName+'/'+item.partnerMobile" style="cursor: pointer;width: 120px;margin: 0; white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;">
{{ item.partnerName }}
{{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}}
</p>
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
@ -102,7 +102,7 @@
<p nz-tooltip [nzTooltipTitle]="item.channelName+'/'+item.channelMobile" style="cursor: pointer;width: 120px;margin: 0; white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;">
{{ item.channelName }}
{{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}}
</p>
</ng-template>
</st>

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

@ -263,7 +263,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
widget: 'select'
}
},
promotersTelephone: {
channelName: {
title: '业务员',
type: 'string',
ui: {
@ -403,9 +403,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
{ title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
{ title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 },
{ title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 200 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 200 },
{ title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 200 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '注册渠道',