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

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'
       },
@@ -426,7 +427,7 @@ tabs = {
       {
         title: '货物信息',
         className: 'text-left',
-        width: '180px',
+        width: '250px',
         render: 'goodsName'
       }, {
         title: '运费单价',

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'
       },

src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html

@@ -1,29 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-14 15:53:03
- * @LastEditTime: 2021-12-14 16:19:03
- * @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\order-management\modal\bulk\sure-depart\sure-depart.component.html
--->
-<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
-  <ng-template sf-template="no2" let-me let-ui="ui" let-schema="schema">
-    <div style="display: flex;">
-     <nz-input-number [(ngModel)]="data.place1" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
-     <div class="left_btn">吨</div>
-    </div>
-   </ng-template>
-  <ng-template sf-template="no3" let-me let-ui="ui" let-schema="schema">
-    <div style="display: flex;">
-     <nz-input-number [(ngModel)]="data.place2" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
-     <div class="left_btn">方</div>
-    </div>
-   </ng-template>
-</sf>
-
-<div class="modal-footer">
-  <button nz-button type="button" (click)="close()">关闭</button>
-  <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
-    >确认发车</button
-  >
-</div>

src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less

@@ -1,7 +0,0 @@
-    .left_btn {
-         width: 50px;
-        height: 32px; 
-         padding-left: 8px;
-         line-height:32px; 
-         background-color: #d7d7d7;
-    }

src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts

@@ -1,201 +0,0 @@
-import { preloaderFinished } from '@delon/theme';
-/*
- * @Author: your name
- * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-20 16:13:16
- * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
- */
-import { Component, OnInit, ViewChild } from '@angular/core';
-import {
-  SFComponent,
-  SFCustomWidgetSchema,
-  SFDateWidgetSchema,
-  SFNumberWidgetSchema,
-  SFRadioWidgetSchema,
-  SFSchema,
-  SFSelectWidgetSchema,
-  SFTextareaWidgetSchema,
-  SFUISchema,
-  SFUploadWidgetSchema
-} from '@delon/form';
-import { _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { SupplyManagementService } from 'src/app/routes/supply-management/services/supply-management.service';
-import { Observable, Observer } from 'rxjs';
-
-@Component({
-  selector: 'app-order-management-sure-depart',
-  templateUrl: './sure-depart.component.html',
-  styleUrls: ['./sure-depart.component.less']
-})
-export class SureDepartComponent implements OnInit {
-  record: any = {};
-  i: any;
-  Status: any;
-
-  data: any ={
-    place1: '',
-    place2: ''
-  };
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  schema: SFSchema = {};
-  ui: SFUISchema = {};
-  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: SupplyManagementService ) {}
-
-  ngOnInit(): void {
-    this.initSF();
-  }
-  initSF() {
-    this.schema = {
-      properties: {
-        datetime: {
-          type: 'string',
-          title: '装货时间',
-          format: 'date-time',
-        },
-        no2: {
-          type: 'string',
-          title: '装货重量',
-          ui: {
-            widget: 'custom',
-           }
-        },
-        no3: {
-          type: 'string',
-          title: '装货体积',
-          ui: {
-            widget: 'custom',
-           }
-        },
-        no4: {
-          type: 'string',
-          title: '',
-          ui: {
-            widget: 'text',
-           },
-           default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
-        },
-        avatar: {
-          type: 'string',
-          title: '装货凭证',
-          ui: {
-            action: `/scm/cms/cms/upload/multipartFile/fileModel`,
-            fileType: 'image/png,image/jpeg,image/jpg',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'url',
-            urlReName: 'url',
-            widget: 'upload',
-            descriptionI18n: ' 提单号',
-            data: {
-              // appId: environment.appId,
-            },
-            name: 'multipartFile',
-            multiple: true,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                const avatar = [
-                  {
-                    uid: -1,
-                    name: 'LOGO',
-                    status: 'done',
-                    url: args.fileList[0].response.url,
-                    response: {
-                      url: args.fileList[0].response.url
-                    }
-                  }
-                ];
-                this.sf?.setValue('/avatar', avatar);
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            }
-          } as SFUploadWidgetSchema
-        },
-        avatar2: {
-          type: 'string',
-          title: '',
-          ui: {
-            action: `/scm/cms/cms/upload/multipartFile/fileModel`,
-            fileType: 'image/png,image/jpeg,image/jpg',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'url',
-            urlReName: 'url',
-            widget: 'upload',
-            descriptionI18n: '人车货照片',
-            data: {
-              // appId: environment.appId,
-            },
-            name: 'multipartFile',
-            multiple: true,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                const avatar = [
-                  {
-                    uid: -1,
-                    name: 'LOGO',
-                    status: 'done',
-                    url: args.fileList[0].response.url,
-                    response: {
-                      url: args.fileList[0].response.url
-                    }
-                  }
-                ];
-                this.sf?.setValue('/avatar', avatar);
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            }
-          } as SFUploadWidgetSchema
-        }
-      },
-      required: ['reason']
-    };
-    this.ui = {
-      '*': {
-        spanLabelFixed: 100,
-        grid: { span: 20 }
-      },
-      $avatar: { grid: { span: 12} },
-      $avatar2: { grid: { span: 12} },
-    };
-  }
-  save(value: any): void {
-    console.log(value)
-    // this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
-    //   this.msgSrv.success('保存成功');
-    //   this.modal.close(true);
-    // });
-  }
-
-  close(): void {
-    this.modal.destroy(true);
-  }
-
-}

