Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html

@@ -37,7 +37,7 @@
                 {{headerInfo?.payDate}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.payBankTypeLabel}}
+                {{headerInfo?.ltdaccountId}}
             </se>
             <se label="确认日期" required>
                 {{headerInfo?.payDate}}

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html

@@ -30,7 +30,7 @@
                 {{headerInfo?.artoname}}
             </se>
             <se label="付款账户" required>
-                {{headerInfo?.arto}}
+                {{headerInfo?.artocode}}
             </se>
             <se label="应收金额">
                 {{headerInfo?.armoney | currency}}
@@ -38,10 +38,10 @@
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="银行类型">
-                {{headerInfo?.banktype}}
+                {{headerInfo?.banktypeLabel}}
             </se>
             <se label="收款类型" required>
-                {{headerInfo?.arvattype==='1'?'费用款项':''}}
+                {{headerInfo?.brmtypeLabel}}
             </se>
             <se label="银行水单">
                 {{headerInfo?.bankreceipt}}

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -37,13 +37,17 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value,
+        ...this.sf.value
+      });
+      if (this.sf.value.createTime) {
+        Object.assign(requestOptions.body, {
           createTime: {
             start: this.sf.value.createTime?.[0] || '',
             end: this.sf.value.createTime?.[1] || ''
           }
         });
       }
+    }
     Object.assign(requestOptions.body, { flag: this.tabType, listSource: 2 });
     return requestOptions;
   };
@@ -246,23 +250,58 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        contactName: {
+        name: {
-          title: '联系人',
+          title: '管理员',
           type: 'string',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
+          }
+        },
+        approval1Status: {
+          type: 'string',
+          title: '企业类型',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
             visibleIf: {
               expand: (value: boolean) => this.tabType === 1
             }
           }
         },
-        name: {
+        approval11Status: {
-          title: '管理员',
           type: 'string',
+          title: '公司所在地',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
           ui: {
-            placeholder: '请输入',
+            widget: 'select',
             visibleIf: {
-              expand: (value: boolean) => this.tabType !== 1
+              expand: (value: boolean) => this.tabType === 1 && value
+            }
+          }
+        },
+        approval11St1atus: {
+          type: 'string',
+          title: '常用服务',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 1 && value
+            }
+          }
+        },
+        approval11St11atus: {
+          type: 'string',
+          title: '客户类型',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 1 && value
             }
           }
         },
