edit

2022-02-25 17:08:11 +08:00
parent 19a0e94828
commit 9955d29d76
20 changed files with 52 additions and 54 deletions
--- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
+++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
@ -30,6 +30,6 @@
        <nz-tab nzTitle="全部"></nz-tab>
    </nz-tabset>

-    <st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns" [req]="{   process: beforeReq }"
+    <st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }"></st>
 </nz-card>
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html
@ -22,7 +22,7 @@
 </nz-card>

 <nz-card class="content-box">
-    <st #st [data]="service.$api_get_advance_collection_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_advance_collection_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html
@ -13,16 +13,12 @@
 <nz-card class="search-box">
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf
-        #sf
-        [schema]="searchSchema"
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        [compact]="true"
-        [button]="'none'"
-      ></sf>
+      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true" [button]="'none'"></sf>
    </div>
    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)"  acl  [acl-ability]="['FINANCIAL-COST-list']">查询</button>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
+        [acl-ability]="['FINANCIAL-COST-list']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <!-- <button nz-button (click)="exportList()"> 导出</button>
      <button nz-button (click)="exportList()"> 导出明细</button> -->
@ -44,14 +40,8 @@
      <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
    </div>
  </div>
-  <st
-    #st
-    [data]="service.$api_get_cost_page"
-    [columns]="columns"
-    [req]="{ process: beforeReq }"
-    [loading]="service.http.loading"
-    [scroll]="{ x: '2000px' }"
-  >
+  <st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
+    [loading]="service.http.loading" [scroll]="{ x: '2000px' }">
    <ng-template st-row="armoeny" let-item let-index="index">
      {{ item.armoeny | currency }}
    </ng-template>
@ -72,13 +62,9 @@
  <div nz-row nzGutter="8">
    <div nz-col nzSpan="24" se-container [labelWidth]="80">
      <se [col]="1" label="备注">
-        <textarea
-          nz-input
-          rows="3"
-          placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-          style="width: 325px; margin-left: 14px"
-        ></textarea>
+        <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px; margin-left: 14px"></textarea>
      </se>
    </div>
  </div>
-</ng-template>
+</ng-template>
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html
@ -22,7 +22,7 @@
 </nz-card>

 <nz-card class="content-box">
-    <st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
        <ng-template st-row="availableBalance" let-item let-index="index">
            <a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
--- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html
+++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html
@ -22,7 +22,7 @@
 </nz-card>

 <nz-card class="content-box">
-    <st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{   process: beforeReq }"
+    <st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
        <ng-template st-row="description" let-item let-index="index">
            <a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
@ -33,7 +33,7 @@
 </nz-card>

 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html
@ -34,7 +34,7 @@
        </div>
    </div>

-    <st #st [data]="service.$api_get_payment_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_payment_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
@ -30,7 +30,7 @@
        <nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
    </nz-tabset>

-    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }"
+    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
        <ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
            {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
@ -52,7 +52,7 @@
 </nz-card>

 <nz-card class="content-box">
-    <st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
@ -40,7 +40,7 @@
    </div>
  </div>

-  <st #st [data]="service.$api_get_receipt_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <st #st [data]="service.$api_get_receipt_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
    [loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
  </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
@ -31,7 +31,7 @@
 </nz-card>

 <nz-card class="content-box" nzBordered>
-  <st #st [data]="service.$api_get_fico_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <st #st [data]="service.$api_get_fico_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
    [loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
  </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
@ -36,7 +36,7 @@
 </nz-card>

 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }"
+    <st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
        <ng-template st-row="transferBankAccount" let-item let-index="index" let-column="column">
            {{ item.transferBankOpenName }} <br> {{ item.transferBankCardNumber }}
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
@ -30,7 +30,7 @@
        <nz-tab nzTitle="退款失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
    </nz-tabset>

-    <st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
        <ng-template st-row="orderRefundCode" let-item let-index="index" let-column="column">
            {{ item.orderRefundCode }} <br> {{ item.refundStatusLabel }}
--- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
+++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
@ -21,7 +21,7 @@
 </nz-card>

 <nz-card class="content-box pt-xl" nzBordered>
-  <st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{  process: beforeReq }"
+  <st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
    [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
    <ng-template st-row="amount">

--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
@ -33,7 +33,7 @@
        </div> -->
    </div>

-    <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
+++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
@ -33,7 +33,7 @@
 </nz-card>

 <nz-card nzBordered>
-    <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
    </st>
 </nz-card>
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
@ -65,7 +65,7 @@
        </div>
    </ng-template>

-    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
        <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
            {{ item.bankName }} <br> {{ item.bankCardNumber }}
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
@ -34,6 +34,19 @@
    <!-- 数据列表 -->
    <st #st multiSort [data]="service.$api_get_freight_list" [columns]="tabType===1?enterColumns:adminColumns"
      [req]="{  process: beforeReq }" [page]=" {}" [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
+      <ng-template st-row="approvalStatus" let-item let-index="index">
+        <ng-container [ngSwitch]="item.approvalStatus">
+          <nz-badge *ngSwitchCase="10" nzColor="#108ee9" nzText="待审核"></nz-badge>
+          <nz-badge *ngSwitchCase="15" nzColor="gold" nzText="已撤销"></nz-badge>
+          <nz-badge *ngSwitchCase="20" nzColor="#87d068" nzText="已成功"></nz-badge>
+          <ng-container *ngSwitchCase="30">
+            <nz-badge nzColor="volcano" nzText="已驳回"></nz-badge><br>
+            <label style="color: #ff4d4f;">（驳回原因：{{item.approvalOpinion}}）</label>
+          </ng-container>
+
+          <p *ngSwitchDefault></p>
+        </ng-container>
+      </ng-template>
    </st>
  </nz-card>
  <ng-template #content>
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
@ -175,7 +175,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
        type: 'enum',
        enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
      },
-      { title: '管理员', className: 'text-center', index: 'contacter', width: 150, format: item => `${item.contacter}/${item.mobile}` },
+      { title: '管理员', className: 'text-center', index: 'contacter', width: 150, format: item => `${item.contacter}<br>/${item.mobile}` },
      {
        title: '常用服务',
        className: 'text-center',
@ -185,19 +185,22 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
        width: 140
      },
      { title: '业务员', className: 'text-center', index: 'promotersTelephone', width: 150 },
-      { title: '注册时间', className: 'text-center', index: 'createTime', width: 170 },
+      {
+        title: '注册渠道',
+        className: 'text-center',
+        index: 'source',
+        type: 'enum',
+        enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
+        width: 130
+      },
+      { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
+      { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' },
+      { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
      {
        title: '审核状态',
        className: 'text-center',
-        index: 'approvalStatus',
-        type: 'badge',
-        badge: {
-          10: { text: '待审核', color: 'processing' },
-          15: { text: '已撤销', color: 'processing' },
-          20: { text: '已成功', color: 'success' },
-          30: { text: '审核失败', color: 'warning' }
-        },
-        width: 130
+        render: 'approvalStatus',
+        width: 160
      },
      {
        title: '常用服务',
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@ -52,10 +52,6 @@
      <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone
        || '添加' }}</a>
    </ng-template>
-    <ng-template st-row="stateCol" let-item let-index="index">
-      <nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
-      <nz-tag *elseBlock nzColor="success">正常</nz-tag>
-    </ng-template>
  </st>
 </nz-card>