车辆对接

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-13 14:52:49
+ * @LastEditTime: 2021-12-16 20:16:30
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -83,7 +83,7 @@ size="small"
           <span *ngIf="item?.serviceType === 2 || item?.serviceType === '2'">指派</span>
       </ng-template>
       <ng-template st-row="totalAmount" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
+        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.totalAmount}}</div>
       </ng-template>
       <ng-template #contentTemplate>
         <div>

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -76,10 +76,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
         serviceType: {
           title: '服务类型',
           type: 'string',
-          default: '',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'ServiceType' },
+            containsAllLable: true,
+            params: { dictKey: 'service:type' },
           } as SFSelectWidgetSchema,
         },
         goodsName: {
@@ -88,7 +88,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
        
           ui: {
               widget: 'dict-select',
-              params: { dictKey: 'GoodsName' },
+              // params: { dictKey: 'GoodsName' },
             placeholder: '请选择',
           } as SFSelectWidgetSchema,
         },
@@ -124,7 +124,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'GoodsResourceAuditStatus' },
+            params: { dictKey: 'goodresource:audit:status' },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -176,7 +176,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
         className: 'text-center',
         render: 'resourceCode'
       },
-      { title: '服务类型', index: 'serviceType', width: '120px', className: 'text-center',render: 'serviceType'},
+      { title: '服务类型', index: 'serviceTypeLabel', width: '120px', className: 'text-center',render: 'serviceType'},
       { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
       {
         title: '项目名称',
@@ -241,7 +241,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
       {
         title: '创建时间',
         width: '170px',
-        index: 'releaseTime',
+        index: 'createTime',
         className: 'text-center',
       },
       {
@@ -251,10 +251,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
         type: 'badge',
         width: '170px',
         badge: {
-          1: { text: '待审核', color: 'warning' },
-          2: { text: '审核通过', color: 'success' },
-          3: { text: '不通过', color: 'default' },
-          4: { text: '已取消', color: 'default' },
+          '1': { text: '待审核', color: 'warning' },
+          '2': { text: '审核通过', color: 'success' },
+          '3': { text: '不通过', color: 'default' },
+          '4': { text: '已取消', color: 'default' },
         },
       },
       {