fix bug

2022-05-09 14:41:57 +08:00
parent bec7346927
commit 2d5ffbf610
3 changed files with 37 additions and 33 deletions
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@ -39,10 +39,17 @@
  </div>

  <div>
-    <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_billExamine_page"
-      [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_billExamine_page"
+      [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>
@ -62,8 +69,7 @@
            <app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
          </div>
          <div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
-            <app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]">
-            </app-imagelist>
+            <app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
          </div>
        </div>
      </ng-template>
@ -72,26 +78,21 @@
        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</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="payeeName" let-item let-index="index">
-        <div> {{ item?.payeeName }}{{item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
+        <div> {{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <!-- <div>{{ item.billCode }}</div> -->
-        <a *ngIf="item.resourceType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{
-          item.billCode }}</a>
-        <a *ngIf="item.resourceType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{
-          item.billCode }}</a>
-        <a *ngIf="item.resourceType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{
-          item.billCode }}</a>
+        <a *ngIf="item.resourceType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <a *ngIf="item.resourceType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
+        <a *ngIf="item.resourceType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
        <div>
-          <span>{{item?.billStatusLabel}}</span>
+          <span>{{ item?.billStatusLabel }}</span>
        </div>
        <div>
-          <span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ?
-            '':item?.serviceTypeLabel}}</span>
+          <span>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel === item?.resourceTypeLabel ? '' : item?.serviceTypeLabel }}</span>
        </div>
      </ng-template>
      <ng-template st-row="goodsName" let-item let-index="index">
@ -116,20 +117,18 @@

 <ng-template #extraTemplate>
  <div>
-    <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
-      [acl-ability]="['ORDER-RECEIPTS-search']">筛选</button>
+    <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
+      >筛选</button
+    >
    <button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button>
    <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
-      更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
+      更多<i nz-icon nzType="down" nzTheme="outline"></i
+    ></button>
    <nz-dropdown-menu #menu="nzDropdownMenu">
      <ul nz-menu>
-        <li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']">
-          批量通过
-        </li>
-        <li nz-menu-item (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']">
-          批量生成电子单据
-        </li>
+        <li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量通过 </li>
+        <li nz-menu-item (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </li>
      </ul>
    </nz-dropdown-menu>
  </div>
-</ng-template>
+</ng-template>
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-04-29 17:28:23
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-09 11:33:34
+ * @LastEditTime : 2022-05-09 14:40:09
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -61,6 +61,14 @@
    [scroll]="{ x: '1200px' }"
    [page]="{}"
  >
+  <ng-template st-row="enterpriseName" let-item let-index="index">
+    <div>
+      {{item.partnerType ? item.enterpriseName || item.contactName : ''}}
+    </div>
+    <div *ngIf="item.partnerType == 1">
+     管理员： {{item.contactName }}
+    </div>
+  </ng-template>
  </st>
 </nz-card>

@ -104,7 +112,6 @@
          [req]="{ process: beforeReq, params: { effectiveStatus: 2, newPartnerId: selectItem.id } }"
          [loading]="service.http.loading"
          [page]="{ show: false }"
-          
          (change)="stChange($event)"
        >
        </st>
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@ -412,13 +412,11 @@ export class PartnerListComponent {
    return [
      {
        title: '合伙人名称',
-        index: 'enterpriseName',
+        render: 'enterpriseName',
        width: 180,
-        format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '')
      },
      { title: '付款编码', index: 'payCode', width: 160 },
      { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 },
-      { title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') },
      { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
      { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } },
      { title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },