From a8a9565b40e1f0a347e91d3330e682544e107802 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 16:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/vehicle/vehicle.component.html |  82 +------------
 .../components/vehicle/vehicle.component.ts   | 111 ------------------
 2 files changed, 2 insertions(+), 191 deletions(-)

diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index 97f7b535..3d37838f 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-17 20:13:41
+ * @LastEditTime: 2022-01-18 16:55:43
  * @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
@@ -94,84 +94,6 @@
         <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
         <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
       </ng-template>
-      <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>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
-        </div>
-      </ng-template>
     </st>
   </div>
-</nz-card>
-
-
-<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel('0')">
-  <ng-container *nzModalContent>
-    <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)="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>变更原因2：</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>
\ No newline at end of file
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index 19929bb7..9617a64e 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -19,34 +19,13 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
 export class WaybillManagementVehicleComponent implements OnInit {
   ui: SFUISchema = {};
   schema: SFSchema = {};
-  auditMany = false;
-  isVisibleView = false;
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
   resourceStatus: any;
   @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 = {
     signQuantity: 0,
     cancelQuantity: 0,
@@ -86,8 +65,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.initSF();
     this.initST();
     this.getGoodsSourceStatistical();
-    this.initSTFloat();
-    this.initSTFloatView();
   }
 
   /**
@@ -355,58 +332,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
       }
     ];
   }
-  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' }
-    ];
-  }
   /**
    * 查询字段个数
    */
@@ -447,42 +372,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
    * 导入货源
    */
   importGoodsSource() {}
-  audit(item: any) {
-    console.log(item);
-  }
-
-  /*
-  * 审核关闭弹窗
-  view: 1
-  浮动费用： 0
-  查看评价： 3
-  */
-  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;
-    }
-  }
-  /**
-   * 审核通过按钮
-   */
-  handleOK() {}
-  OpenPrice() {
-    this.isVisible = true;
-  }
-  /**
-   * 浮动费用查看
-   */
-  FloatView(item: any) {
-    console.log(item);
-    this.isVisibleView = true;
-  }
   /**
    *查看评价
    */