fix bug

2022-05-10 10:41:01 +08:00
parent de8bb56dad
commit 0936b30387
11 changed files with 284 additions and 100 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -31,7 +31,8 @@
  <div class="tab_header">
    <label class="page_title">
      <label class="driver">|</label>
-      大宗订单</label>
+      大宗订单</label
+    >
    <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
      <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
      <nz-tab [nzTitle]="'待接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
@ -44,10 +45,17 @@
  </div>

  <div>
-    <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_listBulkPage"
-      [columns]="columns" [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
+    <st
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px', y: scrollY }"
+      [data]="service.$api_get_listBulkPage"
+      [columns]="columns"
+      [req]="{ process: beforeReq }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="false"
+    >
      <ng-template st-row="freightPrice" let-item let-index="index">
        {{ item.freightPrice | currency }}
      </ng-template>
@ -56,19 +64,19 @@
        <div *ngIf="item?.unloadTime">卸 | {{ item?.unloadTime }}</div>
      </ng-template>
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" +
-          item?.carNo : ''}} </div>
+        <div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }} </div>
      </ng-template>
      <ng-template st-row="settlementWeight" let-item let-index="index">
-        <div> {{ item.settlementWeight ? item.settlementWeight + '吨/ ': ''}} {{ item.settlementVolume ?
-          item.settlementVolume + '方 ': ''}}</div>
+        <div>
+          {{ item.settlementWeight ? item.settlementWeight + '吨/ ' : '' }}
+          {{ item.settlementVolume ? item.settlementVolume + '方 ' : '' }}</div
+        >
      </ng-template>
      <ng-template st-row="payeeName" let-item let-index="index">
-        <div *ngIf="item.payeeName !== item.driverName"> {{ item?.payeeName }}{{ item?.payeePhone ? "/" +
-          item?.payeePhone : '' }} </div>
+        <div *ngIf="item.payeeName !== item.driverName"> {{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }} </div>
      </ng-template>
      <ng-template st-row="createUserName" let-item let-index="index">
-        <div> {{ item?.createUserName }}{{ item?.createUserPhone ? "/" + item?.createUserPhone : '' }} </div>
+        <div> {{ item?.createUserName }}{{ item?.createUserPhone ? '/' + item?.createUserPhone : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a>
@ -91,8 +99,7 @@
        <div *ngIf="item.mybidDetailInfo.length > 0">
          <p *ngFor="let data of item.mybidDetailInfo">
            <span *ngIf="data.expenseCode !== 'FL'">{{ data.expenseName }}：{{ data.price | currency }}</span>
-            <span *ngIf="data.expenseCode === 'FL'">{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%'
-              }}</span>
+            <span *ngIf="data.expenseCode === 'FL'">{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }}</span>
            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
          </p>
        </div>
@ -101,13 +108,25 @@
  </div>
 </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]="service.$api_get_listChangeApply" [columns]="columnsFloat"
-      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }">
+    <st
+      #stFloat
+      size="small"
+      [bordered]="true"
+      [data]="service.$api_get_listChangeApply"
+      [columns]="columnsFloat"
+      [req]="{ process: beforeReq }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    >
      <ng-template st-row="order" let-item let-index="index">
        {{ index + 1 }}
      </ng-template>
@ -127,8 +146,14 @@
  </ng-template>
 </nz-modal>

-<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"
-  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+<nz-modal
+  [(nzVisible)]="isVisibleView"
+  [nzWidth]="600"
+  [nzFooter]="nzModalFooterview"
+  nzTitle="查看"
+  (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel('1')"
+>
  <ng-container *nzModalContent>
    <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">
@ -138,21 +163,30 @@
        </div>
      </ng-template>
    </sf>
-    <st #stFloatView multiSort size="small" [bordered]="true" [data]="service.$api_getChangeRecordBulkDetail"
+    <st
+      #stFloatView
+      multiSort
+      size="small"
+      [bordered]="true"
+      [data]="service.$api_getChangeRecordBulkDetail"
      [columns]="columnsFloatView"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
-      [res]="{ reName: { list: 'data.list', total: 'data.total' } }">
+      [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
+    >
      <ng-template st-row="amountBeforeChange" let-item let-index="index">
        {{ item.amountBeforeChange | currency }}
      </ng-template>
-      <ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2'
-        }} </ng-template>
+      <ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template>
      <ng-template st-row="amountAfterChange" let-item let-index="index">
        {{ item.amountAfterChange | currency }}
      </ng-template>
    </st>
-    <div><span>变更原因：{{ ViewCause?.changeCause }}</span></div>
-    <div><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div>
+    <div
+      ><span>变更原因：{{ ViewCause?.changeCause }}</span></div
+    >
+    <div
+      ><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
+    >
    <div><span>注：附加费依据调整后的运输费用重新计算</span></div>
  </ng-container>
  <ng-template #nzModalFooterview>
@ -161,8 +195,13 @@
  </ng-template>
 </nz-modal>

-<nz-modal [(nzVisible)]="isVisibleEvaluate" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel('2')">
+<nz-modal
+  [(nzVisible)]="isVisibleEvaluate"
+  [nzWidth]="600"
+  [nzFooter]="nzModalFooterEvaluate"
+  (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel('2')"
+>
  <ng-container *nzModalContent>
    <nz-tabset>
      <nz-tab nzTitle="货主评价">
@ -191,21 +230,29 @@
 <ng-template #enable>
  <div class="ant-popover-message">
    <i nz-icon nzType="info-circle" nzTheme="fill"></i>
-    <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">已选择{{
-      selectedRows?.length || 0 }}条订单，确认批量签收吗？
+    <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px"
+      >已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
    </div>
    <div class="ant-popover-message-title ng-star-inserted"> 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 </div>
  </div>
 </ng-template>
 <ng-template #extraTemplate>
  <div class="mr-sm">
-    <button nz-button nzDanger [nzLoading]="loading" (click)="openDrawer()" acl
-      [acl-ability]="['ORDER-BULK-search']">筛选</button>
+    <button nz-button nzDanger [nzLoading]="loading" (click)="openDrawer()" acl [acl-ability]="['ORDER-BULK-search']">筛选</button>
    <button nz-button nzDanger [disabled]="loading" (click)="exprot()">导出</button>
-    <button *ngIf="resourceStatus == 4" nz-button nzType="primary" nzGhost nz-popconfirm [nzPopconfirmTitle]="enable"
-      (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight" acl
-      [acl-ability]="['ORDER-BULK-batchSignBulkOrder']">
+    <button
+      *ngIf="resourceStatus == 4"
+      nz-button
+      nzType="primary"
+      nzGhost
+      nz-popconfirm
+      [nzPopconfirmTitle]="enable"
+      (nzOnConfirm)="userAction()"
+      nzPopconfirmPlacement="bottomRight"
+      acl
+      [acl-ability]="['ORDER-BULK-batchSignBulkOrder']"
+    >
      批量签收
    </button>
  </div>
-</ng-template>
+</ng-template>
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -824,4 +824,5 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
  exprot() {
    this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportBulkList);
  }
+
 }