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

2022-04-19 14:58:15 +08:00
parent 1f5d770714 1b0a7d4c95
commit 7d92f8771f
3 changed files with 51 additions and 74 deletions
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
@ -8,7 +8,7 @@ import { DataService } from '../../../services/data.service';

@Component({
  selector: 'app-datatable-partnertable',
-  templateUrl: './partnertable.component.html',
+  templateUrl: './partnertable.component.html'
 })
 export class DatatablePartnertableComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
@ -24,7 +24,7 @@ export class DatatablePartnertableComponent implements OnInit {
    public service: DataService,
    private modalSrv: NzModalService,
    private modal: ModalHelper,
-    private envSrv: EAEnvironmentService,
+    private envSrv: EAEnvironmentService
  ) {}

  /**
@ -47,7 +47,7 @@ export class DatatablePartnertableComponent implements OnInit {
   * 选中行
   */
  get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
  }

  /**
@ -60,17 +60,17 @@ export class DatatablePartnertableComponent implements OnInit {
  /**
   * 重置表单
   */
-   resetSF() {
+  resetSF() {
    this.sf.reset();
    this._$expand = false;
-    this.isLoading = true
+    this.isLoading = true;
  }
  /**
   * 程序初始化入口
   */
  ngOnInit() {
    this.initSF();
-    this.initST()
+    this.initST();
  }

  /**
@ -84,33 +84,37 @@ export class DatatablePartnertableComponent implements OnInit {
          title: '合伙人名称',
          type: 'string',
          ui: { placeholder: '请输入' },
-          readOnly: false,
+          readOnly: false
        },
        phone: {
          title: '合伙人类型',
          type: 'string',
-          ui: { 
+          ui: {
            widget: 'select',
-            placeholder: '请输入' },
-          readOnly: false,
+            placeholder: '请输入'
+          },
+          readOnly: false
        },
        phone01: {
          title: '合伙人状态',
          type: 'string',
-          ui: { 
+          ui: {
            widget: 'select',
-            placeholder: '请输入' },
-          readOnly: false,
+            placeholder: '请输入'
+          },
+          readOnly: false
        },
        createTime: {
          type: 'string',
          title: '注册时间',
-          ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
-        },
+          ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
+            _$expand: (value: boolean) => value,
+          }, } as SFDateWidgetSchema
+        }
      },
-      type: 'object',
+      type: 'object'
    };
-    this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
  }

  /**
@ -118,7 +122,7 @@ export class DatatablePartnertableComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      { title: '合伙人名称', index: 'name', className: 'text-center' },
+      { title: '合伙人名称', index: 'networkTransporterName', className: 'text-center' },
      { title: '注册时间', index: 'telephone', className: 'text-center' },
      { title: '注册时间', index: 'roleName', className: 'text-center' },
      { title: '业务员', index: 'lastLoginDate', className: 'text-center' },
@ -127,23 +131,21 @@ export class DatatablePartnertableComponent implements OnInit {
        index: 'stateLocked',
        className: 'text-center',
        type: 'enum',
-        enum: { 0: '正常', 1: '冻结' },
+        enum: { 0: '正常', 1: '冻结' }
      },
      { title: '客户数', index: 'lastLoginDate', className: 'text-center' },
      { title: '收益额', index: 'lastLoginDate', className: 'text-center' },
      { title: '已提现金额', index: 'lastLoginDate', className: 'text-center' },
      { title: '订单数', index: 'lastLoginDate', className: 'text-center' },
      { title: '订单金额', index: 'lastLoginDate', className: 'text-center' },
-      { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' },
+      { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }
    ];
  }
- 
+
  /**
   * 数据列表状态变化事件
   */
  change(change: STChange) {
    // console.log(change);
  }
-
- 
 }
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@ -140,19 +140,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
            }
          }
        },
-        declareResult: {
-          title: '申报结果',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
+      
        isOvertime: {
          title: '是否逾期',
          type: 'string',
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@ -7,23 +7,16 @@
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\audit\\audit.component.html
 -->
 <!-- 页头 -->
-<page-header-wrapper ></page-header-wrapper>
+<page-header-wrapper></page-header-wrapper>
 <nz-card>
  <!-- 搜索区 -->
  <!-- 搜索表单 -->
  <div nz-row nzGutter="8">
    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf
-        #sf
-        [schema]="schema"
-        [ui]="ui"
-        [mode]="'search'"
-        [disabled]="!sf?.valid"
-        (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"
-      ></sf>
-    
+      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"></sf>
+
    </div>
    <!-- [loading]="false" -->

@ -33,9 +26,10 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" acl  [acl-ability]="['VEHICLE-AUDIT-search']"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" acl [acl-ability]="['VEHICLE-AUDIT-search']"
+          [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
        <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()">导出</button>
-        <button nz-button  [disabled]="false"(click)="resetSF()">重置</button>
+        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -47,34 +41,27 @@
 <nz-card>
  <!-- 数据列表 -->
  <!-- [data]="service.$api_get_supplier_page" -->
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs' [nzTabBarExtraContent]="extraTemplate">
-  <nz-tab [nzTitle]="'全部'"></nz-tab>
-  <nz-tab [nzTitle]="'待审核'"></nz-tab>
-  <nz-tab [nzTitle]="'审核通过'"></nz-tab>
-  <nz-tab [nzTitle]="'驳回'"></nz-tab>
-</nz-tabset>
-  <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '1200px' }"
-    [columns]="columns"
-    [data]='service.$api_get_userCarLicense_list'
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'
+    [nzTabBarExtraContent]="extraTemplate">
+    <nz-tab [nzTitle]="'全部'"></nz-tab>
+    <nz-tab [nzTitle]="'待审核'"></nz-tab>
+    <nz-tab [nzTitle]="'审核通过'"></nz-tab>
+    <nz-tab [nzTitle]="'驳回'"></nz-tab>
+  </nz-tabset>
+  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]='service.$api_get_userCarLicense_list'
    [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]="false"
-  >
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
    <ng-template st-row="carLength" let-item let-index="index">
-    <div>{{item?.carModelLabel}}-{{item?.carLength?  item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
+      <div>{{item?.carModelLabel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
+        item?.carLoad + '吨' : ''}}</div>
    </ng-template>
    <ng-template st-row="isSelf" let-item let-index="index">
-    <div >{{item?.isSelf ? '是' : '否'}}</div>
+      <div>{{item?.isSelf ? '是' : '否'}}</div>
    </ng-template>
    <ng-template st-row="contactsPhone" let-item let-index="index">
-        <div
-          style="color: #52c41a;" (click)="daoyun(item)"
-        >
-          {{ item.contactsPhone }}
+      <div style="color: #52c41a;" (click)="daoyun(item)">
+        {{ item.contactsPhone }}
      </div>
    </ng-template>
    <ng-template st-row="stateCol" let-item let-index="index">
@ -84,9 +71,9 @@
  </st>
 </nz-card>
 <ng-template #extraTemplate>
-    <!-- 工具栏 -->
-    <div class="toolbar" style="float: right;
+  <!-- 工具栏 -->
+  <div class="toolbar" style="float: right;
    padding-bottom: 15px;">
-      <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
-    </div>
+    <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
+  </div>
 </ng-template>