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

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html

@@ -22,8 +22,8 @@
             [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
-            <!-- <button nz-button nzType="primary" [disabled]="false"> 导出</button>
+            <button nz-button nzType="primary" [disabled]="false" (click)='exportList()'> 导出</button>
-            <button nz-button nzType="primary" [disabled]="false"> 导出明细</button>
+            <!-- <button nz-button nzType="primary" [disabled]="false"> 导出明细</button>
             <button nz-button nzType="primary" [disabled]="false"> 导出凭证</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts

@@ -88,6 +88,10 @@ export class VoucherSummaryComponent implements OnInit {
     this.sf?.setValue('/expand', this._$expand);
   }
 
+  exportList() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fico_vch_page);
+  }
+
   private initSF(): SFSchema {
     return {
       properties: {
@@ -286,7 +290,7 @@ export class VoucherSummaryComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
-      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 180 },
+      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 200 },
       { title: '帐套', index: 'vcltdcode', width: 180 },
       { title: '凭证时间', index: 'createTime', type: 'date', width: 150 },
       {
@@ -302,7 +306,7 @@ export class VoucherSummaryComponent implements OnInit {
       },
       { title: '凭证类型', index: 'vctype', width: 120 },
       { title: '序号', index: 'invmoney', width: 100, format: _ => '1' },
-      { title: '摘要', index: 'remarks', width: 120 },
+      { title: '摘要', index: 'remarks', width: 220 },
       { title: '币种', index: 'currency', width: 100 },
       {
         title: '借方金额',
@@ -320,7 +324,7 @@ export class VoucherSummaryComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) }
       },
-      { title: 'NC凭证', index: 'importncnotes', width: 120 },
+      { title: 'NC凭证', index: 'importncnotes', width: 180 },
       { title: '凭证状态', index: 'stsLabel', width: 120 },
       { title: '创建时间', index: 'createTime', width: 180 },
       { title: '创建人', index: 'createUserName', width: 120 },

src/app/routes/financial-management/services/freight-account.service.ts

@@ -102,6 +102,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询总账凭证表
   $api_get_fico_vch_page = '/api/fcc/ficoVcH/list/page';
+  // 导出总账凭证表
+  $api_export_fico_vch_page = '/api/fcc/ficoVcH/reportVchListPage';
   // 获取总账凭证表详情信息
   $api_get_fico_vch__detail = '/api/fcc/ficoVcH/getDetail';
 

src/app/routes/tax-management/components/individual-collect/individual-collect.component.html

@@ -18,8 +18,8 @@
         [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()"
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-        acl [acl-ability]="['RiskOrder-Search']">查询</button>
+        (click)="search()">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">

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

@@ -17,16 +17,8 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-        nz-button
+        (click)="search()">查询</button>
-        nzType="primary"
-        [disabled]="!sf.valid"
-        [nzLoading]="service.http.loading"
-        (click)="search()"
-        acl
-        [acl-ability]="['RiskOrder-Search']"
-        >查询</button
-      >
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -41,16 +33,10 @@
     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
   </nz-tabset>
   <!-- 数据列表 -->
-  <st
+  <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_taxDeclaration" [columns]="columns"
-    #st
-    [scroll]="{ x: '1200px' }"
-    [data]="service.$api_get_taxDeclaration"
-    [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="false">
-    [loading]="false"
-  >
     <ng-template st-row="orderStatus" let-item let-index="index">
       <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
       <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
@@ -79,7 +65,8 @@
   </div>
 </ng-template>
 
-<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>
     <div> 司机姓名：张三/13812345678 </div>
     <div> 是否确认要将该司机的起征点同步调整为超过15万？ </div>
@@ -88,4 +75,4 @@
     <button nz-button nzType="default" (click)="handleCancel()">取消</button>
     <button nz-button nzType="primary" (click)="handleOK()">确定</button>
   </ng-template>
-</nz-modal>
+</nz-modal>

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

@@ -161,7 +161,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
-            containsAllLabel: true
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
           },
           default: ''
         },
@@ -271,39 +274,39 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
   }
 
   /**
-   *撤销
+   *更正
    * @param record 记录实例
    */
   recall() {
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要撤回的数据');
+      this.openWainingModal('请选择需要更正的数据');
       return;
     }
-    this.modal.confirm({
+    // this.modal.confirm({
-      nzTitle: '撤回提示',
+    //   nzTitle: '撤回提示',
-      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+    //   nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-      nzOkText: '确定',
+    //   nzOkText: '确定',
-      nzCancelText: '取消',
+    //   nzCancelText: '取消',
-      nzOnOk: () => {
+    //   nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //     this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-          if (res) {
+    //       if (res) {
-            this.service.msgSrv.success('撤销成功');
+    //         this.service.msgSrv.success('撤销成功');
-            this.search();
+    //         this.search();
-          }
+    //       }
-        });
+    //     });
-      }
+    //   }
-    });
+    // });
   }
   /**
-   *撤销
+   *修改
    * @param record 记录实例
    */
    uploadSetting() {
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要更新的数据！');
+      this.openWainingModal('请选择需要修改的数据！');
       return;
     }
-    this.isVisible = true
+    // this.isVisible = true
 
   }
   /**
@@ -370,7 +373,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    */
   upload() {
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
+      this.openWainingModal('请选择需要申报的数据');
       return;
     }
     // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {

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

@@ -17,8 +17,7 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" >查询</button>
-        [acl-ability]="['RiskOrder-Search']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts

@@ -39,17 +39,23 @@ export class CancellationInvoiceComponent implements OnInit {
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value,
+        ...this.sf.value
-        createTime: {
-          start: this.sf.value.createTime?.[0] || '',
-          end: this.sf.value.createTime?.[1] || ''
-        }
       });
+      if (this.sf.value.createTime) {
+        Object.assign(requestOptions.body, {
+          createTime: {
+            start: this.sf.value.createTime?.[0] || '',
+            end: this.sf.value.createTime?.[1] || ''
+          }
+        });
+      }
     }
     if (this.resourceStatus) {
       Object.assign(requestOptions.body, {
         sts: this.resourceStatus
       });
+    } else {
+      delete requestOptions.body.sts;
     }
     return requestOptions;
   };
@@ -339,7 +345,7 @@ export class CancellationInvoiceComponent implements OnInit {
         click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId])
       },
       { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
-      { title: '发票类型', index: 'vatapptypeLabel',  width: 150 },
+      { title: '发票类型', index: 'vatapptypeLabel', width: 150 },
       { title: '网络货运人', index: 'ltdName', width: 220 },
       { title: '购买人', index: 'artoname', width: 220 },
       { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
@@ -401,7 +407,7 @@ export class CancellationInvoiceComponent implements OnInit {
             text: '手工开票<br>',
             iif: item => item.sts != '3',
             click: item => this.requestedAction(item)
-          },
+          }
           // {
           //   text: '推送开票<br>',
           //   iif: item => item.sts === '1',

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

@@ -33,6 +33,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
         ...this.sf.value
       });
     }
+    this.selectedRows = [];
     return requestOptions;
   };
 
@@ -192,7 +193,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
             visibleIf: {
               expand: (value: boolean) => value
             }
-          },
+          }
         },
         ltdId: {
           type: 'string',