-
+
diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts
index 5a16a165..fb428f1e 100644
--- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts
+++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts
@@ -19,6 +19,7 @@ import { GeometryLabelCfg } from '@antv/g2/lib/interface';
providers: [CurrencyPipe]
})
export class DatatableDataindexComponent implements OnInit {
+ @ViewChild('AdvanceDeposit', { static: false }) AdvanceDeposit!: G2CustomComponent;
@ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent;
@ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent;
@ViewChild('BillDirectProportion', { static: false }) BillDirectProportion!: G2CustomComponent;
@@ -49,6 +50,7 @@ export class DatatableDataindexComponent implements OnInit {
this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => {
if (res) {
this.totalAdvanceDeposit = this.formatMiniAreaData(res);
+ this.initAreaMap(this.AdvanceDeposit['el'].nativeElement as any, []);
}
});
// 业绩量总额
@@ -179,7 +181,7 @@ export class DatatableDataindexComponent implements OnInit {
.style({
fillOpacity: 1,
stroke: 'white',
- lineWidth: 8
+ lineWidth: 4
})
.state({
active: {
@@ -294,42 +296,57 @@ export class DatatableDataindexComponent implements OnInit {
* @param el
*/
private initAreaMap(el: HTMLElement, datas: any[]): void {
+ const data = [
+ { city: '冰岛（雷克雅未克）', type: '首都人口', value: 0.56 },
+ { city: '冰岛（雷克雅未克）', type: '城市人口', value: 0.38 }
+ ];
+
const chart = new Chart({
container: el,
autoFit: true,
- height: 500
+ height: 45
});
- chart.data(datas);
- chart.scale('Data', {
- range: [0, 1],
- tickCount: 10,
- type: 'timeCat'
+ chart.data(data);
+ chart.legend(false);
+ chart.axis('city', false);
+ chart.axis('value', {
+ label: {
+ formatter: val => val
+ },
+ title: null,
+ grid: null
});
- chart.scale('sales', {
- nice: true
- });
- chart.axis('Data', false);
- chart.axis('sales', false);
+ chart.coordinate('rect').transpose();
chart.tooltip({
- showCrosshairs: true
+ customItems: items => {
+ return [];
+ },
+ showContent: true,
+ title: '1,968.08万'
});
-
- // chart.annotation().dataMarker({
- // position: ['2014-01', 1750],
- // top: true,
- // text: {
- // content: '因政策调整导致销量下滑',
- // style: {
- // fontSize: 13
- // }
- // },
- // line: {
- // length: 30
- // }
- // });
-
- chart.line().position('Data*sales');
- chart.area().position('Data*sales');
+ chart.interaction('active-region');
+ chart
+ .interval()
+ .adjust('stack')
+ .position('city*value')
+ .color('type*city', (type: any, city: any) => {
+ if (type === '首都人口') {
+ return '#E60012';
+ }
+ if (type === '城市人口') {
+ return '#EAEAEB';
+ }
+ return '#EAEAEB';
+ })
+ .style('type', (type: any, city: any) => {
+ if (type === '首都人口') {
+ return { radius: [0, 0, 20, 20] };
+ }
+ if (type === '城市人口') {
+ return { radius: [20, 20, 0, 0] };
+ }
+ return {};
+ });
chart.render();
}
@@ -409,7 +426,7 @@ export class DatatableDataindexComponent implements OnInit {
chart.data(data);
// 设置坐标轴
chart.scale({
- y1: { alias: y1Title, min: 0, max: 1000000 },
+ y1: { alias: y1Title, min: 0, max: 2000000000 },
y2: { alias: y2Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' },
y3: { alias: y3Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' }
});
@@ -420,8 +437,8 @@ export class DatatableDataindexComponent implements OnInit {
padding: [10, 0, 40, 0],
items: [
{ value: 'y1', name: y1Title, marker: { symbol: 'circle', style: { fill: '#E60012', r: 5, fontSize: 13 } } },
- { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#6CBFFF', r: 5, fontSize: 13 } } },
- { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#50D4AB', r: 5, fontSize: 13 } } }
+ { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#FE7823', r: 5, fontSize: 13 } } },
+ { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#F7CFCE', r: 5, fontSize: 13 } } }
]
});
chart.axis('y2', {
@@ -440,16 +457,16 @@ export class DatatableDataindexComponent implements OnInit {
.line()
.position('x*y2')
// .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' }))
- .color('#6CBFFF')
+ .color('#F7CFCE')
.size(3);
- chart.point().position('x*y2').color('#6CBFFF').size(3).shape('circle');
+ chart.point().position('x*y2').color('#F7CFCE').size(3).shape('circle');
chart
.line()
.position('x*y3')
// .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' }))
- .color('#50D4AB')
+ .color('#FE7823')
.size(3);
- chart.point().position('x*y3').color('#50D4AB').size(3).shape('circle');
+ chart.point().position('x*y3').color('#FE7823').size(3).shape('circle');
chart.interaction('active-region');
chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 09e3ac81..00f391e2 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -19,7 +19,7 @@ import { OrderManagementService } from '../../services/order-management.service'
@Component({
selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html',
- styleUrls: ['../../../commom/less/commom-table.less','./vehicle.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less']
})
export class OrderManagementVehicleComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
@@ -113,10 +113,10 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
const params: any = Object.assign({}, this.sf?.value || this.paramsList);
delete params._$expand;
this.paramsList = params
- Object.assign(requestOptions.body, {
- ...a,
- ...this.paramsList,
- });
+ Object.assign(requestOptions.body, {
+ ...a,
+ ...this.paramsList,
+ });
this.loading = true;
return requestOptions;
};
@@ -197,7 +197,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
type: 'string',
title: '运单号',
ui: {
- placeholder: '最多100个单号，空号隔开',
+ placeholder: '最多100个单号，空号隔开',
}
},
resourceCode: {
@@ -416,11 +416,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
text: '运费变更记录',
click: _record => this.OpenPrice(_record),
iif: item =>
- item.billStatus == '4' ||
- item.billStatus == '5' ||
- item.billStatus == '2' ||
- item.billStatus == '3' ||
- item.billStatus == '6',
+ item.billType !== '3' && (
+ item.billStatus == '4' ||
+ item.billStatus == '5' ||
+ item.billStatus == '2' ||
+ item.billStatus == '3' ||
+ item.billStatus == '6'
+ ),
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }
},
// {
@@ -439,7 +441,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
{
text: '变更运费',
click: _record => this.updateFreight(_record),
- iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
+ iif: item => item.billType !== '3' && item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }
},
{
@@ -585,8 +587,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
/**
* 导入货源
*/
- importGoodsSource() {}
- audit(item: any) {}
+ importGoodsSource() { }
+ audit(item: any) { }
/*
* 审核关闭弹窗
@@ -870,8 +872,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
}
});
}
- // 导出
- exprot() {
- this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportWholeList);
- }
+ // 导出
+ exprot() {
+ this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportWholeList);
+ }
}
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
index 6277ed0a..c8e49e8a 100644
--- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts
+++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts
@@ -28,7 +28,7 @@ export class ExpressInfoComponent implements OnInit {
}
},
createTime: {
- title: '创建时间',
+ title: '下单时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
@@ -87,9 +87,9 @@ export class ExpressInfoComponent implements OnInit {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
- createtime: {
- start: this.sf.value.createtime?.[0] || null,
- end: this.sf.value.createtime?.[1] || null
+ createTime: {
+ start: this.sf.value.createTime?.[0] || '',
+ end: this.sf.value.createTime?.[1] || ''
}
});
}
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
index 766fe66f..b56088d4 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
@@ -172,9 +172,15 @@ export class InvoiceDetailComponent implements OnInit {
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请选择',
+ serverSearch: true,
+ searchDebounceTime: 300,
+ searchLoadingText: '搜索中...',
allowClear: true,
- asyncData: () => this.service.getEnterpriseProject({ id: this.ltdId })
+ onSearch: (q: any) => this.service.getProjectList({ projectName: q, enterpriseId: this.headerInfo?.shipperId })
+ // widget: 'select',
+ // placeholder: '请选择',
+ // allowClear: true,
+ // asyncData: () => this.service.getEnterpriseProject({ id: this.ltdId })
},
default: ''
}
@@ -303,7 +309,7 @@ export class InvoiceDetailComponent implements OnInit {
width: 140,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
}
];
}
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index f8f08999..a8f18617 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -284,10 +284,14 @@ export class InvoiceRequestedDetailComponent implements OnInit {
default: '',
ui: {
widget: 'select',
+ serverSearch: true,
+ searchDebounceTime: 300,
+ searchLoadingText: '搜索中...',
+ allowClear: true,
+ onSearch: (q: any) => this.service.getProjectList({ projectName: q, enterpriseId: this.headerInfo?.shipperId }),
visibleIf: {
expand: (value: boolean) => value
- },
- asyncData: () => this.service.getEnterpriseProject()
+ }
}
}
}
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
index ddc9df8a..f45918ab 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
@@ -258,6 +258,22 @@ export class InvoicedListComponent implements OnInit {
expand: (value: boolean) => value
}
}
+ },
+ invoicetype: {
+ type: 'string',
+ title: '发票类型',
+ enum: [
+ { value: '', label: '全部' },
+ { value: '1', label: '运输专用发票' }
+ ],
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ },
+ default: ''
}
}
};
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 3a614d5b..bf46b2dd 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -26,6 +26,8 @@ export class ShipperBaseService extends BaseService {
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
+ // 批量获取项目信息
+ public $api_get_project_list = '/api/mdc/cuc/enterpriseProject/getProjectList';
constructor(public injector: Injector) {
super(injector);
}
@@ -247,6 +249,35 @@ export class ShipperBaseService extends BaseService {
}
}
+ /**
+ * 批量获取项目信息
+ * @returns
+ */
+ getProjectList(params = { projectName: '', enterpriseId: '' }, containerAll = false) {
+ let str = params.projectName.replace(/^\s+|\s+$/g, '');
+ if (str) {
+ return this.request(this.$api_get_project_list, params)
+ .pipe(
+ map((res: any) => {
+ if (!res) {
+ return [];
+ }
+ const list = res.map((item: any) => {
+ return { label: item.projectName, value: item.id };
+ });
+ const obj = [];
+ if (containerAll) {
+ obj.push({ label: '全部', value: '' });
+ }
+ return [...obj, ...list];
+ })
+ )
+ .toPromise();
+ } else {
+ return of([]);
+ }
+ }
+
/**
* 获取结算客户
* @returns
diff --git a/src/styles/compact.less b/src/styles/compact.less
index 1fb4892b..29e50138 100644
--- a/src/styles/compact.less
+++ b/src/styles/compact.less
@@ -109,4 +109,28 @@ h2 {
padding: 12px 0px !important;
margin : 0 0 0 16px !important;
}
+}
+
+.mini_area_title {
+ margin-bottom: 0px !important;
+
+ .title {
+ font-size: 13px !important;
+ }
+
+ .subtitle {
+ font-size: 12px !important;
+ }
+}
+
+.g2-card__meta-wrap {
+
+ .g2-card__total {
+ font-size : 24px !important;
+ margin-top: 0 !important;
+ }
+}
+
+.g2-card__footer {
+ padding-top: 0;
}
\ No newline at end of file