车辆对接

2021-12-22 20:01:22 +08:00
parent 65a842767d
commit 2a91d9fd80
10 changed files with 270 additions and 89 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-22 10:10:22
+ * @LastEditTime: 2021-12-22 19:58:23
 * @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
@ -104,19 +104,22 @@
 </nz-card>


-<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
+<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
  <ng-container *nzModalContent>
    <st
    #stFloat
    size="small"
    [bordered]="true"
-    [data]="datass"
+    [data]="service.$api_get_listChangeApply"
    [columns]="columnsFloat"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
+    [res]="{ reName: { list: 'data', total: 'data.total' } }"
    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
    [loadingDelay]="500"
  >
+  <ng-template st-row="order" let-item let-index="index">
+    {{ index + 1 }}
+  </ng-template>
  <ng-template st-row="externalSn" let-item let-index="index">
    <div>
      <span *ngIf="item?.externalSn == '1'">待确认</span>
@ -129,14 +132,14 @@
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-    <button nz-button nzType="default" (click)="handleOK()">确定</button>
+    <button nz-button nzType="default" (click)="handleCancel('0')">确定</button>
  </ng-template>
 </nz-modal>


 <nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
  <ng-container *nzModalContent>
-    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
+    <sf #sfView [schema]="schemaView" [ui]="uiView" [formData]="ViewCause" [compact]="true" [button]="'none'">
      <ng-template sf-template="no" let-me let-ui="uiView" let-schema="schemaView">
       <div style="display: flex;">
        <nz-input-number [(ngModel)]="demoValue" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
@ -149,21 +152,20 @@
    multiSort
    size="small"
    [bordered]="true"
-    [data]="datass"
+    [data]="service.$api_getChangeRecordBulkDetail"
    [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] }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
