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:
Taric Xin
2022-04-27 16:15:28 +08:00
parent dc42627c81 a599c6f780
commit 5760a69695
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -8,10 +8,9 @@ import { OrderManagementService } from '../../services/order-management.service'
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { of, Subscription } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router, ActivatedRoute } from '@angular/router';
import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service';
import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
@Component({

8
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
View File

@ -49,15 +49,15 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
properties: {
configName: {
type: 'string',
title: '配置名称',
title: '模板名称',
},
stateLocked: {
type: 'string',
title: '状态',
enum: [
{label: '全部', value: ''},
{label: '启用', value: 0},
{label: '禁用', value: 1},
{label: '生效中', value: 1},
{label: '失效', value: 0},
],
ui: {
widget: 'select',
@ -129,7 +129,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
},
{
text: '禁用',
iif: (_record) =>{ return _record.stateLocked == true},
iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)},
click: _record => this.viewEvaluate(_record),
},
{

4
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:23:05
* @LastEditTime : 2022-04-27 11:28:48
* @LastEditTime : 2022-04-27 15:52:30
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@ -38,7 +38,6 @@ import { OrganizationManagementComponent } from './components/organization-manag
import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
import { PartnerSystemConfigComponent } from './components/config/config.component';
const COMPONENTS = [
StaffManagementComponent,
@ -59,7 +58,6 @@ const COMPONENTS = [
NoTeManagementComponent,
SmsTemplateComponent,
OrganizationManagementComponent,
PartnerSystemConfigComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,