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

src/app/routes/order-management/components/risk/risk.component.ts

@@ -133,7 +133,7 @@ export class OrderManagementRiskComponent implements OnInit {
           type: 'string',
           title: '订单号',
           ui: {
-            placeholder: '最多100个单号，空号隔开'
+            placeholder: '请输入订单号'
           }
         },
         resourceCode: {

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

@@ -154,13 +154,13 @@ export class InvoiceDetailComponent implements OnInit {
       { title: '卸货地', index: 'loadingto', width: 220 },
       { title: '货物信息', index: 'goodsinfo', width: 140 },
       { title: '承运司机', index: 'driverinfo', width: 280 },
-        {
+      // {
-        title: '税额',
+      //   title: '税额',
-        index: 'billvatrate',
+      //   index: 'billvatrate',
-        width: 120,
+      //   width: 120,
-        className: 'text-right',
+      //   className: 'text-right',
-        format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
+      //   format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
-      },
+      // },
       {
         title: '申请金额',
         index: 'billkpnotax',

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

@@ -55,6 +55,8 @@ export class InvoiceRequestedComponent {
   };
 
   afterRes = (data: any[], rawData?: any) => {
+    this.totalCallNo = 0;
+    this.selectedRows = [];
     return data.map(item => ({
       ...item,
       disabled: item.expressHSts
@@ -436,7 +438,10 @@ export class InvoiceRequestedComponent {
         width: 150,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicedMoney }) }
+        widget: {
+          type: 'currency-chy',
+          params: ({ record }) => ({ value: record.invoicedMoney })
+        }
       },
       { title: '开户行', index: 'bankName', width: 160 },
       { title: '银行账户', index: 'bankAccount', width: 140 },

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

@@ -47,6 +47,8 @@ export class RequestedInvoiceModalComponent {
           if (res) {
             this.service.msgSrv.success('移除成功');
             this.modal.destroy(true);
+          } else {
+            this.service.msgSrv.warning('移除失败');
           }
         });
       }