diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 28471285..55480ac0 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -14,6 +14,7 @@ import { AmapPoiPickerComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
import { SupplyManagementService } from '../../services/supply-management.service';
+import { debug } from 'console';
@Component({
selector: 'app-publish-goods-onecar-publish',
templateUrl: './onecar-publish.component.html',
@@ -29,8 +30,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
sf6data: any; // 货源单设置回显
sf7data: any; // 货源单设置回显
creatTime: any; // 货源单设置回显
- modifyTime: any; // 货源单设置回显
+ loadingTime: any; // 货源单设置回显
+ unloadingTime: any; // 货源单设置回显
totalFees: any; // 总数信息
+ npp =false
id = this.route.snapshot.params.id;
// // 单位
unit1 = '吨';
@@ -42,8 +45,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
dataList: any;
constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) {
this.validateForm1 = fb.group({
- createTime: [null, []],
- modifyTime: [null, []],
+ loadingTime: [null, []],
+ unloadingTime: [null, []],
});
}
@ViewChild('sf1', { static: false }) sf1!: SFComponent;
@@ -97,15 +100,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF1() {
this.schema1 = {
properties: {
- // shipperAppUserName: {
- // type: 'string',
- // title: '货主',
- // maxLength: 30,
- // ui: {
- // placeholder: '请输入'
- // }
- // },
- enterpriseProjectName: {
+ shipperAppUserName: {
+ type: 'string',
+ title: '货主',
+ maxLength: 30,
+ ui: {
+ placeholder: '请输入'
+ }
+ },
+ enterpriseProjectId: {
type: 'string',
title: '项目',
enum: [
@@ -200,24 +203,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
goodsName: {
type: 'string',
title: '货物名称',
- enum: [
- { label: '真实货物', value: '1' },
- { label: '远程货物', value: '2' },
- { label: '其他', value: '3' }
- ],
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'GoodsName' },
placeholder: '请选择'
- // asyncData: () =>
- // this.categoryService.loadChildData2('0', '2').pipe(
- // map((data: any) => {
- // return data.map((m: any) => {
- // return { label: m.name, value: m.id };
- // });
- // }),
- // ),
- // change: (i) => this.updateCategory(i, '/categoryId2'),
- } as SFSelectWidgetSchema
+ }
},
qita: {
type: 'string',
@@ -228,7 +218,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
}
}
- }
+ },
+ required: ['goodsName', ]
};
this.ui3 = {
'*': {
@@ -476,7 +467,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
console.log(this.totalFees)
}
initSF7() {
- if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
this.schema7 = {
properties: {
prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥', change: ()=> {
@@ -492,7 +482,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥',change: ()=> {
this.changeValue();},
} as SFNumberWidgetSchema },
- oilCardPay2: {
+ subtotal: {
type: 'string',
title: '小计',
ui: {
@@ -525,22 +515,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入',
}
}
- }
+ },
+ required: ['paymentDays']
};
- } else {
- this.schema7 = {
- properties: {
- totalFee: {
- type: 'string',
- title: '总费用',
- ui: {
- widget: 'custom',
- placeholder: '请输入'
- }
- }
- }
- };
- }
this.ui7 = {
'*': {
spanLabelFixed: 90,
@@ -576,15 +553,29 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
})
}
this.startInfo.splice(index, 1);
+ this.validateForm1.removeControl(`loadAddress${index}`);
+ this.validateForm1.removeControl(`loadName${index}`);
+ this.validateForm1.removeControl(`loadPhone${index}`);
}
addEndInfo(event: any) {
- this.endInfo.push({
- detailedAddress: '',
- appUserName: '',
- contractTelephone: '',
- type: 2
- });
+ if (this.addEndInfo.length < 5) {
+ const controlId = this.endInfo.length;
+ this.endInfo.push({
+ detailedAddress: '',
+ appUserName: '',
+ contractTelephone: '',
+ latitude: '',
+ longitude: '',
+ province: '',
+ city: '',
+ area: '',
+ type: 2
+ });
+ this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
+ }
}
subEndInfo(event: any, index: number, id?:any) {
if(id) {
@@ -594,6 +585,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
console.log(event, index, id)
this.endInfo.splice(index, 1);
+ this.validateForm1.removeControl(`unloadAddress${index}`);
+ this.validateForm1.removeControl(`unloadName${index}`);
+ this.validateForm1.removeControl(`unloadPhone${index}`);
}
//指派熟车
@@ -605,76 +599,96 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
});
}
submit(): void {
- Object.keys(this.validateForm1.controls).forEach(key => {
- this.validateForm1.controls[key].markAsDirty();
- this.validateForm1.controls[key].updateValueAndValidity();
- });
- if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
- var c = new Date(this.validateForm1.value.modifyTime);
- this.validateForm1.value.modifyTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
+ console.log('进来了')
+ console.log(this.startInfo)
+ // Object.keys(this.validateForm1.controls).forEach(key => {
+ // this.validateForm1.controls[key].markAsDirty();
+ // this.validateForm1.controls[key].updateValueAndValidity();
+ // });
+ // this.sf1.validator({ emitError: true });
+ // this.sf3.validator({ emitError: true });
+ // this.sf4.validator({ emitError: true });
+ // this.sf6.validator({ emitError: true });
+ // if (this.validateForm1.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid) {
+ // return;
+ // }
+ console.log(this.validateForm1.value)
+ if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) {
+ var c = new Date(this.validateForm1.value.unloadingTime);
+ this.validateForm1.value.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
- if(typeof(this.validateForm1.value.createTime) !== 'string' ) {
- var c = new Date(this.validateForm1.value.createTime);
- this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
+ if(typeof(this.validateForm1.value.loadingTime) !== 'string' ) {
+ var c = new Date(this.validateForm1.value.loadingTime);
+ this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
- if (this.validateForm1.invalid) {
- return;
- }
- this.startInfo.createTime = this.validateForm1.value.createTime
- this.startInfo.modifyTime = this.validateForm1.value.modifyTime
+ // if (this.validateForm1.invalid) {
+ // return;
+ // }
const params: any = {
...this.sf1.value,
...this.sf5.value,
+ ...this.sf6.value,
+ loadingTime: this.validateForm1?.value?.loadingTime,
+ unloadingTime: this.validateForm1?.value?.unloadingTime,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
goodsInfoDTOList: [
- {...this.sf4.value, ...this.sf3.value}
+ {
+ ...this.sf4.value,
+ ...this.sf3.value,
+ maxWeight: this.sf4.value.maxWeight.join(','),
+ maxCube: this.sf4.value.maxCube.join(',')
+ }
]
}
- if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
params.shippingInformationDTO = {
...this.sf7.value,
totalFees: this.totalFees
}
- } else {
- params.freightPrice = this.totalFees
- }
- console.log(this.sf7.value)
console.log(params)
if(this.PageStatus === '整车修改') {
this.requests(this.service.$api_set_WholeModify, params);
} else if(this.PageStatus === '整车下一单') {
this.requests(this.service.$api_set_saveAnotherWholeOrder, params);
- } else if(this.PageStatus === '大宗修改') {
- this.requests(this.service.$api_set_bulkModify, params);
- } else if(this.PageStatus === '大宗下一单') {
- this.requests(this.service.$api_set_saveAnotherBulkOrder, params);
}
-
}
+ addPreZero(num: any){
+ if(num<10){
+ return '0'+num;
+ } else {
+ return num;
+ }
+ }
requests(url: any, params: any) {
this.service.request(url, params).subscribe((res: any) => {
console.log(res)
})
}
- openMap(type: string, index: number) {
+ // 打开地图
+ openMap(type: string, index: number) {
const modalRef = this.modalService.create({
nzTitle: '',
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
const poi = item.poi;
- console.log(item)
+ console.log(item.poi);
const locList = poi.location.toString().split(',');
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.district + poi.name;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
+ this.startInfo[index].province = poi.cityInfo.province;
+ this.startInfo[index].city = poi.cityInfo.city;
+ this.startInfo[index].area = poi.cityInfo.district;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.district + poi.name;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
+ this.endInfo[index].province = poi.cityInfo.province;
+ this.endInfo[index].city = poi.cityInfo.city;
+ this.endInfo[index].area = poi.cityInfo.district;
break;
default:
break;
@@ -687,39 +701,39 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
// 初始化信息
initdata() {
- if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
this.dataR(res);
})
- } else if(this.PageStatus === '大宗修改' || this.PageStatus === '大宗下一单') {
- this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
- this.dataR(res);
- })
- }
}
asds(i: any) {
console.log(i)
}
- // const data =
+ // 初始化信息
dataR (res: any) {
// this.dataList = res;
this.sf1data = {
- // shipperAppUserName: res?.shipperAppUserName || '',
- enterpriseProjectName: res?.enterpriseProjectName || '',
- enterpriseInfoName: res?.enterpriseInfoName || '',
- externalResourceCode: res?.externalResourceCode || '',
- dispatchId: res?.dispatchId || '',
+ // shipperAppUserName: res?.shipperAppUserName ,
+ enterpriseProjectId: res?.enterpriseProjectId ,
+ enterpriseInfoName: res?.enterpriseInfoName ,
+ externalResourceCode: res?.externalResourceCode ,
+ dispatchId: res?.dispatchId ,
}
- if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
+ if(this.PageStatus === '整车修改') {
this.sf1data.id = res?.id;
}
- res?.unLoadingPlaceList.forEach((element: any) => {
+ res?.unLoadingPlaceVOList.forEach((element: any) => {
if(element.type === 1) {
- if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
+ const controlId = this.startInfo.length;
+ if(this.PageStatus === '整车修改') {
this.startInfo.push({
detailedAddress: element.detailedAddress,
appUserName: element.appUserName,
contractTelephone: element.contractTelephone,
+ latitude: element.latitude,
+ longitude: element.longitude,
+ province: element.province,
+ city: element.city,
+ area: element.area,
type: element.type,
id: element.id
})
@@ -728,19 +742,30 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
detailedAddress: element.detailedAddress,
appUserName: element.appUserName,
contractTelephone: element.contractTelephone,
+ latitude: element.latitude,
+ longitude: element.longitude,
+ province: element.province,
+ city: element.city,
+ area: element.area,
type: element.type,
})
}
- if(element.createTime) {
- this.creatTime = element?.createTime
- this.modifyTime = element?.modifyTime
- }
+
+ this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
} else if(element.type === 2) {
- if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
+ const controlId = this.endInfo.length;
+ if(this.PageStatus === '整车修改') {
this.endInfo.push({
detailedAddress: element?.detailedAddress,
appUserName: element?.appUserName,
contractTelephone: element?.contractTelephone,
+ latitude: element.latitude,
+ longitude: element.longitude,
+ province: element.province,
+ city: element.city,
+ area: element.area,
type: element.type,
id: element.id
})
@@ -749,58 +774,64 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
detailedAddress: element?.detailedAddress,
appUserName: element?.appUserName,
contractTelephone: element?.contractTelephone,
+ latitude: element.latitude,
+ longitude: element.longitude,
+ province: element.province,
+ city: element.city,
+ area: element.area,
type: element.type
})
}
-
+ this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
+ this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
}
});
+
this.sf3data = {
- goodsName: res?.goodsInfoList[0]?.goodsName || '',
+ goodsName: res?.goodsInfoVOList[0]?.goodsName ,
}
this.sf4data = {
- weight: res?.goodsInfoList[0]?.weight || '',
- volume: res?.goodsInfoList[0]?.volume || '',
- vehicleDemand: res?.goodsInfoList[0]?.vehicleDemand || '',
- maxCube: res?.goodsInfoList[0]?.maxCube || '',
- maxWeight: res?.goodsInfoList[0]?.maxWeight || '',
- number: res?.goodsInfoList[0]?.number || '',
- freightPrice: res?.goodsInfoList[0]?.freightPrice || '',
- freightType: res?.goodsInfoList[0]?.freightType || '',
- goodsType: res?.goodsInfoList[0]?.goodsType || '',
- modifyTime: res?.goodsInfoList[0]?.modifyTime || '',
- modifyUserId: res?.goodsInfoList[0]?.modifyUserId || '',
- resourceId: res?.goodsInfoList[0]?.resourceId || '',
- rule: res?.goodsInfoList[0]?.rule || '',
- settlementBasis: res?.goodsInfoList[0]?.settlementBasis || '',
-
+ weight: res?.goodsInfoVOList[0]?.weight ,
+ volume: res?.goodsInfoVOList[0]?.volume ,
+ vehicleDemand: res?.goodsInfoVOList[0]?.vehicleDemand ,
+ maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(',') ,
+ maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') ,
+ number: res?.goodsInfoVOList[0]?.number ,
+ goodsType: res?.goodsInfoVOList[0]?.goodsType ,
+ modifyUserId: res?.goodsInfoVOList[0]?.modifyUserId ,
+ resourceId: res?.goodsInfoVOList[0]?.resourceId ,
+ rule: res?.goodsInfoVOList[0]?.rule ,
+ settlementBasis: res?.goodsInfoVOList[0]?.settlementBasis ,
}
- if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
- this.sf4data.id = res?.goodsInfoList[0]?.id;
- }
- if(this.PageStatus === '大宗下一单' || this.PageStatus === '大宗修改') {
- this.totalFees = res?.freightPrice || '0';
- } else {
- this.totalFees = res?.shippingInformationVO?.totalFee || '0';
+ if(res?.loadingTime) {
+ this.loadingTime = res?.loadingTime;
+ }
+ if(res?.unloadingTime) {
+ this.unloadingTime = res?.unloadingTime;
+ }
+ if(this.PageStatus === '整车修改' ) {
+ this.sf4data.id = res?.goodsInfoVOList[0]?.id;
}
+ this.totalFees = res?.shippingInformationVO?.totalFee || '0';
this.sf5data = {
- goodsValue: res?.goodsValue || '',
+ goodsValue: res?.goodsValue ,
}
+ console.log(res?.stateReceipt)
this.sf6data = {
- stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
- remarks: res?.supplementaryInformationVO?.remarks || '',
+ stateReceipt: res?.stateReceipt,
+ receiptType: res?.receiptType ,
+ receiptUserId: res?.receiptUserId ,
+ remarks: res?.remarks
}
this.sf7data = {
- prePay: res?.shippingInformationVO?.prePay || '',
- toPay: res?.shippingInformationVO?.toPay || '',
- oilCardPay: res?.shippingInformationVO?.oilCardPay || '',
- receiptPay: res?.shippingInformationVO?.receiptPay || '',
- // oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
- appendFee: res?.shippingInformationVO?.appendFee || '',
- paymentDays: res?.shippingInformationVO?.paymentDays || '',
+ prePay: res?.shippingInformationVO?.prePay ,
+ toPay: res?.shippingInformationVO?.toPay ,
+ oilCardPay: res?.shippingInformationVO?.oilCardPay ,
+ receiptPay: res?.shippingInformationVO?.receiptPay ,
+ // subtotal: res?.shippingInformationVO?.oilCardPay ,
+ appendFee: res?.shippingInformationVO?.appendFee ,
+ paymentDays: res?.shippingInformationVO?.paymentDays ,
}
- if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
-
- }
}
}
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index a69ef0a6..c60eb253 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
+
+
+
+
+
+
@@ -68,16 +75,8 @@ size="small"
{{item.resourceCode}}
-
-
- {{item?.vehicleDemand.i}}66{{i}}
-
-
-
-
- {{i?.maxCube}}
- {{i?.maxWeight}}
-
+ 车型: {{item?.vehicleDemand?.maxWeight}}
+ 车长: {{item?.vehicleDemand?.maxCube}} 米
抢单
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 4fd4892c..6230a56a 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -27,27 +27,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
columns: STColumn[] = [];
- tabs = [ {
- name: '全部',
- type: 0,
- count: 0,
- },
- {
- name: '待接单',
- type: 1,
- count: 0,
- },
- {
- name: '已接单',
- type: 2,
- count: 0,
- },
- {
- name: '已取消',
- type: 3,
- count: 0,
- },
- ];
+ tabs = {
+ totalQuantity: 0,
+ cancelQuantity: 0,
+ receivedQuantity: 0,
+ stayQuantity: 0
+ };
resourceStatus: any;
constructor(public service: SupplyManagementService, private modal: NzModalService, private router: Router,private ar: ActivatedRoute) { }
@@ -71,6 +56,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
this.initSF();
this.initST();
this.initSFFre();
+ this.getGoodsSourceStatistical();
}
@@ -101,12 +87,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
goodsName: {
type: 'string',
title: '货物名称',
- enum: [
- { label: '普货', value: 1 },
- { label: '指派', value: 2 },
- ],
+
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'GoodsName' },
placeholder: '请选择',
} as SFSelectWidgetSchema,
},
@@ -233,7 +217,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
{
title: '用车需求',
- index: 'vehicleDemand',
className: 'text-center',
width: '120px',
render: 'vehicleDemand'
@@ -455,4 +438,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
})
}
+ // 获取货源状态统计
+ getGoodsSourceStatistical() {
+ this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1 }).subscribe(res => {
+ if (res) {
+ console.log(res)
+ this.tabs = res;
+ }
+ })
+ }
}
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index c7688b1f..7203de79 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-10 15:03:10
+ * @LastEditTime: 2021-12-13 15:39:52
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts
@@ -18,9 +18,9 @@ export class SupplyManagementService extends BaseService {
// 大宗获取货源表详情
$api_get_getBulkDetail = `/api/sdc/goodsResourceOperate/getBulkDetail`;
// 查询运营后台大宗货源列表
- $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/list/bulkPage`;
+ $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
// 查询运营后台整车货源列表
- $api_get_wholePage_list = `/api/sdc/goodsResourceOperate/list/wholePage`;
+ $api_get_wholePage_list = `/api/sdc/goodsResourceOperate/listWholePage`;
// 整车再下一单
$api_set_saveAnotherWholeOrder = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrder`;
// 大宗再下一单
@@ -36,6 +36,7 @@ export class SupplyManagementService extends BaseService {
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_get_listModifyPrice = `/api/sdc/goodsInfo/listModifyPrice`;
$api_update_price = `/api/sdc/goodsInfo/modifyPrice`; // 根据货物ID修改单价
+ $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/StatisticalStatus`; // 统计整车、大宗货源状态数量
constructor(public injector: Injector) {
super(injector)
}
diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts
index a4e19d6e..0f8c3ce9 100644
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@@ -15,6 +15,7 @@ import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bu
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
+import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
const routes: Routes = [
{ path: 'index', component: SupplyManagementIndexComponent },
@@ -22,6 +23,7 @@ const routes: Routes = [
{ path: 'vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent },
{ path: 'add-drivers', component: SupplyManagementAddDriversComponent },
{ path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent },
+ { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent },
];
@NgModule({
diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts
index 2241a0d0..e79883ec 100644
--- a/src/app/routes/supply-management/supply-management.module.ts
+++ b/src/app/routes/supply-management/supply-management.module.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-06 13:41:42
+ * @LastEditTime: 2021-12-13 15:23:25
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\supply-management.module.ts
@@ -25,6 +25,7 @@ import { GaodeMapComponent } from './components/gaode-map/gaode-map.component';
import { PublishGoodsChooseFamifiarComponent } from './components/choose-famifiar/choose-famifiar.component';
import { PublishchooseFamifiarSetCaptainComponent } from './components/choose-famifiar/set-captain/set-captain.component';
import { PublishchooseFamifiarAddComponent } from './components/choose-famifiar/add/add.component';
+import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
const COMPONENTS: Type[] = [
SupplyManagementIndexComponent,
@@ -42,7 +43,9 @@ const COMPONENTS: Type[] = [
GaodeMapComponent,
PublishGoodsChooseFamifiarComponent,
PublishchooseFamifiarSetCaptainComponent,
- PublishchooseFamifiarAddComponent
+ PublishchooseFamifiarAddComponent,
+ SupplyManagementBulkPublishComponent,
+
];
@NgModule({
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html
index 27431f72..f03ede38 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.html
+++ b/src/app/routes/usercenter/components/freight/user/user.component.html
@@ -1,3 +1,11 @@
+
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 85a86167..fecca58b 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -1,8 +1,8 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-29 15:43:42
- * @LastEditors: your name
+ * @LastEditTime: 2021-12-13 11:25:12
+ * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
*/
@@ -74,8 +74,6 @@ export class UsermanageService extends BaseService {
// 保存企业信息表
$api_save_enterprise_admin = '/api/mdc/cuc/enterpriseInfo/operate/save';
-
-
// 根据地区code查询列表
$api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index 27a29cb7..1e37f2b6 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -72,26 +72,18 @@ export class VehicleComponentsAuditComponent implements OnInit {
carNoColor: {
type: 'string',
title: '车牌颜色',
- enum: [
- { label: '全部', value: '' },
- { label: '正常', value: 0 },
- { label: '冻结', value: 1 },
- { label: '废弃', value: 2 },
- ],
ui: {
- widget: 'select',
- },
+ widget: 'dict-select',
+ params: { dictKey: 'CarColor' },
+ }
},
isSelf: {
type: 'string',
title: '是否挂靠',
- enum: [
- { label: '否', value: 0 },
- { label: '是', value: 1 },
- ],
ui: {
- widget: 'select',
- },
+ widget: 'dict-select',
+ params: { dictKey: 'Whether' },
+ }
},
saveUser: {
type: 'string',
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 1d7bdc4f..90554701 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -94,15 +94,9 @@ export class VehicleComponentsListComponent implements OnInit {
carNoColor: {
type: 'string',
title: '车牌颜色',
- enum: [
- { label: '全部', value: '' },
- { label: '正常', value: 0 },
- { label: '冻结', value: 1 },
- { label: '废弃', value: 2 },
- ],
- default: '',
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'CarColor' },
visibleIf: {
expand: (value: boolean) => value,
},
diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html
index 742b309c..169130cc 100644
--- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html
+++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html
@@ -1,6 +1,19 @@
+
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
index 3f167d20..fa58df22 100644
--- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
+++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
@@ -1,7 +1,8 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { throwError } from 'rxjs';
import AMapLoader from '@amap/amap-jsapi-loader';
+import { Component, OnInit, ViewChild } from '@angular/core';
import { amapConf } from '@conf/amap.config';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { throwError } from 'rxjs';
declare var AMap: any;
declare var AMapUI: any;
declare var Loca: any;
@@ -14,15 +15,15 @@ const CONFIG = amapConf;
styleUrls: ['./amap-poi-picker.component.less']
})
export class AmapPoiPickerComponent implements OnInit {
- @ViewChild('modal')
- modal: any;
+ // @ViewChild('modal')
+ // modal: any;
addressInput: any;
aMap: any;
poi: any;
- constructor() {}
+ constructor(private modalRef: NzModalRef) {}
ngOnInit(): void {
this.mapInit();
// this.PoiPicker();
@@ -79,6 +80,7 @@ export class AmapPoiPickerComponent implements OnInit {
});
}
+ //POI选点
poiPickerReady(poiPicker: any) {
(window as any).poiPicker = poiPicker;
const map = this.aMap;
@@ -99,7 +101,6 @@ export class AmapPoiPickerComponent implements OnInit {
poiPicker.on('poiPicked', (poiResult: any) => {
const source = poiResult.source,
poi = poiResult.item;
- console.log(poi);
this.poi = poi;
marker.setMap(map);
infoWindow.setMap(map);
@@ -107,18 +108,29 @@ export class AmapPoiPickerComponent implements OnInit {
marker.setPosition(poi.location);
infoWindow.setPosition(poi.location);
- infoWindow.setContent('地址:
' + poi.name + '
');
+ infoWindow.setContent(`地址:
${poi.name}`);
infoWindow.open(map, marker.getPosition());
map.setCenter(marker.getPosition());
+ //获取行政区信息
+ map.getCity(function (info: any) {
+ poi.cityInfo = info;
+ });
});
- poiPicker.onCityReady(function () {
- poiPicker.suggest('美食');
- });
+ // poiPicker.onCityReady(function () {
+ // poiPicker.suggest('美食');
+ // });
}
closeInfoWindow() {
this.aMap.clearInfoWindow();
}
+
+ sure() {
+ this.modalRef.destroy();
+ }
+ cancel() {
+ this.modalRef.destroy();
+ }
}