+    [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
    [loadingDelay]="500"
  >
  </st>
-  <div><span>变更原因：</span></div>
-  <div><span>拒绝原因：</span></div>
-  <div><span>注：</span></div>
+  <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
+  <div><span>拒绝原因：{{ViewCause?.refuseCause}}</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>
+    <button nz-button nzType="primary" (click)="handleCancel('1')">确定</button>
  </ng-template>
 </nz-modal>

--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -28,6 +28,10 @@ export class OrderManagementBulkComponent implements OnInit {
  isVisibleEvaluate = false;
  isVisible = false;
  _$expand = false;
+  changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
+  changeViewId: any;  // 查看运费变更记录id - 用于查看
+  ViewCause: any;  // 变更运费查看数据
+  sfViewFormData: any;  // 变更运费查看的sf 数据
  @ViewChild('st') private readonly st!: STComponent;
  @ViewChild('stFloat') private readonly stFloat!: STComponent;
  @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@ -76,6 +80,11 @@ tabs = {
  get selectedRows() {
    return this.st?.list.filter((item) => item.checked) || [];
  }
+  get changeParams() {
+    return {
+      id: this.changeId
+    };
+  }
  getGoodsSourceStatistical() {
    this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
      if (res) {
@ -311,39 +320,33 @@ tabs = {
  initSFView() {
    this.schemaView = {
      properties: {
-        no: {
+        freightPrice: {
          type: 'string',
          title: '运费单价',
-         ui: {
-          widget: 'custom',
-         }
        },
-        sex: {
+        rule: {
          title: '',
          type: 'string',
-          default: 0,
-          enum: [
-            { label: '保留小数', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
          ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'goodresource:rounding:rules' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
          } as SFSelectWidgetSchema,
        },
-        appId: {
+        settlementBasis: {
          type: 'string',
          title: '结算重量',
          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.getCatalogueMember(),
-          },
+            widget: 'dict-select',
+            params: { dictKey: 'goodresource:settlement:type' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
        },
      },
-      type: 'object',
    };
    this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
  }
@ -468,19 +471,19 @@ tabs = {
      {
        title: '序号',
        className: 'text-center',
-        index: 'one', 
+        render: 'order'
      },
      {
        title: '操作时间',
        className: 'text-center',
-        index: 'two', 
+        index: 'applyTime'
      },
      {
        title: '操作人',
        className: 'text-center',
-        index: 'three', 
+        index: 'applyUserName'
      },
-      { title: '状态', render: 'externalSn',  className: 'text-center' },
+      { title: '状态',     index: 'handleStatus',  className: 'text-center' },
      {
        title: '操作',
        fixed: 'right',
@ -490,10 +493,14 @@ tabs = {
            text: '查看',
            click: (_record) => this.FloatView(_record),
          },
+          // {
+          //   text: '查看协议',
+          //   click: (_record, _modal, _instance) => this.view(_record)
+          // },
          {
            text: '撤销',
-            click: (_record) => this.audit(_record),
-           iif: item => item.externalSn === '1' || item.externalSn === 1,
+            click: (_record) => this.revoke(_record),
+           iif: item => item.handleStatus === '1' || item.handleStatus === 1,
          },
        ],
      },
@ -505,15 +512,16 @@ tabs = {
        title: '费用名称',
        width: '100px',
        className: 'text-center',
-        render: 'goodsId'
+        index: 'costName'
      },
      {
        title: '变更前',
        width: '100px',
        className: 'text-center',
+        index: 'amountAfterChange'
      },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
+      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
    ];
  }
  /**
@ -522,6 +530,11 @@ tabs = {
  get queryFieldCount(): number {
    return Object.keys(this.schema?.properties || {}).length;
  }
+  get changeViewParams() {
+    return {
+      id: this.changeViewId
+    };
+  }
  /**
  * 伸缩查询条件
  */
@ -589,6 +602,7 @@ tabs = {
    
  }
  OpenPrice(item: any) {
+    this.changeId = item.id;
    this.isVisible = true
  }
   /**
@ -596,6 +610,10 @@ tabs = {
  */
  FloatView(item: any) {
    console.log(item)
+    this.changeViewId = item.id;
+    this.service.request(this.service.$api_getChangeRecordBulkDetail, {id: this.changeViewId}).subscribe((res) => {
+      this.ViewCause = res;
+    })
    this.isVisibleView = true
  }
   /**
@ -676,4 +694,19 @@ tabs = {
            }),
        })
      }
+      revoke(item: any) {
+        this.modal.confirm({
+          nzTitle: '是否确定立即撤销费用变更！</i>',
+          nzOnOk: () => 
+          this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
+            console.log(res)
+            if(res) {
+              this.service.msgSrv.success('撤销成功！')
+              this.stFloat.reload()
+            } else {
+              this.service.msgSrv.error(res.msg)
+            }
+          })
+        });
+      }
 }
--- 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-22 09:56:27
+ * @LastEditTime: 2021-12-22 19:48:42
 * @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
@ -160,7 +160,7 @@
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-    <button nz-button nzType="default" (click)="handleOK()">确定</button>
+    <button nz-button nzType="default" (click)="handleCancel('0')">确定</button>
  </ng-template>
 </nz-modal>

@ -172,20 +172,20 @@
    multiSort
    size="small"
    [bordered]="true"
-    [data]="service.$api_get_listChangeApply"
+    [data]="service.$api_getChangeRecordWholeDetail"
    [columns]="columnsFloatView"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
-    [res]="{ reName: { list: 'data', total: 'data.total' } }"
+    [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
+    [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
    [loadingDelay]="500"
  >
  </st>
-  <div><span>变更原因2：</span></div>
-  <div><span>拒绝原因：</span></div>
-  <div><span>注：</span></div>
+  <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
+  <div><span>拒绝原因：{{ViewCause?.refuseCause}}</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>
+    <button nz-button nzType="primary" (click)="handleCancel('1')">确定</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
@ -30,6 +30,7 @@ export class OrderManagementVehicleComponent implements OnInit {
  isVisible = false;
  changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
  changeViewId: any;  // 查看运费变更记录id - 用于查看
+  ViewCause: any;  // 变更运费查看数据
  _$expand = false;
  @ViewChild('st') private readonly st!: STComponent;
  @ViewChild('stFloat') private readonly stFloat!: STComponent;
@ -457,15 +458,16 @@ resourceStatus: any;
        title: '费用名称',
        width: '100px',
        className: 'text-center',
-        render: 'goodsId'
+        index: 'costName'
      },
      {
        title: '变更前',
        width: '100px',
        className: 'text-center',
+        index: 'amountAfterChange'
      },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
+      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
    ];
  }
  /**
@ -560,6 +562,9 @@ resourceStatus: any;
  FloatView(item: any) {
    console.log(item)
    this.changeViewId = item.id;
+    this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
+      this.ViewCause = res;
+    })
    this.isVisibleView = true
  }
   /**