diff --git a/proxy.conf.js b/proxy.conf.js index 00392e43..eb92fbd4 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html index 3bef51eb..2c6762b8 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ - +
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index c91b3e29..b35e8a87 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -140,39 +140,41 @@ export class WithdrawalsDetailComponent implements OnInit { hidden: true } }, - billHCode: { + orderPaymentCode: { type: 'string', title: '支付编号', ui: { placeholder: '请输入' } }, - billHCod1e: { + billCode: { type: 'string', title: '订单号', ui: { placeholder: '请输入' } }, - billHCo1de: { + resourceCode: { type: 'string', title: '货源编号', ui: { placeholder: '请输入' } }, - billHC1ode: { + serviceType: { type: 'string', title: '服务类型', ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'service:type' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, - billHCo11de: { + driverName: { type: 'string', title: '承运司机', ui: { @@ -182,7 +184,7 @@ export class WithdrawalsDetailComponent implements OnInit { } } }, - billHCo111de: { + driverLicensePlate: { type: 'string', title: '车牌号', ui: { @@ -192,7 +194,7 @@ export class WithdrawalsDetailComponent implements OnInit { } } }, - billHC1o11de: { + captain: { type: 'string', title: '收款人', ui: { @@ -202,9 +204,14 @@ export class WithdrawalsDetailComponent implements OnInit { } } }, - billHC1o111de: { + isCaptain: { type: 'string', title: '车队长收款', + enum: [ + {label: '全部', value: ''}, + {label: '是', value: '1'}, + {label: '否', value: '2'} + ], ui: { widget: 'select', placeholder: '请选择', diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html index fe3fd680..5d82c78c 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 15:48:01 + * @LastEditTime : 2022-04-21 13:29:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index ed607da7..4594edb6 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -29,7 +29,6 @@ import format from 'date-fns/format'; providers: [DatePipe] }) export class orderManagementVoucherViewComponent implements OnInit { - record: any = {}; i: any; loadPDF: string = ''; formData: any; @@ -45,7 +44,7 @@ export class orderManagementVoucherViewComponent implements OnInit { constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { } ngOnInit(): void { - // console.log(this.i) + console.log(this.i) this.initData() this.i.time = this.i.loadingTime; this.initSF(); @@ -72,8 +71,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -117,8 +116,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -170,8 +169,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -215,8 +214,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -274,8 +273,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -320,8 +319,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -382,8 +381,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -428,8 +427,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -560,7 +559,13 @@ export class orderManagementVoucherViewComponent implements OnInit { this.modal.destroy(true); } openlaod(value: any) { + if (value === 1) { + if(this.datas?.esignFlowStatus == '1') { + this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => { + console.log(res); + }) + } const a = document.createElement('a'); a.href = this.datas?.loadingElectronicsLadingBillFilePath; document.body.appendChild(a); @@ -568,6 +573,11 @@ export class orderManagementVoucherViewComponent implements OnInit { a.click(); //点击下载 document.body.removeChild(a); //下载完成移除元素 } else { + if(this.datas?.esignFlowStatus == '1') { + this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => { + console.log(res); + }) + } const a = document.createElement('a'); a.href = this.datas?.unloadingElectronicsLadingBillFilePath; document.body.appendChild(a); diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 178e640f..12584bca 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -204,10 +204,16 @@ export class OrderManagementService extends ShipperBaseService { $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`; // 异步导出投诉管理导出 $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; - //操作日志 - public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; - // 查看补充协议 + //操作日志 + public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; + // 查看补充协议 public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`; + + + // 获取电子提货单签章附件 + public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`; + // 获取电子卸货单签章附件 + public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 95aba48d..a390161f 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -64,6 +64,7 @@ export class SettingRoleEditComponent implements OnInit { const params = { id: this.params.id }; +console.log(this.params.infoUrl) this.service.request(this.params.infoUrl, params).subscribe(res => { if (res) { this.roleInfoData = res; diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts index f867aee9..34a9ba11 100644 --- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts +++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts @@ -57,10 +57,15 @@ export class SettingMenuComponent implements OnInit, OnChanges { }); } addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) { + console.log(origin,node); + if (this.authority?.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) { // 判断此菜单权限是否已经存在权限列表中 // 当前操作菜单id存在权限列表里 this.authority.forEach(menuItem => { + console.log(menuItem); + console.log(item); + if (menuItem.authorityId === origin.id) { menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在，给属性指定数据类型 if (item) { @@ -312,6 +317,8 @@ export class SettingMenuComponent implements OnInit, OnChanges { if (res) { origin.buttonInfoList = res; origin.all = false; + console.log(origin); + // 判断此菜单下是否已有此按钮权限 this.againGetBtn(id, origin); } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 032f85fe..2503b9fe 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -77,23 +77,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - declareStatus: { - title: '申报状态', - type: 'string', - enum: [ - { value: '', label: '全部' }, - { value: '0', label: '待申报' }, - { value: '1', label: '待审核' }, - { value: '2', label: '已通过' }, - { value: '3', label: '不通过' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - containsAllLabel: true - }, - default: '' - }, overdueStatus: { title: '是否逾期', type: 'string', diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index 15583442..f6bf2ede 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -96,26 +96,26 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { placeholder: '请输入证件号码' } }, - declareStatus: { - title: '申报状态', - type: 'string', - enum: [ - { value: '', label: '全部' }, - { value: '0', label: '待申报' }, - { value: '1', label: '待审核' }, - { value: '2', label: '已通过' }, - { value: '3', label: '不通过' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - }, - default: '' - }, + // declareStatus: { + // title: '申报状态', + // type: 'string', + // enum: [ + // { value: '', label: '全部' }, + // { value: '0', label: '待申报' }, + // { value: '1', label: '待审核' }, + // { value: '2', label: '已通过' }, + // { value: '3', label: '不通过' } + // ], + // ui: { + // placeholder: '请选择', + // widget: 'select', + // containsAllLabel: true, + // visibleIf: { + // _$expand: (value: boolean) => value + // } + // }, + // default: '' + // }, // declareStatu1s: { // title: '申报结果', // type: 'string', diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 056ca944..cfd71b20 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -153,7 +153,7 @@ - + diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts index 73b44001..8aee6208 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.ts +++ b/src/app/routes/usercenter/components/freight/user/user.component.ts @@ -197,6 +197,8 @@ export class FreightComponentsUserComponent implements OnInit { private initST(): STColumn[] { return [ + { title: '企业名称', className: 'text-center', index: 'enterpriseName' }, + { title: '项目名称', className: 'text-center', index: 'projectName' }, { title: '用户姓名', className: 'text-center', index: 'name' }, { title: '手机号', className: 'text-center', index: 'telephone' }, { title: '身份证件号', className: 'text-center', index: 'certificateNumber' }, diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index db00ea06..9b9c5d9f 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -48,7 +48,7 @@ export class UsermanageService extends ShipperBaseService { $api_update_enter_newowork_batch = '/api/mdc/cuc/enterpriseInfo/operate/updatnNetworkTransporter'; // 货主员工列表(运营后台) - $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList'; + $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList'; // 冻结或恢复员工 $api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff'; // 冻结或恢复应用用户