订单

src/app/routes/order-management/components/additionalc/additionalc.component.html

@@ -0,0 +1,103 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-03 11:10:14
+ * @LastEditTime: 2021-12-07 11:16: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\vehicle\vehicle.component.html
+-->
+<!-- 搜索表单 -->
+<page-header-wrapper [title]="''" >
+ 
+</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" [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+          (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" 
+         >导出</button>
+        <button nz-button (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card>
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
+    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
+    </nz-tab>
+  </nz-tabset>
+  <div style="margin-top: 15px;">
+    <!-- [req]="{ method: 'GET', 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] }"
+      [loadingDelay]="500" [loading]="service.http.loading" -->
+    <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
+      <ng-template st-row="goodsId" let-item let-index="index">
+        <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
+      </ng-template>
+    </st>
+  </div>
+</nz-card>
+
+
+<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
+  <ng-container *nzModalContent>
+    <sv-container labelWidth="160" class="apply-sv">
+      <sv label="车牌号" col="1">{{ infoData1?.enterpriseName }}</sv>
+      <sv label="车型" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
+      <sv label="车长" col="1">{{ infoData1?.enterpriseType }}</sv>
+      <sv label="载重" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
+      <sv label="备注" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
+      <sv label=" 行驶证" col="1">
+        <!-- <span class="sv-img"
+          ><img
+            [src]="infoData1?.enterpriseQualificationCertificateurl"
+            (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
+        /></span> -->
+      </sv>
+      <sv label="行驶证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
+      <sv label="道运证" col="1">
+        <!-- <span class="sv-img"
+          ><img
+            [src]="infoData1?.enterpriseQualificationCertificateurl"
+            (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
+        /></span> -->
+      </sv>
+      <sv label="道运证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
+    </sv-container>
+  </ng-container>
+  <ng-template #nzModalFooterview>
+    <button  *ngIf="!auditstatus" nz-button nzType="default" (click)="Reject()">驳回</button>
+    <button  *ngIf="!auditstatus" nz-button nzType="primary" (click)="handleOK()">通过</button>
+    <button *ngIf="auditstatus" nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
+  </ng-template>
+</nz-modal>
+
+<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+  <ng-container *nzModalContent>
+    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
+    </sf>
+  </ng-container>
+  <ng-template #nzModalFooterview2>
+    <button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+  </ng-template>
+</nz-modal>
+

src/app/routes/order-management/components/additionalc/additionalc.component.less

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

src/app/routes/order-management/components/additionalc/additionalc.component.spec.ts

@@ -0,0 +1,40 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-06 20:03:28
+ * @LastEditTime: 2021-12-07 11:21: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\bulk\bulk.component.spec.ts
+ */
+/*
+ * @Author: your name
+ * @Date: 2021-12-06 19:39:49
+ * @LastEditTime: 2021-12-06 19:41:08
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts
+ */
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { OrderManagementAdditionalcComponent } from './additionalc.component';
+
+describe('OrderManagementAdditionalcComponent', () => {
+  let component: OrderManagementAdditionalcComponent;
+  let fixture: ComponentFixture<OrderManagementAdditionalcComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OrderManagementAdditionalcComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrderManagementAdditionalcComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/order-management/components/additionalc/additionalc.component.ts

@@ -0,0 +1,289 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { SupplyManagementService } from '../../services/order-management.service';
+
+
+@Component({
+  selector: 'app-supply-management-additionalc',
+  templateUrl: './additionalc.component.html',
+  styleUrls: ['./additionalc.component.less']
+})
+export class OrderManagementAdditionalcComponent implements OnInit {
+  url = `/user?_allow_anonymous=true`;
+  ui: SFUISchema = {};
+  uiView: SFUISchema = {};
+  schema: SFSchema = {};
+  schemaView: SFSchema = {};
+  auditMany = false;
+  auditstatus = false;
+  isVisibleView = false;
+  isVisibleRE = false;
+  _$expand = false;
+  infoData1: any;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('sfView', { static: false }) sfView!: SFComponent;
+  columns: STColumn[] = [];
+  demoValue: any;
+  datass: any = [
+    {
+    one: '1',
+    two: '1',
+    three: '1',
+    id: 1
+   },
+    {
+    one: '2',
+    two: '2',
+    three: '2',
+    id: 2
+   },
+];
+  tabs = [  {
+    name: '全部',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '待审核',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '已审核',
+    type: 5,
+    count: 0,
+  },
+  {
+    name: '驳回',
+    type: 5,
+    count: 0,
+  }
+  ];
+  constructor(public service: SupplyManagementService, private modal: NzModalService) { }
+
+  /**
+ * 查询参数
+ */
+  get reqParams() {
+    return {
+      ...this.sf?.value,
+    };
+  }
+  get selectedRows() {
+    return this.st?.list.filter((item) => item.checked) || [];
+  }
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+    this.initSFReject();
+  }
+
+
+
+  /**
+ * 初始化查询表单
+ */
+  initSF() {
+    this.schema = {
+      properties: {
+        no: {
+          type: 'string',
+          title: '公司名称',
+        },
+        no2: {
+          type: 'string',
+          title: '车牌号'
+        },
+      },
+    };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+  }
+  initSFReject() {
+    this.schemaView = {
+      properties: {
+        roleDescription: {
+          title: '驳回原因',
+          type: 'string',
+          maxLength: 50,
+          ui: {
+            placeholder: '请输入驳回原因，最多不超过50字',
+            widget: 'textarea',
+            autosize: { minRows: 2, maxRows: 6 }
+          },
+        },
+      },
+    };
+    this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 12 } } };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  initST() {
+    this.columns = [
+      {
+        title: '公司名称',
+        width: '100px',
+        className: 'text-center',
+        render: 'goodsId'
+      },
+      {
+        title: '车牌号',
+        width: '100px',
+        className: 'text-center',
+      },
+      { title: '车型', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '车长(m)', index: 'linkUrl', width: '120px', className: 'text-center' },
+      {
+        title: '载重(吨)',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '行驶证',
+        className: 'text-center',
+        width: '120px',
+      }, 
+      {
+        title: '道运证',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '审核状态',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '驳回原因',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '添加时间',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '驳回原因',
+        className: 'text-center',
+        width: '120px',
+        render: 'feiong'
+      },
+      {
+        title: '添加人',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '200px',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '审核',
+            click: (_record) => this.viewAudit(_record),
+          },
+          {
+            text: '查看详情',
+            click: (_record) => this.viewDetail(_record),
+          },
+        ],
+      },
+    ];
+  }
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+  /**
+  * 伸缩查询条件
+  */
+  expandToggle(): void {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+  tabChange(item: any) {
+    console.log(item)
+  }
+  /**
+   * 重置表单
+   */
+  resetSF(): void {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+
+
+  // 获取录单员 
+  getCatalogueMember() {
+    const params = {
+    };
+    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
+      map((res) => {
+        if (res) {
+          console.log(res)
+        }
+      }),
+    );
+  }
+
+  selectChange(e: number) {
+    console.log(e);
+  }
+  /**
+   * 导入货源
+   */
+  importGoodsSource() {
+
+  }
+  audit(item: any) {
+    console.log(item)
+  }
+
+ /*
+  * 审核关闭弹窗
+  */
+  handleCancel(item: string) {
+    if(item === '0') {
+      this.isVisibleView = false
+    } else{
+      this.isVisibleRE = false
+    }
+  }
+    /**
+  * 审核通过按钮
+  */
+  handleOK() {
+    
+  }
+   /**
+  *查看评价
+  */
+  viewDetail(item: any) {
+    console.log(item)
+    this.auditstatus = true;
+    this.isVisibleView = true
+  }
+  viewAudit(item: any) {
+    console.log(item)
+    this.auditstatus = false;
+    this.isVisibleView = true
+  }
+  /**
+  *驳回
+  */
+  Reject() {
+    this.isVisibleRE = true;
+  }
+}

src/app/routes/order-management/components/car-manage/car-manage.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-07 11:12:08
+ * @LastEditTime: 2021-12-07 11:16: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\vehicle\vehicle.component.html
@@ -60,39 +60,27 @@
 <nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
   <ng-container *nzModalContent>
     <sv-container labelWidth="160" class="apply-sv">
-      <sv label="身份证号" col="1">{{ infoData1?.enterpriseName }}</sv>
+      <sv label="车牌号" col="1">{{ infoData1?.enterpriseName }}</sv>
-      <sv label="姓名" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
+      <sv label="车型" col="1">{{ infoData1?.unifiedSocialCreditCode }}</sv>
-      <sv label="手机号" col="1">{{ infoData1?.enterpriseType }}</sv>
+      <sv label="车长" col="1">{{ infoData1?.enterpriseType }}</sv>
-      <sv label="银行卡号" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
+      <sv label="载重" col="1">{{ infoData1?.registrationCapital }} 万元</sv>
-      <sv label="开户行" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
+      <sv label="备注" col="1">{{ infoData1?.enterpriseRegistrationTime }}</sv>
-      <sv label="备注" col="1">
+      <sv label=" 行驶证" col="1">
-        {{ infoData1?.enterpriseRegistrationTime }}
-      </sv>
-      <sv label="身份证正面照" col="1">
         <!-- <span class="sv-img"
           ><img
             [src]="infoData1?.enterpriseQualificationCertificateurl"
             (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
         /></span> -->
       </sv>
-      <sv label="身份证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
+      <sv label="行驶证过期时间" col="1">{{ infoData1?.enterpriseAddress }}</sv>
-      <sv label="驾驶证照片" col="1">
+      <sv label="道运证" col="1">
         <!-- <span class="sv-img"
           ><img
             [src]="infoData1?.enterpriseQualificationCertificateurl"
             (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
         /></span> -->
       </sv>
-      <sv label="驾驶证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
+      <sv label="道运证过期时间" col="1">{{ infoData1?.businessScope }}</sv>
-      <sv label="从业资格证" col="1">
-        <!-- <span class="sv-img"
-          ><img
-            [src]="infoData1?.enterpriseQualificationCertificateurl"
-            (click)="viewImg(infoData1?.enterpriseQualificationCertificateurl)"
-        /></span> -->
-      </sv>
-      <sv label="从业资格证过期时间" col="2">{{ infoData1?.businessScope }}</sv>
-      <sv  col="2">已临期</sv>
     </sv-container>
   </ng-container>
   <ng-template #nzModalFooterview>

src/app/routes/order-management/components/car-manage/car-manage.component.ts

@@ -97,11 +97,7 @@ export class OrderManagementCarManageComponent implements OnInit {
         },
         no2: {
           type: 'string',
-          title: '姓名'
+          title: '车牌号'
-        },
-        no1: {
-          type: 'string',
-          title: '手机号'
         },
       },
     };
@@ -137,34 +133,24 @@ export class OrderManagementCarManageComponent implements OnInit {
         render: 'goodsId'
       },
       {
-        title: '姓名',
+        title: '车牌号',
         width: '100px',
         className: 'text-center',
       },
-      { title: '身份证号', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '车型', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '手机号', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '车长(m)', index: 'linkUrl', width: '120px', className: 'text-center' },
       {
-        title: '身份证',
+        title: '载重(吨)',
         className: 'text-center',
         width: '120px',
       },
       {
-        title: '驾驶证',
+        title: '行驶证',
         className: 'text-center',
         width: '120px',
       }, 
       {
-        title: '从业资格证',
+        title: '道运证',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '平台认证状态',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '银行卡',
         className: 'text-center',
         width: '120px',
       },
@@ -177,18 +163,22 @@ export class OrderManagementCarManageComponent implements OnInit {
         title: '驳回原因',
         className: 'text-center',
         width: '120px',
-        render: 'feiong'
       },
       {
         title: '添加时间',
         className: 'text-center',
         width: '120px',
       },
+      {
+        title: '驳回原因',
+        className: 'text-center',
+        width: '120px',
+        render: 'feiong'
+      },
       {
         title: '添加人',
         className: 'text-center',
         width: '120px',
-        render: 'enStatusStr27878'
       },
       {
         title: '操作',

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

@@ -8,6 +8,7 @@
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component';
 import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
 import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
 import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
@@ -22,6 +23,7 @@ const routes: Routes = [
   { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent },
   { path: 'driver-manage', component: OrderManagementDriverManageComponent },
   { path: 'car-manage', component: OrderManagementCarManageComponent },
+  { path: 'additionalc', component: OrderManagementAdditionalcComponent },
 ]
 @NgModule({
   imports: [RouterModule.forChild(routes)],

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

@@ -1,5 +1,6 @@
 import { NgModule, Type } from '@angular/core';
 import { SharedModule } from '@shared';
+import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component';
 import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
 import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
 import { OrderManagementCarManageComponent } from './components/car-manage/car-manage.component';
@@ -15,7 +16,8 @@ const COMPONENTS: Type<void>[] = [
   OrderManagementBulkComponent,
   OrderManagementBulkeDetailComponent,
   OrderManagementDriverManageComponent,
-  OrderManagementCarManageComponent
+  OrderManagementCarManageComponent,
+  OrderManagementAdditionalcComponent
 ];
 
 @NgModule({

src/assets/mocks/menu-data.json

@@ -198,6 +198,16 @@
                 }
                ]
             },
+            {
+              "text": "补录单",
+              "children": [
+                {
+                  "text": "补录运单",
+                  "icon": "anticon anticon-dashboard",
+                  "link": "/order-management/additionalc"
+                }
+               ]
+            },
             {
               "text": "整车订单详情",
               "icon": "anticon anticon-dashboard",