src/app/routes/order-management/order-management.module.ts

@@ -20,7 +20,6 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta
 
 import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
 import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component';
-import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.component';
 import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
 import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component';
 import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component';
@@ -41,7 +40,6 @@ const COMPONENTS: Type<void>[] = [
   OrderManagementComplaintComponent,
   UpdateFreightComponent,
   ConfirReceiptComponent,
-  SureDepartComponent,
   VehicleUpdateFreightComponent,
   VehicleConfirReceiptComponent,
   VehicleSureDepartComponent,

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html

@@ -217,7 +217,7 @@
         </ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" style="width: 350px;">
+            <div class="align-center2"  style="width: 350px;">
               <div nz-col nzSpan="12">
                 <nz-input-number
                   [(ngModel)]="i.value"
@@ -225,11 +225,10 @@
                   [nzMin]="1"
                   [nzMax]="30"
                   [nzStep]="1"
-                  style="width: 150px;"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="6">
+              <div >
-                <span>天内支付运费</span>
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less

@@ -15,8 +15,16 @@
   align-items: center;
   justify-content: center;
 }
-
+.align-center2 {
+  display: flex;
+  align-items: center;
+}
 #container {
   width: 300px;
   height: 180px;
 }
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html

@@ -165,13 +165,13 @@
         </ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" style="width: 350px;">
+            <div class="align-center2" style="width: 350px;">
               <div nz-col nzSpan="12">
-                <nz-input-number [ngModel]="i.value" style="width: 150px;" [nzMin]="1" [nzMax]="30" [nzStep]="1"
+                <nz-input-number [ngModel]="i.value"  [nzMin]="1" [nzMax]="30" [nzStep]="1"
                   (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30"></nz-input-number>
               </div>
-              <div nz-col nzSpan="6">
+              <div >
-                <span>天内支付运费</span>
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less

@@ -15,8 +15,17 @@
   align-items: center;
   justify-content: center;
 }
+.align-center2 {
+  display: flex;
+  align-items: center;
+}
 
 #container {
   width: 300px;
   height: 180px;
 }
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}

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:37:16
  * @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"
@@ -94,6 +92,7 @@
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{item?.goodsInfos?.goodsName}}</div>
         <div>货源：{{item?.goodsInfos?.goodsResource}}</div>
+        <div class="text-error-dark">剩余: {{item?.goodsInfos?.remainingAmount}}</div>
       </ng-template>
       <!-- 用车需求 -->
       <ng-template st-row="useCarDemand" let-item let-index="index">

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'
       },

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html

@@ -205,22 +205,24 @@
   <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a>《投保告知》</a></ng-template>
   <div nz-row>
     <div nz-col nzSpan="12">
-      <sf #sf5 [schema]="schema5" [formData]="sf5data" [button]="'none'" [ui]="ui5">
+      <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
         <ng-template sf-template="goodsValue" let-i let-ui="ui">
           <div class="align-center">
-            <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
+            <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="3000000" [nzStep]="0.01"
-            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2"
+              (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入50000-3000000之间数值"></nz-input-number>
-              ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
+          </div>
-            ></span>
+        </ng-template>
-            <ng-template #template2
+        <ng-template sf-template="insureInfo" let-i let-ui="ui">
-              >注意事项：<br />
+          <div class="align-center">
-
+            <input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" />
-              ①请仔细阅读《投保告知》<br />
+            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon
-
+                nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span>
-              ②港澳台、西藏不在投保范围内，不予承保<br />
+            <ng-template #template2>
-
+              <p>注意事项:</p>
-              ③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</ng-template
+              <p>①请仔细阅读《投保告知》</p>
-            >
+              <p>②港澳台、西藏不在投保范围内，不予承保</p>
+              <p>③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</p>
+            </ng-template>
           </div>
         </ng-template>
       </sf>
@@ -228,6 +230,7 @@
   </div>
 </nz-card>
 
+
 <nz-card>
   <div class="card-title">补充信息</div>
   <div nz-row>
@@ -263,13 +266,12 @@
                   [nzMin]="1"
                   [nzMax]="30"
                   [nzStep]="1"
-                  style="width: 150px"
                   (ngModelChange)="i.setValue($event)"
                   nzPlaceHolder="请输入1-30"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="8">
+              <div >
-                <span>天内支付运费</span>
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less

@@ -20,3 +20,10 @@
   width: 300px;
   height: 180px;
 }
