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-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/ticket-management/services/ticket.service.ts

@@ -33,7 +33,7 @@ export class TicketService extends ShipperBaseService {
   // 运营端订单明细开票处理
   $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo';
   // 运营端手工开票/确认/E税云开票成功后的回调
-  $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/ficoVatinvInvoicing';
+  $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv';
 
   // 获取汇总下单路径
   $api_get_order_summary_path = '/api/fcc/ficoExpressH/getSummaryOrderAddress';

src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html

@@ -12,28 +12,14 @@
   <!-- 搜索区 -->
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
-    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+    <div nz-col [nzXl]=" 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 120, 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">
+    <div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-      <button
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
-        nz-button
+        [acl-ability]="['USERCENTER-DRIVER-CONFIG-search']">查询</button>
-        nzType="primary"
+      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl
-        [nzLoading]="service.http.loading"
+        [acl-ability]="['USERCENTER-DRIVER-CONFIG-export']">导出</button>
-        (click)="st?.load(1)"
-        acl
-        [acl-ability]="['USERCENTER-DRIVER-CONFIG-search']"
-        >查询</button
-      >
-      <button
-        nz-button
-        nzType="primary"
-        [disabled]="service.http.loading"
-        (click)="exportList()"
-        acl
-        [acl-ability]="['USERCENTER-DRIVER-CONFIG-export']"
-        >导出</button
-      >
       <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
       <!-- <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
@@ -44,15 +30,8 @@
 </nz-card>
 <nz-card>
   <!-- 数据列表 -->
-  <st
+  <st #st [columns]="columns" [data]="service.$api_configPage" [req]="{  params: reqParams }"
-    #st
+    [loading]="service.http.loading">
-    [columns]="columns"
-    [data]="service.$api_configPage"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading"
-  >
     <ng-template st-row="monthFreightAmount" let-item let-index="index">
       <div>{{item?.monthFreightAmount | currency}}</div>
     </ng-template>
@@ -70,13 +49,3 @@
     </ng-template>
   </st>
 </nz-card>
-
-<ng-template #promoterModal>
-  <div nz-row nzGutter="8">
-    <div nz-col nzSpan="24" se-container [labelWidth]="80">
-      <se [col]="1" label="手机号">
-        <input nz-input [(ngModel)]="promotersTelephone" maxlength="11" required />
-      </se>
-    </div>
-  </div>
-</ng-template>

src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts

@@ -1,8 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
-import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
+import { STColumn, STComponent } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFSchema } from '@delon/form';
-import { ModalHelper } from '@delon/theme';
 import { DynamicSettingModalComponent } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { UsermanageService } from '../../../services/usercenter.service';
@@ -12,19 +11,12 @@ import { UsermanageService } from '../../../services/usercenter.service';
   styleUrls: ['./driver-config.component.less']
 })
 export class UserCenterComponentsDriverConfigComponent implements OnInit {
-  _$expand = false;
-
-  ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } };
   schema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  @ViewChild('promoterModal', { static: false })
