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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-12 17:15:50
+ * @LastEditTime : 2022-05-13 09:36:19
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts

@@ -114,7 +114,9 @@ export class AddPersonalPartnerComponent {
       side: isFront
     };
     this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-      if (res) {
+      if (res.name) {
+        console.log(res);
+        
         // 法定代表人证件照
         if (isFront === 'front') {
           // 正面
@@ -138,6 +140,8 @@ export class AddPersonalPartnerComponent {
             this.sf.setValue('/adminUserInfo/_isLoingDate', true);
           }
         }
+      } else {
+        this.sf.setValue('/adminUserInfo/_isLoingDate', false);
       }
     });
   }
@@ -169,7 +173,7 @@ export class AddPersonalPartnerComponent {
                 this.loadingIdentityInfoSub = true;
                 this.getIdentityInfoSub = this.service.request(this.service.$api_get_identityInfo_by_mobile, { mobile }).subscribe(
                   res => {
-                    if (res) {
+                    if (res?.name) {
                       this.setInfo(res);
                       this.sf.setValue('/adminUserInfo/id', res.id);
                       this.sf.setValue('/adminUserInfo/userId', res.userId);
@@ -289,17 +293,17 @@ export class AddPersonalPartnerComponent {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.sf?.setValue('/adminUserInfo/validEndTime', null)
+                change: i => this.sf?.setValue('/adminUserInfo/validEndTime', ' ')
               } as SFCheckboxWidgetSchema
             }
           },
-          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'validStartTime']
+          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'validStartTime', 'validEndTime']
         },
         // 所属城市
         _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
         cityCodesList: {
           type: 'string',
-          title: '所属城市7',
+          title: '所属城市',
           maxMultipleCount: 3,
           ui: {
             widget: 'tree-select',

src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html

@@ -23,7 +23,7 @@
       ></sf>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" acl  [acl-ability]="['REBATE-RECORD-export']">导出</button>
+      <button nz-button nzType="primary" (click)="exprot()"  [disabled]="service.http.loading" acl  [acl-ability]="['REBATE-RECORD-export']">导出</button>
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
     </div>
   </div>

src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts

@@ -149,4 +149,10 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
     this.sf.reset();
     this.st.load(1);
   }
+    // 导出
+    exprot() {
+      // this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_partnerIncomeHead_export);
+      this.service.downloadFile(this.service.$api_get_partnerIncomeHead_export, { ...this.reqParams, pageSize: -1 });
+    }
+  
 }

src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts

@@ -203,7 +203,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
         className: 'text-center',
         width: '200px',
         type: 'widget',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) }
       },
       {
         title: '税率',
@@ -299,7 +299,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
   unnormal(value: any) {
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {

src/app/routes/tax-management/components/individual-income/individual-income.component.ts

@@ -322,7 +322,7 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
     }
     // this.modal.warning({
     //   nzTitle: '申报提示',
-    //   nzContent: '订单结算时间所在月份与申报月份不一致......'
+    // nzContent: `${value?.exceptionInfo}`,
     // });
     // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
     //   if (res) {

src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts

@@ -251,7 +251,7 @@ export class TaxManagementInvoiceReportingComponent extends BasicTableComponent
     });
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -321,7 +321,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
     });
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {

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

@@ -21,23 +21,32 @@
 </nz-card> -->
 
 <nz-card class="table-box">
-    <div class="header_box">
+  <div class="header_box">
-        <label class="page_title"> <label class="driver">|</label> 运单开票记录</label>
+    <label class="page_title"> <label class="driver">|</label> 运单开票记录</label>
-        <div class="mr-sm">
+    <div class="mr-sm">
-            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl [acl-ability]="['FINANCIAL-VOUCHER-list']"
-                [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
+        >筛选</button
-            <button nz-button nzDanger (click)="exprot()" acl
+      >
-                [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">导出</button>
+      <button nz-button nzDanger (click)="exprot()" acl [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">导出</button>
-        </div>
+      <button nz-button nzDanger (click)="sureInvoice()" acl [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']">确认开票</button>
     </div>
+  </div>
 
-    <st #st [data]="service.$api_get_invoice_record_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <st
-        [page]="{}" [loading]="false" [scroll]="{ x:'1200px' }">
+    #st
-        <ng-template st-row="call1No" let-item let-index="index" let-column="column">
+    [data]="service.$api_get_invoice_record_page"
-            {{item.driverName}}<br>{{item.driverTelephone}}
+    [columns]="columns"
-        </ng-template>
+    [req]="{ process: beforeReq }"
-        <ng-template st-row="call12No" let-item let-index="index" let-column="column">
+    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-            {{item.licenseCarNo}}<br>{{item.licenseBelonging}}
+    [page]="{}"
-        </ng-template>
+    [loading]="false"
-    </st>
+    [scroll]="{ x: '1200px' }"
-</nz-card>
+  >
+    <ng-template st-row="call1No" let-item let-index="index" let-column="column">
+      {{ item.driverName }}<br />{{ item.driverTelephone }}
+    </ng-template>
+    <ng-template st-row="call12No" let-item let-index="index" let-column="column">
+      {{ item.licenseCarNo }}<br />{{ item.licenseBelonging }}
+    </ng-template>
+  </st>
+</nz-card>

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

@@ -38,7 +38,15 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
     }
     return requestOptions;
   };
-
+  afterRes = (data: any[], rawData?: any) => {
+    return data.map(item => ({
+      ...item,
+      disabled: item.invoicingStatus !== '1' || item.invoicingStatus !== '9'
+    }));
+  };
+  get selectedRows() {
+    return this.st?.list.filter(item => item.checked) || [];
+  }
   showDetail(item: any) {
     const modal = this.nzModalService.create({
       nzTitle: '运单交易明细',
@@ -129,6 +137,7 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
 
   private initST(): STColumn[] {
     return [
+      { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
       { title: '运单号', index: 'wayBillCode', width: 200 },
       { title: '订单号', index: 'billCode', width: 200 },
       {
@@ -177,4 +186,19 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
   exprot() {
     this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportEtcApplyRecordList);
   }
+  sureInvoice() {
+    if (this.selectedRows.length <= 0) {
+      this.service.msgSrv.error('请选择订单！');
+      return;
+    }
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    this.service.request(this.service.$api_updateEtcRecordStatus, params).subscribe(res => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
 }

src/app/routes/ticket-management/services/ticket.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-29 13:12:35
- * @LastEditTime : 2022-05-10 09:51:30
+ * @LastEditTime : 2022-05-13 10:38:32
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@@ -152,6 +152,8 @@ export class TicketService extends ShipperBaseService {
   $api_export_InvoicedBillInfoPage = '/api/fcc/invoicedBillInfo/exportInvoicedBillInfoPage'
   // 批量生成进项发票
   $api_createFicoInpinv = '/api/fcc/ficoEtcInvoiceL/createFicoInpinv'
+  // 开票记录-确认开票
+  $api_updateEtcRecordStatus = '/api/fcc/ficoEtcRecord/updateEtcRecordStatus'
 
   constructor(public injector: Injector) {
     super(injector);