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

@@ -93,6 +93,20 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
             placeholder: '请输入'
           }
         },
+        billHCode: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        waybillHCode: {
+          type: 'string',
+          title: '运单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
         ltdId: {
           type: 'string',
           title: '网络货运人',
@@ -141,13 +155,12 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
         sts: {
           type: 'string',
           title: '核销状态',
-          enum: [
+          default: '',
-            { value: 1, label: '已核销' },
-            { value: 0, label: '待核销' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
-            placeholder: '请选择'
+            containsAllLable: true,
+            params: { dictKey: 'write:off:status' },
+            containAllLable: true
           }
         },
         phxdate: {
@@ -166,13 +179,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
             format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
-        billHCode: {
-          type: 'string',
-          title: '订单号',
-          ui: {
-            placeholder: '请输入'
-          }
-        },
         feeHCode: {
           type: 'string',
           title: '费用号',
@@ -195,7 +201,9 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
+      { title: '核销单号', index: 'phxcode', type: 'link', width: 160 },
+      { title: '订单号', index: 'billHCode', width: 160 },
+      { title: '运单号', index: 'waybillHCode', width: 160 },
       { title: '网络货运人', index: 'ltdName', width: 220 },
       { title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
       { title: '付款账户', index: 'shipperaccount', width: 170 },
@@ -223,7 +231,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
       { title: '银行水单', index: 'bankreceipt', width: 190 },
       { title: '创建时间', index: 'createTime', width: 180 },
       // { title: '创建人', index: 'createUserIdLabel', width: 120 },
-      { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
+      { title: '核销状态', index: 'stsLabel', width: 120 },
       { title: '核销备注', index: 'remarks', width: 120 },
       {
         title: '操作',

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

@@ -207,6 +207,13 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
             placeholder: '请输入'
           }
         },
+        waybillHCode: {
+          type: 'string',
+          title: '运单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
         // orderS3: {
         //   type: 'string',
         //   title: '费用号',
@@ -234,6 +241,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'ahxcode', type: 'link', width: 210 },
       { title: '订单号', index: 'billHCode', type: 'link', width: 180 },
+      { title: '运单号', index: 'waybillHCode', width: 180 },
       { title: '网络货运人', index: 'ltdName', width: 220 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
       { title: '收款账户', index: 'ltdaccountId', width: 200 },

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

@@ -212,7 +212,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
       },
       { title: '发票类型', index: 'invtype', width: 150, className: 'text-center' },
       { title: '销售方', index: 'hrtoName', width: 200 },
-      { title: '创建时间', index: 'createtime', type: 'date', width: 150, className: 'text-center' },
+      { title: '创建时间', index: 'createTime', type: 'date', width: 150, className: 'text-center' },
       { title: '创建人', index: 'createbyname', width: 120 },
       { title: '收票状态', index: 'stsLabel', width: 120, className: 'text-center' },
       {