Merge branch 'weiyu' into develop

src/app/routes/ticket-management/components/billing-order/billing-order.component.html

@@ -33,5 +33,8 @@
             <span *ngIf="item.sts === '6'">已撤销</span>
             <span *ngIf="item.sts === '7'">已作废</span>
         </ng-template>
+        <ng-template st-row="serviceType" let-item let-index="index">
+            <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span>
+        </ng-template>
     </st>
 </nz-card>

src/app/routes/ticket-management/components/billing-order/billing-order.component.ts

@@ -77,14 +77,28 @@ export class BillingOrderComponent implements OnInit {
         serviceType: {
           title: '服务类型',
           type: 'string',
+          enum: [{
+            label: '全部',
+            value: ''
+          },{
+            label: '整车抢单',
+            value: 1
+          },{
+            label: '整车指派',
+            value: 2
+          },{
+            label: '大宗抢单',
+            value: 3
+          },{
+            label: '大宗指派',
+            value: 4
+          },{
+            label: '结算单',
+            value: 5
+          }],
           ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          } as SFSelectWidgetSchema
+            widget: 'select',
+          }
         },
         shipperAppUserName: {
           type: 'string',
@@ -179,7 +193,7 @@ export class BillingOrderComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '订单号', index: 'billCode', type:'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
+      { title: '订单号', index: 'billCode', type: 'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
       { title: '运单号', index: 'wayBillCode', width: 180, className: 'text-center' },
       { title: '银行类型', index: 'bankTypeLabel', render: 'bankType', width: 100, className: 'text-center' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: 220, className: 'text-center' },
@@ -234,24 +248,24 @@ export class BillingOrderComponent implements OnInit {
       { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
       {
         title: '服务类型',
-        index: 'serviceTypeLabel',
-        width: '180px',
+        render: 'serviceType',
+        width: '120px',
         className: 'text-center'
       },
       { title: '装货地', index: 'consignor', width: '180px', className: 'text-center' },
       { title: '卸货地', index: 'consignee', width: '180px', className: 'text-center' },
-      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
-      { title: '车牌号', index: 'carNo', className: 'text-center', width: '180px' },
+      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '140px' },
+      { title: '车牌号', index: 'carNo', className: 'text-center', width: '120px' },
       {
         title: '承运司机',
-        index:'driverName',
+        index: 'driverName',
         className: 'text-center',
-        width: '180px',
+        width: '120px',
       },
       {
         title: '车队长',
         className: 'text-center',
-        width: '180px',
+        width: '120px',
         index: 'carCaptainName',
       },
       { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', },
@@ -260,16 +274,16 @@ export class BillingOrderComponent implements OnInit {
       { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', },
       { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', },
       { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', },
-      { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 },
+      { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 },
       { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 },
-      { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 },
-      { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', },
+      { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 },
+      { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', },
       { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', },
       { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' },
       { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' },
       // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO
       {
-        title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 200, type: 'widget',
+        title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) }
       }
     ];

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

@@ -36,7 +36,7 @@
                 <strong class="text-red">{{totalCallNo }}</strong>
                 <a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
             </div>
-            <button nz-button *ngIf="resourceStatus===1 || !resourceStatus" (click)="this.batchPush()">推送开票</button>
+            <!-- <button nz-button *ngIf="resourceStatus===1 || !resourceStatus" (click)="this.batchPush()">推送开票</button> -->
             <!-- <button nz-button *ngIf="resourceStatus===1 || !resourceStatus"
                 (click)="this.batchRemove(selectedRows)">移除</button>
             <button nz-button *ngIf="resourceStatus===2 || !resourceStatus"