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

Merge branch 'develop'

Browse Source
This commit is contained in:
Taric Xin
2022-05-05 18:03:04 +08:00
parent 18b969a3eb cb14f5f6cb
commit 0cabe1c54d
13 changed files with 113 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -174,15 +174,11 @@
<!--
结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
-->
<nz-card #distannce3
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
[nzBorderless]="true" class="mb0">
<!-- <ng-template #priceTitel>
<span>运费信息</span><span
style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
</ng-template> -->
[nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>运费信息</span>

1
src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
View File

@ -306,6 +306,7 @@ export class AddPersonalPartnerComponent {
placeholder: '请选择城市(最多3个)',
checkable: true,
class: 'city-tree-select',
virtualHeight: '300px',
asyncData: () =>
this.getRegionDetailByCode('').pipe(
map((res: any) =>

8
src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
View File

@ -131,10 +131,10 @@ export class AnnouncementMessageComponent implements OnInit {
// { label: '运营后台', value: this.envSrv.env.appId },
// { label: '货主后台', value: this.envSrv.env.HzappId },
// { label: '司机端', value: this.envSrv.env.sjappId }
{ label: '全平台', value: 0},
{ label: '运营后台', value: 3},
{ label: '货主后台', value: 2 },
{ label: '司机端', value: 1 },
{ label: '全平台', value: '0'},
{ label: '运营后台', value: '3'},
{ label: '货主后台', value: '2' },
{ label: '司机端', value: '1' },
],
ui: {
widget: 'select',

2
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
View File

@ -25,7 +25,7 @@ export class BasicSettingComponent implements OnInit {
configList: any = [];
isCanSave = false;
constructor(public service: SystemService, private acl: ACLService) {
this.isCanSave = !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save');
this.isCanSave = acl.data.full || !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save');
}
ngOnInit() {

45
src/app/routes/usercenter/components/driver/driver.component.html
View File

@ -1,17 +1,5 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 13:35:56
* @LastEditors : Shiming
* @LastEditTime : 2022-02-28 14:17:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [title]="'司机列表'"></page-header-wrapper>
<!-- <page-header-wrapper [title]="'司机列表'"></page-header-wrapper>
<nz-card>
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
@ -27,25 +15,40 @@
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
</nz-card> -->
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"><label class="driver">|</label>司机列表</label>
<nz-tabset [nzSelectedIndex]="1" [nzTabBarExtraContent]="extraTemplate">
<nz-tab nzTitle="全部" (nzClick)="selectChange(null)"></nz-tab>
<nz-tab nzTitle="待审核" (nzClick)="selectChange(10)"></nz-tab>
<nz-tab nzTitle="已审核" (nzClick)="selectChange(20)"></nz-tab>
</nz-tabset>
</div>
<!-- 数据列表 -->
<st #st [columns]="columns" [scroll]="{x: '1200px'}" [data]='service.$api_get_driver_list'
<st #st [columns]="columns" [scroll]="{x: '1200px',y:scrollY}" [data]='service.$api_get_driver_list'
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading">
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
<ng-container *ngIf="item.promotersTelephone; else promotersTelephoneTemplate">
<a (click)="addPromoter(item)">{{
item.promotersTelephone
|| '添加' }}</a>
</ng-container>
<ng-template #promotersTelephoneTemplate>
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">添加</a>
</ng-template>
</ng-template>
<ng-template st-row="carNo" let-item let-index="index">
<a (click)="viewCar(item)" >{{ item?.carNo }}</a>
<a (click)="viewCar(item)">{{ item?.carNo }}</a>
</ng-template>
</st>
</nz-card>
@ -60,7 +63,11 @@
</div>
</ng-template>
<ng-template #extraTemplate>
<div>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['USERCENTER-DRIVER-LIST-list']"
(click)="openDrawer()">筛选</button>
<button nz-button nzDanger (click)="exportList()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-export']">
导出</button>
<button nz-button nzType="primary" (click)="add()">添加司机</button>
</div>
</ng-template>

60
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -3,21 +3,19 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper } from '@delon/theme';
import { DynamicSettingModalComponent } from '@shared';
import { DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { UsermanageService } from '../../services/usercenter.service';
import { CarSettleAddDriverComponent } from './add-driver/add-driver.component';
@Component({
selector: 'app-usercenter-components-driver',
styleUrls: ['./driver.component.less'],
styleUrls: ['../../../commom/less/commom-table.less'],
templateUrl: './driver.component.html'
})
export class UserCenterComponentsDriverComponent implements OnInit {
_$expand = false;
export class UserCenterComponentsDriverComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
ui: SFUISchema = { '*': { spanLabelFixed: 130, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ -31,8 +29,15 @@ export class UserCenterComponentsDriverComponent implements OnInit {
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
private modalHelper: ModalHelper
) {}
private modalHelper: ModalHelper,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
search() {
this.st?.load(1);
}
/**
* 查询参数
@ -127,18 +132,6 @@ export class UserCenterComponentsDriverComponent implements OnInit {
});
}
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
exportList() {
const params = this.reqParams;
this.service.downloadFile(this.service.$api_export_driver, { ...params, pageSize: -1 });
@ -188,10 +181,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
widget: 'select'
}
},
practiceSenioritLicenseStatus: {
@ -206,10 +196,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
widget: 'select'
}
},
promotersTelephone: {
@ -217,10 +204,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
type: 'string',
maxLength: 11,
ui: {
placeholder: '请输入手机号',
visibleIf: {
expand: (value: boolean) => value
}
placeholder: '请输入手机号'
}
},
source: {
@ -234,10 +218,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
widget: 'select'
}
},
effectiveDate: {
@ -246,10 +227,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
}
@ -304,7 +282,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
'-1': { text: '未提交', color: 'default' },
1: { text: '已提交', color: 'processing' },
2: { text: '已通过', color: 'success' },
3: { text: '已过期', color: 'error' },
3: { text: '已过期', color: 'error' }
// 10: { text: '待审核', color: 'default' },
// 20: { text: '审核通过', color: 'success' },
// 30: { text: '驳回', color: 'warning' },

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
View File

@ -27,7 +27,7 @@
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"><label class="driver">|</label>货主员工列表</label>
<label class="page_title"><label class="driver">|</label>企业审核列表</label>
<nz-tabset [nzTabBarExtraContent]="extraTemplate">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="changeTab(tab)"> </nz-tab>
</nz-tabset>

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

@ -1,16 +1,5 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-02-17 20:24:17
* @LastEditors : Shiming
* @LastEditTime : 2022-04-21 15:28:21
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\freight-config\\freight-config.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'货主配置'"></page-header-wrapper>
<!-- <page-header-wrapper [title]="'货主配置'"></page-header-wrapper>
<nz-card class="search-box">
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="schema"
@ -24,14 +13,10 @@
<button nz-button nzType="primary" [disabled]="false" acl (click)="exportList()"
[acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
<button nz-button [disabled]="false" (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>
</nz-card> -->
<!-- <nz-card>
<div class="d-flex align-items-center mb-md " style="justify-content: end;">
<button nz-button (click)="editRoleBatch()">修改角色</button>
<button nz-button (click)="editIWBatch()">修改网络货运人</button>
@ -40,7 +25,35 @@
<strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
</div> -->
<nz-card class="table-box">
<div class="header_box">
<label class="page_title"> <label class="driver">|</label> 货主配置</label>
<div class="mr-sm" style="display: flex;align-items: center;">
<div class="mr-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
<button nz-button nzDanger [nzLoading]="service.http.loading" acl
[acl-ability]="['USERCENTER-FREIGHT-CONFIG-list']" (click)="openDrawer()">筛选</button>
<button nz-button nzDanger acl (click)="exportList()" [acl-ability]="['USERCENTER-FREIGHT-CONFIG-export']">
导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item (click)="editRoleBatch()" acl [acl-ability]="['USERCENTER-FREIGHT-CONFIG-role']">
修改角色
</li>
<li nz-menu-item (click)="editIWBatch()" acl [acl-ability]="['USERCENTER-FREIGHT-CONFIG-netword']">
修改网络货运人
</li>
</ul>
</nz-dropdown-menu>
</div>
</div>
<!-- 数据列表 -->
<st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{ process: beforeReq }" [page]="{}"
[scroll]="{ x: '1200px' }" [loading]="false" (change)="stChange($event)">

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

@ -2,21 +2,21 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st';
import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form';
import { ShipperBaseService, DynamicSettingModalComponent } from '@shared';
import { ShipperBaseService, DynamicSettingModalComponent, SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-freight-config',
templateUrl: './freight-config.component.html',
styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
styleUrls: ['../../../../commom/less/commom-table.less']
})
export class FreightConfigComponent implements OnInit {
export class FreightConfigComponent extends BasicTableComponent implements OnInit {
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
selectedRows: any[] = [];
@ViewChild('IWModal', { static: false })
@ -27,8 +27,18 @@ export class FreightConfigComponent implements OnInit {
roles: any = [];
networkTransporter = null;
roleId = null;
_$expand = false;
constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {}
constructor(
public service: UsermanageService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
search() {
this.st?.load(1);
}
ngOnInit() {
this.initST();
@ -191,21 +201,6 @@ export class FreightConfigComponent implements OnInit {
});
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
private initSF(): SFSchema {
return {
properties: {
@ -235,7 +230,7 @@ export class FreightConfigComponent implements OnInit {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
nzShowTime: true,
nzShowTime: true
} as SFDateWidgetSchema
}
}

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

@ -339,7 +339,8 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
enum: [
{ label: '全部', value: '' },
{ label: '货主注册', value: 1 },
{ label: '平台添加', value: 2 }
{ label: '平台添加', value: 2 },
{ label: '数据迁移', value: 4 },
],
default: '',
ui: {
@ -411,7 +412,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
className: 'text-center',
index: 'source',
type: 'enum',
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' },
width: 130
},
{ title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },

2
src/app/routes/usercenter/components/freight/user/user.component.html
View File

@ -19,7 +19,7 @@
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"><label class="driver">|</label>企业审核列表</label>
<label class="page_title"><label class="driver">|</label>货主员工列表</label>
<nz-tabset [nzSelectedIndex]="1" [nzTabBarExtraContent]="extraTemplate">
<nz-tab nzTitle="全部" (nzClick)="selectChange(null)"></nz-tab>
<nz-tab nzTitle="待审核" (nzClick)="selectChange(0)"></nz-tab>

3
src/app/routes/usercenter/usercenter-routing.module.ts
View File

@ -44,7 +44,8 @@ const routes: Routes = [
},
{
path: 'freight/config',
component: FreightConfigComponent
component: FreightConfigComponent,
data: { guard: { ability: ['USERCENTER-FREIGHT-CONFIG-list'] } }
},
{ path: 'freight/user', component: FreightComponentsUserComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-USER-list'] } } },
{

1
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -190,7 +190,6 @@
{{detailData?.carOwner }}
</ng-template>
</sv>
<<<<<<< HEAD=======>>>>>>> 6d503f57e2434e5c0a0baa406ac42fe2b7a8a9b5
</sv-container>
<sv-container col="1">
<sv label="行驶证照片">