+
+
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -358,8 +358,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           type: 'string',
           title: '货物价值',
           ui: {
-            widget: 'custom',
+            widget: 'custom'
-            placeholder: '请输入'
+          }
+        },
+        insureInfo: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom'
           }
         }
       },
@@ -368,7 +374,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     this.ui5 = {
       '*': {
         spanLabelFixed: 90,
-        grid: { span: 24 }
+        grid: { span: 12 }
       }
     };
   }

src/app/routes/supply-management/components/release-publish/release-publish.component.html

@@ -233,21 +233,19 @@
   </div>
   <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a>《投保告知》</a></ng-template>
   <div nz-row>
-    <div nz-col nzSpan="8">
+    <div nz-col nzSpan="12">
       <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
         <ng-template sf-template="goodsValue" let-i let-ui="ui">
           <div class="align-center">
-            <nz-input-number
+            <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="3000000" [nzStep]="0.01"
-              [ngModel]="i.value"
+              (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入50000-3000000之间数值"></nz-input-number>
-              [nzMin]="50000"
+          </div>
-              [nzMax]="3000000"
+        </ng-template>
-              [nzStep]="0.01"
+        <ng-template sf-template="insureInfo" let-i let-ui="ui">
-              (ngModelChange)="i.setValue($event)"
+          <div class="align-center">
-              nzPlaceHolder="请输入50000-3000000之间数值，保留2位小数"
+            <input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" />
-            ></nz-input-number>
+            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon
-            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"
+                nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span>
-              ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
-            ></span>
             <ng-template #template2>
               <p>注意事项:</p>
               <p>①请仔细阅读《投保告知》</p>
@@ -260,7 +258,6 @@
     </div>
   </div>
 </nz-card>
-
 <nz-card>
   <div class="card-title">补充信息</div>
   <div nz-row>
@@ -290,7 +287,7 @@
         <ng-template sf-template="total" let-i let-ui="ui">￥{{ i.value }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center">
+            <div class="align-center" style="width: 300px">
               <div nz-col nzSpan="16">
                 <nz-input-number
                   [ngModel]="i.value"
@@ -301,8 +298,8 @@
                   nzPlaceHolder="请输入1-30"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="8">
+              <div >
-                <span>天内支付运费</span>
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -376,13 +376,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'custom'
           }
+        },
+        insureInfo: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom'
+          }
         }
