订单

2021-12-06 20:23:42 +08:00
parent 24de0ea9ea
commit 322aca7b43
18 changed files with 1538 additions and 197 deletions
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-03 16:01:20
+ * @LastEditTime: 2021-12-06 19:06:12
 * @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
@ -36,7 +36,7 @@
 </nz-card>

 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
    </nz-tab>
  </nz-tabset>
@ -45,16 +45,6 @@
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
      [loadingDelay]="500" [loading]="service.http.loading" -->
-      <!-- 选中提示框 -->
-<div style="position: relative">
-  <nz-alert
-    nzType="info"
-    [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
-    nzShowIcon
-    [ngStyle]="{ margin: '0 0 1rem 0' }"
-  >
-  </nz-alert>
-</div>
    <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
      <ng-template st-row="goodsId" let-item let-index="index">
        <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.no}}</a>
@ -66,6 +56,11 @@
      <ng-template st-row="enStatusStr27878" let-item let-index="index">
        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
      </ng-template>
+      <ng-template st-row="feiong" let-item let-index="index">
+        <div style="color: aqua;" (click)="OpenPrice()">
+          {{item.no}}
+        </div>
+      </ng-template>
      <ng-template #contentTemplate>
        <div>
          <p>预付：¥200.00</p>
@ -79,30 +74,74 @@
    </st>
  </div>
 </nz-card>
-<ng-template #extraTemplate>
-  <div>
-    <button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
-    <button (click)="importGoodsSource()" nz-button nzType="primary">发布货源</button>
-    <button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
-  </div>
-</ng-template>

-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
+
+<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
  <ng-container *nzModalContent>
-    <div style="position: relative" *ngIf="auditMany">
-      <nz-alert
-        nzType="info"
-        [nzMessage]="'已选择' +  6 + '项'"
-        nzShowIcon
-        [ngStyle]="{ margin: '0 0 1rem 0' }"
-      >
-      </nz-alert>
-      </div>
-    <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'">
-    </sf>
+    <st
+    #stFloat
+    multiSort
+    size="small"
+    [bordered]="true"
+    [data]="datass"
+    [columns]="columnsFloat"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+  >
+  </st>
  </ng-container>
  <ng-template #nzModalFooter>
