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

src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts

@@ -117,17 +117,17 @@ export class PayableOrderDetailComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        cno: {
-          type: 'string',
-          title: '结算客户',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.service.getCloseAccount()
-          },
-          default: ''
-        },
+        // cno: {
+        //   type: 'string',
+        //   title: '结算客户',
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder: '请选择',
+        //     allowClear: true,
+        //     asyncData: () => this.service.getCloseAccount()
+        //   },
+        //   default: ''
+        // },
         feedate: {
           title: '费用日期',
           type: 'string',

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

@@ -114,7 +114,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
           title: '发票类型',
           enum: [
             { value: '', label: '全部' },
-            { value: '1', label: '运输专票' }
+            { value: '运输专票', label: '运输专票' }
           ],
           ui: {
             widget: 'select',