@@ -271,7 +310,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
           type: 'string',
           maxLength: 11,
           ui: {
-            placeholder: '请输入'
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 2
+            }
           }
         },
         approvalStatus: {

src/app/routes/usercenter/components/freight/list/list.component.html

@@ -17,11 +17,12 @@
     <div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+    <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+      [class.expend-options]="_$expand">
       <button nz-button nzType="primary" (click)="creat()" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">新增企业</button>
-      <button nz-button nzType="primary"  [nzLoading]="loadingList"
+      <button nz-button nzType="primary" [nzLoading]="loadingList" (click)="st?.load(1)" acl
-        (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
+        [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
       <button nz-button nzType="primary" [disabled]="loadingList" (click)="exportList()" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
       <button nz-button (click)="resetSF()" [disabled]="loadingList">重置</button>
@@ -38,6 +39,12 @@
 
   <st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{  process: beforeReq }"
     [res]="{  process: dataProcess }" [scroll]="{ x: '1200px' }" [page]=" {}" [loading]="loadingList">
+    <ng-template st-row="unifiedSocialCreditCode" let-item let-index="index">
+      <label [ngStyle]="{'color': item.isExpired?'#ff4d4f':''}">{{ item.unifiedSocialCreditCode }}</label><br>
+      <ng-container *ngIf="item.isExpired">
+        <nz-tag nzColor="#ff4d4f">已过期</nz-tag>
+      </ng-container>
+    </ng-template>
     <ng-template st-row="contacter" let-item let-index="index">
       {{ item.contacter }}<br>/{{item.mobile}}
     </ng-template>

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -9,7 +9,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
 @Component({
   selector: 'app-Freight-components-list',
   templateUrl: './list.component.html',
-  styleUrls: ['./list.component.less']
+  styleUrls: ['../../../../commom/less/expend-but.less']
 })
 export class FreightComponentsListComponent implements OnInit {
   _$expand = false;
@@ -116,17 +116,60 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-
+        enterpriseType: {
-        networkTransporter: {
           type: 'string',
-          title: '网络货运人',
+          title: '企业类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 1 },
+            { label: '货运代理', value: 2 },
+            { label: '生产型企业', value: 3 },
+            { label: '贸易类企业', value: 4 },
+            { label: '科技型企业', value: 5 },
+            { label: '化学化工企业', value: 6 },
+            { label: '其他', value: 7 }
+          ],
+          default: '',
           ui: {
-            widget: 'select',
+            widget: 'select'
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
+        sou11rce: {
+          type: 'string',
+          title: '公司所在地',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        oftenUsedServices: {
+          type: 'string',
+          title: '常用服务',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        // sou1r3ce: {
+        //   type: 'string',
+        //   title: '客户类型',
+        //   enum: [{ label: '全部', value: '' }],
+        //   default: '',
+        //   ui: {
+        //     widget: 'select',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
         promotersTelephone: {
           title: '业务员',
           type: 'string',
@@ -138,23 +181,63 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        source: {
+        // promotersTe1le3phone: {
+        //   title: '合伙人',
+        //   type: 'string',
+        //   ui: {
+        //     placeholder: '请输入',
+        //     showRequired: false,
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
+        // promotersTe1lep1hone: {
+        //   title: '客服人员',
+        //   type: 'string',
+        //   ui: {
+        //     placeholder: '请输入',
+        //     showRequired: false,
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
+        approvalUserName: {
+          title: '审核人',
           type: 'string',
-          title: '注册渠道',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '用户注册', value: 1 },
-            { label: '货主添加', value: 2 },
-            { label: '运营添加', value: 3 }
-          ],
-          default: '',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
+            showRequired: false,
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
+        createTime: {
+          title: '申请时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        approvalTime: {
+          title: '审核时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
         lockedStatus: {
           type: 'string',
           title: '企业状态',
@@ -170,6 +253,47 @@ export class FreightComponentsListComponent implements OnInit {
               expand: (value: boolean) => value
             }
           }
+        },
+        source: {
+          type: 'string',
+          title: '注册渠道',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '货主注册', value: 1 },
+            { label: '平台添加', value: 2 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        isExpired: {
+          type: 'string',
+          title: '证件是否过期',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        networkTransporter: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
         }
       }
     };
@@ -180,10 +304,23 @@ export class FreightComponentsListComponent implements OnInit {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
-      { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
+      { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
+      {
+        title: '公司所在地',
+        className: 'text-center',
+        index: 'province',
+        width: 200,
+        format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+      },
+      {
+        title: '企业类型',
+        className: 'text-center',
+        index: 'enterpriseType',
+        width: 200,
+        type: 'enum',
+        enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
+      },
       { title: '管理员', className: 'text-center', render: 'contacter', width: 150 },
-      { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
-      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '常用服务',
         className: 'text-center',
@@ -192,7 +329,10 @@ export class FreightComponentsListComponent implements OnInit {
         enum: { 10: '整车发货', 20: '大宗发货' },
         width: 140
       },
-      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+      { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+      // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '注册渠道',
         className: 'text-center',
@@ -201,6 +341,20 @@ export class FreightComponentsListComponent implements OnInit {
         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: 'insuranceAuthState',
+        type: 'badge',
+        badge: {
+          10: { text: '成功', color: 'success' },
+          20: { text: '失败', color: 'error' }
+        },
+        width: 130
+      },
       {
         title: '企业状态',
         className: 'text-center',

src/app/routes/usercenter/components/freight/list/new/new.component.ts

@@ -206,9 +206,9 @@ export class FreightComponentsListNewComponent implements OnInit {
         if (res.name) {
           this.sf1.setValue('/enterpriseName', res.name);
         }
-        if (res.type) {
+        // if (res.type) {
-          this.sf1.setValue('/enterpriseType', res.type);
+        //   this.sf1.setValue('/enterpriseType', res.type);
-        }
+        // }
         if (res.addressRegionCodes) {
           this.sf1.setValue('/enterpriseAddressCode', res.addressRegionCodes);
         }
@@ -291,13 +291,21 @@ export class FreightComponentsListNewComponent implements OnInit {
         enterpriseType: {
           title: '公司类型',
           type: 'string',
-          minLength: 1,
+          enum: [
-          maxLength: 30,
+            { label: '物流企业', value: 1 },
+            { label: '货运代理', value: 2 },
+            { label: '生产型企业', value: 3 },
+            { label: '贸易类企业', value: 4 },
+            { label: '科技型企业', value: 5 },
+            { label: '化学化工企业', value: 6 },
+            { label: '其他', value: 7 }
+          ],
           ui: {
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-            placeholder: '请输入公司类型',
+            widget: 'select',
+            placeholder: '请选择公司类型',
             errors: {
-              required: '请输入公司类型'
+              required: '请选择公司类型'
             }
           }
         },