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.ts

@@ -281,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: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', },
-      { title: '司机状态', render: 'driverPutStatus', 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/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html

@@ -56,37 +56,48 @@
 
 <ng-template #requestedModal>
     <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="100">
+        <div nz-col nzSpan="24" se-container [labelWidth]="100" [col]="1">
-            <se [col]="1" label="开票信息" class="mb-sm">
+            <se label="购买方" class="mb-sm">
-                <p style="margin: 0;">公司名： {{openInfo?.artoname}}</p>
+                {{openInfo?.artoname}}
-                <p style="margin: 0;">税号： {{openInfo?.artotaxno}}</p>
-                <p style="margin: 0;">注册地址： {{openInfo?.artoadd}}</p>
-                <p style="margin: 0;">注册电话： {{openInfo?.artotel}}</p>
-                <p style="margin: 0;">开户行： {{openInfo?.artobank}}</p>
             </se>
-            <se [col]="1" label="服务名称" class="mb-sm">
+            <se label="纳税号" class="mb-sm">
+                {{openInfo?.artotaxno}}
+            </se>
+            <se label="注册地址" class="mb-sm">
+                {{openInfo?.artoadd}}
+            </se>
+            <se label="注册电话" class="mb-sm">
+                {{openInfo?.artotel}}
+            </se>
+            <se label="开户行" class="mb-sm">
+                {{openInfo?.artobank}}
+            </se>
+            <se label="银行账户" class="mb-sm">
+                {{openInfo?.artoacc}}
+            </se>
+            <se label="服务名称" class="mb-sm">
                 {{openInfo?.vatnameLabel}}
             </se>
-            <se [col]="1" label="发票备注栏" class="mb-sm">
+            <se label="发票备注栏" class="mb-sm">
                 {{openInfo?.vatremarks}}
             </se>
-            <se [col]="1" label="其它要求" class="mb-sm">
+            <se label="其它要求" class="mb-sm">
                 {{openInfo?.otherremarks}}
             </se>
-            <se [col]="1" label="销货清单" class="mb-sm">
+            <se label="销货清单" class="mb-sm">
                 {{openInfo?.isdetail?'需要':'不需要'}}
             </se>
-            <se [col]="1" label="开票金额" class="mb-sm">
+            <se label="开票金额" class="mb-sm">
                 {{openInfo?.vatmoney | currency}}
             </se>
-            <se [col]="1" label="开票日期" required>
+            <se label="开票日期" required>
-                <nz-date-picker [(ngModel)]="openInfo.invoicedate" nzPlaceHolder="请选择" style=" width: 100%;">
+                <nz-date-picker [(ngModel)]="openInfo.invoicedate" nzShowTime nzPlaceHolder="请选择" style=" width: 100%;">
                 </nz-date-picker>
             </se>
-            <se [col]="1" label="发票号码" required>
+            <se label="发票号码" required>
                 <input nz-input [(ngModel)]="openInfo.invoiceno" placeholder="请输入" />
             </se>
-            <se [col]="1" label="发票代码" required>
+            <se label="发票代码" required>
                 <input nz-input [(ngModel)]="openInfo.invoiceno2" placeholder="请输入" />
             </se>
         </div>

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

@@ -89,7 +89,6 @@ export class CancellationInvoiceComponent implements OnInit {
     this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null };
     this.service.request(this.service.$api_get_apply_fico_info, { id: item.vatappHId }).subscribe(info => {
       if (info) {
-        console.log(info);
         Object.assign(this.openInfo, { ...info });
         const modal = this.nzModalService.create({
           nzTitle: '发票确认',