-    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
-    <button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
+    <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
+    <button nz-button nzType="default" (click)="handleOK()">确定</button>
+  </ng-template>
+</nz-modal>
+
+
+<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+  <ng-container *nzModalContent>
+    <st
+    #stFloatView
+    multiSort
+    size="small"
+    [bordered]="true"
+    [data]="datass"
+    [columns]="columnsFloatView"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+  >
+  </st>
+  <div><span>变更原因：</span></div>
+  <div><span>拒绝原因：</span></div>
+  <div><span>注：</span></div>
+  </ng-container>
+  <ng-template #nzModalFooterview>
+    <button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+  </ng-template>
+</nz-modal>
+
+<nz-modal [(nzVisible)]="isVisibleEvaluate"  [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('2')">
+  <ng-container *nzModalContent>
+    <nz-tabset>
+      <nz-tab nzTitle="我的评价">
+      <div>
+        评分: <nz-rate [ngModel]="2.5" nzAllowHalf></nz-rate>
+        <div><span>评价内容：</span></div>
+      </div>
+      </nz-tab>
+      <nz-tab nzTitle="司机评价">
+      <div>
+        暂无评价内容
+      </div>
+      </nz-tab>
+    </nz-tabset>
+  </ng-container>
+  <ng-template #nzModalFooterEvaluate>
+    <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
  </ng-template>
 </nz-modal>
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
@ -15,16 +15,34 @@ import { SupplyManagementService } from '../../services/order-management.service
 export class OrderManagementVehicleComponent implements OnInit {
  url = `/user?_allow_anonymous=true`;
  ui: SFUISchema = {};
-  ui2: SFUISchema = {};
  schema: SFSchema = {};
-  freightSchema: SFSchema = {};
  auditMany = false;
+  isVisibleView = false;
+  isVisibleEvaluate = false;
  isVisible = false;
  _$expand = false;
  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('stFloat') private readonly stFloat!: STComponent;
+  @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
  columns: STColumn[] = [];
+  columnsFloat: STColumn[] = [];
+  columnsFloatView: STColumn[] = [];
+  datass: any = [
+    {
+    one: '1',
+    two: '1',
+    three: '1',
+    id: 1
+   },
+    {
+    one: '2',
+    two: '2',
+    three: '2',
+    id: 2
+   },
+];
  tabs = [  {
    name: '全部',
    type: 5,
@ -36,7 +54,22 @@ export class OrderManagementVehicleComponent implements OnInit {
    count: 0,
  },
  {
-    name: '已接单',
+    name: '待发车',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '运输中',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '代签收',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '已完成',
    type: 5,
    count: 0,
  },
@ -62,7 +95,8 @@ export class OrderManagementVehicleComponent implements OnInit {
  ngOnInit(): void {
    this.initSF();
    this.initST();
-    this.initSFFre();
+    this.initSTFloat();
+    this.initSTFloatView();
  }


@ -76,18 +110,63 @@ export class OrderManagementVehicleComponent implements OnInit {
        _$expand: { type: 'boolean', ui: { hidden: true } },
        no: {
          type: 'string',
-          title: '货源编号',
+          title: '订单号',
        },
        no2: {
          type: 'string',
-          title: '装货地'
+          title: '货源编号'
        },
        no1: {
          type: 'string',
-          title: '卸货地'
+          title: '托运人'
+        },
+        no3: {
+          type: 'string',
+          title: '装货地',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        no4: {
+          type: 'string',
+          title: '卸货地',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        no7: {
+          type: 'string',
+          title: '承运司机',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        no9: {
+          type: 'string',
+          title: '车牌号',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        no10: {
+          type: 'string',
+          title: '收款人',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
        },
        sex: {
-          title: '货物类型',
+          title: '支付状态',
          type: 'string',
          default: 0,
          enum: [
@ -103,9 +182,21 @@ export class OrderManagementVehicleComponent implements OnInit {
            },
          } as SFSelectWidgetSchema,
        },
+        createTime: {
+          title: '创建时间',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
        appId: {
          type: 'string',
-          title: '录单员',
+          title: '是否风险单',
          ui: {
            widget: 'select',
            placeholder: '请选择',
@ -119,24 +210,9 @@ export class OrderManagementVehicleComponent implements OnInit {
      },
      type: 'object',
    };
-    this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } };
-  }
-  initSFFre() {
-    this.freightSchema = {
-      properties: {
-      roleDescription: {
-        title: '备注',
-        type: 'string',
-        maxLength: 50,
-        ui: {
-          placeholder: '请输入备注',
-          widget: 'textarea',
-        },
-      },
-    }
-  };
-  this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
  }
+
  /**
   * 初始化数据列表
   */
@ -144,23 +220,19 @@ export class OrderManagementVehicleComponent implements OnInit {
    this.columns = [
      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
      {
-        title: '货源编号',
+        title: '运单号',
        width: '100px',
        className: 'text-center',
        render: 'goodsId'
      },
-      { title: '服务类型', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '货主', index: 'linkUrl', width: '120px', className: 'text-center' },
      {
-        title: '项目名称',
+        title: '货源编号',
+        width: '100px',
        className: 'text-center',
-        width: '120px',
      },
+      { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
      {
-        title: '装货地',
-        className: 'text-center',
-        width: '120px',
-      }, {
        title: '卸货地',
        className: 'text-center',
        width: '120px',
@ -169,34 +241,44 @@ export class OrderManagementVehicleComponent implements OnInit {
        title: '货物名称',
        className: 'text-center',
        width: '120px',
-      },
-      {
-        title: '货物数量',
+      }, {
+        title: '重量/体积',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '用车需求',
+        title: '承运司机',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '总费用',
+        title: '车牌号',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '出价',
        className: 'text-center',
        width: '120px',
-        index: 'goodsId',
        render: 'enStatusStr27878'
      },
      {
-        title: '附加费',
+        title: '浮动费用',
+        className: 'text-center',
+        width: '120px',
+        render: 'feiong'
+      },
+      {
+        title: '成交金额',
        className: 'text-center',
        width: '120px',
      },
      {
-        title: '货源状态',
+        title: '收款人',
        className: 'text-center',
        index: 'enStatusStr2',
        type: 'badge',
+        width: '100px',
        badge: {
          正常: { text: '正常', color: 'success' },
          冻结: { text: '冻结', color: 'warning' },
@ -204,15 +286,40 @@ export class OrderManagementVehicleComponent implements OnInit {
        },
      },
      {
-        title: '创建时间',
+        title: '支付状态',
        width: '170px',
        className: 'text-center',
      },
      {
-        title: '审核状态',
+        title: '创建时间',
        className: 'text-center',
        index: 'enStatusStr3',
        type: 'badge',
+        width: '100px',
+        badge: {
+          正常: { text: '正常', color: 'success' },
+          冻结: { text: '冻结', color: 'warning' },
+          废弃: { text: '废弃', color: 'default' },
+        },
+      },
+      {
+        title: '异常原因',
+        className: 'text-center',
+        index: 'enStatusStr3',
+        type: 'badge',
+        width: '100px',
+        badge: {
+          正常: { text: '正常', color: 'success' },
+          冻结: { text: '冻结', color: 'warning' },
+          废弃: { text: '废弃', color: 'default' },
+        },
+      },
+      {
+        title: '运单状态',
+        className: 'text-center',
+        index: 'enStatusStr3',
+        type: 'badge',
+        width: '100px',
        badge: {
          正常: { text: '正常', color: 'success' },
          冻结: { text: '冻结', color: 'warning' },
@ -223,40 +330,67 @@ export class OrderManagementVehicleComponent implements OnInit {
        title: '操作',
        fixed: 'right',
        width: '200px',
-        className: 'text-center',
+        className: 'text-left',
        buttons: [
          {
-            text: '货源审核',
-            click: (_record) => this.audit(_record, 1),
-          },
-          {
-            text: '修改货源',
-            // click: (_record) => this.editOne(_record),
-          },
-          {
-            text: '修改运费',
-            click: (_record) => this.updateFreight(_record),
-          },
-          {
-            text: '取消货源',
-            // click: (_record) => this.delOne(_record),
-          },
-          {
-            text: '再下一单',
-            // click: (_record) => this.editOne(_record),
-          },
-          {
-            text: '重新指派',
-            click: (_record) => this.assignedCar(_record),
+            text: '查看评价',
+            click: (_record) => this.viewEvaluate(_record),
          },
        ],
      },
    ];
  }
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
+  initSTFloat() {
+    this.columnsFloat = [
+      {
+        title: '序号',
+        className: 'text-center',
+        index: 'one', 
+      },
+      {
+        title: '操作时间',
+        className: 'text-center',
+        index: 'two', 
+      },
+      {
+        title: '操作人',
+        className: 'text-center',
+        index: 'three', 
+      },
+      { title: '状态', index: 'externalSn',  className: 'text-center' },
+      {
+        title: '操作',
+        fixed: 'right',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '查看',
+            click: (_record) => this.FloatView(_record),
+          },
+          {
+            text: '撤销',
+            click: (_record) => this.audit(_record),
+          },
+        ],
+      },
+    ];
+  }
+  initSTFloatView() {
+    this.columnsFloatView = [
+      {
+        title: '费用名称',
+        width: '100px',
+        className: 'text-center',
+        render: 'goodsId'
+      },
+      {
+        title: '变更前',
+        width: '100px',
+        className: 'text-center',
+      },
+      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
+    ];
  }
  /**
   * 查询字段个数
@ -300,77 +434,33 @@ export class OrderManagementVehicleComponent implements OnInit {
  selectChange(e: number) {
    console.log(e);
  }
-
-  /**
-   * 编辑外部货源号
-   * @param item st当前行对象
-   */
-  editEnternalSn(item: any) {
-    const modalRef = this.modal.create({
-      nzWidth: '400px',
-      // nzContent: SupplyManagementUpdateExternalSnComponent,
-      nzComponentParams: {
-        orderObject: item,
-      },
-      nzFooter: null,
-      nzClosable: false
-    });
-  }
-
  /**
   * 导入货源
   */
  importGoodsSource() {

  }
-
-  /**
-   * 修改运费
-   */
-  updateFreight(item: any) {
-    const modalRef = this.modal.create({
-      nzTitle: '修改运费',
-      nzWidth: '40%',
-      // nzContent: SupplyManagementUpdateFreightComponent,
-      nzComponentParams: {
-        i: item,
-      },
-      nzFooter: null,
-    });
+  audit(item: any) {
+    console.log(item)
  }

-  /**
-  * 重新指派
-  */
-  assignedCar(item: any) {
-    const modalRef = this.modal.create({
-      nzTitle: '指派熟车',
-      nzWidth: '800px',
-      // nzContent: SupplyManagementAssignedCarComponent,
-      nzComponentParams: {
-        i: item,
-      },
-      nzFooter: null,
-    });
-  }
-   /**
-  * 审核
-  */
-  audit(value: any, status?: any) {
-    console.log(value)
-    console.log(status)
-    if(status === 2) {
-      this.auditMany = true;
-    } else {
-      this.auditMany = false;
-    }
-    this.isVisible = true;
-  }
-  /**
+ /*
  * 审核关闭弹窗
+  view: 1
+  浮动费用： 0
+  查看评价： 3
  */
-  handleCancel(type: any) {
+  handleCancel(type: string) {
+    console.log(type)
+    if(type === '0') {
      this.isVisible = false
+    } else if(type === '1') {
+    console.log(type)
+      this.isVisibleView = false
+    } else if(type === '2') {
+    console.log(type)
+      this.isVisibleEvaluate = false
+    }
  }
    /**
  * 审核通过按钮
@ -378,4 +468,21 @@ export class OrderManagementVehicleComponent implements OnInit {
  handleOK() {
    
  }
+  OpenPrice() {
+    this.isVisible = true
+  }
+   /**
+  * 浮动费用查看
+  */
+  FloatView(item: any) {
+    console.log(item)
+    this.isVisibleView = true
+  }
+   /**
+  *查看评价
+  */
+  viewEvaluate(item: any) {
+    console.log(item)
+    this.isVisibleEvaluate = true
+  }
 }