车辆对接

2022-01-13 16:31:29 +08:00
parent 6ae6403750
commit 66655f298d
8 changed files with 59 additions and 47 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -399,10 +399,11 @@ tabs = {
   */
  initST() {
    this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '订单号',
        width: '180px',
+        fixed: 'left',
        className: 'text-left',
        render: 'billCode'
      },
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -351,10 +351,11 @@ resourceStatus: any;
   */
  initST() {
    this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '订单号',
        width: '200px',
+        fixed: 'left',
        className: 'text-left',
        render: 'billCode'
      },
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 16:02:08
+ * @LastEditTime: 2022-01-13 16:26:41
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@ -59,8 +59,6 @@
  <div style="margin-top: 15px;">
    <st
    #st
-    size="small"
-    [bordered]="true"
    [scroll]="{ x: '2000px' }"
    [data]="service.$api_get_bulkPage_list"
    [columns]="columns"
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@ -190,10 +190,11 @@ export class SupplyManagementBulkComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '货源编号',
        width: '200px',
+        fixed: 'left',
        className: 'text-left',
        render: 'resourceCode'
      },
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-22 11:28:28
- * @LastEditTime: 2022-01-13 15:02:42
+ * @LastEditTime: 2022-01-13 16:26:00
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -10,15 +10,17 @@
 <nz-card>
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="schema"
-        [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } }}" [compact]="true"
-        [button]="'none'"></sf>
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
    </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
-      class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
-        (click)="st?.load(1)">查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
      <button nz-button nzType="link" (click)="expandToggle()">
        {{ !_$expand ? '展开' : '收起' }}
@ -29,44 +31,47 @@
 </nz-card>

 <nz-card>
-  <!-- <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
-    </nz-tab>
-  </nz-tabset> -->
  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'待接单('+tabs?.stayQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'已接单('+tabs?.receivedQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
+    <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
  </nz-tabset>
-  <div style="margin-top: 15px;">
+  <div style="margin-top: 15px">
    <!-- 选中提示框 -->
    <div style="position: relative">
-      <nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
-        [ngStyle]="{ margin: '0 0 1rem 0' }">
+      <nz-alert
+        nzType="info"
+        [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
+        nzShowIcon
+        [ngStyle]="{ margin: '0 0 1rem 0' }"
+      >
      </nz-alert>
    </div>
-    <st #st size="small" [bordered]="true" [scroll]="{ x: '2000px' }" [data]="service.$api_get_wholePage_list"
+    <st
+      #st
+      [scroll]="{ x: '2000px' }"
+      [data]="service.$api_get_wholePage_list"
      [columns]="columns"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="service.http.loading" [scroll]="{ x: '1200px',y:'500px' }">
+      [loading]="service.http.loading"
+      [scroll]="{ x: '1200px', y: '500px' }"
+    >
      <ng-template st-row="resourceCode" let-item let-index="index">
-        <a [routerLink]="'/supply-management/vehicle-detail/'+item.id">{{item.resourceCode}}</a>
-        <p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
+        <a [routerLink]="'/supply-management/vehicle-detail/' + item.id">{{ item.resourceCode }}</a>
+        <p>{{ item.resourceTypeLabel }}{{ item.serviceTypeLabel }}</p>
      </ng-template>
      <ng-template st-row="totalAmount" let-item let-index="index">
-        <div class="mr-xs" >{{item.totalAmount | currency}}
-        </div>
+        <div class="mr-xs">{{ item.totalAmount | currency }} </div>
      </ng-template>
      <ng-template st-row="surcharge" let-item let-index="index">
-        <div class="mr-xs" >{{item.surcharge | currency}}
-        </div>
+        <div class="mr-xs">{{ item.surcharge | currency }} </div>
      </ng-template>
      <ng-template st-row="useCarDemand" let-item let-index="index">
-        <div>车型: {{item.carModelLabel}}</div>
-        <div class="error">车长: {{item.expand}} 米</div>
+        <div>车型: {{ item.carModelLabel }}</div>
+        <div class="error">车长: {{ item.expand }} 米</div>
      </ng-template>
      <ng-template #contentTemplate>
        <div>
@ -83,21 +88,24 @@
 </nz-card>
 <ng-template #extraTemplate>
  <div>
-    <button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
+    <button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
    <button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
    <button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
  </div>
 </ng-template>

-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel('suppliersType')">
+<nz-modal
+  [(nzVisible)]="isVisible"
+  [nzFooter]="nzModalFooter"
+  nzTitle="货源审核"
+  (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel('suppliersType')"
+>
  <ng-container *nzModalContent>
    <div style="position: relative" *ngIf="auditMany">
-      <nz-alert nzType="info" [nzMessage]="'已选择' +  6 + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
-      </nz-alert>
+      <nz-alert nzType="info" [nzMessage]="'已选择' + 6 + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
    </div>
-    <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'">
-    </sf>
+    <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@ -354,10 +354,11 @@ export class SupplyManagementVehicleComponent implements OnInit {
   */
  private initST(): STColumn[] {
    return [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '货源编号',
        width: '180px',
+        fixed: 'left',
        className: 'text-left',
        render: 'resourceCode'
      },
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@ -348,10 +348,11 @@ tabs = {
   */
   initST() {
    this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '运单号',
        width: '180px',
+        fixed: 'left',
        className: 'text-left',
        render: 'wayBillCode'
      },
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@ -300,10 +300,11 @@ export class WaybillManagementVehicleComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
      {
        title: '运单号',
        width: '180px',
+        fixed: 'left',
        className: 'text-left',
        render: 'wayBillCode'
      },