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

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html

@@ -3,19 +3,19 @@
 <nz-card>
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
-    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+    <div nz-col [nzSpan]=" 24 ">
       <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 [acl-ability]="['RiskOrder-Search']">查询</button>
-      <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button (click)="export()">导出</button>
-      <button nz-button nzType="link" (click)="expandToggle()">
-        {{ !_$expand ? '展开' : '收起' }}
-        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-      </button>
-    </div>
+  </div>
+  <div [class.text-right]="true">
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
+      acl [acl-ability]="['RiskOrder-Search']">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
+    <button nz-button (click)="export()">导出</button>
+    <button nz-button nzType="link" (click)="expandToggle()">
+      {{ !_$expand ? '展开' : '收起' }}
+      <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+    </button>
   </div>
 </nz-card>
 <nz-card>

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit {
             placeholder: '请选择',
             widget: 'select',
             asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
-
             allowClear: true
           }
         },
@@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit {
       },
     };
     this.ui = {
-      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
-      $time: { grid: { span: 24 } },
+      '*': {
+        spanLabelFixed: 120,
+        grid: {
+          lg: 12,
+          xl: 8
+        }, enter: () => this.search()
+      },
     };
   }
 
@@ -277,12 +281,12 @@ export class DatatableOrderReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '订单状态', render: 'billPutStatus', className: 'text-center', width: '120px', },
-      { title: '司机状态', render: 'driverPutStatus', className: 'text-center', width: '120px', },
+      { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', },
+      { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', },
 
-      { title: '车辆状态', render: 'carPutStatus', className: 'text-center', width: '120px', },
+      { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', },
 
-      { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
+      { title: '本地校验', index: 'checkStatusLabel', className: 'text-center', width: '120px', },
       {
         title: '订单号',
         render: 'billCode',

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

@@ -32,7 +32,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
   ];
   selectedIndex = ''; //选择的项目
   serviceTel = '';
-  isVisible : boolean = false
+  isVisible: boolean = false;
   constructor(
     public service: TaxManagementService,
     private router: Router,
@@ -88,16 +88,16 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
   ngOnInit() {
     this.initSF();
     this.initST();
-    const object1 : any = {};
-    const object2 : any = {};
-    Object.defineProperty(object1, 'name',{  writable: false ,value: 'wang'});
-    Object.defineProperty(object2, 'xxoo',{  writable: false ,value: 'wang'});
+    const object1: any = {};
+    const object2: any = {};
+    Object.defineProperty(object1, 'name', { writable: false, value: 'wang' });
+    Object.defineProperty(object2, 'xxoo', { writable: false, value: 'wang' });
     console.log(object1);
     console.log(object1.name);
     console.log(object2);
     console.log(object2.xxoo);
-    object1.name = 'ming'
-    object2.xxoo = 'ming'
+    object1.name = 'ming';
+    object2.xxoo = 'ming';
     console.log(object1);
     console.log(object2);
   }
@@ -254,22 +254,40 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
         width: '180px'
       },
       { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
-      { title: '姓名', index: 'xm',  className: 'text-center', width: '200px' },
+      { title: '姓名', index: 'xm', className: 'text-center', width: '200px' },
       { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '200px' },
-      { title: '证件号码', index: 'sfzjhm',  className: 'text-center', width: '200px' },
+      { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' },
       { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' },
-      { title: '国家（地区）', index: ' gjdq',  className: 'text-center', width: '200px' },
-      { title: '所属行业', index: 'hy',  className: 'text-center', width: '200px' },
-      { title: '征收项目', index: 'zsxm',  className: 'text-center', width: '200px' },
+      { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' },
+      { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' },
+      { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' },
       { title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' },
       { title: '计税依据', index: 'jsyj', className: 'text-center', width: '200px' },
-      { title: '税率', index: 'sl', render: 'sl', className: 'text-center', width: '200px' },
-      { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' },
-      { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' },
-      { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px' },
-      { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px' },
-      { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px' },
-      { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' },
+      {
+        title: '税率',
+        index: 'sl',
+        render: 'sl',
+        className: 'text-center',
+        width: '200px',
+        format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%`
+      },
+      {
+        title: '应纳税额',
+        index: 'ynse',
+        className: 'text-center',
+        width: '180px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+      },
+      { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' ,  type: 'widget',
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jmse }) } },
+      { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px',  type: 'widget',
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yjnse }) } },
+      { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px',  type: 'widget',
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dzse }) } },
+      { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px',  type: 'widget',
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ydzse }) } },
+      { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' }
     ];
   }
 
@@ -301,13 +319,12 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    *修改
    * @param record 记录实例
    */
-   uploadSetting() {
+  uploadSetting() {
     if (this.selectedRows.length === 0) {
       this.openWainingModal('请选择需要修改的数据！');
       return;
     }
     // this.isVisible = true
-
   }
   /**
    *撤销
@@ -388,7 +405,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    *
    * @param params 更新数据
    */
-   resetData() {
+  resetData() {
     if (this.selectedRows.length === 0) {
       this.openWainingModal('请选择需要更新的数据');
       return;
@@ -402,7 +419,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
         this.service.msgSrv.success('更新成功');
         this.st.load(1);
       }
-    })
+    });
   }
 
   /**
@@ -450,10 +467,8 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
       nzContent: content
     });
   }
-  handleOK() {
-
-  }
+  handleOK() {}
   handleCancel() {
-      this.isVisible = false;
+    this.isVisible = false;
   }
 }

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -106,9 +106,9 @@
       <st #costST [data]="service.$api_get_invoice_cost_detail" [columns]="costColumns" size="small" bordered="true"
         [page]="{}" [req]="{  process: beforeReq }" [loading]="false" [scroll]="{ x: '1200px', y: '250px' }">
         <ng-template st-row="vatmoney" let-item let-index="index">
-          {{ item.billLType }}: {{ item.vatmoney |currency }}
+          {{ item.billLTypeLabel }}: {{ item.vatmoney |currency }}
         </ng-template>
-      </st>
+      </st>vatmoney
     </nz-tab>
     <nz-tab nzTitle="发票明细">
       <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"