diff --git a/proxy.conf.js b/proxy.conf.js index 1f0027c2..8fd91df6 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 10:05:01 + * @LastEditTime : 2022-04-22 14:01:00 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ 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 9133fdfa..dc423d83 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,27 +4,33 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 14:41:44 + * @LastEditTime : 2022-04-22 11:03:26 * @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 3bc73604..c8ae7969 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 @@ -575,99 +575,116 @@ export class orderManagementVoucherViewComponent implements OnInit { } openlaod(value: any) { if (value === 1) { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); - const modal = this.modalService.success({ - nzTitle: '电子装货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillTakeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.loadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子装货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - return; - case 2: - modal.destroy(); - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.loadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } } else { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); //反复执行函数本身 - const modal = this.modalService.success({ - nzTitle: '电子卸货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillDischargeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.unloadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子卸货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - - return; - case 2: - modal.destroy(); - - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.unloadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } - } } + } + // openlaod2(value: any) { + // if (value === 1) { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); + // const modal = this.modalService.success({ + // nzTitle: '电子装货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.loadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子装货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + // return; + // case 2: + // modal.destroy(); + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.loadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(a); //下载完成移除元素 + // } + // } else { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); //反复执行函数本身 + // const modal = this.modalService.success({ + // nzTitle: '电子卸货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.unloadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子卸货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + + // return; + // case 2: + // modal.destroy(); + + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.unloadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(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 2c7f4a05..3df90939 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 15:16:37 + * @LastEditTime : 2022-04-22 10:54:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -209,11 +209,14 @@ export class OrderManagementService extends ShipperBaseService { // 查看补充协议 public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`; - // 获取电子提货单签章附件 public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`; // 获取电子卸货单签章附件 public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`; + // 预览卸货单 + public $api_getBillDischargeGoods = `/api/sdc/billOperate/getBillDischargeGoods`; + // 预览提货单 + public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`; // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html index a537892f..5d060bcc 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-28 14:53:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 17:03:21 + * @LastEditTime : 2022-04-22 10:30:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,6 +25,6 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" [scroll]="{ x: '1000' }"> - + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts index 65ce3f8c..bf422f94 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -128,7 +128,7 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { // 回复操作 add(item: any) { console.log(item); - this.modals.destroy(item); + this.modals.destroy([item]); } // 批量回复操作 batchReply() { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 65cd23f9..8a4b1a3f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,38 +4,44 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:47:02 + * @LastEditTime : 2022-04-22 14:29:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
- -    + + 固定结算费率配置 -     % + +  % + 业务量和管理费比例配置 -    + + - -    - + + +
+ +
+ 关联合伙人配置 -    - + + + -   添加 + 添加 -    + + 1 2 @@ -52,19 +59,22 @@ 5 -    - + -    + + + +
-
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 958809db..cf090af2 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:53:39 + * @LastEditTime : 2022-04-22 15:01:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -26,12 +26,13 @@ import { inRange } from '@delon/util'; export class ParterRebateManageMentAddComponent implements OnInit { @ViewChild('table') table!: any; tabelData: any; + addStatus: boolean = false; configName: string = ''; partnerType: string = ''; remarke: string = ''; accountingRate: Number = 0; priority: string = ''; - partnerPeopleList: any; + partnerPeopleList: any = []; configType = '1'; precision = 2; partnerId :Array =[]; @@ -78,7 +79,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { widget: 'tinymce', loadingTip: 'loading...', config: { - height: 650 + height: 500, } }, // default: data?.agreementContent || '' @@ -87,6 +88,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { + this.addStatus =false this.initSF(); } goBack() { @@ -108,22 +110,25 @@ export class ParterRebateManageMentAddComponent implements OnInit { modalRef.afterClose.subscribe((res: any) => { this.partnerId = []; if (res) { - console.log(Array.isArray(res)); - console.log(res); if(Array.isArray(res)) { - this.partnerPeopleList = res; + console.log(res); + console.log(this.partnerPeopleList); + this.partnerPeopleList = this.partnerPeopleList.concat(res); res.forEach((ele: any) => { this.partnerId.push(ele?.id); }) } else { - this.partnerPeopleList = [res]; + console.log(res); + this.partnerPeopleList = this.partnerPeopleList.concat(res); this.partnerId.push(res?.id); } } }); } delete(item: any) { - console.log(item); + this.partnerPeopleList = this.partnerPeopleList.filter((d:any, i: any) => { + return item.id != d.id + }); } save () { const params = { @@ -146,4 +151,10 @@ export class ParterRebateManageMentAddComponent implements OnInit { } }) } + changePartner(value: any) { + console.log(value); + if(value) { + this.addStatus = true + } + } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 9c7e7250..33c7f6e6 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime : 2022-04-20 16:48:26 + * @LastEditTime : 2022-04-22 14:50:25 * @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\\services\\system.service.ts @@ -64,7 +64,7 @@ export class SystemService extends BaseService { $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch'; // 获取某个应用的所有菜单 - $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppIdNoHide'; + $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId'; // 查询网络货运信息表 $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page'; diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html index 90e39e1c..fe7bd829 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html @@ -8,42 +8,30 @@