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:
wangshiming
2022-01-12 13:12:36 +08:00
parent a7ea496e4d ad33c512f1
commit eaef5be8ff
7 changed files with 96 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/menu-manager/components/index/index.component.html
View File

@ -6,3 +6,9 @@
<button nz-button (click)="menuImport(1)" [nzLoading]="service.http.loading">
导入运营后台菜单
</button>
<button nz-button (click)="delMenu(0)" [nzLoading]="service.http.loading">
清空货主菜单
</button>
<button nz-button (click)="delMenu(1)" [nzLoading]="service.http.loading">
清空运营后台菜单
</button>

33
src/app/routes/menu-manager/components/index/index.component.ts
View File

@ -46,8 +46,6 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
loadMenus(appId: string) {
this.service.request(this.service.$api_get_one, { appId }, 'POST', false).subscribe(res => {
console.log(res);
this.menus = res;
});
}
@ -63,8 +61,6 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
}
this.service.http.request('GET', `assets/mocks/platform/${this.selectedPlatform.enName}.json`).subscribe((res: any) => {
console.log(res);
this.addMenu(res.menu);
});
}
@ -96,24 +92,23 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
addMenuRecursion() {}
delMenu(appId: string, menus: Array<Menu>) {
if (!menus || menus.length === 0) {
return;
}
let notice = `确认删除菜单[${menus[0].text}]?`;
if (menus.length > 1) {
notice = `确认删除勾选的${menus.length}行菜单记录？`;
}
const ids = menus.map(r => r.id);
delMenu(type: number) {
this.modal.confirm({
nzTitle: '<i>删除确认</i>',
nzContent: `<b>${notice}</b><br>是否删除？`,
nzOnOk: () =>
this.service.delMany(ids).subscribe(res => {
if (res === true) {
this.service.msgSrv.success('删除成功！');
nzContent: `是否确认删除？`,
nzOnOk: () => {
this.deleteMenuByAppID(type === 0 ? 'A48F72F0A304427F921794BAD86B3522' : this.envSrv.env.appId);
}
});
}
deleteMenuByAppID(appId: string) {
this.service.request(this.service.$api_get_one, { appId }, 'POST', false).subscribe(res => {
console.log(res);
if (res) {
this.menus = res;
}
})
});
}
}

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

@ -18,10 +18,14 @@
</div>
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<!-- [data]="service.$api_get_supplier_page" -->
<nz-card class="content-box">
<nz-tabset [nzSelectedIndex]="1">
<nz-tab nzTitle="全部" (nzClick)="selectChange(null)"></nz-tab>
<nz-tab nzTitle="待审核" (nzClick)="selectChange(0)"></nz-tab>
<nz-tab nzTitle="已审核" (nzClick)="selectChange(1)"></nz-tab>
</nz-tabset>
<!-- 数据列表 -->
<st #st [columns]="columns" [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' } }"

6
src/app/routes/usercenter/components/driver/driver.component.less
View File

@ -19,4 +19,10 @@
nz-range-picker {
width: 100%;
}
.content-box {
.ant-card-body {
padding-top: 6px;
}
}
}

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

@ -22,6 +22,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
promoterModal!: any;
promotersTelephone = '';
resourceStatus: any = 0;
constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
/**
@ -52,6 +53,11 @@ export class UserCenterComponentsDriverComponent implements OnInit {
});
}
selectChange(e: any) {
this.resourceStatus = e;
this.st.load();
}
addPromoter(item?: any) {
this.promotersTelephone = item?.promotersTelephone;
const modal = this.modal.create({

91
src/assets/mocks/platform/tms-obc-web.json
View File

@ -1,7 +1,7 @@
{
"menu": [
{
"text": "主导航",
"text": "样例",
"hideInBreadcrumb": true,
"children": [
{
@ -158,37 +158,6 @@
"icon": "anticon anticon-dashboard",
"link": "/order-management/bulk"
},
{
"text": "结算单",
"children": [
{
"text": "司机管理",
"icon": "anticon anticon-dashboard",
"link": "/order-management/driver-manage"
},
{
"text": "车辆管理",
"icon": "anticon anticon-dashboard",
"link": "/order-management/car-manage"
}
]
},
{
"text": "补录单",
"children": [
{
"text": "补录运单",
"icon": "anticon anticon-dashboard",
"link": "/order-management/additionalc"
},
{
"text": "补录运单详情",
"icon": "anticon anticon-dashboard",
"link": "/order-management/additionalc-detail/:id",
"hide": true
}
]
},
{
"text": "风险单管理",
"icon": "anticon anticon-dashboard",
@ -241,6 +210,10 @@
"hide": true,
"text": "大宗运单详情",
"link": "/waybill-management/bulk-detail/:id"
},
{
"text": "异常上报",
"link": "/waybill-management/abnormal-appear"
}
]
},
@ -258,6 +231,14 @@
"hide": true,
"link": "/financial-management/cost-management/detail/:id"
},
{
"text": "凭证管理",
"link": "/financial-management/voucher-management"
},
{
"text": "凭证汇总",
"link": "/financial-management/voucher-summary"
},
{
"text": "应收费用单",
"hide": true,
@ -268,6 +249,14 @@
"hide": true,
"link": "/financial-management/cost-management/expenses-payable/:id"
},
{
"text": "付款单",
"link": "/financial-management/payment-order"
},
{
"text": "收款单",
"link": "/financial-management/receipt-order"
},
{
"text": "货主账户",
"link": "/financial-management/freight-account"
@ -358,7 +347,7 @@
"link": "/ticket/etc-invoice-requested"
},
{
"text": "运单开票记录",
"text": "开票记录",
"link": "/ticket/etc-invoice-list"
},
{
@ -366,10 +355,24 @@
"link": "/ticket/etc-invoiced-logs"
},
{
"text": "黑名单",
"text": "ETC白名单",
"link": "/ticket/etc-blacklist"
}
]
},
{
"text": "进项发票",
"link": "/ticket/input-invoice"
},
{
"text": "修改收票信息",
"link": "/ticket/input-invoice/detail/:id",
"hide": true
},
{
"text": "进项发票",
"link": "/ticket/input-invoice/edit/:id",
"hide": true
}
]
},
@ -379,8 +382,16 @@
"group": true,
"children": [
{
"text": "合同列表",
"link": "/contract-management/list"
"text": "保单管理",
"link": "/contract-management/policy"
},
{
"text": "合同管理",
"link": "/contract-management/index"
},
{
"text": "合同模板",
"link": "/contract-management/template"
}
]
},
@ -431,6 +442,14 @@
"text": "系统操作日志",
"link": "/system/system-logs"
},
{
"text": "货源操作日志",
"link": "/system/system-supply-logs"
},
{
"text": "订单操作日志",
"link": "/system/system-waybill-logs"
},
{
"text": "用户登录日志",
"link": "/system/user-logs"

2
src/assets/mocks/platform/tms-smc-web.json
View File

@ -137,7 +137,7 @@
{
"text": "投诉管理",
"i18n": "menu.ctc.order.complaint.complaintOrder",
"link": "/ctc/order/complaint"
"link": "/ctc/order/complaint/index"
},
{
"text": "投诉详情",