Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html

@@ -30,7 +30,7 @@
           {{ costInfo?.armoeny | currency }}
         </se>
         <se label="开票金额" required>
-          {{ costInfo?.arkpmoney | currency }}
+          {{ costInfo?.armoeny | currency }}
         </se>
         <se label="收款金额" required>
           {{ costInfo?.armoeny | currency }}

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts

@@ -42,7 +42,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
   }
 
   beforeReq = (requestOptions: STRequestOptions) => {
-    Object.assign(requestOptions.body, { billHId: this.billHId });
+    Object.assign(requestOptions.body, { ahxHId: this.id });
     if (this.sf) {
       Object.assign(requestOptions.body, {
         ...this.sf.value,

src/app/routes/financial-management/components/refund-record/refund-record.component.ts

@@ -255,7 +255,7 @@ export class RefundRecordComponent implements OnInit {
       { title: '退款类型', index: 'refundTypeLabel', width: 140 },
       { title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 },
       { title: '退款时间', index: 'refundExecuteTime', width: 170 },
-      { title: '企业名称', index: 'shipperId', width: 150 },
+      { title: '企业名称', index: 'enterpriseInfoName', width: 150 },
       { title: '所属项目', index: 'enterpriseProjectName', width: 140 },
       { title: '支付单', render: 'billRefundPaymentVOS', width: 150 },
       { title: '订单号', index: 'billCode', width: 150 },

src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html

@@ -4,7 +4,7 @@
   <div style="width: 80%;margin: 0 auto;" id="qr_page">
     <div style="text-align: center;">
 
-      <h2> {{i?.enterpriseInfoName}}</h2>
+      <h2> {{i?.shipperAppUserName}}</h2>
       <qr [value]="qrCodeValue" #qr></qr>
       <div class="mb-sm" *ngFor="let address of i?.loadingAddressArr">卸货地 : {{address}}</div>
       <div class="mb-sm" *ngFor="let address of i?.unloadingAddressArr">装货地 : {{address}}</div>

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts

@@ -212,10 +212,10 @@ export class InvoicedListComponent implements OnInit {
       },
       {
         title: '税率',
-        index: 'vatrate',
+        index: 'billvatrate',
         className: 'text-right',
         width: 90,
-        format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%`
+        format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
       },
       {
         title: '税额',

src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts

@@ -26,7 +26,6 @@ export class AuditAdminComponent implements OnInit {
 
   ngOnInit(): void {
     this.loadUserInfo();
-    this.msgSrv.warning('111')
   }
 
   loadUserInfo() {

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -278,7 +278,7 @@
     </sv>
     <sv label="身份证有效期" col="1">
       <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
-        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 120px;"
         class="calendar"></nz-date-picker>
       -
       <ng-container
@@ -286,7 +286,7 @@
         <label style="padding-left: 11px;">长期</label>
       </ng-container>
       <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validEndTime" [nzDisabled]="!isEdit"
-        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 120px;"
         class="calendar"></nz-date-picker>
       <ng-container *ngIf="isEdit">
         <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"

src/app/shared/components/account-detail/account-detail.component.ts

@@ -46,7 +46,7 @@ export class AccountDetailComponent implements OnInit {
         })
         .subscribe(res => {
           if (res) {
-            this.service.msgSrv.success('开户成功');
+            this.service.msgSrv.success(res?.pfMsg);
             this.modalHelp.destroy();
           }
         });
@@ -60,7 +60,7 @@ export class AccountDetailComponent implements OnInit {
         })
         .subscribe(res => {
           if (res) {
-            this.service.msgSrv.success('开户成功');
+            this.service.msgSrv.success(res?.paMsg);
             this.modalHelp.destroy();
           }
         });