-      }
+      },
+      required: ['goodsValue']
     };
     this.ui5 = {
       '*': {
         spanLabelFixed: 90,
-        grid: { span: 24 }
+        grid: { span: 12 }
       }
     };
   }

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"
+      <sf
-        [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } }}" [compact]="true"
+        #sf
-        [button]="'none'"></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"
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+      <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
-        (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?.totalQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'待接单('+tabs?.stayQuantity+')'"></nz-tab>
+    <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'已接单('+tabs?.receivedQuantity+')'"></nz-tab>
+    <nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></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
+      <nz-alert
-        [ngStyle]="{ margin: '0 0 1rem 0' }">
+        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>
+        <a [routerLink]="'/supply-management/vehicle-detail/' + item.id">{{ item.resourceCode }}</a>
-        <p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
+        <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 class="mr-xs">{{ item.totalAmount | currency }} </div>
-        </div>
       </ng-template>
       <ng-template st-row="surcharge" let-item let-index="index">
-        <div class="mr-xs" >{{item.surcharge | currency}}
+        <div class="mr-xs">{{ item.surcharge | currency }} </div>
-        </div>
       </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
-        <div>车型: {{item.carModelLabel}}</div>
+        <div>车型: {{ item.carModelLabel }}</div>
-        <div class="error">车长: {{item.expand}} 米</div>
+        <div class="error">车长: {{ item.expand }} 米</div>
       </ng-template>
       <ng-template #contentTemplate>
         <div>
@@ -83,24 +88,27 @@
 </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()"
+<nz-modal
-  (nzOnCancel)="handleCancel('suppliersType')">
+  [(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 nzType="info" [nzMessage]="'已选择' + 6 + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
-      </nz-alert>
     </div>
-    <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'">
+    <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
-    </sf>
   </ng-container>
   <ng-template #nzModalFooter>
     <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
     <button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
   </ng-template>
-</nz-modal>
+</nz-modal>

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'
       },

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-04 15:34:07
+ * @LastEditTime: 2022-01-13 16:43:37
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button  >确认发车</button>
+        <button nz-button *ngIf="i.wayBillStatus == '2'"  (click)="sureDepart(i)">确认发车</button>
-        <button nz-button nzType="primary" nzGhost >确认到车</button>
+        <button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost >确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts

@@ -13,6 +13,8 @@ import { _HttpClient } from '@delon/theme';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
+import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
 import { WaybillManagementServe } from '../../services/waybill-management.service';
 @Component({
   selector: 'app-supply-management-bulk-detail',
@@ -50,6 +52,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
+    private modal: NzModalService, 
     private service: WaybillManagementServe,
     private modalService: NzModalService
   ) {
@@ -111,5 +114,38 @@ goDistance(elf: NzCardComponent) {
   if (elf) {
     elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
   }
+}
+ //  *确认发车
+ sureDepart(item: any) {
+  const modalRef = this.modal.create({
+    nzTitle: '确认发车',
+    nzWidth: '50%',
+    nzContent: VehicleSureDepartComponent,
+    nzComponentParams: {
+      i: item,
+     Status: 2
+    },
+    nzFooter: null
+  });
+  modalRef.afterClose.subscribe((result: any) => {
+    this.initData()
+
+});
+}
+// 确认到车
+sureArrive(item: any) {
+  const modalRef = this.modal.create({
+    nzTitle: '确认到车',
+    nzWidth: '50%',
+    nzContent: VehicleSureArriveComponent,
+    nzComponentParams: {
+      i: item,
+     Status: 2
+    },
+    nzFooter: null
+  });
+  modalRef.afterClose.subscribe((result: any) => {
+    this.initData()
+});
 }
 }

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -58,7 +58,10 @@ tabs = {
   totalQuantity: 0,
   compolatelQuantity: 0
 };
-  constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
+  constructor(
+    public service: WaybillManagementServe, 
+    private modal: NzModalService, 
+    public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
@@ -348,16 +351,17 @@ 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'
       },
       {
         title: '运费明细',
-        width: '150px',
+        width: '220px',
         className: 'text-left',
         render: 'billExpenseDetailVOList'
       },
@@ -387,7 +391,7 @@ tabs = {
       {
         title: '接单数量',
         className: 'text-left',
-        width: '120px',
+        width: '200px',
         index: 'orderReceivingQuantity'
 
       },

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-04 15:35:11
+ * @LastEditTime: 2022-01-13 16:55:33
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button  >确认发车</button>
+        <button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" >确认发车</button>
-        <button nz-button nzType="primary" nzGhost >确认到车</button>
+        <button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost >确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 17:10:12
+ * @LastEditTime: 2022-01-13 16:52:42
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.ts
@@ -13,6 +13,8 @@ import { _HttpClient } from '@delon/theme';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
+import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
 import { WaybillManagementServe } from '../../services/waybill-management.service';
 @Component({
   selector: 'app-supply-management-vehicle-detail',
@@ -51,7 +53,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
     private service: WaybillManagementServe,
-    private modalService: NzModalService
+    private modal: NzModalService,
   ) {
 
   }
@@ -75,15 +77,6 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
     })
   }
 
-
-  hand() {
-    this.modalService.create({
-      nzTitle: '',
-      // nzContent: OrderManagementGaodeMapComponent,
-      nzWidth: 1200
-    });
-  }
-
   goBack() {
     window.history.go(-1);
   }
@@ -112,4 +105,39 @@ goDistance(elf: NzCardComponent) {
     elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
   }
 }
+  //  *确认发车
+
+  sureDepart(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认发车',
+      nzWidth: '50%',
+      nzContent: VehicleSureDepartComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 1
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.initData()
+  
+  });
+  }
+  // 确认到车
+  sureArrive(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认到车',
+      nzWidth: '50%',
+      nzContent: VehicleSureArriveComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 1
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.initData()
+   
+  });
+  }
 }

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -55,7 +55,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
     totalQuantity: 0,
     compolatelQuantity: 0
   };
-  constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) {}
+  constructor(
+    public service: WaybillManagementServe,
+     private modal: NzModalService,
+      public service2: ShipperBaseService) {}
 
   /**
    * 查询参数
@@ -300,10 +303,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'
       },