+  constructor(public service: UsermanageService, private modal: NzModalService) {}
-  promoterModal!: any;
-  promotersTelephone = '';
-
-  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper,) {}
 
   /**
    * 查询参数
@@ -33,56 +25,12 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
     const params: any = {
       ...(this.sf && this.sf.value)
     };
-    if (this.sf?.value.effectiveDate) {
-      params.effectiveDateStart = this.sf?.value.effectiveDate[0];
-      params.effectiveDateEnd = this.sf?.value.effectiveDate[1];
-    }
     delete params.effectiveDate;
     delete params.expand;
     return params;
   }
 
-  get selectedRows() {
+  ngOnInit() {}
-    return this.st?.list.filter(item => item.checked) || [];
-  }
-
-  ngOnInit() {
-    this.ar.url.subscribe(params => {
-      this.st?.load(1);
-    });
-  }
-  dataProcess(data: STData[]): STData[] {
-    return data.map((i, index) => {
-      i.showSortFlag = false;
-      return i;
-    });
-  }
-
-  addPromoter(item?: any) {
-    this.promotersTelephone = item?.promotersTelephone;
-    const modal = this.modal.create({
-      nzTitle: '推广业务员',
-      nzContent: this.promoterModal,
-      nzOnOk: () => {
-        if (!!!this.promotersTelephone) {
-          return false;
-        }
-        if (typeof this.promotersTelephone === 'string' && !/(^1\d{10}$)/.test(this.promotersTelephone)) {
-          this.service.msgSrv.error('手机格式错误');
-          return false;
-        }
-        this.service
-          .request(this.service.$api_add_user_salesman, { userId: item.userId, mobile: this.promotersTelephone })
-          .subscribe(res => {
-            if (res) {
-              this.service.msgSrv.success(item?.promotersTelephone ? '添加推广员成功' : '修改推广员成功');
-            }
-            this.st.load();
-          });
-        return;
-      }
-    });
-  }
 
   settingAction(item?: any) {
     this.modal.create({
@@ -91,24 +39,18 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
       nzWidth: 900,
       nzComponentParams: {
         extendType: '3',
-        businessId: item.id,
+        businessId: item.appUserId,
         configvalue: 'sys.config'
       },
       nzFooter: null
     });
   }
 
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   /**
    * 重置表单
    */
   resetSF() {
     this.sf.reset();
-    this._$expand = false;
   }
 
   exportList() {
@@ -140,11 +82,11 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '车队长', value: 1 },
-            { label: '司机', value: 0 },
+            { label: '司机', value: 0 }
           ],
           default: '',
           ui: {
-            widget: 'select',
+            widget: 'select'
           }
         }
       }
@@ -158,7 +100,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
       { title: '手机号', className: 'text-center', index: 'mobile' },
       { title: '类型', className: 'text-center', render: 'isCaptain' },
       { title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' },
-      { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount', },
+      { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount' },
       { title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' },
       { title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' },
       {

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -319,11 +319,11 @@ export class UserCenterComponentsDriverComponent implements OnInit {
             },
             acl: { ability: ['USERCENTER-DRIVER-LIST-view'] },
           },
-          {
+          // {
-            text: '基础设置',
+          //   text: '基础设置',
-            click: item => this.settingAction(item),
+          //   click: item => this.settingAction(item),
-            acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] },
+          //   acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] },
-          },
+          // },
           {
             text: '资金账户',
             click: item => this.showAccountDetail(item),

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html

@@ -88,7 +88,7 @@
                                 <ng-container *ngSwitchCase="9">
                                     <nz-upload [nzAction]="service.$api_upload_url" [nzName]="'multipartFile'"
                                         [nzHeaders]="{ authorization: 'authorization-text' }"
-                                        [(nzFileList)]="item.itemValue">
+                                        [(nzFileList)]="item.itemValue" style="margin-left: 26px;">
                                         <button nz-button>
                                             <i nz-icon nzType="upload"></i>
                                             上传文件
@@ -97,7 +97,7 @@
                                 </ng-container>
                                 <!-- 开关选项 -->
                                 <ng-container *ngSwitchCase="10">
-                                    <nz-switch [(ngModel)]="item.itemValue"></nz-switch>
+                                    <nz-switch [ngModel]="item.itemValue" style="margin-left: 26px;"></nz-switch>
                                 </ng-container>
                                 <!-- 开关选项 -->
                                 <ng-container *ngSwitchCase="999">

src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts

@@ -75,6 +75,8 @@ export class DynamicSettingModalComponent implements OnInit {
           this.configList = this.formatItems(this.selectedTab.items);
           const hiddenType = this.configList.find((item: any) => item.itemType === 7 || item.itemType === 999);
           this.labelWidth = hiddenType ? 0 : 200;
+          console.log(this.configList);
+          
         }
       });
   }

src/app/shared/shared-zorro.module.ts

@@ -45,6 +45,7 @@ import { NzCascaderModule } from 'ng-zorro-antd/cascader';
 import { NzAnchorModule } from 'ng-zorro-antd/anchor';
 import { NzAffixModule } from 'ng-zorro-antd/affix';
 import { NzTypographyModule  } from 'ng-zorro-antd/typography';
+import { NzSwitchModule } from 'ng-zorro-antd/switch';
 export const SHARED_ZORRO_MODULES = [
   NzButtonModule,
   NzGridModule,
@@ -84,5 +85,5 @@ export const SHARED_ZORRO_MODULES = [
   NzAnchorModule,
   NzAffixModule,
   NzTypographyModule,
-
+  NzSwitchModule 
 ];