diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 166effcf..2780e2eb 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -1,7 +1,7 @@
-
添加司机
+
添加司机
- - -
-
-
正面照
-
示例
-
-
-
- - -
-
-
背面照
-
示例
-
-
-
- - - - -
- - + +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts index 703e2b54..9c053953 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts @@ -453,18 +453,18 @@ export class CarAddDriverComponent implements OnInit { }; } getProvinceData() { - // return this.service.request(this.service.$api_getRegionByCode, { regionCode: '' }).pipe( - // map(res => { - // const result: any = [] - // if (res) { - // res.map((m: any) => { - // const item = { label: m.name, value: m.regionCode } - // result.push(item) - // }); - // } - // return result - // }) - // ); + return this.service.request(this.service.$api_getRegionByCode, { regionCode: '' }).pipe( + map((res: any) => { + const result: any = [] + if (res) { + res.map((m: any) => { + const item = { label: m.name, value: m.regionCode } + result.push(item) + }); + } + return result + }) + ); } checkIdCard(imgurl: any, side: any, type: any) { // 识别身份证 参数side：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证 @@ -472,18 +472,18 @@ export class CarAddDriverComponent implements OnInit { idCardUrl: imgurl, side, }; - // this.service.request(this.service.$api_checkIdCard, params).subscribe((res) => { - // if (res) { - // if (type === 0) { - // // 法定代表人身份证 - // if (side === 'front') { - // // 正面 - // this.sf.setValue('/name', res.name); - // this.sf.setValue('/certificateNumber', res.number); - // } - // } - // } - // }); + this.service.request(this.service.$api_checkIdCard, params).subscribe((res: any) => { + if (res) { + if (type === 0) { + // 法定代表人身份证 + if (side === 'front') { + // 正面 + this.sf.setValue('/name', res.name); + this.sf.setValue('/certificateNumber', res.number); + } + } + } + }); } checkDriverCard(imgurl: any, side: any, type: any) { // 识别身份证 参数side：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证 @@ -491,21 +491,21 @@ export class CarAddDriverComponent implements OnInit { driverLicenseUrl: imgurl, side, }; - // this.service.request(this.service.$api_recognizeDriverLicense, params).subscribe((res) => { - // if (res) { - // if (type === 0) { - // // 法定代表人身份证 - // if (side === 'front') { - // // 正面 - // this.sf1.setValue('/licenseNo', res.number); - // this.sf1.setValue('/driverModel', res.number); - // this.sf1.setValue('/validStartTime', res.validFrom); - // this.sf1.setValue('/validEndTime', res.validTo); - // this.sf1.setValue('/signingOrganization', res.issuingAuthority); - // } - // } - // } - // }); + this.service.request(this.service.$api_recognizeDriverLicense, params).subscribe((res: any) => { + if (res) { + if (type === 0) { + // 法定代表人身份证 + if (side === 'front') { + // 正面 + this.sf1.setValue('/licenseNo', res.number); + this.sf1.setValue('/driverModel', res.number); + this.sf1.setValue('/validStartTime', res.validFrom); + this.sf1.setValue('/validEndTime', res.validTo); + this.sf1.setValue('/signingOrganization', res.issuingAuthority); + } + } + } + }); } close(): void { this.modal.destroy(); @@ -546,11 +546,11 @@ export class CarAddDriverComponent implements OnInit { delete params.userDriverLicenseDTO.tipsA; delete params.userPracticeSeniorityDTO.tipsC; delete params.showName - // this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe(res => { - // if(res){ - // this.service.msgSrv.success('添加成功') - // this.close() - // } - // }) + this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe((res: any) => { + if(res){ + this.service.msgSrv.success('添加成功') + this.modal.close(true) + } + }) } } diff --git a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts index feaa1445..1d8e7646 100644 --- a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts +++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts @@ -130,14 +130,14 @@ export class CarAddmodalComponent implements OnInit { initData(flag?: any) { if (this.sf?.value.mobile) { this.flag = flag - // this.service.request(this.service.$api_getCarCaptainByMobile, { mobile: this.sf?.value.mobile }).subscribe(res => { - // if (res.userId) { - // this.tableData = [res]; - // } else { - // this.tableData = [] - // } - // this.st.reload() - // }) + this.service.request(this.service.$api_getCarCaptainByMobile, { mobile: this.sf?.value.mobile }).subscribe(res => { + if (res.userId) { + this.tableData = [res]; + } else { + this.tableData = [] + } + this.st.reload() + }) } } /** @@ -158,11 +158,11 @@ export class CarAddmodalComponent implements OnInit { appUserId: item.appUserId ? item.appUserId : '', mobile: item.mobile } - // this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe(res => { - // if (res.data) { - // this.service.msgSrv.success('添加成功') - // } - // }) + this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe(res => { + if (res.data) { + this.service.msgSrv.success('添加成功') + } + }) } addModal() { this.modalHelper.create(CarAddDriverComponent, {mobile: this.sf?.value.mobile}, { size: 900 }).subscribe((res) => { diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html index e9ef1f28..e2e9599e 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html @@ -1,11 +1,3 @@ -
@@ -19,7 +11,7 @@
- - {{item.name}} {{item.phone}} + {{item.captainName}} {{item.captainPhone}} 设置 diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts index 67b5319f..6c73d077 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts @@ -6,9 +6,9 @@ import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { SupplyManagementService } from '../../services/supply-management.service'; import { SupplyManagementAddDriversComponent } from '../add-drivers/add-drivers.component'; - import { CarAddmodalComponent } from '../addmodal/addmodal.component'; + const BADGE: STColumnBadge = { 1: { text: '空闲', color: 'success' }, 2: { text: '未实名', color: 'error' }, @@ -19,7 +19,7 @@ const BADGE: STColumnBadge = { selector: 'app-supply-management-assigned-car', templateUrl: './assigned-car.component.html', }) -export class SupplyManagementAssignedCarComponent implements OnInit { +export class SupplyManagementVehicleAssignedCarComponent implements OnInit { record: any = {}; i: any; schema: SFSchema = {}; @@ -105,19 +105,18 @@ export class SupplyManagementAssignedCarComponent implements OnInit { return data.map((i, index) => { i.carId = ''; i.disabled = i.carStatus === '1'; - const defaultCar = i?.userCarLicenseDesensitizationVOList?.filter((item: any) => item.isDefault); - if (defaultCar.length > 0) { - i.carId = defaultCar[0].carId; + const defaultCar = i?.userCarLicenseDesensitizationVOList?.find((item: any) => item.isDefault); + if (defaultCar) { + i.carId = defaultCar?.carId; } return i; }); } save(): void { - console.log(this.selectedRows); if (this.selectedRows) { - const { carId, userId: driverId } = this.selectedRows; - const params: any = { carId, driverId }; + const { carId, appUserId: driverId, captainAppUserId: carCaptainId } = this.selectedRows; + const params: any = { carId, driverId, carCaptainId }; this.service.request(this.url, { ...params, ...this.params }).subscribe((res: any) => { if (res) { this.modal.close(res); @@ -130,7 +129,6 @@ export class SupplyManagementAssignedCarComponent implements OnInit { changeSt(e: STChange): void { if (e?.type === 'loaded') this.selectedRows = null; if (e?.type === 'radio') this.selectedRows = e?.radio; - console.log(this.selectedRows); } /** diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index a223044f..cf0a1578 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -5,7 +5,7 @@ import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SupplyManagementService } from '../../services/supply-management.service'; -import { SupplyManagementAssignedCarComponent } from '../assigned-car/assigned-car.component'; +import { SupplyManagementVehicleAssignedCarComponent } from '../assigned-car/assigned-car.component'; import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component'; @Component({ @@ -139,7 +139,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { const modalRef = this.modal.create({ nzTitle: '指派熟车', nzWidth: '1200px', - nzContent: SupplyManagementAssignedCarComponent, + nzContent: SupplyManagementVehicleAssignedCarComponent, nzComponentParams: { i: item, }, 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 10842415..7958f967 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -6,7 +6,8 @@ import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { map } from 'rxjs/operators'; import { SupplyManagementService } from '../../services/supply-management.service'; -import { SupplyManagementAssignedCarComponent } from '../assigned-car/assigned-car.component'; +import { SupplyManagementVehicleAssignedCarComponent, +} from '../assigned-car/assigned-car.component'; import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component'; import { SupplyManagementUpdateFreightComponent } from '../update-freight/update-freight.component'; @@ -150,11 +151,11 @@ export class SupplyManagementVehicleComponent implements OnInit { const modalRef = this.modal.create({ nzTitle: '指派熟车', nzWidth: '1200px', - nzContent: SupplyManagementAssignedCarComponent, + nzContent: SupplyManagementVehicleAssignedCarComponent, nzComponentParams: { i: item, status: 'anew', - // url: this.service.$api_save_assign_vehicle, + url: this.service.$api_save_assign_vehicle, params: { resourceId } }, nzFooter: null 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 4f6ca5ce..a7297b5b 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-22 10:45:44 + * @LastEditTime: 2021-12-28 10:15:55 * @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 @@ -46,6 +46,32 @@ export class SupplyManagementService extends BaseService { public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 取消货源 public $api_cancelSource = '/api/sdc/goodsResourceOperate/cancelSource'; + + + + + $api_get_practice_car_list = `/api/mdc/cuc/enterpriseVehicle/getPracticeCarList`; // 获取熟车列表 + $api_add_car_caption = `/api/mdc/userDriverExpand/addCarCaptainForShiper`; // 设置为车队长 + $api_get_goods_resource_shipper = `/api/sdc/goodsResourceShipper/modifyPricePre`; // 修改单价页面根据货源ID获取货物表 + $api_get_car_captain_by_mobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; // 查询车队长或者司机列表 + $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`;// 货主端大宗货源重新指派 + $api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车 + $api_get_has_assigned_car_list = `/api/sdc/goodsResourceShipper/getCarDriverIdsByResourceId`;// 大宗货源根据货源id获取司机和车辆的id集合 + + // 根据手机号查询车队长/司机 + $api_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; + // 新增熟车 + $api_enterpriseVehicleSave = `/api/mdc/cuc/enterpriseVehicle/save`; + // 删除熟车 + $api_deletebatch = `/api/mdc/cuc/enterpriseVehicle/deletebatch`; + // 熟车详情 + $api_getMyDriverUserDetail = `/api/mdc/cuc/enterpriseVehicle/getMyDriverUserDetail`; + // 根据地区code查询列表 + $api_getRegionByCode = '/api/mdc/pbc/region/getRegionByCode'; + // 识别身份证 + $api_checkIdCard = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; + // 驾驶证识别 + $api_recognizeDriverLicense = `/api/mdc/pbc/hwc/ocr/recognizeDriverLicense`; constructor(public injector: Injector) { super(injector) } diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts index 44ceb3d7..9f00c1cb 100644 --- a/src/app/routes/supply-management/supply-management.module.ts +++ b/src/app/routes/supply-management/supply-management.module.ts @@ -14,7 +14,7 @@ import { SupplyManagementBulkComponent } from './components/bulk/bulk.component' import { SupplyManagementVehicleComponent } from './components/vehicle/vehicle.component'; import { SupplyManagementUpdatePriceComponent } from './components/update-price/update-price.component'; import { SupplyManagementUpdateFreightComponent } from './components/update-freight/update-freight.component'; -import { SupplyManagementAssignedCarComponent } from './components/assigned-car/assigned-car.component'; +import { SupplyManagementVehicleAssignedCarComponent } from './components/assigned-car/assigned-car.component'; import { SupplyManagementQrcodePageComponent } from './components/qrcode-page/qrcode-page.component'; import { SupplyManagementUpdateExternalSnComponent } from './components/update-external-sn/update-external-sn.component'; import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; @@ -37,7 +37,7 @@ const COMPONENTS: Type[] = [ SupplyManagementVehicleComponent, SupplyManagementUpdatePriceComponent, SupplyManagementUpdateFreightComponent, - SupplyManagementAssignedCarComponent, + SupplyManagementVehicleAssignedCarComponent, SupplyManagementQrcodePageComponent, SupplyManagementUpdateExternalSnComponent, SupplyManagementVehicleDetailComponent, diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 9e71aa21..f105d094 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -1,149 +1,230 @@ - + - - -
-
- - {{ i?.no }} - {{i?.wayBillStatusLabel}} - - - - + +
+ +

运单号: {{ i?.billCode }}

-
- - - - -
-
- -
- {{ i?.enterpriseProject }} - {{ i?.dispatch?.name }}/{{i?.dispatch?.phone}} - 到货后{{ i?.paymentDays }}天内支付运费 - {{ i?.serviceTypeLabel }} -
- -
-
-
-

装卸货信息

-
-

装货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

发货日期：{{item?.createTime}}

-
-
-

卸货地：{{item?.detailedAddress}}

- -

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

卸货日期：{{item?.modifyTime}}

-
-
- -
-
-
-

货物信息

-
-

货物名称：{{item?.goodsName}}

-

重量/体积：{{item?.weight}}吨/{{item?.volume}}立方

-

用车需求：{{item?.vehicleDemand}}

-
-
-
-
-
-

托运信息

-

公司名称：{{i?.enterpriseInfoName}}

-

联系人：{{ i?.dispatch?.name }}/{{i?.dispatch?.phone}}

-
-
-
-
-

承运信息

-

司机：{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}

-

车牌号：{{i?.carVO?.carNo}}

-

车型/车长/承重：{{i?.carVO?.carModel}} | {{i?.carVO?.carLength}} | {{i?.carVO?.carLoad}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{i?.payee?.name}} /{{i?.payee?.phone}} / {{i?.payee?.phone}}

-
-

{{ item?.price| currency: '￥' }}

-
+
+
+ +
-
-
-

{{i?.freight | currency: '￥' }}

-

{{i?.wayBillStatusLabel}}

-
+
+
+ {{ i?.goodsResource?.[0]?.enterpriseInfoName }} + {{ i?.goodsResource?.[0]?.shipperAppUserName }} + {{i?.goodsResource?.[0]?.enterpriseProjectName}} + {{i?.goodsResource?.[0]?.serviceTypeLabel}} + {{i?.goodsResource?.[0]?.dispatchName}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+   +   +   +   +
+
+ -
-
- -
-
-
-
平台支付
- 司机运输费666 - 1000.00 - 未支付 + + + + {{i?.goodsInfoList?.[0]?.goodsName}} + + + + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + + {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}} + + + {{i?.driverId}} + + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + + {{i?.loadPlanTime}} + + + {{i?.unloadPlanTime}} + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + + +
+

装货卸货信息 + ( + + + ) + +

+
+
+
+
+
+
装
+
+

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
-
-
-
货主支付
- 司机运输费22 - 1000.00 - 未支付 -
-
- 附加费 - 1000.00 - 未支付 +
+
+
+
+
卸
+
+

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
- +
+ + +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

+ + + +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+
收款人：
+ + + + + + + 查看附件      + 补充协议 + + + + + + + + + + + + + + + + + {{i?.goodsResource?.stateReceipt ?'是':'否'}} + + + {{i?.goodsResource?.receiptTypeLabel}} + + + {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + + + {{i?.goodsResource?.receiptAddress}} + + + {{i?.goodsResource?.receiptAddress}} + + + + + + + + {{i?.goodsResource?.remarks}} + + + + +
- +
- - +
@@ -152,6 +233,7 @@
+ diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less index 3cd8c1be..b8327013 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less @@ -33,4 +33,38 @@ .leftPadding { padding-right: 100px; } + .handling-info { + min-height: 100px; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; + + &.loading-bg { + background-color: #50D4AB; + } + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } } \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 7a0c22fd..0590d472 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@